Merge branch '989-update-ports' into 3.x

Author: twoseat

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/applications/_CreateApplicationRequest.java

@@ -155,7 +155,7 @@ abstract class _CreateApplicationRequest {
     abstract String getName();
 
     /**
-     * The ports on which application may listen
+     * The ports on which the application may listen
      */
     @JsonProperty("ports")
     @Nullable

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/applications/_UpdateApplicationRequest.java

@@ -23,6 +23,7 @@
 import org.cloudfoundry.Nullable;
 import org.immutables.value.Value;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -154,6 +155,13 @@ abstract class _UpdateApplicationRequest {
     @Nullable
     abstract String getName();
 
+    /**
+     * The ports on which the application may listen
+     */
+    @JsonProperty("ports")
+    @Nullable
+    abstract List<Integer> getPorts();
+
     /**
      * Whether the application is production
      */

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

@@ -81,7 +81,9 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.nio.file.Path;
 import java.time.Duration;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Map;
@@ -833,8 +835,9 @@ public void update() {
             .flatMap(applicationId -> this.cloudFoundryClient.applicationsV2()
                 .update(UpdateApplicationRequest.builder()
                     .applicationId(applicationId)
-                    .name(applicationName2)
                     .environmentJson("test-var", "test-value")
+                    .name(applicationName2)
+                    .ports(60606, 60607)
                     .build())
                 .map(ResourceUtils::getId))
             .flatMap(applicationId -> Mono.zip(
@@ -855,6 +858,7 @@ public void update() {
             .as(StepVerifier::create)
             .consumeNextWith(consumer((entity1, entity2) -> {
                 assertThat(entity1.getName()).isEqualTo(applicationName2);
+                assertThat(entity1.getPorts().containsAll(Arrays.asList(60606, 60607)));
                 assertThat(entity1.getEnvironmentJsons()).containsEntry("test-var", "test-value");
                 assertThat(entity2.getEnvironmentJsons()).isEmpty();
             }))
@@ -897,48 +901,38 @@ public void uploadAndDownloadAsyncFalse() {
     }
 
     @Test
-    public void uploadDirectory() {
+    public void uploadDirectory() throws IOException {
+        Path application = new ClassPathResource("test-application").getFile().toPath();
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
             .flatMap(spaceId -> createApplicationId(this.cloudFoundryClient, spaceId, applicationName))
-            .flatMap(applicationId -> {
-                try {
-                    return this.cloudFoundryClient.applicationsV2()
-                        .upload(UploadApplicationRequest.builder()
-                            .application(new ClassPathResource("test-application").getFile().toPath())
-                            .async(true)
-                            .applicationId(applicationId)
-                            .build())
-                        .flatMap(job -> JobUtils.waitForCompletion(this.cloudFoundryClient, Duration.ofMinutes(5), job));
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
-            })
+            .flatMap(applicationId -> this.cloudFoundryClient.applicationsV2()
+                .upload(UploadApplicationRequest.builder()
+                    .application(application)
+                    .async(true)
+                    .applicationId(applicationId)
+                    .build())
+                .flatMap(job -> JobUtils.waitForCompletion(this.cloudFoundryClient, Duration.ofMinutes(5), job)))
             .as(StepVerifier::create)
             .expectComplete()
             .verify(Duration.ofMinutes(5));
     }
 
     @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_1_9)
     @Test
-    public void uploadDroplet() {
+    public void uploadDroplet() throws IOException {
+        Path droplet = new ClassPathResource("test-droplet.tgz").getFile().toPath();
         String applicationName = this.nameFactory.getApplicationName();
 
         this.spaceId
             .flatMap(spaceId -> createApplicationId(this.cloudFoundryClient, spaceId, applicationName))
-            .flatMap(applicationId -> {
-                try {
-                    return this.cloudFoundryClient.applicationsV2()
-                        .uploadDroplet(UploadApplicationDropletRequest.builder()
-                            .applicationId(applicationId)
-                            .droplet(new ClassPathResource("test-droplet.tgz").getFile().toPath())
-                            .build())
-                        .flatMap(job -> JobUtils.waitForCompletion(this.cloudFoundryClient, Duration.ofMinutes(5), job));
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
-            })
+            .flatMap(applicationId -> this.cloudFoundryClient.applicationsV2()
+                .uploadDroplet(UploadApplicationDropletRequest.builder()
+                    .applicationId(applicationId)
+                    .droplet(droplet)
+                    .build())
+                .flatMap(job -> JobUtils.waitForCompletion(this.cloudFoundryClient, Duration.ofMinutes(5), job)))
             .as(StepVerifier::create)
             .expectComplete()
             .verify(Duration.ofMinutes(5));