Merge branch '3.x'

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

Author: nebhale

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/util/RequestLogger.java

@@ -35,7 +35,7 @@ public class RequestLogger {
     private long requestSentTime;
 
     public void request(HttpClientRequest request) {
-        request(String.format("%-5s {}", request.method()), request.uri());
+        request(String.format("%-6s {}", request.method()), request.uri());
     }
 
     public void response(HttpClientResponse response) {

cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/deployments/ReactorDeploymentsV3Test.java

@@ -71,6 +71,7 @@ public void cancel() {
             .verify(Duration.ofSeconds(5));
     }
 
+    @SuppressWarnings("deprecation")
     @Test
     public void create() {
         mockRequest(InteractionContext.builder()
@@ -134,6 +135,7 @@ public void create() {
             .verify(Duration.ofSeconds(5));
     }
 
+    @SuppressWarnings("deprecation")
     @Test
     public void get() {
         mockRequest(InteractionContext.builder()
@@ -189,6 +191,7 @@ public void get() {
             .verify(Duration.ofSeconds(5));
     }
 
+    @SuppressWarnings("deprecation")
     @Test
     public void list() {
         mockRequest(InteractionContext.builder()

cloudfoundry-client-reactor/src/test/resources/logback-test.xml

@@ -25,6 +25,7 @@
 
     <logger name="cloudfoundry-client.request"  level="${CLIENT_LOGGING_LEVEL:-INFO}"/>
     <logger name="cloudfoundry-client.response" level="${CLIENT_LOGGING_LEVEL:-INFO}"/>
+    <logger name="cloudfoundry-client.wire"     level="${CLIENT_LOGGING_LEVEL:-INFO}"/>
     <logger name="okhttp3"                      level="WARN"/>
     <logger name="reactor.netty"                level="INFO"/>
     <logger name="stream"                       level="INFO"/>

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

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

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/_MaintenanceInfo.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2013-2019 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;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import org.cloudfoundry.Nullable;
+import org.immutables.value.Value;
+
+/**
+ * The entity representing service plan maintenance info
+ */
+@JsonDeserialize
+@Value.Immutable
+abstract class _MaintenanceInfo {
+
+    /**
+     * The description
+     */
+    @JsonProperty("description")
+    @Nullable
+    abstract String getDescription();
+
+    /**
+     * The version
+     */
+    @JsonProperty("version")
+    @Nullable
+    abstract String getVersion();
+
+}

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/serviceinstances/_Plan.java

@@ -19,6 +19,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import org.cloudfoundry.Nullable;
+import org.cloudfoundry.client.v2.MaintenanceInfo;
 import org.immutables.value.Value;
 
 /**
@@ -35,6 +36,13 @@ abstract class _Plan {
     @Nullable
     abstract String getId();
 
+    /**
+     * The maintenance info
+     */
+    @JsonProperty("maintenance_info")
+    @Nullable
+    abstract MaintenanceInfo getMaintenanceInfo();
+
     /**
      * The name
      */

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/serviceinstances/_ServiceInstance.java

@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import org.cloudfoundry.AllowNulls;
 import org.cloudfoundry.Nullable;
+import org.cloudfoundry.client.v2.MaintenanceInfo;
 import org.immutables.value.Value;
 
 import java.util.List;
@@ -59,13 +60,27 @@ abstract class _ServiceInstance {
     @Nullable
     abstract LastOperation getLastOperation();
 
+    /**
+     * The maintenance info
+     */
+    @JsonProperty("maintenance_info")
+    @Nullable
+    abstract MaintenanceInfo getMaintenanceInfo();
+
     /**
      * The name
      */
     @JsonProperty("name")
     @Nullable
     abstract String getName();
 
+    /**
+     * The service broker name
+     */
+    @JsonProperty("service_broker_name")
+    @Nullable
+    abstract String getServiceBrokerName();
+
     /**
      * The service plan
      */
@@ -88,4 +103,11 @@ abstract class _ServiceInstance {
     @Nullable
     abstract List<Share> getSharedTo();
 
+    /**
+     * The type
+     */
+    @JsonProperty("type")
+    @Nullable
+    abstract String getType();
+
 }

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/serviceinstances/_ServiceInstanceEntity.java

@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import org.cloudfoundry.Nullable;
+import org.cloudfoundry.client.v2.MaintenanceInfo;
 import org.immutables.value.Value;
 
 /**
@@ -51,6 +52,13 @@ abstract class _ServiceInstanceEntity extends BaseServiceInstanceEntity {
     @Nullable
     abstract LastOperation getLastOperation();
 
+    /**
+     * The instance maintenance info
+     */
+    @JsonProperty("maintenance_info")
+    @Nullable
+    abstract MaintenanceInfo getMaintenanceInfo();
+
     /**
      * The service id
      */

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/serviceinstances/_UnionServiceInstanceEntity.java

@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import org.cloudfoundry.Nullable;
+import org.cloudfoundry.client.v2.MaintenanceInfo;
 import org.immutables.value.Value;
 
 /**
@@ -51,6 +52,13 @@ abstract class _UnionServiceInstanceEntity extends BaseServiceInstanceEntity {
     @Nullable
     abstract LastOperation getLastOperation();
 
+    /**
+     * The maintenance info
+     */
+    @JsonProperty("maintenance_info")
+    @Nullable
+    abstract MaintenanceInfo getMaintenanceInfo();
+
     /**
      * URL to which requests for bound routes will be forwarded
      */

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

@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import org.cloudfoundry.Nullable;
+import org.cloudfoundry.client.v2.MaintenanceInfo;
 import org.immutables.value.Value;
 
 /**
@@ -64,13 +65,34 @@ abstract class _ServicePlanEntity {
     @Nullable
     abstract Boolean getFree();
 
+    /**
+     * The plan maintenance info
+     */
+    @JsonProperty("maintenance_info")
+    @Nullable
+    abstract MaintenanceInfo getMaintenanceInfo();
+
+    /**
+     * The maximum polling duration
+     */
+    @JsonProperty("maximum_polling_duration")
+    @Nullable
+    abstract Long getMaximumPollingDuration();
+
     /**
      * The name
      */
     @JsonProperty("name")
     @Nullable
     abstract String getName();
 
+    /**
+     * Whether the plan is updatable
+     */
+    @JsonProperty("plan_updateable")
+    @Nullable
+    abstract Boolean getPlanUpdatable();
+
     /**
      * The public flag
      */