From de438666e25e6ab885186a6bd24d58ed29230b9a Mon Sep 17 00:00:00 2001 From: indvd00m Date: Fri, 25 Nov 2022 17:34:38 +0300 Subject: [PATCH 1/2] Possibility to extend broker responses --- .../cloud/servicebroker/service/CatalogService.java | 4 ++-- .../service/ServiceInstanceBindingService.java | 8 ++++---- .../service/ServiceInstanceService.java | 12 +++++++----- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/service/CatalogService.java b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/service/CatalogService.java index 0a0eaf66..7ad5ea2e 100644 --- a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/service/CatalogService.java +++ b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/service/CatalogService.java @@ -33,7 +33,7 @@ public interface CatalogService { * * @return the catalog of services */ - Mono getCatalog(); + Mono getCatalog(); /** * Get a service definition from the catalog by ID. @@ -41,6 +41,6 @@ public interface CatalogService { * @param serviceId The ID of the service definition in the catalog * @return the service definition, or null if it doesn't exist */ - Mono getServiceDefinition(String serviceId); + Mono getServiceDefinition(String serviceId); } diff --git a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/service/ServiceInstanceBindingService.java b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/service/ServiceInstanceBindingService.java index 55c01b01..e9c22237 100644 --- a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/service/ServiceInstanceBindingService.java +++ b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/service/ServiceInstanceBindingService.java @@ -58,7 +58,7 @@ public interface ServiceInstanceBindingService { * @throws ServiceBrokerCreateOperationInProgressException if a an operation is in progress for the service * binding */ - default Mono createServiceInstanceBinding( + default Mono createServiceInstanceBinding( CreateServiceInstanceBindingRequest request) { return Mono.error(new UnsupportedOperationException( "This service broker does not support creating service bindings.")); @@ -74,7 +74,7 @@ default Mono createServiceInstanceBinding( * @throws ServiceInstanceBindingDoesNotExistException if a binding with the given ID is not known to the broker * @throws ServiceBrokerOperationInProgressException if a an operation is in progress for the service binding */ - default Mono getServiceInstanceBinding( + default Mono getServiceInstanceBinding( GetServiceInstanceBindingRequest request) { return Mono.error(new UnsupportedOperationException( "This service broker does not support retrieving service bindings. " + @@ -91,7 +91,7 @@ default Mono getServiceInstanceBinding( * broker * @throws ServiceInstanceBindingDoesNotExistException if a binding with the given ID is not known to the broker */ - default Mono getLastOperation( + default Mono getLastOperation( GetLastServiceBindingOperationRequest request) { return Mono .error(new UnsupportedOperationException("This service broker does not support getting the status of " + @@ -112,7 +112,7 @@ default Mono getLastOperation( * binding * @throws ServiceBrokerAsyncRequiredException if the broker requires asynchronous processing of the request */ - default Mono deleteServiceInstanceBinding( + default Mono deleteServiceInstanceBinding( DeleteServiceInstanceBindingRequest request) { return Mono.error(new UnsupportedOperationException( "This service broker does not support deleting service bindings.")); diff --git a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/service/ServiceInstanceService.java b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/service/ServiceInstanceService.java index 00d5c078..730e5555 100644 --- a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/service/ServiceInstanceService.java +++ b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/service/ServiceInstanceService.java @@ -61,7 +61,7 @@ public interface ServiceInstanceService { * @throws ServiceBrokerCreateOperationInProgressException if a an operation is in progress for the service * instance */ - Mono createServiceInstance(CreateServiceInstanceRequest request); + Mono createServiceInstance(CreateServiceInstanceRequest request); /** * Get the details of a service instance. @@ -74,7 +74,7 @@ public interface ServiceInstanceService { * @throws ServiceBrokerConcurrencyException if a service instance is being updated and therefore cannot be * fetched */ - default Mono getServiceInstance(GetServiceInstanceRequest request) { + default Mono getServiceInstance(GetServiceInstanceRequest request) { return Mono.error(new UnsupportedOperationException("This service broker does not support retrieving service " + "instances. The service broker should set 'instances_retrievable:false' in the service catalog, or " + "provide an implementation of the fetch instance API.")); @@ -88,7 +88,8 @@ default Mono getServiceInstance(GetServiceInstanceRe * @throws ServiceInstanceDoesNotExistException if a service instance with the given ID is not known to the * broker */ - default Mono getLastOperation(GetLastServiceOperationRequest request) { + default Mono getLastOperation( + GetLastServiceOperationRequest request) { return Mono.error(new UnsupportedOperationException("This service broker does not support getting the status " + "of an asynchronous operation. If the service broker returns '202 Accepted' in response to a " + "provision, update, or deprovision request, it must also provide an implementation of the get last " + @@ -105,7 +106,7 @@ default Mono getLastOperation(GetLastServiceOpe * @throws ServiceBrokerAsyncRequiredException if the broker requires asynchronous processing of the request * @throws ServiceBrokerDeleteOperationInProgressException if an operation is in progress for the service instance */ - Mono deleteServiceInstance(DeleteServiceInstanceRequest request); + Mono deleteServiceInstance(DeleteServiceInstanceRequest request); /** * Update a service instance. @@ -120,7 +121,8 @@ default Mono getLastOperation(GetLastServiceOpe * @throws ServiceBrokerInvalidParametersException if any parameters passed in the request are invalid * @throws ServiceBrokerUpdateOperationInProgressException if an operation is in progress for the service instance */ - default Mono updateServiceInstance(UpdateServiceInstanceRequest request) { + default Mono updateServiceInstance( + UpdateServiceInstanceRequest request) { return Mono.error(new UnsupportedOperationException("This service broker does not support updating service " + "instances. The service broker should set 'plan_updateable:false' in the service catalog, or " + "provide an implementation of the update instance API.")); From 3f546e62ab5bbef985a71140fcc3d0ac44261f32 Mon Sep 17 00:00:00 2001 From: indvd00m Date: Fri, 25 Nov 2022 17:36:20 +0300 Subject: [PATCH 2/2] Possibility to override equals/hashCode methods --- .../CreateServiceInstanceBindingRequest.java | 4 ++-- .../DeleteServiceInstanceBindingRequest.java | 4 ++-- .../GetLastServiceBindingOperationRequest.java | 4 ++-- .../GetLastServiceBindingOperationResponse.java | 17 ++++++++++++++--- .../GetServiceInstanceBindingRequest.java | 4 ++-- .../servicebroker/model/catalog/Catalog.java | 16 +++++++++++++--- .../model/catalog/ServiceDefinition.java | 17 ++++++++++++++--- .../instance/CreateServiceInstanceRequest.java | 4 ++-- .../instance/CreateServiceInstanceResponse.java | 4 ++-- .../instance/DeleteServiceInstanceRequest.java | 4 ++-- .../GetLastServiceOperationRequest.java | 4 ++-- .../GetLastServiceOperationResponse.java | 17 ++++++++++++++--- .../instance/GetServiceInstanceRequest.java | 4 ++-- .../instance/GetServiceInstanceResponse.java | 4 ++-- .../instance/UpdateServiceInstanceRequest.java | 4 ++-- .../instance/UpdateServiceInstanceResponse.java | 4 ++-- ...CreateServiceInstanceBindingRequestTest.java | 1 + ...DeleteServiceInstanceBindingRequestTest.java | 1 + ...tLastServiceBindingOperationRequestTest.java | 1 + ...LastServiceBindingOperationResponseTest.java | 2 ++ .../GetServiceInstanceBindingRequestTest.java | 1 + .../model/catalog/CatalogTest.java | 3 ++- .../model/catalog/ServiceDefinitionTest.java | 2 ++ .../CreateServiceInstanceRequestTest.java | 1 + .../CreateServiceInstanceResponseTest.java | 2 ++ .../DeleteServiceInstanceRequestTest.java | 1 + .../GetLastServiceOperationRequestTest.java | 1 + .../GetLastServiceOperationResponseTest.java | 2 ++ .../instance/GetServiceInstanceRequestTest.java | 1 + .../GetServiceInstanceResponseTest.java | 2 ++ .../UpdateServiceInstanceRequestTest.java | 1 + .../UpdateServiceInstanceResponseTest.java | 2 ++ 32 files changed, 102 insertions(+), 37 deletions(-) diff --git a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/binding/CreateServiceInstanceBindingRequest.java b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/binding/CreateServiceInstanceBindingRequest.java index 13e16d45..a82d8efe 100644 --- a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/binding/CreateServiceInstanceBindingRequest.java +++ b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/binding/CreateServiceInstanceBindingRequest.java @@ -277,7 +277,7 @@ public static CreateServiceInstanceBindingRequestBuilder builder() { } @Override - public final boolean equals(Object o) { + public boolean equals(Object o) { if (this == o) { return true; } @@ -305,7 +305,7 @@ public final boolean canEqual(Object other) { } @Override - public final int hashCode() { + public int hashCode() { return Objects.hash(super.hashCode(), serviceDefinitionId, serviceInstanceId, planId, bindingId, appGuid, bindResource, serviceDefinition, plan); } diff --git a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/binding/DeleteServiceInstanceBindingRequest.java b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/binding/DeleteServiceInstanceBindingRequest.java index 626075da..939c0359 100644 --- a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/binding/DeleteServiceInstanceBindingRequest.java +++ b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/binding/DeleteServiceInstanceBindingRequest.java @@ -184,7 +184,7 @@ public static DeleteServiceInstanceBindingRequestBuilder builder() { } @Override - public final boolean equals(Object o) { + public boolean equals(Object o) { if (this == o) { return true; } @@ -210,7 +210,7 @@ public final boolean canEqual(Object other) { } @Override - public final int hashCode() { + public int hashCode() { return Objects.hash(super.hashCode(), serviceInstanceId, bindingId, serviceDefinitionId, planId, serviceDefinition, plan); } diff --git a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/binding/GetLastServiceBindingOperationRequest.java b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/binding/GetLastServiceBindingOperationRequest.java index 5f945202..65a93e6d 100644 --- a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/binding/GetLastServiceBindingOperationRequest.java +++ b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/binding/GetLastServiceBindingOperationRequest.java @@ -148,7 +148,7 @@ public static GetLastServiceBindingOperationRequestBuilder builder() { } @Override - public final boolean equals(Object o) { + public boolean equals(Object o) { if (this == o) { return true; } @@ -173,7 +173,7 @@ public final boolean canEqual(Object other) { } @Override - public final int hashCode() { + public int hashCode() { return Objects.hash(super.hashCode(), serviceInstanceId, bindingId, serviceDefinitionId, planId, operation); } diff --git a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/binding/GetLastServiceBindingOperationResponse.java b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/binding/GetLastServiceBindingOperationResponse.java index 06ca6d17..05b43eb0 100644 --- a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/binding/GetLastServiceBindingOperationResponse.java +++ b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/binding/GetLastServiceBindingOperationResponse.java @@ -104,7 +104,7 @@ public static GetLastServiceBindingOperationResponseBuilder builder() { } @Override - public final boolean equals(Object o) { + public boolean equals(Object o) { if (this == o) { return true; } @@ -112,13 +112,24 @@ public final boolean equals(Object o) { return false; } GetLastServiceBindingOperationResponse that = (GetLastServiceBindingOperationResponse) o; - return deleteOperation == that.deleteOperation && + return that.canEqual(this) && + deleteOperation == that.deleteOperation && state == that.state && Objects.equals(description, that.description); } + /** + * Is another object type compatible with this object + * + * @param other the other object + * @return true of compatible + */ + public boolean canEqual(Object other) { + return other instanceof GetLastServiceBindingOperationResponse; + } + @Override - public final int hashCode() { + public int hashCode() { return Objects.hash(state, description, deleteOperation); } diff --git a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/binding/GetServiceInstanceBindingRequest.java b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/binding/GetServiceInstanceBindingRequest.java index af9bf1ea..6dd63137 100644 --- a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/binding/GetServiceInstanceBindingRequest.java +++ b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/binding/GetServiceInstanceBindingRequest.java @@ -129,7 +129,7 @@ public static GetServiceInstanceBindingRequestBuilder builder() { } @Override - public final boolean equals(Object o) { + public boolean equals(Object o) { if (this == o) { return true; } @@ -153,7 +153,7 @@ public final boolean canEqual(Object other) { } @Override - public final int hashCode() { + public int hashCode() { return Objects.hash(super.hashCode(), serviceInstanceId, bindingId, serviceDefinitionId, planId); } diff --git a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/catalog/Catalog.java b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/catalog/Catalog.java index d78ffa88..bfeefa99 100644 --- a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/catalog/Catalog.java +++ b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/catalog/Catalog.java @@ -69,7 +69,7 @@ public List getServiceDefinitions() { } @Override - public final boolean equals(Object o) { + public boolean equals(Object o) { if (this == o) { return true; } @@ -77,11 +77,21 @@ public final boolean equals(Object o) { return false; } Catalog catalog = (Catalog) o; - return Objects.equals(serviceDefinitions, catalog.serviceDefinitions); + return catalog.canEqual(this) && Objects.equals(serviceDefinitions, catalog.serviceDefinitions); + } + + /** + * Is another object type compatible with this object + * + * @param other the other object + * @return true of compatible + */ + public boolean canEqual(Object other) { + return other instanceof Catalog; } @Override - public final int hashCode() { + public int hashCode() { return Objects.hash(serviceDefinitions); } diff --git a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/catalog/ServiceDefinition.java b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/catalog/ServiceDefinition.java index 7defb617..dda8e875 100644 --- a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/catalog/ServiceDefinition.java +++ b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/catalog/ServiceDefinition.java @@ -251,7 +251,7 @@ public static ServiceDefinitionBuilder builder() { } @Override - public final boolean equals(Object o) { + public boolean equals(Object o) { if (this == o) { return true; } @@ -259,7 +259,8 @@ public final boolean equals(Object o) { return false; } ServiceDefinition that = (ServiceDefinition) o; - return bindable == that.bindable && + return that.canEqual(this) && + bindable == that.bindable && Objects.equals(planUpdateable, that.planUpdateable) && Objects.equals(instancesRetrievable, that.instancesRetrievable) && Objects.equals(bindingsRetrievable, that.bindingsRetrievable) && @@ -274,8 +275,18 @@ public final boolean equals(Object o) { Objects.equals(dashboardClient, that.dashboardClient); } + /** + * Is another object type compatible with this object + * + * @param other the other object + * @return true of compatible + */ + public boolean canEqual(Object other) { + return other instanceof ServiceDefinition; + } + @Override - public final int hashCode() { + public int hashCode() { return Objects.hash(id, name, description, bindable, planUpdateable, instancesRetrievable, bindingsRetrievable, allowContextUpdates, plans, tags, metadata, requires, dashboardClient); 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 2e85cbd9..eb31b571 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 @@ -324,7 +324,7 @@ public static CreateServiceInstanceRequestBuilder builder() { * {@inheritDoc} */ @Override - public final boolean equals(Object o) { + public boolean equals(Object o) { if (this == o) { return true; } @@ -352,7 +352,7 @@ public boolean canEqual(Object other) { } @Override - public final int hashCode() { + public int hashCode() { return Objects.hash(super.hashCode(), serviceDefinitionId, planId, organizationGuid, spaceGuid, serviceInstanceId, serviceDefinition, plan, maintenanceInfo); } diff --git a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/CreateServiceInstanceResponse.java b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/CreateServiceInstanceResponse.java index 70f747c3..d4c380a4 100644 --- a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/CreateServiceInstanceResponse.java +++ b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/CreateServiceInstanceResponse.java @@ -110,7 +110,7 @@ public static CreateServiceInstanceResponseBuilder builder() { } @Override - public final boolean equals(Object o) { + public boolean equals(Object o) { if (this == o) { return true; } @@ -133,7 +133,7 @@ public boolean canEqual(Object other) { } @Override - public final int hashCode() { + public int hashCode() { return Objects.hash(super.hashCode(), dashboardUrl, instanceExisted, metadata); } diff --git a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/DeleteServiceInstanceRequest.java b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/DeleteServiceInstanceRequest.java index 6741ce23..898e1545 100644 --- a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/DeleteServiceInstanceRequest.java +++ b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/DeleteServiceInstanceRequest.java @@ -168,7 +168,7 @@ public static DeleteServiceInstanceRequestBuilder builder() { } @Override - public final boolean equals(Object o) { + public boolean equals(Object o) { if (this == o) { return true; } @@ -193,7 +193,7 @@ public final boolean canEqual(Object other) { } @Override - public final int hashCode() { + public int hashCode() { return Objects.hash(super.hashCode(), serviceInstanceId, serviceDefinitionId, planId, serviceDefinition, plan); } diff --git a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/GetLastServiceOperationRequest.java b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/GetLastServiceOperationRequest.java index 2956f90c..87ff97ce 100644 --- a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/GetLastServiceOperationRequest.java +++ b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/GetLastServiceOperationRequest.java @@ -130,7 +130,7 @@ public static GetLastServiceOperationRequestBuilder builder() { } @Override - public final boolean equals(Object o) { + public boolean equals(Object o) { if (this == o) { return true; } @@ -154,7 +154,7 @@ public final boolean canEqual(Object other) { } @Override - public final int hashCode() { + public int hashCode() { return Objects.hash(super.hashCode(), serviceInstanceId, serviceDefinitionId, planId, operation); } diff --git a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/GetLastServiceOperationResponse.java b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/GetLastServiceOperationResponse.java index cfc62bd0..1d5ff09b 100644 --- a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/GetLastServiceOperationResponse.java +++ b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/GetLastServiceOperationResponse.java @@ -146,8 +146,18 @@ public static GetLastServiceOperationResponseBuilder builder() { return new GetLastServiceOperationResponseBuilder(); } + /** + * Is another object type compatible with this object + * + * @param other the other object + * @return true of compatible + */ + public boolean canEqual(Object other) { + return other instanceof GetLastServiceOperationResponse; + } + @Override - public final boolean equals(Object o) { + public boolean equals(Object o) { if (this == o) { return true; } @@ -155,7 +165,8 @@ public final boolean equals(Object o) { return false; } GetLastServiceOperationResponse that = (GetLastServiceOperationResponse) o; - return state == that.state && + return that.canEqual(this) && + state == that.state && Objects.equals(description, that.description) && Objects.equals(instanceUsable, that.instanceUsable) && Objects.equals(updateRepeatable, that.updateRepeatable) && @@ -163,7 +174,7 @@ public final boolean equals(Object o) { } @Override - public final int hashCode() { + public int hashCode() { return Objects.hash(state, description, instanceUsable, updateRepeatable, deleteOperation); } diff --git a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/GetServiceInstanceRequest.java b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/GetServiceInstanceRequest.java index 14704f93..02ecad8e 100644 --- a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/GetServiceInstanceRequest.java +++ b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/GetServiceInstanceRequest.java @@ -111,7 +111,7 @@ public static GetServiceInstanceRequestBuilder builder() { } @Override - public final boolean equals(Object o) { + public boolean equals(Object o) { if (this == o) { return true; } @@ -134,7 +134,7 @@ public final boolean canEqual(Object other) { } @Override - public final int hashCode() { + public int hashCode() { return Objects.hash(super.hashCode(), serviceInstanceId, serviceDefinitionId, planId); } diff --git a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/GetServiceInstanceResponse.java b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/GetServiceInstanceResponse.java index cd4cc222..80aba98c 100644 --- a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/GetServiceInstanceResponse.java +++ b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/GetServiceInstanceResponse.java @@ -120,7 +120,7 @@ public static GetServiceInstanceResponseBuilder builder() { } @Override - public final boolean equals(Object o) { + public boolean equals(Object o) { if (this == o) { return true; } @@ -146,7 +146,7 @@ public final boolean canEqual(Object other) { } @Override - public final int hashCode() { + public int hashCode() { return Objects.hash(serviceDefinitionId, planId, dashboardUrl, parameters); } 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 af446bf6..a1208262 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 @@ -240,7 +240,7 @@ public static UpdateServiceInstanceRequestBuilder builder() { } @Override - public final boolean equals(Object o) { + public boolean equals(Object o) { if (this == o) { return true; } @@ -267,7 +267,7 @@ public final boolean canEqual(Object other) { } @Override - public final int hashCode() { + public int hashCode() { return Objects.hash(super.hashCode(), serviceDefinitionId, planId, previousValues, serviceInstanceId, serviceDefinition, plan, maintenanceInfo); } diff --git a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/UpdateServiceInstanceResponse.java b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/UpdateServiceInstanceResponse.java index 3d4d45c2..36a558ac 100644 --- a/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/UpdateServiceInstanceResponse.java +++ b/spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/UpdateServiceInstanceResponse.java @@ -93,7 +93,7 @@ public static UpdateServiceInstanceResponseBuilder builder() { } @Override - public final boolean equals(Object o) { + public boolean equals(Object o) { if (this == o) { return true; } @@ -115,7 +115,7 @@ public boolean canEqual(Object other) { } @Override - public final int hashCode() { + public int hashCode() { return Objects.hash(super.hashCode(), dashboardUrl, metadata); } diff --git a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/binding/CreateServiceInstanceBindingRequestTest.java b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/binding/CreateServiceInstanceBindingRequestTest.java index ee586bb1..14878634 100755 --- a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/binding/CreateServiceInstanceBindingRequestTest.java +++ b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/binding/CreateServiceInstanceBindingRequestTest.java @@ -247,6 +247,7 @@ void equalsAndHashCode() { .withRedefinedSuperclass() .suppress(Warning.NONFINAL_FIELDS) .suppress(Warning.TRANSIENT_FIELDS) + .suppress(Warning.STRICT_INHERITANCE) .verify(); } diff --git a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/binding/DeleteServiceInstanceBindingRequestTest.java b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/binding/DeleteServiceInstanceBindingRequestTest.java index 5f06d96f..f3ae19da 100755 --- a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/binding/DeleteServiceInstanceBindingRequestTest.java +++ b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/binding/DeleteServiceInstanceBindingRequestTest.java @@ -119,6 +119,7 @@ void equalsAndHashCode() { .withRedefinedSuperclass() .suppress(Warning.NONFINAL_FIELDS) .suppress(Warning.TRANSIENT_FIELDS) + .suppress(Warning.STRICT_INHERITANCE) .verify(); } diff --git a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/binding/GetLastServiceBindingOperationRequestTest.java b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/binding/GetLastServiceBindingOperationRequestTest.java index 81bfbd6e..87bb31e4 100755 --- a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/binding/GetLastServiceBindingOperationRequestTest.java +++ b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/binding/GetLastServiceBindingOperationRequestTest.java @@ -81,6 +81,7 @@ void equalsAndHashCode() { .withRedefinedSuperclass() .suppress(Warning.NONFINAL_FIELDS) .suppress(Warning.TRANSIENT_FIELDS) + .suppress(Warning.STRICT_INHERITANCE) .verify(); } diff --git a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/binding/GetLastServiceBindingOperationResponseTest.java b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/binding/GetLastServiceBindingOperationResponseTest.java index 8f7a23e0..7a5d9109 100755 --- a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/binding/GetLastServiceBindingOperationResponseTest.java +++ b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/binding/GetLastServiceBindingOperationResponseTest.java @@ -18,6 +18,7 @@ import com.jayway.jsonpath.DocumentContext; import nl.jqno.equalsverifier.EqualsVerifier; +import nl.jqno.equalsverifier.Warning; import org.junit.jupiter.api.Test; import org.springframework.cloud.servicebroker.JsonUtils; @@ -117,6 +118,7 @@ private void responseWithStateIsSerializedToJson(OperationState stateValue, Stri void equalsAndHashCode() { EqualsVerifier .forClass(GetLastServiceBindingOperationResponse.class) + .suppress(Warning.STRICT_INHERITANCE) .verify(); } diff --git a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/binding/GetServiceInstanceBindingRequestTest.java b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/binding/GetServiceInstanceBindingRequestTest.java index 1d856e81..34fdbf75 100755 --- a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/binding/GetServiceInstanceBindingRequestTest.java +++ b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/binding/GetServiceInstanceBindingRequestTest.java @@ -77,6 +77,7 @@ void equalsAndHashCode() { .withRedefinedSuperclass() .suppress(Warning.NONFINAL_FIELDS) .suppress(Warning.TRANSIENT_FIELDS) + .suppress(Warning.STRICT_INHERITANCE) .verify(); } diff --git a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/catalog/CatalogTest.java b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/catalog/CatalogTest.java index 3572b7e2..b4598da4 100755 --- a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/catalog/CatalogTest.java +++ b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/catalog/CatalogTest.java @@ -23,6 +23,7 @@ import com.jayway.jsonpath.DocumentContext; import nl.jqno.equalsverifier.EqualsVerifier; +import nl.jqno.equalsverifier.Warning; import org.junit.jupiter.api.Test; import org.springframework.cloud.servicebroker.JsonUtils; @@ -111,7 +112,7 @@ void catalogWithServicesIsDeserializedFromJson() { @Test void equalsAndHashCode() { - EqualsVerifier.forClass(Catalog.class).verify(); + EqualsVerifier.forClass(Catalog.class).suppress(Warning.STRICT_INHERITANCE).verify(); } } diff --git a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/catalog/ServiceDefinitionTest.java b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/catalog/ServiceDefinitionTest.java index 4379c285..2a991aff 100755 --- a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/catalog/ServiceDefinitionTest.java +++ b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/catalog/ServiceDefinitionTest.java @@ -21,6 +21,7 @@ import com.jayway.jsonpath.DocumentContext; import nl.jqno.equalsverifier.EqualsVerifier; +import nl.jqno.equalsverifier.Warning; import org.junit.jupiter.api.Test; import org.springframework.cloud.servicebroker.JsonUtils; @@ -149,6 +150,7 @@ void serviceDefinitionWithAllFieldsIsSerializedToJson() { void equalsAndHashCode() { EqualsVerifier .forClass(ServiceDefinition.class) + .suppress(Warning.STRICT_INHERITANCE) .verify(); } diff --git a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/CreateServiceInstanceRequestTest.java b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/CreateServiceInstanceRequestTest.java index 38eec7ed..bbe520d7 100755 --- a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/CreateServiceInstanceRequestTest.java +++ b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/CreateServiceInstanceRequestTest.java @@ -204,6 +204,7 @@ void equalsAndHashCode() { .withRedefinedSuperclass() .suppress(Warning.NONFINAL_FIELDS) .suppress(Warning.TRANSIENT_FIELDS) + .suppress(Warning.STRICT_INHERITANCE) .verify(); } diff --git a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/CreateServiceInstanceResponseTest.java b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/CreateServiceInstanceResponseTest.java index 4a8ec939..5b127602 100755 --- a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/CreateServiceInstanceResponseTest.java +++ b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/CreateServiceInstanceResponseTest.java @@ -22,6 +22,7 @@ import com.jayway.jsonpath.DocumentContext; import net.bytebuddy.utility.RandomString; import nl.jqno.equalsverifier.EqualsVerifier; +import nl.jqno.equalsverifier.Warning; import org.assertj.core.util.Maps; import org.junit.jupiter.api.Test; @@ -97,6 +98,7 @@ void equalsAndHashCode() { EqualsVerifier .forClass(CreateServiceInstanceResponse.class) .withRedefinedSuperclass() + .suppress(Warning.STRICT_INHERITANCE) .verify(); } diff --git a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/DeleteServiceInstanceRequestTest.java b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/DeleteServiceInstanceRequestTest.java index aca5ca0a..755807ff 100755 --- a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/DeleteServiceInstanceRequestTest.java +++ b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/DeleteServiceInstanceRequestTest.java @@ -113,6 +113,7 @@ void equalsAndHashCode() { .withRedefinedSuperclass() .suppress(Warning.NONFINAL_FIELDS) .suppress(Warning.TRANSIENT_FIELDS) + .suppress(Warning.STRICT_INHERITANCE) .verify(); } diff --git a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/GetLastServiceOperationRequestTest.java b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/GetLastServiceOperationRequestTest.java index 26263bec..6d71a053 100755 --- a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/GetLastServiceOperationRequestTest.java +++ b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/GetLastServiceOperationRequestTest.java @@ -76,6 +76,7 @@ void equalsAndHashCode() { .withRedefinedSuperclass() .suppress(Warning.NONFINAL_FIELDS) .suppress(Warning.TRANSIENT_FIELDS) + .suppress(Warning.STRICT_INHERITANCE) .verify(); } diff --git a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/GetLastServiceOperationResponseTest.java b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/GetLastServiceOperationResponseTest.java index a9d8de06..3088b8c0 100755 --- a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/GetLastServiceOperationResponseTest.java +++ b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/GetLastServiceOperationResponseTest.java @@ -18,6 +18,7 @@ import com.jayway.jsonpath.DocumentContext; import nl.jqno.equalsverifier.EqualsVerifier; +import nl.jqno.equalsverifier.Warning; import org.junit.jupiter.api.Test; import org.springframework.cloud.servicebroker.JsonUtils; @@ -136,6 +137,7 @@ private void responseWithStateIsSerializedToJson(OperationState stateValue, Stri void equalsAndHashCode() { EqualsVerifier .forClass(GetLastServiceOperationResponse.class) + .suppress(Warning.STRICT_INHERITANCE) .verify(); } diff --git a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/GetServiceInstanceRequestTest.java b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/GetServiceInstanceRequestTest.java index c61276c8..cb1f0070 100755 --- a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/GetServiceInstanceRequestTest.java +++ b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/GetServiceInstanceRequestTest.java @@ -73,6 +73,7 @@ void equalsAndHashCode() { .withRedefinedSuperclass() .suppress(Warning.NONFINAL_FIELDS) .suppress(Warning.TRANSIENT_FIELDS) + .suppress(Warning.STRICT_INHERITANCE) .verify(); } diff --git a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/GetServiceInstanceResponseTest.java b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/GetServiceInstanceResponseTest.java index 15c36185..7dd7023b 100755 --- a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/GetServiceInstanceResponseTest.java +++ b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/GetServiceInstanceResponseTest.java @@ -21,6 +21,7 @@ import com.jayway.jsonpath.DocumentContext; import nl.jqno.equalsverifier.EqualsVerifier; +import nl.jqno.equalsverifier.Warning; import org.junit.jupiter.api.Test; import org.springframework.cloud.servicebroker.JsonUtils; @@ -103,6 +104,7 @@ void responseWithAllValuesIsDeserialized() { void equalsAndHashCode() { EqualsVerifier .forClass(GetServiceInstanceResponse.class) + .suppress(Warning.STRICT_INHERITANCE) .verify(); } diff --git a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/UpdateServiceInstanceRequestTest.java b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/UpdateServiceInstanceRequestTest.java index 13c31e89..a68b5c7e 100755 --- a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/UpdateServiceInstanceRequestTest.java +++ b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/UpdateServiceInstanceRequestTest.java @@ -145,6 +145,7 @@ void equalsAndHashCode() { .withRedefinedSuperclass() .suppress(Warning.NONFINAL_FIELDS) .suppress(Warning.TRANSIENT_FIELDS) + .suppress(Warning.STRICT_INHERITANCE) .verify(); } diff --git a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/UpdateServiceInstanceResponseTest.java b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/UpdateServiceInstanceResponseTest.java index c75c50f9..4f1e3c47 100755 --- a/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/UpdateServiceInstanceResponseTest.java +++ b/spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/instance/UpdateServiceInstanceResponseTest.java @@ -21,6 +21,7 @@ import com.jayway.jsonpath.DocumentContext; import nl.jqno.equalsverifier.EqualsVerifier; +import nl.jqno.equalsverifier.Warning; import org.assertj.core.util.Maps; import org.junit.jupiter.api.Test; @@ -88,6 +89,7 @@ void equalsAndHashCode() { EqualsVerifier .forClass(UpdateServiceInstanceResponse.class) .withRedefinedSuperclass() + .suppress(Warning.STRICT_INHERITANCE) .verify(); }