Merge branch 'reduce-port-tests' into 4.x

Author: twoseat

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

@@ -601,45 +601,6 @@ public void listRoutesFilterByPath() {
             .verify(Duration.ofMinutes(5));
     }
 
-    @Test
-    public void listRoutesFilterByPort() {
-        String applicationName = this.nameFactory.getApplicationName();
-        String domainName = this.nameFactory.getDomainName();
-
-        Mono
-            .zip(this.organizationId, this.spaceId)
-            .flatMap(function((organizationId, spaceId) -> Mono.zip(
-                Mono.just(organizationId),
-                Mono.just(spaceId),
-                createApplicationId(this.cloudFoundryClient, spaceId, applicationName)
-            )))
-            .flatMap(function((organizationId, spaceId, applicationId) -> Mono.zip(
-                Mono.just(applicationId),
-                createApplicationRoute(this.cloudFoundryClient, organizationId, spaceId, domainName, applicationId)
-            )))
-            .flatMap(function((applicationId, routeResponse) -> Mono.zip(
-                Mono.just(ResourceUtils.getId(routeResponse)),
-                PaginationUtils
-                    .requestClientV2Resources(page -> {
-                        ListApplicationRoutesRequest.Builder builder = ListApplicationRoutesRequest.builder()
-                            .applicationId(applicationId)
-                            .page(page);
-
-                        Optional.ofNullable(ResourceUtils.getEntity(routeResponse).getPort()).ifPresent(builder::port);
-
-                        return this.cloudFoundryClient.applicationsV2()
-                            .listRoutes(builder
-                                .build());
-                    })
-                    .single()
-                    .map(ResourceUtils::getId)
-            )))
-            .as(StepVerifier::create)
-            .consumeNextWith(tupleEquality())
-            .expectComplete()
-            .verify(Duration.ofMinutes(5));
-    }
-
     @Test
     public void listServiceBindings() {
         String applicationName = this.nameFactory.getApplicationName();

integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceInstancesTest.java

@@ -48,12 +48,7 @@
 import org.cloudfoundry.client.v2.serviceplans.ServicePlanResource;
 import org.cloudfoundry.client.v2.services.ListServicesRequest;
 import org.cloudfoundry.client.v2.services.ServiceResource;
-import org.cloudfoundry.client.v2.shareddomains.CreateSharedDomainRequest;
-import org.cloudfoundry.client.v2.shareddomains.CreateSharedDomainResponse;
 import org.cloudfoundry.routing.RoutingClient;
-import org.cloudfoundry.routing.v1.routergroups.ListRouterGroupsRequest;
-import org.cloudfoundry.routing.v1.routergroups.ListRouterGroupsResponse;
-import org.cloudfoundry.routing.v1.routergroups.RouterGroup;
 import org.cloudfoundry.util.JobUtils;
 import org.cloudfoundry.util.LastOperationUtils;
 import org.cloudfoundry.util.PaginationUtils;
@@ -623,41 +618,6 @@ public void listRoutesFilterByPath() {
             .verify(Duration.ofMinutes(5));
     }
 
-    @Test
-    public void listRoutesFilterByPort() {
-        String domainName = this.nameFactory.getDomainName();
-        Integer port = this.nameFactory.getPort();
-        String serviceInstanceName = this.nameFactory.getServiceInstanceName();
-
-        Mono.zip(this.organizationId, this.spaceId)
-            .flatMap(function((organizationId, spaceId) -> Mono.zip(
-                getRouterGroupId(this.routingClient, DEFAULT_ROUTER_GROUP)
-                    .flatMap(routerGroupId -> createTcpDomainId(this.cloudFoundryClient, domainName, routerGroupId)),
-                createServiceInstanceId(this.cloudFoundryClient, this.serviceBrokerId, serviceInstanceName, this.serviceName, spaceId),
-                Mono.just(spaceId)
-            )))
-            .flatMap(function((domainId, serviceInstanceId, spaceId) -> Mono.zip(
-                createRouteId(this.cloudFoundryClient, domainId, port, spaceId),
-                Mono.just(serviceInstanceId))
-            ))
-            .flatMap(function((routeId, serviceInstanceId) -> requestBindServiceInstanceRoute(this.cloudFoundryClient, routeId, serviceInstanceId)
-                .thenReturn(serviceInstanceId)))
-            .flatMapMany(serviceInstanceId -> Mono.zip(
-                Mono.just(serviceInstanceId),
-                PaginationUtils.requestClientV2Resources(page -> this.cloudFoundryClient.serviceInstances()
-                    .listRoutes(ListServiceInstanceRoutesRequest.builder()
-                        .page(page)
-                        .port(port.toString())
-                        .serviceInstanceId(serviceInstanceId)
-                        .build()))
-                    .map(resource -> ResourceUtils.getEntity(resource).getServiceInstanceId())
-                    .single()))
-            .as(StepVerifier::create)
-            .consumeNextWith(tupleEquality())
-            .expectComplete()
-            .verify(Duration.ofMinutes(5));
-    }
-
     @Test
     public void listServiceBindings() {
         String applicationName = this.nameFactory.getApplicationName();
@@ -825,11 +785,6 @@ private static Mono<String> createRouteId(CloudFoundryClient cloudFoundryClient,
             .map(ResourceUtils::getId);
     }
 
-    private static Mono<String> createRouteId(CloudFoundryClient cloudFoundryClient, String domainId, Integer port, String spaceId) {
-        return requestCreateRoute(cloudFoundryClient, domainId, port, spaceId)
-            .map(ResourceUtils::getId);
-    }
-
     private static Mono<String> createServiceBindingId(CloudFoundryClient cloudFoundryClient, String applicationId, String serviceInstanceId) {
         return requestCreateServiceBinding(cloudFoundryClient, applicationId, serviceInstanceId)
             .map(ResourceUtils::getId);
@@ -847,11 +802,6 @@ private static Mono<String> createServiceKeyId(CloudFoundryClient cloudFoundryCl
             .map(ResourceUtils::getId);
     }
 
-    private static Mono<String> createTcpDomainId(CloudFoundryClient cloudFoundryClient, String name, String routerGroupId) {
-        return requestCreateTcpDomain(cloudFoundryClient, name, routerGroupId)
-            .map(ResourceUtils::getId);
-    }
-
     private static Mono<String> getPlanId(CloudFoundryClient cloudFoundryClient, String serviceBrokerId, String serviceName) {
         return requestListServices(cloudFoundryClient, serviceBrokerId, serviceName)
             .filter(resource -> serviceName.equals(ResourceUtils.getEntity(resource).getLabel()))
@@ -862,14 +812,6 @@ private static Mono<String> getPlanId(CloudFoundryClient cloudFoundryClient, Str
             .map(ResourceUtils::getId);
     }
 
-    private static Mono<String> getRouterGroupId(RoutingClient routingClient, String routerGroupName) {
-        return requestListRouterGroups(routingClient)
-            .flatMapIterable(ListRouterGroupsResponse::getRouterGroups)
-            .filter(group -> routerGroupName.equals(group.getName()))
-            .single()
-            .map(RouterGroup::getRouterGroupId);
-    }
-
     private static Mono<BindServiceInstanceRouteResponse> requestBindServiceInstanceRoute(CloudFoundryClient cloudFoundryClient, String routeId, String serviceInstanceId) {
         return cloudFoundryClient.serviceInstances()
             .bindRoute(BindServiceInstanceRouteRequest.builder()
@@ -894,15 +836,6 @@ private static Mono<CreatePrivateDomainResponse> requestCreatePrivateDomain(Clou
                 .build());
     }
 
-    private static Mono<CreateRouteResponse> requestCreateRoute(CloudFoundryClient cloudFoundryClient, String domainId, Integer port, String spaceId) {
-        return cloudFoundryClient.routes()
-            .create(CreateRouteRequest.builder()
-                .domainId(domainId)
-                .port(port)
-                .spaceId(spaceId)
-                .build());
-    }
-
     private static Mono<CreateRouteResponse> requestCreateRoute(CloudFoundryClient cloudFoundryClient, String domainId, String hostName, String path, String spaceId) {
         return cloudFoundryClient.routes()
             .create(CreateRouteRequest.builder()
@@ -939,20 +872,6 @@ private static Mono<CreateServiceKeyResponse> requestCreateServiceKey(CloudFound
                 .build());
     }
 
-    private static Mono<CreateSharedDomainResponse> requestCreateTcpDomain(CloudFoundryClient cloudFoundryClient, String name, String routerGroupId) {
-        return cloudFoundryClient.sharedDomains()
-            .create(CreateSharedDomainRequest.builder()
-                .name(name)
-                .routerGroupId(routerGroupId)
-                .build());
-    }
-
-    private static Mono<ListRouterGroupsResponse> requestListRouterGroups(RoutingClient routingClient) {
-        return routingClient.routerGroups()
-            .list(ListRouterGroupsRequest.builder()
-                .build());
-    }
-
     private static Flux<RouteResource> requestListRoutes(CloudFoundryClient cloudFoundryClient, String serviceInstanceId) {
         return PaginationUtils
             .requestClientV2Resources(page -> cloudFoundryClient.serviceInstances()

integration-test/src/test/java/org/cloudfoundry/client/v2/UserProvidedServicesTest.java

@@ -41,9 +41,6 @@
 import org.cloudfoundry.client.v2.userprovidedserviceinstances.UpdateUserProvidedServiceInstanceResponse;
 import org.cloudfoundry.client.v2.userprovidedserviceinstances.UserProvidedServiceInstanceResource;
 import org.cloudfoundry.routing.RoutingClient;
-import org.cloudfoundry.routing.v1.routergroups.ListRouterGroupsRequest;
-import org.cloudfoundry.routing.v1.routergroups.ListRouterGroupsResponse;
-import org.cloudfoundry.routing.v1.routergroups.RouterGroup;
 import org.cloudfoundry.util.PaginationUtils;
 import org.cloudfoundry.util.ResourceUtils;
 import org.junit.Test;
@@ -278,39 +275,6 @@ public void listRoutesFilterByPath() {
             .verify(Duration.ofMinutes(5));
     }
 
-    @Test
-    public void listRoutesFilterByPort() {
-        String domainName = this.nameFactory.getDomainName();
-        String instanceName = this.nameFactory.getServiceInstanceName();
-        Integer port = this.nameFactory.getPort();
-
-        Mono.zip(
-            getRouterGroupId(this.routingClient, DEFAULT_ROUTER_GROUP)
-                .flatMap(routerGroupId -> createTcpDomainId(this.cloudFoundryClient, domainName, routerGroupId)),
-            this.spaceId
-        )
-            .flatMap(function((domainId, spaceId) -> Mono.zip(
-                createUserProvidedServiceInstanceId(this.cloudFoundryClient, instanceName, spaceId),
-                createRouteId(this.cloudFoundryClient, domainId, port, spaceId))
-            ))
-            .flatMap(function((instanceId, routeId) -> requestAssociateRoute(this.cloudFoundryClient, instanceId, routeId)
-                .thenReturn(instanceId)))
-            .flatMapMany(instanceId -> Mono.zip(
-                Mono.just(instanceId),
-                PaginationUtils.requestClientV2Resources(page -> this.cloudFoundryClient.userProvidedServiceInstances()
-                    .listRoutes(ListUserProvidedServiceInstanceRoutesRequest.builder()
-                        .page(page)
-                        .port(port.toString())
-                        .userProvidedServiceInstanceId(instanceId)
-                        .build()))
-                    .map(resource -> ResourceUtils.getEntity(resource).getServiceInstanceId())
-                    .single()))
-            .as(StepVerifier::create)
-            .consumeNextWith(tupleEquality())
-            .expectComplete()
-            .verify(Duration.ofMinutes(5));
-    }
-
     @Test
     public void listServiceBindings() {
         String applicationName = this.nameFactory.getApplicationName();
@@ -394,29 +358,11 @@ private static Mono<String> createRouteId(CloudFoundryClient cloudFoundryClient,
             .map(ResourceUtils::getId);
     }
 
-    private static Mono<String> createRouteId(CloudFoundryClient cloudFoundryClient, String domainId, Integer port, String spaceId) {
-        return requestCreateRoute(cloudFoundryClient, domainId, port, spaceId)
-            .map(ResourceUtils::getId);
-    }
-
-    private static Mono<String> createTcpDomainId(CloudFoundryClient cloudFoundryClient, String name, String routerGroupId) {
-        return requestCreateTcpDomain(cloudFoundryClient, name, routerGroupId)
-            .map(ResourceUtils::getId);
-    }
-
     private static Mono<String> createUserProvidedServiceInstanceId(CloudFoundryClient cloudFoundryClient, String instanceName, String spaceId) {
         return requestCreateUserProvidedServiceInstance(cloudFoundryClient, instanceName, spaceId)
             .map(ResourceUtils::getId);
     }
 
-    private static Mono<String> getRouterGroupId(RoutingClient routingClient, String routerGroupName) {
-        return requestListRouterGroups(routingClient)
-            .flatMapIterable(ListRouterGroupsResponse::getRouterGroups)
-            .filter(group -> routerGroupName.equals(group.getName()))
-            .single()
-            .map(RouterGroup::getRouterGroupId);
-    }
-
     private static Mono<AssociateUserProvidedServiceInstanceRouteResponse> requestAssociateRoute(CloudFoundryClient cloudFoundryClient, String instanceId, String routeId) {
         return cloudFoundryClient.userProvidedServiceInstances()
             .associateRoute(AssociateUserProvidedServiceInstanceRouteRequest.builder()
@@ -451,23 +397,6 @@ private static Mono<CreateRouteResponse> requestCreateRoute(CloudFoundryClient c
                 .build());
     }
 
-    private static Mono<CreateRouteResponse> requestCreateRoute(CloudFoundryClient cloudFoundryClient, String domainId, Integer port, String spaceId) {
-        return cloudFoundryClient.routes()
-            .create(CreateRouteRequest.builder()
-                .domainId(domainId)
-                .port(port)
-                .spaceId(spaceId)
-                .build());
-    }
-
-    private static Mono<CreateSharedDomainResponse> requestCreateTcpDomain(CloudFoundryClient cloudFoundryClient, String name, String routerGroupId) {
-        return cloudFoundryClient.sharedDomains()
-            .create(CreateSharedDomainRequest.builder()
-                .name(name)
-                .routerGroupId(routerGroupId)
-                .build());
-    }
-
     private static Mono<CreateUserProvidedServiceInstanceResponse> requestCreateUserProvidedServiceInstance(CloudFoundryClient cloudFoundryClient, String instanceName, String spaceId) {
         return cloudFoundryClient.userProvidedServiceInstances()
             .create(CreateUserProvidedServiceInstanceRequest.builder()
@@ -477,12 +406,6 @@ private static Mono<CreateUserProvidedServiceInstanceResponse> requestCreateUser
                 .build());
     }
 
-    private static Mono<ListRouterGroupsResponse> requestListRouterGroups(RoutingClient routingClient) {
-        return routingClient.routerGroups()
-            .list(ListRouterGroupsRequest.builder()
-                .build());
-    }
-
     private static Flux<UserProvidedServiceInstanceResource> requestListUserProvidedServiceInstances(CloudFoundryClient cloudFoundryClient, String instanceName) {
         return PaginationUtils
             .requestClientV2Resources(page -> cloudFoundryClient.userProvidedServiceInstances()

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

@@ -503,41 +503,6 @@ public void listApplicationRoutesByPath() {
             .verify(Duration.ofMinutes(5));
     }
 
-    //TODO: Establish router group availability. This test has not been verified.
-    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_10)
-    public void listApplicationRoutesByPort() {
-        String applicationName = this.nameFactory.getApplicationName();
-        String domainName = this.nameFactory.getDomainName();
-        Integer port = this.nameFactory.getPort();
-
-        this.organizationId
-            .flatMap(organizationId -> Mono.zip(
-                createDomainId(this.cloudFoundryClient, domainName, organizationId),
-                this.spaceId
-            ))
-
-            .flatMap(function((domainId, spaceId) -> Mono.zip(
-                createApplicationId(this.cloudFoundryClient, applicationName, spaceId),
-                createRouteId(this.cloudFoundryClient, domainId, null, "listApplicationRoutesByPort", null, port, spaceId)
-            )))
-            .flatMapMany(function((applicationId, routeId) -> requestReplaceDestinations(this.cloudFoundryClient, applicationId, routeId)
-                .thenReturn(applicationId)))
-            .flatMap(applicationId -> PaginationUtils.requestClientV3Resources(page ->
-                this.cloudFoundryClient.applicationsV3()
-                    .listRoutes(ListApplicationRoutesRequest.builder()
-                        .applicationId(applicationId)
-                        .port(port)
-                        .page(page)
-                        .build())))
-            .filter(route -> route.getMetadata().getLabels().containsKey("test-listApplicationRoutesByPort-key"))
-            .map(RouteResource::getMetadata)
-            .map(Metadata::getLabels)
-            .as(StepVerifier::create)
-            .expectNext(Collections.singletonMap("test-listApplicationRoutesByPort-key", "test-listApplicationRoutesByPort-value"))
-            .expectComplete()
-            .verify(Duration.ofMinutes(5));
-    }
-
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
     public void listApplicationRoutesBySpaceId() {
@@ -991,23 +956,6 @@ private static Mono<GetPackageResponse> requestGetPackage(CloudFoundryClient clo
                 .build());
     }
 
-    private static Flux<ApplicationResource> requestListApplications(CloudFoundryClient cloudFoundryClient, String applicationName) {
-        return PaginationUtils.requestClientV3Resources(page ->
-            cloudFoundryClient.applicationsV3()
-                .list(ListApplicationsRequest.builder()
-                    .name(applicationName)
-                    .page(page)
-                    .build()));
-    }
-
-    private static Flux<DropletResource> requestListDroplets(CloudFoundryClient cloudFoundryClient) {
-        return PaginationUtils.requestClientV3Resources(page ->
-            cloudFoundryClient.droplets()
-                .list(ListDropletsRequest.builder()
-                    .page(page)
-                    .build()));
-    }
-
     private static Mono<ReplaceRouteDestinationsResponse> requestReplaceDestinations(CloudFoundryClient cloudFoundryClient, String applicationId, String routeId) {
         return cloudFoundryClient.routesV3()
             .replaceDestinations(ReplaceRouteDestinationsRequest.builder()

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

@@ -364,32 +364,6 @@ public void listByPath() {
             .verify(Duration.ofMinutes(5));
     }
 
-    //TODO: Establish router group availability. This test has not been verified.
-    public void listByPort() {
-        String domainName = this.nameFactory.getDomainName();
-        Integer port = this.nameFactory.getPort();
-
-        this.organizationId
-            .flatMap(organizationId -> Mono.zip(
-                createDomainId(this.cloudFoundryClient, domainName, organizationId),
-                this.spaceId
-            ))
-            .flatMap(function((domainId, spaceId) -> requestCreateRoute(this.cloudFoundryClient, domainId, null, "listByPort", null, port, spaceId)))
-            .thenMany(PaginationUtils.requestClientV3Resources(page ->
-                this.cloudFoundryClient.routesV3()
-                    .list(ListRoutesRequest.builder()
-                        .port(port)
-                        .page(page)
-                        .build())))
-            .filter(route -> route.getMetadata().getLabels().containsKey("test-listByPort-key"))
-            .map(RouteResource::getMetadata)
-            .map(Metadata::getLabels)
-            .as(StepVerifier::create)
-            .expectNext(Collections.singletonMap("test-listByPort-key", "test-listByPort-value"))
-            .expectComplete()
-            .verify(Duration.ofMinutes(5));
-    }
-
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_9)
     @Test
     public void listBySpaceId() {