ch4: JsonComparator and RequestPostProcessor

Author: Kehrlann

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

@@ -111,6 +111,8 @@
 import org.cloudfoundry.client.v3.applications.ApplicationResource;
 import org.cloudfoundry.client.v3.applications.GetApplicationEnvironmentRequest;
 import org.cloudfoundry.client.v3.applications.GetApplicationEnvironmentResponse;
+import org.cloudfoundry.client.v3.applications.GetApplicationProcessStatisticsRequest;
+import org.cloudfoundry.client.v3.applications.GetApplicationProcessStatisticsResponse;
 import org.cloudfoundry.client.v3.applications.GetApplicationResponse;
 import org.cloudfoundry.client.v3.applications.GetApplicationSshEnabledRequest;
 import org.cloudfoundry.client.v3.applications.GetApplicationSshEnabledResponse;
@@ -821,14 +823,15 @@ private static String cleanName(ApplicationManifest manifest) {
         return manifest.getName().replaceAll("\\.", "");
     }
 
-    private static BiFunction<String, String, String> collectStates() {
+    public static BiFunction<ProcessState, ProcessState, ProcessState> collectStates() {
         return (totalState, instanceState) -> {
-            if ("RUNNING".equals(instanceState) || "RUNNING".equals(totalState)) {
-                return "RUNNING";
+            if (ProcessState.RUNNING.equals(instanceState)
+                    || ProcessState.RUNNING.equals(totalState)) {
+                return ProcessState.RUNNING;
             }
 
-            if ("FLAPPING".equals(instanceState) || "CRASHED".equals(instanceState)) {
-                return "FAILED";
+            if (ProcessState.CRASHED.equals(instanceState)) {
+                return ProcessState.CRASHED;
             }
 
             return totalState;
@@ -1434,8 +1437,8 @@ private static boolean isIdentical(String s, String t) {
         return Objects.equals(s, t);
     }
 
-    private static Predicate<String> isInstanceComplete() {
-        return state -> "RUNNING".equals(state) || "FAILED".equals(state);
+    private static Predicate<ProcessState> isInstanceComplete() {
+        return state -> ProcessState.RUNNING.equals(state) || ProcessState.CRASHED.equals(state);
     }
 
     private static Predicate<AbstractApplicationResource> isNotIn(String expectedState) {
@@ -1452,8 +1455,8 @@ private static boolean isRestartRequired(
                 && STARTED_STATE.equals(ResourceUtils.getEntity(applicationResource).getState());
     }
 
-    private static Predicate<String> isRunning() {
-        return "RUNNING"::equals;
+    private static Predicate<ProcessState> isRunning() {
+        return ProcessState.RUNNING::equals;
     }
 
     private static Predicate<String> isStaged() {
@@ -1643,6 +1646,17 @@ private Mono<ApplicationInstancesResponse> requestApplicationInstances(String ap
                         ApplicationInstancesRequest.builder().applicationId(applicationId).build());
     }
 
+    private Mono<GetApplicationProcessStatisticsResponse> requestApplicationStatisticsV3(
+            String applicationId) {
+        return this.cloudFoundryClient
+                .applicationsV3()
+                .getProcessStatistics(
+                        GetApplicationProcessStatisticsRequest.builder()
+                                .applicationId(applicationId)
+                                .type("web")
+                                .build());
+    }
+
     private Flux<org.cloudfoundry.client.v3.routes.RouteResource> requestApplicationRoutes(
             String applicationId) {
         return PaginationUtils.requestClientV3Resources(
@@ -2620,10 +2634,10 @@ private Mono<Void> waitForRunning(
             String application, String applicationId, Duration startupTimeout) {
         Duration timeout = Optional.ofNullable(startupTimeout).orElse(Duration.ofMinutes(5));
 
-        return requestApplicationInstances(applicationId)
-                .flatMapMany(response -> Flux.fromIterable(response.getInstances().values()))
-                .map(ApplicationInstanceInfo::getState)
-                .reduce("UNKNOWN", collectStates())
+        return requestApplicationStatisticsV3(applicationId)
+                .flatMapIterable(GetApplicationProcessStatisticsResponse::getResources)
+                .map(ProcessStatisticsResource::getState)
+                .reduce(ProcessState.STARTING, collectStates())
                 .filter(isInstanceComplete())
                 .repeatWhenEmpty(
                         exponentialBackOff(Duration.ofSeconds(1), Duration.ofSeconds(15), timeout))