Merge branch 'version-update' into 2.x

Author: twoseat

cloudfoundry-client/src/main/java/org/cloudfoundry/client/CloudFoundryClient.java

@@ -68,7 +68,7 @@ public interface CloudFoundryClient {
     /**
      * The currently supported Cloud Controller API version
      */
-    String SUPPORTED_API_VERSION = "2.120.0";
+    String SUPPORTED_API_VERSION = "2.125.0";
 
     /**
      * Main entry point to the Cloud Foundry Application Usage Events Client API

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/info/_GetInfoResponse.java

@@ -112,6 +112,13 @@ abstract class _GetInfoResponse {
     @Nullable
     abstract String getName();
 
+    /**
+     * The version of the supported Open Service Broker API
+     */
+    @JsonProperty("osbapi_version")
+    @Nullable
+    abstract String getOsbapiVersion();
+
     /**
      * The routing endpoint
      */

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/services/_ServiceEntity.java

@@ -133,6 +133,13 @@ abstract class _ServiceEntity {
     @Nullable
     abstract String getServiceBrokerId();
 
+    /**
+     * The service broker name
+     */
+    @JsonProperty("service_broker_name")
+    @Nullable
+    abstract String getServiceBrokerName();
+
     /**
      * The service plans url
      */

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/serviceusageevents/_ServiceUsageEventEntity.java

@@ -35,6 +35,20 @@ abstract class _ServiceUsageEventEntity {
     @Nullable
     abstract String getOrganizationId();
 
+    /**
+     * The service broker id
+     */
+    @JsonProperty("service_broker_guid")
+    @Nullable
+    abstract String getServiceBrokerId();
+
+    /**
+     * The service broker name
+     */
+    @JsonProperty("service_broker_name")
+    @Nullable
+    abstract String getServiceBrokerName();
+
     /**
      * The service id
      */

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

@@ -26,6 +26,13 @@
  */
 public abstract class ProcessStatistics {
 
+    /**
+     * Information about errors placing the instance
+     */
+    @JsonProperty("details")
+    @Nullable
+    public abstract String getDetails();
+
     /**
      * The disk quota
      */
@@ -56,6 +63,13 @@ public abstract class ProcessStatistics {
     @JsonProperty("instance_ports")
     public abstract List<PortMapping> getInstancePorts();
 
+    /**
+     * The isolation segment
+     */
+    @JsonProperty("isolation_segment")
+    @Nullable
+    public abstract String getIsolationSegment();
+
     /**
      * The memory quota
      */
@@ -87,12 +101,5 @@ public abstract class ProcessStatistics {
     @JsonProperty("usage")
     public abstract ProcessUsage getUsage();
 
-    /**
-     * The isolation segment
-     */
-    @JsonProperty("isolation_segment")
-    @Nullable
-    abstract String getIsolationSegment();
-
 }
 

cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/identityzones/AbstractIdentityZone.java

@@ -24,6 +24,13 @@
  */
 public abstract class AbstractIdentityZone {
 
+    /**
+     * Whether the identity zone is active
+     */
+    @JsonProperty("active")
+    @Nullable
+    abstract Boolean getActive();
+
     /**
      * The configuration
      */

cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/tokens/_GetTokenByAuthorizationCodeResponse.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;
 
 /**
@@ -27,6 +28,13 @@
 @Value.Immutable
 abstract class _GetTokenByAuthorizationCodeResponse extends AbstractToken {
 
+    /**
+     * The OpenId token
+     */
+    @JsonProperty("id_token")
+    @Nullable
+    abstract String getOpenIdToken();
+
     /**
      * The refresh token
      */

cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/tokens/_GetTokenByOneTimePasscodeResponse.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;
 
 /**
@@ -27,6 +28,13 @@
 @Value.Immutable
 abstract class _GetTokenByOneTimePasscodeResponse extends AbstractToken {
 
+    /**
+     * The OpenId token
+     */
+    @JsonProperty("id_token")
+    @Nullable
+    abstract String getOpenIdToken();
+
     /**
      * The refresh token
      */

cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/tokens/_GetTokenByPasswordResponse.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;
 
 /**
@@ -27,6 +28,13 @@
 @Value.Immutable
 abstract class _GetTokenByPasswordResponse extends AbstractToken {
 
+    /**
+     * The OpenId token
+     */
+    @JsonProperty("id_token")
+    @Nullable
+    abstract String getOpenIdToken();
+
     /**
      * The refresh token
      */

cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/tokens/_RefreshTokenResponse.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;
 
 /**
@@ -27,6 +28,13 @@
 @Value.Immutable
 abstract class _RefreshTokenResponse extends AbstractToken {
 
+    /**
+     * The OpenId token
+     */
+    @JsonProperty("id_token")
+    @Nullable
+    abstract String getOpenIdToken();
+
     /**
      * The refresh token
      */