DefaultApplications: use applicationsV3 to determine app started

Author: Kehrlann

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

@@ -116,7 +116,6 @@
 import org.cloudfoundry.client.v3.applications.GetApplicationResponse;
 import org.cloudfoundry.client.v3.applications.GetApplicationSshEnabledRequest;
 import org.cloudfoundry.client.v3.applications.GetApplicationSshEnabledResponse;
-import org.cloudfoundry.client.v3.applications.ListApplicationProcessesRequest;
 import org.cloudfoundry.client.v3.applications.ListApplicationRoutesRequest;
 import org.cloudfoundry.client.v3.applications.ListApplicationsRequest;
 import org.cloudfoundry.client.v3.applications.SetApplicationCurrentDropletRequest;
@@ -136,8 +135,6 @@
 import org.cloudfoundry.client.v3.packages.PackageState;
 import org.cloudfoundry.client.v3.packages.PackageType;
 import org.cloudfoundry.client.v3.packages.UploadPackageRequest;
-import org.cloudfoundry.client.v3.processes.GetProcessStatisticsRequest;
-import org.cloudfoundry.client.v3.processes.GetProcessStatisticsResponse;
 import org.cloudfoundry.client.v3.processes.ProcessState;
 import org.cloudfoundry.client.v3.processes.ProcessStatisticsResource;
 import org.cloudfoundry.client.v3.resourcematch.MatchedResource;
@@ -2655,61 +2652,7 @@ private Mono<Void> waitForRunning(
 
     private Mono<Void> waitForRunningV3(
             String applicationName, String applicationId, Duration startupTimeout) {
-        Duration timeout = Optional.ofNullable(startupTimeout).orElse(Duration.ofMinutes(5));
-
-        return PaginationUtils.requestClientV3Resources(
-                        page ->
-                                this.cloudFoundryClient
-                                        .applicationsV3()
-                                        .listProcesses(
-                                                ListApplicationProcessesRequest.builder()
-                                                        .applicationId(applicationId)
-                                                        .page(page)
-                                                        .build()))
-                .filter(p -> p.getInstances() != 0)
-                .flatMap(
-                        process ->
-                                this.cloudFoundryClient
-                                        .processes()
-                                        .getStatistics(
-                                                GetProcessStatisticsRequest.builder()
-                                                        .processId(process.getId())
-                                                        .build())
-                                        .flatMapIterable(GetProcessStatisticsResponse::getResources)
-                                        .map(ProcessStatisticsResource::getState)
-                                        .filter(
-                                                state ->
-                                                        EnumSet.of(
-                                                                        ProcessState.RUNNING,
-                                                                        ProcessState.CRASHED)
-                                                                .contains(state))
-                                        .reduce(
-                                                (totalState, instanceState) ->
-                                                        totalState.ordinal()
-                                                                        < instanceState.ordinal()
-                                                                ? totalState
-                                                                : instanceState) // CRASHED takes
-                                        // precedence over
-                                        // RUNNING
-                                        .repeatWhenEmpty(
-                                                exponentialBackOff(
-                                                        Duration.ofSeconds(1),
-                                                        Duration.ofSeconds(15),
-                                                        timeout))
-                                        .filter(state -> state == ProcessState.RUNNING)
-                                        .switchIfEmpty(
-                                                ExceptionUtils.illegalState(
-                                                        "Process %s of Application %s failed during"
-                                                                + " start",
-                                                        process.getId(), applicationName))
-                                        .onErrorResume(
-                                                DelayTimeoutException.class,
-                                                t ->
-                                                        ExceptionUtils.illegalState(
-                                                                "Process %s of Application %s timed"
-                                                                        + " out during start",
-                                                                process.getId(), applicationName)))
-                .then();
+        return waitForRunning(applicationName, applicationId, startupTimeout);
     }
 
     private Mono<Void> waitForStaging(

cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/AbstractOperationsTest.java

@@ -48,6 +48,7 @@
 import org.cloudfoundry.client.v3.domains.DomainsV3;
 import org.cloudfoundry.client.v3.jobs.JobsV3;
 import org.cloudfoundry.client.v3.organizations.OrganizationsV3;
+import org.cloudfoundry.client.v3.processes.Processes;
 import org.cloudfoundry.client.v3.routes.RoutesV3;
 import org.cloudfoundry.client.v3.spaces.SpacesV3;
 import org.cloudfoundry.client.v3.stacks.StacksV3;
@@ -117,6 +118,7 @@ public abstract class AbstractOperationsTest {
     protected final Organizations organizations = mock(Organizations.class, RETURNS_SMART_NULLS);
     protected final OrganizationsV3 organizationsV3 =
             mock(OrganizationsV3.class, RETURNS_SMART_NULLS);
+    protected final Processes processes = mock(Processes.class, RETURNS_SMART_NULLS);
 
     protected final PrivateDomains privateDomains = mock(PrivateDomains.class, RETURNS_SMART_NULLS);
 
@@ -188,6 +190,7 @@ public final void mockClient() {
         when(this.cloudFoundryClient.organizationQuotaDefinitions())
                 .thenReturn(this.organizationQuotaDefinitions);
         when(this.cloudFoundryClient.privateDomains()).thenReturn(this.privateDomains);
+        when(this.cloudFoundryClient.processes()).thenReturn(this.processes);
         when(this.cloudFoundryClient.resourceMatch()).thenReturn(this.resourceMatch);
         when(this.cloudFoundryClient.routes()).thenReturn(this.routes);
         when(this.cloudFoundryClient.routesV3()).thenReturn(this.routesV3);