DefaultApplications: setEnvironmentVariable and unsetEnvironmentVariable use v3 api

Author: Kehrlann

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/applications/_UpdateApplicationEnvironmentVariablesRequest.java

@@ -16,14 +16,15 @@
 
 package org.cloudfoundry.client.v3.applications;
 
+import java.util.Map;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import org.cloudfoundry.AllowNulls;
 import org.immutables.value.Value;
 
-import java.util.Map;
-
 @JsonSerialize
 @Value.Immutable
 abstract class _UpdateApplicationEnvironmentVariablesRequest {
@@ -39,6 +40,7 @@ abstract class _UpdateApplicationEnvironmentVariablesRequest {
      */
     @AllowNulls
     @JsonProperty("var")
+    @JsonInclude(value = JsonInclude.Include.ALWAYS)
     abstract Map<String, String> getVars();
 
 }

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

@@ -117,6 +117,8 @@
 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.UpdateApplicationEnvironmentVariablesRequest;
+import org.cloudfoundry.client.v3.applications.UpdateApplicationEnvironmentVariablesResponse;
 import org.cloudfoundry.client.v3.applications.UpdateApplicationFeatureRequest;
 import org.cloudfoundry.client.v3.auditevents.AuditEventResource;
 import org.cloudfoundry.client.v3.auditevents.ListAuditEventsRequest;
@@ -624,22 +626,6 @@ public Mono<Void> scale(ScaleApplicationRequest request) {
                 .checkpoint();
     }
 
-    @Override
-    public Mono<Void> setEnvironmentVariable(SetEnvironmentVariableApplicationRequest request) {
-        return getApplication(request.getName())
-                .flatMap(
-                        resource ->
-                                requestUpdateApplicationEnvironment(
-                                        ResourceUtils.getId(resource),
-                                        addToEnvironment(
-                                                getEnvironment(resource),
-                                                request.getVariableName(),
-                                                request.getVariableValue())))
-                .then()
-                .transform(OperationsLogging.log("Set Application Environment Variable"))
-                .checkpoint();
-    }
-
     @Override
     public Mono<Void> setHealthCheck(SetApplicationHealthCheckRequest request) {
         return getApplicationIdV3(request.getName())
@@ -694,15 +680,21 @@ public Mono<Void> terminateTask(TerminateApplicationTaskRequest request) {
     }
 
     @Override
-    public Mono<Void> unsetEnvironmentVariable(UnsetEnvironmentVariableApplicationRequest request) {
-        return getApplication(request.getName())
+    public Mono<Void> setEnvironmentVariable(SetEnvironmentVariableApplicationRequest request) {
+        return getApplicationIdV3(request.getName())
                 .flatMap(
-                        resource ->
-                                requestUpdateApplicationEnvironment(
-                                        ResourceUtils.getId(resource),
-                                        removeFromEnvironment(
-                                                getEnvironment(resource),
-                                                request.getVariableName())))
+                        id ->
+                                requestSetEnvironmentVariable(
+                                        id, request.getVariableName(), request.getVariableValue()))
+                .then()
+                .transform(OperationsLogging.log("Set Application Environment Variable"))
+                .checkpoint();
+    }
+
+    @Override
+    public Mono<Void> unsetEnvironmentVariable(UnsetEnvironmentVariableApplicationRequest request) {
+        return getApplicationIdV3(request.getName())
+                .flatMap(id -> requestUnsetEnvironmentVariable(id, request.getVariableName()))
                 .then()
                 .transform(OperationsLogging.log("Unset Application Environment Variable"))
                 .checkpoint();
@@ -2177,10 +2169,26 @@ private Mono<Void> requestUpdateApplicationV3(
                 .then();
     }
 
-    private Mono<AbstractApplicationResource> requestUpdateApplicationEnvironment(
-            String applicationId, Map<String, Object> environment) {
-        return requestUpdateApplication(
-                applicationId, builder -> builder.environmentJsons(environment));
+    private Mono<UpdateApplicationEnvironmentVariablesResponse> requestSetEnvironmentVariable(
+            String applicationId, String name, String value) {
+        return this.cloudFoundryClient
+                .applicationsV3()
+                .updateEnvironmentVariables(
+                        UpdateApplicationEnvironmentVariablesRequest.builder()
+                                .applicationId(applicationId)
+                                .var(name, value)
+                                .build());
+    }
+
+    private Mono<UpdateApplicationEnvironmentVariablesResponse> requestUnsetEnvironmentVariable(
+            String applicationId, String name) {
+        return this.cloudFoundryClient
+                .applicationsV3()
+                .updateEnvironmentVariables(
+                        UpdateApplicationEnvironmentVariablesRequest.builder()
+                                .applicationId(applicationId)
+                                .var(name, null)
+                                .build());
     }
 
     private Mono<AbstractApplicationResource> requestUpdateApplicationHealthCheckType(