Skip to content

Commit 6f5c9c8

Browse files
LokowandtgLokowandtg
committed
running ./mvnw spotless:check on the code
1 parent d76c282 commit 6f5c9c8

File tree

10 files changed

+150
-143
lines changed

10 files changed

+150
-143
lines changed

‎test-service-broker/src/main/java/org/cloudfoundry/servicebroker/Nullable.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,4 @@
1616

1717
package org.cloudfoundry.servicebroker;
1818

19-
public @interface Nullable {
20-
21-
}
19+
public @interface Nullable {}

‎test-service-broker/src/main/java/org/cloudfoundry/servicebroker/TestServiceBroker.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ public static void main(String[] args) {
3131

3232
@Bean
3333
ObjectMapper objectMapper() {
34-
return new ObjectMapper()
35-
.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
34+
return new ObjectMapper().disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
3635
}
37-
3836
}

‎test-service-broker/src/main/java/org/cloudfoundry/servicebroker/binding/BindingController.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,11 @@ final class BindingController {
2727

2828
@PutMapping("/v2/service_instances/{instanceId}/service_bindings/{bindingId}")
2929
ResponseEntity<BindResponse> bind() {
30-
return ResponseEntity.status(HttpStatus.CREATED)
31-
.body(BindResponse.builder()
32-
.build());
30+
return ResponseEntity.status(HttpStatus.CREATED).body(BindResponse.builder().build());
3331
}
3432

3533
@DeleteMapping("/v2/service_instances/{instanceId}/service_bindings/{bindingId}")
3634
ResponseEntity<UnbindResponse> unbind() {
37-
return ResponseEntity.ok()
38-
.body(UnbindResponse.builder()
39-
.build());
35+
return ResponseEntity.ok().body(UnbindResponse.builder().build());
4036
}
41-
4237
}

‎test-service-broker/src/main/java/org/cloudfoundry/servicebroker/catalog/CatalogController.java‎

Lines changed: 113 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -16,102 +16,133 @@
1616

1717
package org.cloudfoundry.servicebroker.catalog;
1818

19+
import java.util.UUID;
1920
import org.springframework.beans.factory.annotation.Value;
2021
import org.springframework.http.ResponseEntity;
2122
import org.springframework.web.bind.annotation.GetMapping;
2223
import org.springframework.web.bind.annotation.RestController;
2324

