Fixed issue with PR#1126 where compilation+unit tests failed with UnsupportedOperation (#1129)

Author: pivotal-david-osullivan

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

@@ -790,13 +790,11 @@ private static Mono<String> getApplicationId(CloudFoundryClient cloudFoundryClie
         return requestApplications(cloudFoundryClient, manifest.getName(), spaceId)
             .singleOrEmpty()
             .flatMap(application -> {
-                Map<String, Object> entityEnvironmentJsons = ResourceUtils.getEntity(application).getEnvironmentJsons();
-                Map<String, Object> environmentJsons = Optional
-                    .ofNullable(entityEnvironmentJsons)
-                    .orElse(Collections.emptyMap());
-                Optional.ofNullable(manifest.getEnvironmentVariables()).ifPresent(environmentJsons::putAll);
+                HashMap<String, Object> merge = new HashMap<>();
+                Optional.ofNullable(ResourceUtils.getEntity(application).getEnvironmentJsons()).ifPresent(merge::putAll);
+                Optional.ofNullable(manifest.getEnvironmentVariables()).ifPresent(merge::putAll);
 
-                return requestUpdateApplication(cloudFoundryClient, ResourceUtils.getId(application), environmentJsons, manifest, stackId)
+                return requestUpdateApplication(cloudFoundryClient, ResourceUtils.getId(application), merge, manifest, stackId)
                     .map(ResourceUtils::getId);
             })
             .switchIfEmpty(requestCreateApplication(cloudFoundryClient, manifest, spaceId, stackId)

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

@@ -1442,6 +1442,7 @@ public void pushExistingApplicationWithNullEnvironment() throws IOException {
                     .manifest(ApplicationManifest.builder()
                         .path(testApplication)
                         .domain("test-shared-domain")
+                        .environmentVariable("test-key-1", "test-value-1")
                         .environmentVariable("test-key-2", "test-value-2")
                         .name("test-name")
                         .build())