Merge branch 'fix-ci' into 3.x

Author: twoseat

integration-test/src/test/java/org/cloudfoundry/client/v3/ApplicationsTest.java

@@ -62,6 +62,7 @@ public final class ApplicationsTest extends AbstractIntegrationTest {
     @Autowired
     private Mono<String> spaceId;
 
+    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
     public void listApplicationRoutes() {
         String applicationName = this.nameFactory.getApplicationName();
@@ -92,6 +93,7 @@ public void listApplicationRoutes() {
             .verify(Duration.ofMinutes(5));
     }
 
+    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
     public void listApplicationRoutesByDomain() {
         String applicationName = this.nameFactory.getApplicationName();
@@ -123,6 +125,7 @@ public void listApplicationRoutesByDomain() {
             .verify(Duration.ofMinutes(5));
     }
 
+    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
     public void listApplicationRoutesByHost() {
         String applicationName = this.nameFactory.getApplicationName();
@@ -156,6 +159,7 @@ public void listApplicationRoutesByHost() {
             .verify(Duration.ofMinutes(5));
     }
 
+    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
     public void listApplicationRoutesByLabelSelector() {
         String applicationName = this.nameFactory.getApplicationName();
@@ -187,6 +191,7 @@ public void listApplicationRoutesByLabelSelector() {
             .verify(Duration.ofMinutes(5));
     }
 
+    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
     public void listApplicationRoutesByOrganizationId() {
         String applicationName = this.nameFactory.getApplicationName();
@@ -222,6 +227,7 @@ public void listApplicationRoutesByOrganizationId() {
             .verify(Duration.ofMinutes(5));
     }
 
+    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
     public void listApplicationRoutesByPath() {
         String applicationName = this.nameFactory.getApplicationName();
@@ -256,10 +262,13 @@ public void listApplicationRoutesByPath() {
             .verify(Duration.ofMinutes(5));
     }
 
+    //TODO: Test has not been validated
+    @IfCloudFoundryVersion(greaterThan = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void listApplicationRoutesBySpaceId() {
+    public void listApplicationRoutesByPort() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
+        Integer port = this.nameFactory.getPort();
 
         this.organizationId
             .flatMap(organizationId -> Mono.zip(
@@ -269,34 +278,31 @@ public void listApplicationRoutesBySpaceId() {
 
             .flatMap(function((domainId, spaceId) -> Mono.zip(
                 createApplicationId(this.cloudFoundryClient, applicationName, spaceId),
-                createRouteId(this.cloudFoundryClient, domainId, "listBySpaceId", spaceId),
-                Mono.just(spaceId)
+                createRouteId(this.cloudFoundryClient, domainId, null, "listByPort", null, port, spaceId)
             )))
-            .delayUntil(function((applicationId, routeId, spaceId) -> requestReplaceDestinations(this.cloudFoundryClient, applicationId, routeId)
+            .flatMapMany(function((applicationId, routeId) -> requestReplaceDestinations(this.cloudFoundryClient, applicationId, routeId)
                 .thenReturn(applicationId)))
-            .flatMapMany(function((applicationId, ignore, spaceId) -> PaginationUtils.requestClientV3Resources(page ->
+            .flatMap(applicationId -> PaginationUtils.requestClientV3Resources(page ->
                 this.cloudFoundryClient.applicationsV3()
                     .listRoutes(ListApplicationRoutesRequest.builder()
                         .applicationId(applicationId)
+                        .port(port)
                         .page(page)
-                        .spaceId(spaceId)
-                        .build()))))
-            .filter(route -> route.getMetadata().getLabels().containsKey("test-listBySpaceId-key"))
+                        .build())))
+            .filter(route -> route.getMetadata().getLabels().containsKey("test-listByPort-key"))
             .map(RouteResource::getMetadata)
             .map(Metadata::getLabels)
             .as(StepVerifier::create)
-            .expectNext(Collections.singletonMap("test-listBySpaceId-key", "test-listBySpaceId-value"))
+            .expectNext(Collections.singletonMap("test-listByPort-key", "test-listByPort-value"))
             .expectComplete()
             .verify(Duration.ofMinutes(5));
     }
 
-    //TODO: Test has not been validated
-    @IfCloudFoundryVersion(greaterThan = CloudFoundryVersion.PCF_2_9)
+    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
-    public void listByPort() {
+    public void listApplicationRoutesBySpaceId() {
         String applicationName = this.nameFactory.getApplicationName();
         String domainName = this.nameFactory.getDomainName();
-        Integer port = this.nameFactory.getPort();
 
         this.organizationId
             .flatMap(organizationId -> Mono.zip(
@@ -306,22 +312,23 @@ public void listByPort() {
 
             .flatMap(function((domainId, spaceId) -> Mono.zip(
                 createApplicationId(this.cloudFoundryClient, applicationName, spaceId),
-                createRouteId(this.cloudFoundryClient, domainId, null, "listByPort", null, port, spaceId)
+                createRouteId(this.cloudFoundryClient, domainId, "listBySpaceId", spaceId),
+                Mono.just(spaceId)
             )))
-            .flatMapMany(function((applicationId, routeId) -> requestReplaceDestinations(this.cloudFoundryClient, applicationId, routeId)
+            .delayUntil(function((applicationId, routeId, spaceId) -> requestReplaceDestinations(this.cloudFoundryClient, applicationId, routeId)
                 .thenReturn(applicationId)))
-            .flatMap(applicationId -> PaginationUtils.requestClientV3Resources(page ->
+            .flatMapMany(function((applicationId, ignore, spaceId) -> PaginationUtils.requestClientV3Resources(page ->
                 this.cloudFoundryClient.applicationsV3()
                     .listRoutes(ListApplicationRoutesRequest.builder()
                         .applicationId(applicationId)
-                        .port(port)
                         .page(page)
-                        .build())))
-            .filter(route -> route.getMetadata().getLabels().containsKey("test-listByPort-key"))
+                        .spaceId(spaceId)
+                        .build()))))
+            .filter(route -> route.getMetadata().getLabels().containsKey("test-listBySpaceId-key"))
             .map(RouteResource::getMetadata)
             .map(Metadata::getLabels)
             .as(StepVerifier::create)
-            .expectNext(Collections.singletonMap("test-listByPort-key", "test-listByPort-value"))
+            .expectNext(Collections.singletonMap("test-listBySpaceId-key", "test-listBySpaceId-value"))
             .expectComplete()
             .verify(Duration.ofMinutes(5));
     }