DefaultApplications: use applicationsV3 for routes

Author: Kehrlann

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

@@ -56,7 +56,6 @@
 import org.cloudfoundry.client.v2.applications.CreateApplicationResponse;
 import org.cloudfoundry.client.v2.applications.DockerCredentials;
 import org.cloudfoundry.client.v2.applications.InstanceStatistics;
-import org.cloudfoundry.client.v2.applications.ListApplicationRoutesRequest;
 import org.cloudfoundry.client.v2.applications.ListApplicationServiceBindingsRequest;
 import org.cloudfoundry.client.v2.applications.RemoveApplicationRouteRequest;
 import org.cloudfoundry.client.v2.applications.RemoveApplicationServiceBindingRequest;
@@ -116,6 +115,7 @@
 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;
 import org.cloudfoundry.client.v3.applications.UpdateApplicationFeatureRequest;
@@ -1096,7 +1096,8 @@ private Mono<ApplicationInstancesResponse> getApplicationInstances(String applic
                         t -> Mono.just(ApplicationInstancesResponse.builder().build()));
     }
 
-    private Mono<List<RouteResource>> getApplicationRoutes(String applicationId) {
+    private Mono<List<org.cloudfoundry.client.v3.routes.RouteResource>> getApplicationRoutes(
+            String applicationId) {
         return requestApplicationRoutes(applicationId).collectList();
     }
 
@@ -1490,11 +1491,11 @@ private Mono<Void> prepareDomainsAndRoutes(
             String applicationId,
             List<DomainSummary> availableDomains,
             ApplicationManifest manifest,
-            List<RouteResource> existingRoutes,
+            List<org.cloudfoundry.client.v3.routes.RouteResource> existingRoutes,
             RandomWords randomWords) {
         if (Optional.ofNullable(manifest.getNoRoute()).orElse(false)) {
             return Flux.fromIterable(existingRoutes)
-                    .map(ResourceUtils::getId)
+                    .map(org.cloudfoundry.client.v3.routes.RouteResource::getId)
                     .flatMap(routeId -> requestRemoveRouteFromApplication(applicationId, routeId))
                     .then();
         }
@@ -1524,7 +1525,9 @@ private Mono<Void> prepareDomainsAndRoutes(
         }
 
         List<String> existingRouteIds =
-                existingRoutes.stream().map(ResourceUtils::getId).collect(Collectors.toList());
+                existingRoutes.stream()
+                        .map(org.cloudfoundry.client.v3.routes.RouteResource::getId)
+                        .collect(Collectors.toList());
 
         return getPushRouteIdFromRoute(availableDomains, manifest, randomWords)
                 .filter(routeId -> !existingRouteIds.contains(routeId))
@@ -1640,11 +1643,12 @@ private Mono<ApplicationInstancesResponse> requestApplicationInstances(String ap
                         ApplicationInstancesRequest.builder().applicationId(applicationId).build());
     }
 
-    private Flux<RouteResource> requestApplicationRoutes(String applicationId) {
-        return PaginationUtils.requestClientV2Resources(
+    private Flux<org.cloudfoundry.client.v3.routes.RouteResource> requestApplicationRoutes(
+            String applicationId) {
+        return PaginationUtils.requestClientV3Resources(
                 page ->
                         this.cloudFoundryClient
-                                .applicationsV2()
+                                .applicationsV3()
                                 .listRoutes(
                                         ListApplicationRoutesRequest.builder()
                                                 .applicationId(applicationId)

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

@@ -55,8 +55,6 @@
 import org.cloudfoundry.client.v2.applications.DockerCredentials;
 import org.cloudfoundry.client.v2.applications.GetApplicationResponse;
 import org.cloudfoundry.client.v2.applications.InstanceStatistics;
-import org.cloudfoundry.client.v2.applications.ListApplicationRoutesRequest;
-import org.cloudfoundry.client.v2.applications.ListApplicationRoutesResponse;
 import org.cloudfoundry.client.v2.applications.ListApplicationServiceBindingsRequest;
 import org.cloudfoundry.client.v2.applications.ListApplicationServiceBindingsResponse;
 import org.cloudfoundry.client.v2.applications.RemoveApplicationRouteRequest;
@@ -124,11 +122,14 @@
 import org.cloudfoundry.client.v3.BuildpackData;
 import org.cloudfoundry.client.v3.DockerData;
 import org.cloudfoundry.client.v3.Lifecycle;
+import org.cloudfoundry.client.v3.Pagination;
 import org.cloudfoundry.client.v3.applications.ApplicationState;
 import org.cloudfoundry.client.v3.applications.GetApplicationEnvironmentRequest;
 import org.cloudfoundry.client.v3.applications.GetApplicationEnvironmentResponse;
 import org.cloudfoundry.client.v3.applications.GetApplicationSshEnabledRequest;
 import org.cloudfoundry.client.v3.applications.GetApplicationSshEnabledResponse;
+import org.cloudfoundry.client.v3.applications.ListApplicationRoutesRequest;
+import org.cloudfoundry.client.v3.applications.ListApplicationRoutesResponse;
 import org.cloudfoundry.client.v3.applications.ListApplicationsRequest;
 import org.cloudfoundry.client.v3.applications.ListApplicationsResponse;
 import org.cloudfoundry.client.v3.applications.UpdateApplicationFeatureRequest;
@@ -4241,30 +4242,30 @@ private static void requestApplicationNullUsage(
     private static void requestApplicationRoutes(
             CloudFoundryClient cloudFoundryClient, String applicationId, String routeId) {
         when(cloudFoundryClient
-                        .applicationsV2()
+                        .applicationsV3()
                         .listRoutes(
-                                ListApplicationRoutesRequest.builder()
+                                org.cloudfoundry.client.v3.applications.ListApplicationRoutesRequest
+                                        .builder()
                                         .applicationId(applicationId)
                                         .page(1)
                                         .build()))
                 .thenReturn(
                         Mono.just(
-                                fill(ListApplicationRoutesResponse.builder())
+                                fill(org.cloudfoundry.client.v3.applications
+                                                .ListApplicationRoutesResponse.builder())
                                         .resource(
-                                                fill(RouteResource.builder())
-                                                        .metadata(
-                                                                fill(Metadata.builder())
-                                                                        .id(routeId)
-                                                                        .build())
+                                                fill(org.cloudfoundry.client.v3.routes.RouteResource
+                                                                .builder())
+                                                        .id(routeId)
                                                         .build())
-                                        .totalPages(1)
+                                        .pagination(Pagination.builder().totalPages(1).build())
                                         .build()));
     }
 
     private static void requestApplicationRoutesEmpty(
             CloudFoundryClient cloudFoundryClient, String applicationId) {
         when(cloudFoundryClient
-                        .applicationsV2()
+                        .applicationsV3()
                         .listRoutes(
                                 ListApplicationRoutesRequest.builder()
                                         .applicationId(applicationId)
@@ -4273,7 +4274,7 @@ private static void requestApplicationRoutesEmpty(
                 .thenReturn(
                         Mono.just(
                                 fill(ListApplicationRoutesResponse.builder())
-                                        .totalPages(1)
+                                        .pagination(Pagination.builder().totalPages(1).build())
                                         .build()));
     }