Merge branch '2.x'

Author: nebhale

cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/applications/ReactorApplicationsV2Test.java

@@ -800,6 +800,7 @@ public void statistics() {
             .expectNext(ApplicationStatisticsResponse.builder()
                 .instance("0", InstanceStatistics.builder()
                     .state("RUNNING")
+                    .isolationSegment("iso-seg-name")
                     .statistics(org.cloudfoundry.client.v2.applications.Statistics.builder()
                         .usage(Usage.builder()
                             .disk(66392064L)

cloudfoundry-client-reactor/src/test/resources/fixtures/client/v2/apps/GET_{id}_stats_response.json

@@ -1,6 +1,7 @@
 {
   "0": {
     "state": "RUNNING",
+    "isolation_segment": "iso-seg-name",
     "stats": {
       "usage": {
         "disk": 66392064,

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

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

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

@@ -25,6 +25,13 @@
 @Value.Immutable
 abstract class _InstanceStatistics {
 
+    /**
+     * The isolation segment
+     */
+    @JsonProperty("isolation_segment")
+    @Nullable
+    abstract String getIsolationSegment();
+
     /**
      * The instance state
      */

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/serviceplans/_Schema.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2013-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.cloudfoundry.client.v2.serviceplans;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import org.immutables.value.Value;
+
+import java.util.Map;
+
+/**
+ * The entity representing a service plan schema
+ */
+@JsonDeserialize
+@Value.Immutable
+abstract class _Schema {
+
+    @JsonProperty("parameters")
+    abstract Map<String, String> getParameters();
+
+}

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/serviceplans/_Schemas.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2013-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.cloudfoundry.client.v2.serviceplans;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import org.immutables.value.Value;
+
+/**
+ * The entity representing service plan schemas
+ */
+@JsonDeserialize
+@Value.Immutable
+abstract class _Schemas {
+
+    /**
+     * The service binding schema
+     */
+    @JsonProperty("service_binding")
+    abstract ServiceBindingSchema getServiceBinding();
+
+    /**
+     * The service instance schema
+     */
+    @JsonProperty("service_instance")
+    abstract ServiceInstanceSchema getServiceInstance();
+
+}

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/serviceplans/_ServiceBindingSchema.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2013-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.cloudfoundry.client.v2.serviceplans;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import org.immutables.value.Value;
+
+/**
+ * The entity representing a service binding schema
+ */
+@JsonDeserialize
+@Value.Immutable
+abstract class _ServiceBindingSchema {
+
+    /**
+     * The create schema
+     */
+    @JsonProperty("create")
+    abstract Schema getCreate();
+
+}

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/serviceplans/_ServiceInstanceSchema.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2013-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.cloudfoundry.client.v2.serviceplans;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import org.immutables.value.Value;
+
+/**
+ * The entity representing a service instance schema
+ */
+@JsonDeserialize
+@Value.Immutable
+abstract class _ServiceInstanceSchema {
+
+    /**
+     * The create schema
+     */
+    @JsonProperty("create")
+    abstract Schema getCreate();
+
+    /**
+     * The update schema
+     */
+    @JsonProperty("update")
+    abstract Schema getUpdate();
+
+}

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/serviceplans/_ServicePlanEntity.java

@@ -78,6 +78,13 @@ abstract class _ServicePlanEntity {
     @Nullable
     abstract Boolean getPubliclyVisible();
 
+    /**
+     * The schemas
+     */
+    @JsonProperty("schemas")
+    @Nullable
+    abstract Schemas getSchemas();
+
     /**
      * The service id
      */

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

@@ -45,12 +45,14 @@
 
     enum CloudFoundryVersion {
 
-        PCF_1_8(Version.forIntegers(2, 58, 0)),
-
         PCF_1_9(Version.forIntegers(2, 65, 0)),
 
         PCF_1_10(Version.forIntegers(2, 75, 0)),
 
+        PCF_1_11(Version.forIntegers(2, 82, 0)),
+
+        PCF_1_12(Version.forIntegers(2, 94, 0)),
+
         UNSPECIFIED(Version.forIntegers(0));
 
         private final Version version;