From ac0f15bb1d8340b1420b7a75e5f47452cf9683e6 Mon Sep 17 00:00:00 2001 From: Georg Lokowandt Date: Thu, 5 Sep 2024 16:27:39 +0200 Subject: [PATCH 1/2] minor refactoring to allow import to Eclipse --- .../ReactorServiceInstancesV3Test.java | 0 .../_DeleteServiceInstanceResponse.java | 3 +- .../client/v3/PaginatedRequest.java | 2 +- .../_ListIdentityZonesResponse.java | 4 +++ .../applications/DefaultApplications.java | 32 ++++++++++++------- .../logcachetest/package-info.java | 2 ++ .../binding/_UnbindResponse.java | 2 ++ .../instance/_DeprovisionSyncResponse.java | 2 ++ .../instance/_UpdateSyncResponse.java | 2 ++ .../_LastOperationDeprovisionResponse.java | 2 ++ .../servicebroker/package-info.java | 2 ++ 11 files changed, 38 insertions(+), 15 deletions(-) rename cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/{serviceInstances => serviceinstances}/ReactorServiceInstancesV3Test.java (100%) diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/serviceInstances/ReactorServiceInstancesV3Test.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/serviceinstances/ReactorServiceInstancesV3Test.java similarity index 100% rename from cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/serviceInstances/ReactorServiceInstancesV3Test.java rename to cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/serviceinstances/ReactorServiceInstancesV3Test.java diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/serviceinstances/_DeleteServiceInstanceResponse.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/serviceinstances/_DeleteServiceInstanceResponse.java index 4876f4f3a4..301853f570 100644 --- a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/serviceinstances/_DeleteServiceInstanceResponse.java +++ b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/serviceinstances/_DeleteServiceInstanceResponse.java @@ -25,7 +25,6 @@ import com.fasterxml.jackson.databind.jsontype.impl.TypeIdResolverBase; import org.cloudfoundry.Nullable; import org.cloudfoundry.client.v2.Resource; -import org.cloudfoundry.client.v2.jobs.JobEntity; import org.immutables.value.Value; /** @@ -40,7 +39,7 @@ abstract class _DeleteServiceInstanceResponse extends Resource { */ @JsonProperty("entity") @JsonTypeIdResolver(_DeleteServiceInstanceResponse.DeleteServiceInstanceResponseTypeIdResolver.class) - @JsonTypeInfo(use = JsonTypeInfo.Id.CUSTOM, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "type", defaultImpl = JobEntity.class, visible = true) + @JsonTypeInfo(use = JsonTypeInfo.Id.CUSTOM, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "type", defaultImpl = org.cloudfoundry.client.v2.jobs.JobEntity.class, visible = true) @Nullable public abstract Object getEntity(); diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/PaginatedRequest.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/PaginatedRequest.java index 2e1f9e61cd..514b90ef7e 100644 --- a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/PaginatedRequest.java +++ b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/PaginatedRequest.java @@ -47,7 +47,7 @@ public abstract class PaginatedRequest { public abstract Integer getPerPage(); @Value.Check - void check() { + public void check() { if (getPage() != null && getPage() < 1) { throw new IllegalStateException("page must be greater than or equal to 1"); } diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/identityzones/_ListIdentityZonesResponse.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/identityzones/_ListIdentityZonesResponse.java index 873faa32b3..905de04309 100644 --- a/cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/identityzones/_ListIdentityZonesResponse.java +++ b/cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/identityzones/_ListIdentityZonesResponse.java @@ -17,11 +17,14 @@ package org.cloudfoundry.uaa.identityzones; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; + +import org.cloudfoundry.Nullable; import org.immutables.value.Value; import java.io.IOException; @@ -34,6 +37,7 @@ @Value.Immutable abstract class _ListIdentityZonesResponse { + /** * The identity zones */ diff --git a/cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/DefaultApplications.java b/cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/DefaultApplications.java index 03ddf9527c..a41368edca 100644 --- a/cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/DefaultApplications.java +++ b/cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/DefaultApplications.java @@ -693,18 +693,11 @@ public Mono pushManifestV3(PushManifestV3Request request) { .flatMap( function( (appId, packageId) -> - buildAndStage( - cloudFoundryClient, - manifestApp, - packageId) - .flatMap( - dropletId -> - applyDropletAndWaitForRunning( - cloudFoundryClient, - manifestApp - .getName(), - appId, - dropletId)))))) + buildAndStageAndWaitForRunning( + cloudFoundryClient, + manifestApp, + packageId, + appId))))) .then(); } @@ -1157,6 +1150,21 @@ private static Mono bindServices( .then(); } + private static Mono buildAndStageAndWaitForRunning( + CloudFoundryClient cloudFoundryClient, + ManifestV3Application manifestApp, + String packageId, + String appId) { + return buildAndStage(cloudFoundryClient, manifestApp, packageId) + .flatMap( + dropletId -> + applyDropletAndWaitForRunning( + cloudFoundryClient, + manifestApp.getName(), + appId, + dropletId)); + } + private static Mono buildAndStage( CloudFoundryClient cloudFoundryClient, ManifestV3Application manifestApp, diff --git a/test-log-cache/src/main/java/org/cloudfoundry/logcachetest/package-info.java b/test-log-cache/src/main/java/org/cloudfoundry/logcachetest/package-info.java index 440918b866..d1daa10d1d 100644 --- a/test-log-cache/src/main/java/org/cloudfoundry/logcachetest/package-info.java +++ b/test-log-cache/src/main/java/org/cloudfoundry/logcachetest/package-info.java @@ -24,3 +24,5 @@ typeImmutable = "*" ) package org.cloudfoundry.logcachetest; + +import org.immutables.value.Value; diff --git a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/binding/_UnbindResponse.java b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/binding/_UnbindResponse.java index 4379da6be3..044653808f 100644 --- a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/binding/_UnbindResponse.java +++ b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/binding/_UnbindResponse.java @@ -16,6 +16,8 @@ package org.cloudfoundry.servicebroker.binding; +import org.immutables.value.Value; + @Value.Immutable abstract class _UnbindResponse { diff --git a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/instance/_DeprovisionSyncResponse.java b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/instance/_DeprovisionSyncResponse.java index cb078134a4..a4ec3c5f22 100644 --- a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/instance/_DeprovisionSyncResponse.java +++ b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/instance/_DeprovisionSyncResponse.java @@ -16,6 +16,8 @@ package org.cloudfoundry.servicebroker.instance; +import org.immutables.value.Value; + @Value.Immutable abstract class _DeprovisionSyncResponse { diff --git a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/instance/_UpdateSyncResponse.java b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/instance/_UpdateSyncResponse.java index b33cce5ef2..e288a0a6df 100644 --- a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/instance/_UpdateSyncResponse.java +++ b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/instance/_UpdateSyncResponse.java @@ -16,6 +16,8 @@ package org.cloudfoundry.servicebroker.instance; +import org.immutables.value.Value; + @Value.Immutable abstract class _UpdateSyncResponse { diff --git a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/lastoperation/_LastOperationDeprovisionResponse.java b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/lastoperation/_LastOperationDeprovisionResponse.java index 2492975420..ff669bcdb1 100644 --- a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/lastoperation/_LastOperationDeprovisionResponse.java +++ b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/lastoperation/_LastOperationDeprovisionResponse.java @@ -16,6 +16,8 @@ package org.cloudfoundry.servicebroker.lastoperation; +import org.immutables.value.Value; + @Value.Immutable abstract class _LastOperationDeprovisionResponse { diff --git a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/package-info.java b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/package-info.java index 217d28ba61..cd1e62f229 100644 --- a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/package-info.java +++ b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/package-info.java @@ -28,3 +28,5 @@ typeImmutable = "*" ) package org.cloudfoundry.servicebroker; + +import org.immutables.value.Value; From 2102c93407b7d5a46c0bf659f50d994f1ca2a0a1 Mon Sep 17 00:00:00 2001 From: Georg Lokowandt Date: Thu, 20 Feb 2025 18:51:04 +0100 Subject: [PATCH 2/2] running ./mvnw spotless:check on the code --- .../cloudfoundry/servicebroker/Nullable.java | 4 +- .../servicebroker/TestServiceBroker.java | 4 +- .../binding/BindingController.java | 9 +- .../catalog/CatalogController.java | 195 ++++++++++-------- .../instance/InstanceController.java | 44 ++-- .../LastOperationController.java | 16 +- .../LastOperationRepository.java | 1 - .../lastoperation/OperationType.java | 2 - .../servicebroker/lastoperation/State.java | 2 - .../servicebroker/package-info.java | 16 +- 10 files changed, 150 insertions(+), 143 deletions(-) diff --git a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/Nullable.java b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/Nullable.java index 9477c5faee..d5d9bcfa7b 100644 --- a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/Nullable.java +++ b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/Nullable.java @@ -16,6 +16,4 @@ package org.cloudfoundry.servicebroker; -public @interface Nullable { - -} +public @interface Nullable {} diff --git a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/TestServiceBroker.java b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/TestServiceBroker.java index 27f4519214..acc60c6de6 100644 --- a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/TestServiceBroker.java +++ b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/TestServiceBroker.java @@ -31,8 +31,6 @@ public static void main(String[] args) { @Bean ObjectMapper objectMapper() { - return new ObjectMapper() - .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS); + return new ObjectMapper().disable(SerializationFeature.FAIL_ON_EMPTY_BEANS); } - } diff --git a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/binding/BindingController.java b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/binding/BindingController.java index 8672573385..697eb72f9b 100644 --- a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/binding/BindingController.java +++ b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/binding/BindingController.java @@ -27,16 +27,11 @@ final class BindingController { @PutMapping("/v2/service_instances/{instanceId}/service_bindings/{bindingId}") ResponseEntity bind() { - return ResponseEntity.status(HttpStatus.CREATED) - .body(BindResponse.builder() - .build()); + return ResponseEntity.status(HttpStatus.CREATED).body(BindResponse.builder().build()); } @DeleteMapping("/v2/service_instances/{instanceId}/service_bindings/{bindingId}") ResponseEntity unbind() { - return ResponseEntity.ok() - .body(UnbindResponse.builder() - .build()); + return ResponseEntity.ok().body(UnbindResponse.builder().build()); } - } diff --git a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/catalog/CatalogController.java b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/catalog/CatalogController.java index 08210f066e..e5b158ed45 100644 --- a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/catalog/CatalogController.java +++ b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/catalog/CatalogController.java @@ -16,102 +16,133 @@ package org.cloudfoundry.servicebroker.catalog; +import java.util.UUID; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.UUID; - @RestController final class CatalogController { private final Catalog catalog; - CatalogController(@Value("${service.name}") String serviceName, @Value("${plan.name}") String planName) { - this.catalog = Catalog.builder() - .service(Service.builder() - .id(UUID.randomUUID().toString()) - .name(serviceName) - .require("route_forwarding") - .description("test-service-description") - .bindable(true) - .planUpdateable(true) - .metadata(ServiceMetadata.builder() - .displayName("test-service-display-name") - .listing(Listing.builder() - .blurb("test-listing-blurb") - .imageUrl("http://test-image-host/test-image.gif") - .longDescription("test-listing-long-description") - .build()) - .provider(Provider.builder() - .name("test-provider-name") - .build()) - .build()) - .dashboardClient(DashboardClient.builder() - .id(UUID.randomUUID().toString()) - .redirectUri("http://test-dashboard-host") - .secret(UUID.randomUUID().toString()) - .build()) - .plan(Plan.builder() - .id(UUID.randomUUID().toString()) - .name(planName) - .description("test-plan-description") - .metadata(PlanMetadata.builder() - .bullet(Bullet.builder() - .content("test-plan-metadata-bullet") - .build()) - .cost(Cost.builder() - .amount("usd", 1) - .unit("MONTHLY") - .build()) - .build()) - .build()) - .build()) - .service(Service.builder() - .id(UUID.randomUUID().toString()) - .name(serviceName + "-shareable") - .description("test-service-description-shareable") - .bindable(true) - .planUpdateable(true) - .metadata(ServiceMetadata.builder() - .displayName("test-service-display-name") - .listing(Listing.builder() - .blurb("test-listing-blurb") - .imageUrl("http://test-image-host/test-image.gif") - .longDescription("test-listing-long-description") - .build()) - .provider(Provider.builder() - .name("test-provider-name") - .build()) - .shareable(true) - .build()) - .dashboardClient(DashboardClient.builder() - .id(UUID.randomUUID().toString()) - .redirectUri("http://test-dashboard-host") - .secret(UUID.randomUUID().toString()) - .build()) - .plan(Plan.builder() - .id(UUID.randomUUID().toString()) - .name(planName + "-shareable") - .description("test-plan-description-shareable") - .metadata(PlanMetadata.builder() - .bullet(Bullet.builder() - .content("test-plan-metadata-bullet") - .build()) - .cost(Cost.builder() - .amount("usd", 1) - .unit("MONTHLY") - .build()) - .build()) - .build()) - .build()) - .build(); + CatalogController( + @Value("${service.name}") String serviceName, @Value("${plan.name}") String planName) { + this.catalog = + Catalog.builder() + .service( + Service.builder() + .id(UUID.randomUUID().toString()) + .name(serviceName) + .require("route_forwarding") + .description("test-service-description") + .bindable(true) + .planUpdateable(true) + .metadata( + ServiceMetadata.builder() + .displayName("test-service-display-name") + .listing( + Listing.builder() + .blurb("test-listing-blurb") + .imageUrl( + "http://test-image-host/test-image.gif") + .longDescription( + "test-listing-long-description") + .build()) + .provider( + Provider.builder() + .name("test-provider-name") + .build()) + .build()) + .dashboardClient( + DashboardClient.builder() + .id(UUID.randomUUID().toString()) + .redirectUri("http://test-dashboard-host") + .secret(UUID.randomUUID().toString()) + .build()) + .plan( + Plan.builder() + .id(UUID.randomUUID().toString()) + .name(planName) + .description("test-plan-description") + .metadata( + PlanMetadata.builder() + .bullet( + Bullet.builder() + .content( + "test-plan-metadata-bullet") + .build()) + .cost( + Cost.builder() + .amount( + "usd", + 1) + .unit( + "MONTHLY") + .build()) + .build()) + .build()) + .build()) + .service( + Service.builder() + .id(UUID.randomUUID().toString()) + .name(serviceName + "-shareable") + .description("test-service-description-shareable") + .bindable(true) + .planUpdateable(true) + .metadata( + ServiceMetadata.builder() + .displayName("test-service-display-name") + .listing( + Listing.builder() + .blurb("test-listing-blurb") + .imageUrl( + "http://test-image-host/test-image.gif") + .longDescription( + "test-listing-long-description") + .build()) + .provider( + Provider.builder() + .name("test-provider-name") + .build()) + .shareable(true) + .build()) + .dashboardClient( + DashboardClient.builder() + .id(UUID.randomUUID().toString()) + .redirectUri("http://test-dashboard-host") + .secret(UUID.randomUUID().toString()) + .build()) + .plan( + Plan.builder() + .id(UUID.randomUUID().toString()) + .name(planName + "-shareable") + .description( + "test-plan-description-shareable") + .metadata( + PlanMetadata.builder() + .bullet( + Bullet.builder() + .content( + "test-plan-metadata-bullet") + .build()) + .cost( + Cost.builder() + .amount( + "usd", + 1) + .unit( + "MONTHLY") + .build()) + .build()) + .build()) + .build()) + .build(); } @GetMapping("/v2/catalog") ResponseEntity catalog() { return ResponseEntity.ok(this.catalog); } - } diff --git a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/instance/InstanceController.java b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/instance/InstanceController.java index ae5aa07a6a..807cb32d3e 100644 --- a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/instance/InstanceController.java +++ b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/instance/InstanceController.java @@ -16,6 +16,8 @@ package org.cloudfoundry.servicebroker.instance; +import java.util.Map; +import java.util.Optional; import org.cloudfoundry.servicebroker.lastoperation.LastOperationRepository; import org.cloudfoundry.servicebroker.lastoperation.OperationType; import org.springframework.http.HttpStatus; @@ -28,9 +30,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import java.util.Map; -import java.util.Optional; - @RestController final class InstanceController { @@ -41,54 +40,49 @@ final class InstanceController { } @DeleteMapping("/v2/service_instances/{instanceId}") - ResponseEntity deprovision(@RequestParam("accepts_incomplete") Optional acceptsIncomplete, @PathVariable String instanceId) { + ResponseEntity deprovision( + @RequestParam("accepts_incomplete") Optional acceptsIncomplete, + @PathVariable String instanceId) { if (acceptsIncomplete.orElse(false)) { this.lastOperationRepository.register(instanceId, OperationType.DEPROVISION); return ResponseEntity.accepted() - .body(DeprovisionAsyncResponse.builder() - .operation("test-operation") - .build()); + .body(DeprovisionAsyncResponse.builder().operation("test-operation").build()); } - return ResponseEntity.ok() - .body(DeprovisionSyncResponse.builder() - .build()); + return ResponseEntity.ok().body(DeprovisionSyncResponse.builder().build()); } @PutMapping("/v2/service_instances/{instanceId}") - ResponseEntity provision(@PathVariable String instanceId, @RequestBody Map payload) { + ResponseEntity provision( + @PathVariable String instanceId, @RequestBody Map payload) { boolean acceptsIncomplete = (boolean) payload.getOrDefault("accepts_incomplete", false); if (acceptsIncomplete) { this.lastOperationRepository.register(instanceId, OperationType.PROVISION); - return ResponseEntity.accepted() - .body(ProvisionAsyncResponse.builder() - .build()); + return ResponseEntity.accepted().body(ProvisionAsyncResponse.builder().build()); } return ResponseEntity.status(HttpStatus.CREATED) - .body(ProvisionSyncResponse.builder() - .dashboardUrl(String.format("http://test-dashboard-host/%s", instanceId)) - .build()); + .body( + ProvisionSyncResponse.builder() + .dashboardUrl( + String.format("http://test-dashboard-host/%s", instanceId)) + .build()); } @PatchMapping("/v2/service_instances/{instanceId}") - ResponseEntity update(@PathVariable String instanceId, @RequestBody Map payload) { + ResponseEntity update( + @PathVariable String instanceId, @RequestBody Map payload) { boolean acceptsIncomplete = (boolean) payload.getOrDefault("accepts_incomplete", false); if (acceptsIncomplete) { this.lastOperationRepository.register(instanceId, OperationType.UPDATE); - return ResponseEntity.accepted() - .body(UpdateAsyncResponse.builder() - .build()); + return ResponseEntity.accepted().body(UpdateAsyncResponse.builder().build()); } - return ResponseEntity.ok() - .body(UpdateSyncResponse.builder() - .build()); + return ResponseEntity.ok().body(UpdateSyncResponse.builder().build()); } - } diff --git a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/lastoperation/LastOperationController.java b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/lastoperation/LastOperationController.java index db2ad4cf32..fa2c346b7b 100644 --- a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/lastoperation/LastOperationController.java +++ b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/lastoperation/LastOperationController.java @@ -16,15 +16,14 @@ package org.cloudfoundry.servicebroker.lastoperation; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - @RestController final class LastOperationController implements LastOperationRepository { @@ -41,14 +40,13 @@ ResponseEntity lastOperation(@PathVariable String instanceId) { if (OperationType.DEPROVISION == operationType) { return ResponseEntity.status(HttpStatus.GONE) - .body(LastOperationDeprovisionResponse.builder() - .build()); + .body(LastOperationDeprovisionResponse.builder().build()); } return ResponseEntity.ok() - .body(LastOperationProvisionUpdateResponse.builder() - .state(State.SUCCEEDED) - .build()); + .body( + LastOperationProvisionUpdateResponse.builder() + .state(State.SUCCEEDED) + .build()); } - } diff --git a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/lastoperation/LastOperationRepository.java b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/lastoperation/LastOperationRepository.java index 9800d2bba5..bb840989cc 100644 --- a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/lastoperation/LastOperationRepository.java +++ b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/lastoperation/LastOperationRepository.java @@ -19,5 +19,4 @@ public interface LastOperationRepository { void register(String instanceId, OperationType operationType); - } diff --git a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/lastoperation/OperationType.java b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/lastoperation/OperationType.java index 3ba632f217..7f90939107 100644 --- a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/lastoperation/OperationType.java +++ b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/lastoperation/OperationType.java @@ -17,11 +17,9 @@ package org.cloudfoundry.servicebroker.lastoperation; public enum OperationType { - DEPROVISION, PROVISION, UPDATE - } diff --git a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/lastoperation/State.java b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/lastoperation/State.java index f6eceaebbc..740aff343a 100644 --- a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/lastoperation/State.java +++ b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/lastoperation/State.java @@ -19,7 +19,6 @@ import com.fasterxml.jackson.annotation.JsonValue; enum State { - FAILED("failed"), IN_PROGRESS("in progress"), @@ -36,5 +35,4 @@ enum State { String getValue() { return this.value; } - } diff --git a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/package-info.java b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/package-info.java index cd1e62f229..064a50afa4 100644 --- a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/package-info.java +++ b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/package-info.java @@ -17,16 +17,14 @@ /** * Created by bhale on 2/22/17. */ - @Value.Style( - add = "*", - defaults = @Value.Immutable(copy = false), - depluralize = true, - jdkOnly = true, - put = "*", - typeAbstract = "_*", - typeImmutable = "*" -) + add = "*", + defaults = @Value.Immutable(copy = false), + depluralize = true, + jdkOnly = true, + put = "*", + typeAbstract = "_*", + typeImmutable = "*") package org.cloudfoundry.servicebroker; import org.immutables.value.Value;