Polishing

[resolves #942] [resolves #992]

Signed-off-by: Paul Harris <[email protected]>

Author: twoseat

cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/DefaultApplications.java

@@ -942,6 +942,10 @@ private static Mono<SpaceResource> getOrganizationSpaceByName(CloudFoundryClient
             .onErrorResume(NoSuchElementException.class, t -> ExceptionUtils.illegalArgument("Space %s not found", space));
     }
 
+    private static String getPassword(DockerCredentials dockerCredentials) {
+        return Optional.ofNullable(dockerCredentials).map(DockerCredentials::getPassword).orElse(null);
+    }
+
     private static Flux<String> getPushRouteIdFromDomain(CloudFoundryClient cloudFoundryClient, List<DomainSummary> availableDomains, String domainId, ApplicationManifest manifest,
                                                          RandomWords randomWords, String spaceId) {
         if (isTcpDomain(availableDomains, domainId)) {
@@ -1062,6 +1066,10 @@ private static Mono<String> getTcpRouteId(CloudFoundryClient cloudFoundryClient,
             .map(ResourceUtils::getId);
     }
 
+    private static String getUsername(DockerCredentials dockerCredentials) {
+        return Optional.ofNullable(dockerCredentials).map(DockerCredentials::getUsername).orElse(null);
+    }
+
     private static boolean isIdentical(String s, String t) {
         return Objects.equals(s, t);
     }
@@ -1765,25 +1773,6 @@ private static Mono<ApplicationManifest> toApplicationManifest(SummaryApplicatio
                 .build());
     }
 
-    private static Docker toDocker(SummaryApplicationResponse response) {
-        if (response.getDockerImage() == null) {
-            return null;
-        }
-        return Docker.builder()
-            .image(response.getDockerImage())
-            .username(getUsername(response.getDockerCredentials()))
-            .password(getPassword(response.getDockerCredentials()))
-            .build();
-    }
-
-    private static String getUsername(DockerCredentials dockerCredentials) {
-        return Optional.ofNullable(dockerCredentials).map(DockerCredentials::getUsername).orElse(null);
-    }
-
-    private static String getPassword(DockerCredentials dockerCredentials) {
-        return Optional.ofNullable(dockerCredentials).map(DockerCredentials::getPassword).orElse(null);
-    }
-
     private static ApplicationSummary toApplicationSummary(SpaceApplicationSummary spaceApplicationSummary) {
         return ApplicationSummary.builder()
             .diskQuota(spaceApplicationSummary.getDiskQuota())
@@ -1805,6 +1794,17 @@ private static Date toDate(Double date) {
         return date == null ? null : DateUtils.parseSecondsFromEpoch(date);
     }
 
+    private static Docker toDocker(SummaryApplicationResponse response) {
+        if (response.getDockerImage() == null) {
+            return null;
+        }
+        return Docker.builder()
+            .image(response.getDockerImage())
+            .username(getUsername(response.getDockerCredentials()))
+            .password(getPassword(response.getDockerCredentials()))
+            .build();
+    }
+
     private static DomainSummary toDomain(SharedDomainResource resource) {
         SharedDomainEntity entity = ResourceUtils.getEntity(resource);
 

cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/DefaultApplicationsTest.java

@@ -3130,6 +3130,22 @@ private static void requestApplicationSummary(CloudFoundryClient cloudFoundryCli
                     .build()));
     }
 
+    private static void requestApplicationSummaryDetectedBuildpack(CloudFoundryClient cloudFoundryClient, String applicationId) {
+        when(cloudFoundryClient.applicationsV2()
+            .summary(SummaryApplicationRequest.builder()
+                .applicationId(applicationId)
+                .build()))
+            .thenReturn(Mono
+                .just(fill(SummaryApplicationResponse.builder(), "application-summary-")
+                    .route(fill(org.cloudfoundry.client.v2.routes.Route.builder(), "route-")
+                        .domain(fill(org.cloudfoundry.client.v2.domains.Domain.builder(), "domain-")
+                            .build())
+                        .build())
+                    .buildpack(null)
+                    .packageUpdatedAt(DateUtils.formatToIso8601(new Date(0)))
+                    .build()));
+    }
+
     private static void requestApplicationSummaryDocker(CloudFoundryClient cloudFoundryClient, String applicationId) {
         when(cloudFoundryClient.applicationsV2()
             .summary(SummaryApplicationRequest.builder()
@@ -3156,22 +3172,6 @@ private static void requestApplicationSummaryDocker(CloudFoundryClient cloudFoun
                     .build()));
     }
 
-    private static void requestApplicationSummaryDetectedBuildpack(CloudFoundryClient cloudFoundryClient, String applicationId) {
-        when(cloudFoundryClient.applicationsV2()
-            .summary(SummaryApplicationRequest.builder()
-                .applicationId(applicationId)
-                .build()))
-            .thenReturn(Mono
-                .just(fill(SummaryApplicationResponse.builder(), "application-summary-")
-                    .route(fill(org.cloudfoundry.client.v2.routes.Route.builder(), "route-")
-                        .domain(fill(org.cloudfoundry.client.v2.domains.Domain.builder(), "domain-")
-                            .build())
-                        .build())
-                    .buildpack(null)
-                    .packageUpdatedAt(DateUtils.formatToIso8601(new Date(0)))
-                    .build()));
-    }
-
     private static void requestApplicationSummaryNoBuildpack(CloudFoundryClient cloudFoundryClient, String applicationId) {
         when(cloudFoundryClient.applicationsV2()
             .summary(SummaryApplicationRequest.builder()