24-
import java.util.UUID;
25-
2625
@RestController
2726
final class CatalogController {
2827

2928
private final Catalog catalog;
3029

31-
CatalogController(@Value("${service.name}") String serviceName, @Value("${plan.name}") String planName) {
32-
this.catalog = Catalog.builder()
33-
.service(Service.builder()
34-
.id(UUID.randomUUID().toString())
35-
.name(serviceName)
36-
.require("route_forwarding")
37-
.description("test-service-description")
38-
.bindable(true)
39-
.planUpdateable(true)
40-
.metadata(ServiceMetadata.builder()
41-
.displayName("test-service-display-name")
42-
.listing(Listing.builder()
43-
.blurb("test-listing-blurb")
44-
.imageUrl("http://test-image-host/test-image.gif")
45-
.longDescription("test-listing-long-description")
46-
.build())
47-
.provider(Provider.builder()
48-
.name("test-provider-name")
49-
.build())
50-
.build())
51-
.dashboardClient(DashboardClient.builder()
52-
.id(UUID.randomUUID().toString())
53-
.redirectUri("http://test-dashboard-host")
54-
.secret(UUID.randomUUID().toString())
55-
.build())
56-
.plan(Plan.builder()
57-
.id(UUID.randomUUID().toString())
58-
.name(planName)
59-
.description("test-plan-description")
60-
.metadata(PlanMetadata.builder()
61-
.bullet(Bullet.builder()
62-
.content("test-plan-metadata-bullet")
63-
.build())
64-
.cost(Cost.builder()
65-
.amount("usd", 1)
66-
.unit("MONTHLY")
67-
.build())
68-
.build())
69-
.build())
70-
.build())
71-
.service(Service.builder()
72-
.id(UUID.randomUUID().toString())
73-
.name(serviceName + "-shareable")
74-
.description("test-service-description-shareable")
75-
.bindable(true)
76-
.planUpdateable(true)
77-
.metadata(ServiceMetadata.builder()
78-
.displayName("test-service-display-name")
79-
.listing(Listing.builder()
80-
.blurb("test-listing-blurb")
81-
.imageUrl("http://test-image-host/test-image.gif")
82-
.longDescription("test-listing-long-description")
83-
.build())
84-
.provider(Provider.builder()
85-
.name("test-provider-name")
86-
.build())
87-
.shareable(true)
88-
.build())
89-
.dashboardClient(DashboardClient.builder()
90-
.id(UUID.randomUUID().toString())
91-
.redirectUri("http://test-dashboard-host")
92-
.secret(UUID.randomUUID().toString())
93-
.build())
94-
.plan(Plan.builder()
95-
.id(UUID.randomUUID().toString())
96-
.name(planName + "-shareable")
97-
.description("test-plan-description-shareable")
98-
.metadata(PlanMetadata.builder()
99-
.bullet(Bullet.builder()
100-
.content("test-plan-metadata-bullet")
101-
.build())
102-
.cost(Cost.builder()
103-
.amount("usd", 1)
104-
.unit("MONTHLY")
105-
.build())
106-
.build())
107-
.build())
108-
.build())
109-
.build();
30+
CatalogController(
31+
@Value("${service.name}") String serviceName, @Value("${plan.name}") String planName) {
32+
this.catalog =
33+
Catalog.builder()
34+
.service(
35+
Service.builder()
36+
.id(UUID.randomUUID().toString())
37+
.name(serviceName)
38+
.require("route_forwarding")
39+
.description("test-service-description")
40+
.bindable(true)
41+
.planUpdateable(true)
42+
.metadata(
43+
ServiceMetadata.builder()
44+
.displayName("test-service-display-name")
45+
.listing(
46+
Listing.builder()
47+
.blurb("test-listing-blurb")
48+
.imageUrl(
49+
"http://test-image-host/test-image.gif")
50+
.longDescription(
51+
"test-listing-long-description")
52+
.build())
53+
.provider(
54+
Provider.builder()
55+
.name("test-provider-name")
56+
.build())
57+
.build())
58+
.dashboardClient(
59+
DashboardClient.builder()
60+
.id(UUID.randomUUID().toString())
61+
.redirectUri("http://test-dashboard-host")
62+
.secret(UUID.randomUUID().toString())
63+
.build())
64+
.plan(
65+
Plan.builder()
66+
.id(UUID.randomUUID().toString())
67+
.name(planName)
68+
.description("test-plan-description")
69+
.metadata(
70+
PlanMetadata.builder()
71+
.bullet(
72+
Bullet.builder()
73+
.content(
74+
"test-plan-metadata-bullet")
75+
.build())
76+
.cost(
77+
Cost.builder()
78+
.amount(
79+
"usd",
80+
1)
81+
.unit(
82+
"MONTHLY")
83+
.build())
84+
.build())
85+
.build())
86+
.build())
87+
.service(
88+
Service.builder()
89+
.id(UUID.randomUUID().toString())
90+
.name(serviceName + "-shareable")
91+
.description("test-service-description-shareable")
92+
.bindable(true)
93+
.planUpdateable(true)
94+
.metadata(
95+
ServiceMetadata.builder()
96+
.displayName("test-service-display-name")
97+
.listing(
98+
Listing.builder()
99+
.blurb("test-listing-blurb")
100+
.imageUrl(
101+
"http://test-image-host/test-image.gif")
102+
.longDescription(
103+
"test-listing-long-description")
104+
.build())
105+
.provider(
106+
Provider.builder()
107+
.name("test-provider-name")
108+
.build())
109+
.shareable(true)
110+
.build())
111+
.dashboardClient(
112+
DashboardClient.builder()
113+
.id(UUID.randomUUID().toString())
114+
.redirectUri("http://test-dashboard-host")
115+
.secret(UUID.randomUUID().toString())
116+
.build())
117+
.plan(
118+
Plan.builder()
119+
.id(UUID.randomUUID().toString())
120+
.name(planName + "-shareable")
121+
.description(
122+
"test-plan-description-shareable")
123+
.metadata(
124+
PlanMetadata.builder()
125+
.bullet(
126+
Bullet.builder()
127+
.content(
128+
"test-plan-metadata-bullet")
129+
.build())
130+
.cost(
131+
Cost.builder()
132+
.amount(
133+
"usd",
134+
1)
135+
.unit(
136+
"MONTHLY")
137+
.build())
138+
.build())
139+
.build())
140+
.build())
141+
.build();
110142
}
111143

112144
@GetMapping("/v2/catalog")
113145
ResponseEntity<Catalog> catalog() {
114146
return ResponseEntity.ok(this.catalog);
115147
}
116-
117148
}

‎test-service-broker/src/main/java/org/cloudfoundry/servicebroker/instance/InstanceController.java‎

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package org.cloudfoundry.servicebroker.instance;
1818

19+
import java.util.Map;
20+
import java.util.Optional;
1921
import org.cloudfoundry.servicebroker.lastoperation.LastOperationRepository;
2022
import org.cloudfoundry.servicebroker.lastoperation.OperationType;
2123
import org.springframework.http.HttpStatus;
@@ -28,9 +30,6 @@
2830
import org.springframework.web.bind.annotation.RequestParam;
2931
import org.springframework.web.bind.annotation.RestController;
3032

31-
import java.util.Map;
32-
import java.util.Optional;
33-
3433
@RestController
3534
final class InstanceController {
3635

@@ -41,54 +40,49 @@ final class InstanceController {
4140
}
4241

4342
@DeleteMapping("/v2/service_instances/{instanceId}")
44-
ResponseEntity<?> deprovision(@RequestParam("accepts_incomplete") Optional<Boolean> acceptsIncomplete, @PathVariable String instanceId) {
43+
ResponseEntity<?> deprovision(
44+
@RequestParam("accepts_incomplete") Optional<Boolean> acceptsIncomplete,
45+
@PathVariable String instanceId) {
4546
if (acceptsIncomplete.orElse(false)) {
4647
this.lastOperationRepository.register(instanceId, OperationType.DEPROVISION);
4748

4849
return ResponseEntity.accepted()
49-
.body(DeprovisionAsyncResponse.builder()
50-
.operation("test-operation")
51-
.build());
50+
.body(DeprovisionAsyncResponse.builder().operation("test-operation").build());
5251
}
5352

54-
return ResponseEntity.ok()
55-
.body(DeprovisionSyncResponse.builder()
56-
.build());
53+
return ResponseEntity.ok().body(DeprovisionSyncResponse.builder().build());
5754
}
5855

5956
@PutMapping("/v2/service_instances/{instanceId}")
60-
ResponseEntity<?> provision(@PathVariable String instanceId, @RequestBody Map<String, Object> payload) {
57+
ResponseEntity<?> provision(
58+
@PathVariable String instanceId, @RequestBody Map<String, Object> payload) {
6159
boolean acceptsIncomplete = (boolean) payload.getOrDefault("accepts_incomplete", false);
6260

6361
if (acceptsIncomplete) {
6462
this.lastOperationRepository.register(instanceId, OperationType.PROVISION);
6563

66-
return ResponseEntity.accepted()
67-
.body(ProvisionAsyncResponse.builder()
68-
.build());
64+
return ResponseEntity.accepted().body(ProvisionAsyncResponse.builder().build());
6965
}
7066

7167
return ResponseEntity.status(HttpStatus.CREATED)
72-
.body(ProvisionSyncResponse.builder()
73-
.dashboardUrl(String.format("http://test-dashboard-host/%s", instanceId))
74-
.build());
68+
.body(
69+
ProvisionSyncResponse.builder()
70+
.dashboardUrl(
71+
String.format("http://test-dashboard-host/%s", instanceId))
72+
.build());
7573
}
7674

7775
@PatchMapping("/v2/service_instances/{instanceId}")
78-
ResponseEntity<?> update(@PathVariable String instanceId, @RequestBody Map<String, Object> payload) {
76+
ResponseEntity<?> update(
77+
@PathVariable String instanceId, @RequestBody Map<String, Object> payload) {
7978
boolean acceptsIncomplete = (boolean) payload.getOrDefault("accepts_incomplete", false);
8079

8180
if (acceptsIncomplete) {
8281
this.lastOperationRepository.register(instanceId, OperationType.UPDATE);
8382

84-
return ResponseEntity.accepted()
85-
.body(UpdateAsyncResponse.builder()
86-
.build());
83+
return ResponseEntity.accepted().body(UpdateAsyncResponse.builder().build());
8784
}
8885

89-
return ResponseEntity.ok()
90-
.body(UpdateSyncResponse.builder()
91-
.build());
86+
return ResponseEntity.ok().body(UpdateSyncResponse.builder().build());
9287
}
93-
9488
}

‎test-service-broker/src/main/java/org/cloudfoundry/servicebroker/lastoperation/LastOperationController.java‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@
1616

1717
package org.cloudfoundry.servicebroker.lastoperation;
1818

19+
import java.util.Map;
20+
import java.util.concurrent.ConcurrentHashMap;
1921
import org.springframework.http.HttpStatus;
2022
import org.springframework.http.ResponseEntity;
2123
import org.springframework.web.bind.annotation.GetMapping;
2224
import org.springframework.web.bind.annotation.PathVariable;
2325
import org.springframework.web.bind.annotation.RestController;
2426

25-
import java.util.Map;
26-
import java.util.concurrent.ConcurrentHashMap;
27-
2827
@RestController
2928
final class LastOperationController implements LastOperationRepository {
3029

@@ -41,14 +40,13 @@ ResponseEntity<?> lastOperation(@PathVariable String instanceId) {
4140

4241
if (OperationType.DEPROVISION == operationType) {
4342
return ResponseEntity.status(HttpStatus.GONE)
44-
.body(LastOperationDeprovisionResponse.builder()
45-
.build());
43+
.body(LastOperationDeprovisionResponse.builder().build());
4644
}
4745

4846
return ResponseEntity.ok()
49-
.body(LastOperationProvisionUpdateResponse.builder()
50-
.state(State.SUCCEEDED)
51-
.build());
47+
.body(
48+
LastOperationProvisionUpdateResponse.builder()
49+
.state(State.SUCCEEDED)
50+
.build());
5251
}
53-
5452
}

‎test-service-broker/src/main/java/org/cloudfoundry/servicebroker/lastoperation/LastOperationRepository.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,4 @@
1919
public interface LastOperationRepository {
2020

2121
void register(String instanceId, OperationType operationType);
22-
2322
}

‎test-service-broker/src/main/java/org/cloudfoundry/servicebroker/lastoperation/OperationType.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,9 @@
1717
package org.cloudfoundry.servicebroker.lastoperation;
1818

1919
public enum OperationType {
20-
2120
DEPROVISION,
2221

2322
PROVISION,
2423

2524
UPDATE
26-
2725
}

0 commit comments

Comments
 (0)