More test polishing

Signed-off-by: Ben Hale <[email protected]>

Author: nebhale

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/processes/_PortMapping.java

@@ -18,6 +18,7 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import org.cloudfoundry.Nullable;
 import org.immutables.value.Value;
 
 /**
@@ -37,6 +38,7 @@ abstract class _PortMapping {
      * The external TLS proxy port
      */
     @JsonProperty("external_tls_proxy_port")
+    @Nullable
     abstract Integer getExternalTlsProxyPort();
 
     /**
@@ -49,6 +51,7 @@ abstract class _PortMapping {
      * The internal TLS proxy port
      */
     @JsonProperty("internal_tls_proxy_port")
+    @Nullable
     abstract Integer getInternalTlsProxyPort();
 
 }

integration-test/src/test/java/org/cloudfoundry/CloudFoundryVersion.java

@@ -38,6 +38,14 @@ public enum CloudFoundryVersion {
 
     PCF_2_4(Version.forIntegers(2, 125, 0)),
 
+    PCF_2_5(Version.forIntegers(2, 131, 0)),
+
+    PCF_2_6(Version.forIntegers(2, 135, 0)),
+
+    PCF_2_7(Version.forIntegers(2, 139, 0)),
+
+    PCF_2_8(Version.forIntegers(2, 142, 0)),
+
     UNSPECIFIED(Version.forIntegers(0));
 
     private final Version version;

integration-test/src/test/java/org/cloudfoundry/uaa/ClientsTest.java

@@ -18,6 +18,8 @@
 
 import io.netty.util.AsciiString;
 import org.cloudfoundry.AbstractIntegrationTest;
+import org.cloudfoundry.CloudFoundryVersion;
+import org.cloudfoundry.IfCloudFoundryVersion;
 import org.cloudfoundry.uaa.clients.BatchChangeSecretRequest;
 import org.cloudfoundry.uaa.clients.BatchChangeSecretResponse;
 import org.cloudfoundry.uaa.clients.BatchCreateClientsRequest;
@@ -201,8 +203,28 @@ public void batchUpdate() {
             .verify(Duration.ofMinutes(5));
     }
 
+    @IfCloudFoundryVersion(lessThan = CloudFoundryVersion.PCF_2_8)
     @Test
-    public void changeSecret() {
+    public void changeSecret27() {
+        String clientId = this.nameFactory.getClientId();
+        String newClientSecret = this.nameFactory.getClientSecret();
+        String oldClientSecret = this.nameFactory.getClientSecret();
+
+        requestCreateClient(this.uaaClient, clientId, oldClientSecret)
+            .then(this.uaaClient.clients()
+                .changeSecret(ChangeSecretRequest.builder()
+                    .clientId(clientId)
+                    .oldSecret(oldClientSecret)
+                    .secret(newClientSecret)
+                    .build()))
+            .as(StepVerifier::create)
+            .consumeErrorWith(t -> assertThat(t).isInstanceOf(UaaException.class).hasMessage("invalid_client: Only a client can change client secret"))
+            .verify(Duration.ofMinutes(5));
+    }
+
+    @IfCloudFoundryVersion(greaterThanOrEqualTo = CloudFoundryVersion.PCF_2_8)
+    @Test
+    public void changeSecret28() {
         String clientId = this.nameFactory.getClientId();
         String newClientSecret = this.nameFactory.getClientSecret();
         String oldClientSecret = this.nameFactory.getClientSecret();
@@ -221,7 +243,6 @@ public void changeSecret() {
             })
             .expectComplete()
             .verify(Duration.ofMinutes(5));
-
     }
 
     @Test