From ad7f25f01a841b172f150fa416ff4611d1202045 Mon Sep 17 00:00:00 2001 From: Roy Clarkson Date: Tue, 27 Aug 2024 11:27:25 -0400 Subject: [PATCH] Upgrade to spring-javaformat-checkstyle 0.0.4.3 --- build.gradle | 2 +- .../model/instance/CreateServiceInstanceRequest.java | 6 ++++++ .../model/instance/UpdateServiceInstanceRequest.java | 10 ++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index db6d7209..8166f07d 100644 --- a/build.gradle +++ b/build.gradle @@ -99,7 +99,7 @@ configure(allprojects - [project(':spring-cloud-open-service-broker-docs')]) { } dependencies { - checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.42") + checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.43") } test { diff --git a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/CreateServiceInstanceRequest.java b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/CreateServiceInstanceRequest.java index 4d59b32e..facccaa2 100644 --- a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/CreateServiceInstanceRequest.java +++ b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/CreateServiceInstanceRequest.java @@ -56,6 +56,9 @@ public class CreateServiceInstanceRequest extends AsyncParameterizedServiceInsta /** * remains in the model for marshalling support but test harnesses should not use. + * @deprecated in favor of {@link CloudFoundryContext#getOrganizationGuid()}. + * @see https://github.com/openservicebrokerapi/servicebroker/blob/v2.15/spec.md#body-3 */ @Deprecated @JsonProperty("organization_guid") @@ -63,6 +66,9 @@ public class CreateServiceInstanceRequest extends AsyncParameterizedServiceInsta /** * remains in the model for marshalling support but test harnesses should not use. + * @deprecated in favor of {@link CloudFoundryContext#getSpaceGuid()}. + * @see https://github.com/openservicebrokerapi/servicebroker/blob/v2.15/spec.md#body-3 */ @Deprecated @JsonProperty("space_guid") diff --git a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/UpdateServiceInstanceRequest.java b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/UpdateServiceInstanceRequest.java index f3668628..c620bfc6 100644 --- a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/UpdateServiceInstanceRequest.java +++ b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/UpdateServiceInstanceRequest.java @@ -26,6 +26,7 @@ import com.fasterxml.jackson.databind.annotation.JsonNaming; import jakarta.validation.constraints.NotEmpty; +import org.springframework.cloud.servicebroker.model.CloudFoundryContext; import org.springframework.cloud.servicebroker.model.Context; import org.springframework.cloud.servicebroker.model.catalog.MaintenanceInfo; import org.springframework.cloud.servicebroker.model.catalog.Plan; @@ -287,6 +288,9 @@ public static class PreviousValues { /** * remains in the model for marshaling support. + * @deprecated determined to be unnecessary as the value is immutable. + * @see https://github.com/openservicebrokerapi/servicebroker/blob/v2.16/spec.md#previous-values-object */ @Deprecated @JsonProperty("service_id") @@ -297,12 +301,18 @@ public static class PreviousValues { /** * remains in the model for marshaling support. + * @deprecated in favor of {@link CloudFoundryContext#getOrganizationGuid()}. + * @see https://github.com/openservicebrokerapi/servicebroker/blob/v2.16/spec.md#previous-values-object */ @Deprecated private final String organizationId; /** * remains in the model for marshaling support. + * @deprecated in favor of {@link CloudFoundryContext#getSpaceGuid()}. + * @see https://github.com/openservicebrokerapi/servicebroker/blob/v2.16/spec.md#previous-values-object */ @Deprecated private final String spaceId;