DefaultApplications: rename uses v3 api

Author: Kehrlann

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

@@ -538,10 +538,12 @@ public Mono<Void> pushManifestV3(PushManifestV3Request request) {
 
     @Override
     public Mono<Void> rename(RenameApplicationRequest request) {
-        return getApplicationId(request.getName())
+        return getApplicationIdV3(request.getName())
                 .flatMap(
                         applicationId ->
-                                requestUpdateApplicationName(applicationId, request.getNewName()))
+                                requestUpdateApplicationV3(
+                                        applicationId,
+                                        builder -> builder.name(request.getNewName())))
                 .then()
                 .transform(OperationsLogging.log("Rename Application"))
                 .checkpoint();
@@ -2147,6 +2149,21 @@ private Mono<AbstractApplicationResource> requestUpdateApplication(
                 .cast(AbstractApplicationResource.class);
     }
 
+    private Mono<Void> requestUpdateApplicationV3(
+            String applicationId,
+            UnaryOperator<org.cloudfoundry.client.v3.applications.UpdateApplicationRequest.Builder>
+                    modifier) {
+        return this.cloudFoundryClient
+                .applicationsV3()
+                .update(
+                        modifier.apply(
+                                        org.cloudfoundry.client.v3.applications
+                                                .UpdateApplicationRequest.builder()
+                                                .applicationId(applicationId))
+                                .build())
+                .then();
+    }
+
     private Mono<AbstractApplicationResource> requestUpdateApplicationEnvironment(
             String applicationId, Map<String, Object> environment) {
         return requestUpdateApplication(

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

@@ -3236,7 +3236,7 @@ void pushUploadFails() throws IOException {
 
     @Test
     void rename() {
-        requestApplications(
+        requestApplicationsV3(
                 this.cloudFoundryClient, "test-app-name", TEST_SPACE_ID, "test-metadata-id");
         requestUpdateApplicationRename(
                 this.cloudFoundryClient, "test-metadata-id", "test-new-app-name");
@@ -3254,7 +3254,7 @@ void rename() {
 
     @Test
     void renameNoApp() {
-        requestApplicationsEmpty(this.cloudFoundryClient, "test-app-name", TEST_SPACE_ID);
+        requestApplicationsEmptyV3(this.cloudFoundryClient, "test-app-name", TEST_SPACE_ID);
 
         this.applications
                 .rename(
@@ -5931,19 +5931,25 @@ private static void requestUpdateApplicationHealthCheck(
     private static void requestUpdateApplicationRename(
             CloudFoundryClient cloudFoundryClient, String applicationId, String name) {
         when(cloudFoundryClient
-                        .applicationsV2()
+                        .applicationsV3()
                         .update(
-                                UpdateApplicationRequest.builder()
+                                org.cloudfoundry.client.v3.applications.UpdateApplicationRequest
+                                        .builder()
                                         .applicationId(applicationId)
                                         .name(name)
                                         .build()))
                 .thenReturn(
                         Mono.just(
-                                fill(UpdateApplicationResponse.builder())
-                                        .entity(
-                                                fill(
-                                                                ApplicationEntity.builder(),
-                                                                "application-entity-")
+                                org.cloudfoundry.client.v3.applications.UpdateApplicationResponse
+                                        .builder()
+                                        .id("test-application-id")
+                                        .createdAt("2016-02-08T15:45:59Z")
+                                        .state(ApplicationState.STARTED)
+                                        .name("test-application-name")
+                                        .lifecycle(
+                                                Lifecycle.builder()
+                                                        .data(BuildpackData.builder().build())
+                                                        .type(BUILDPACK)
                                                         .build())
                                         .build()));
     }