Skip to content

Commit 60afbdc

Browse files
wilkinsonawilkinsona
committed
Polish
1 parent 871d65d commit 60afbdc

File tree

12 files changed

+85
-77
lines changed

12 files changed

+85
-77
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/CloudFoundryWebFluxEndpointHandlerMapping.java

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -98,17 +98,20 @@ protected void registerMappingForOperation(WebEndpointOperation operation) {
9898
@ResponseBody
9999
private Publisher<ResponseEntity<Object>> links(ServerWebExchange exchange) {
100100
ServerHttpRequest request = exchange.getRequest();
101-
return this.securityInterceptor.preHandle(exchange, "").map(securityResponse -> {
102-
if (!securityResponse.getStatus().equals(HttpStatus.OK)) {
103-
return new ResponseEntity<>(securityResponse.getStatus());
104-
}
105-
AccessLevel accessLevel = exchange
106-
.getAttribute(AccessLevel.REQUEST_ATTRIBUTE);
107-
Map<String, Link> links = this.endpointLinksResolver
108-
.resolveLinks(getEndpoints(), request.getURI().toString());
109-
return new ResponseEntity<>(Collections.singletonMap("_links",
110-
getAccessibleLinks(accessLevel, links)), HttpStatus.OK);
111-
});
101+
return this.securityInterceptor.preHandle(exchange, "")
102+
.map((securityResponse) -> {
103+
if (!securityResponse.getStatus().equals(HttpStatus.OK)) {
104+
return new ResponseEntity<>(securityResponse.getStatus());
105+
}
106+
AccessLevel accessLevel = exchange
107+
.getAttribute(AccessLevel.REQUEST_ATTRIBUTE);
108+
Map<String, Link> links = this.endpointLinksResolver
109+
.resolveLinks(getEndpoints(), request.getURI().toString());
110+
return new ResponseEntity<>(
111+
Collections.singletonMap("_links",
112+
getAccessibleLinks(accessLevel, links)),
113+
HttpStatus.OK);
114+
});
112115
}
113116

114117
private Map<String, Link> getAccessibleLinks(AccessLevel accessLevel,

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveTokenValidator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ private Mono<Void> validateAlgorithm(Token token) {
6868
private Mono<Void> validateKeyIdAndSignature(Token token) {
6969
String keyId = token.getKeyId();
7070
return this.securityService.fetchTokenKeys()
71-
.filter(tokenKeys -> tokenKeys.containsKey(keyId))
71+
.filter((tokenKeys) -> tokenKeys.containsKey(keyId))
7272
.switchIfEmpty(Mono.error(
7373
new CloudFoundryAuthorizationException(Reason.INVALID_KEY_ID,
7474
"Key Id present in token header does not match")))
75-
.filter(tokenKeys -> hasValidSignature(token, tokenKeys.get(keyId)))
75+
.filter((tokenKeys) -> hasValidSignature(token, tokenKeys.get(keyId)))
7676
.switchIfEmpty(Mono.error(new CloudFoundryAuthorizationException(
7777
Reason.INVALID_SIGNATURE, "RSA Signature did not match content")))
7878
.then();

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundrySecurityInterceptorTests.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,9 @@ public void preHandleWhenAccessIsNotAllowedShouldReturnAccessDenied()
130130
.header(HttpHeaders.AUTHORIZATION, "bearer " + mockAccessToken())
131131
.build());
132132
StepVerifier.create(this.interceptor.preHandle(request, "/a"))
133-
.consumeNextWith((response) -> {
134-
assertThat(response.getStatus())
135-
.isEqualTo(Reason.ACCESS_DENIED.getStatus());
136-
}).verifyComplete();
133+
.consumeNextWith((response) -> assertThat(response.getStatus())
134+
.isEqualTo(Reason.ACCESS_DENIED.getStatus()))
135+
.verifyComplete();
137136
}
138137

139138
@Test

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundrySecurityServiceTests.java

Lines changed: 36 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@ public void shutdown() throws Exception {
7070
@Test
7171
public void getAccessLevelWhenSpaceDeveloperShouldReturnFull() throws Exception {
7272
String responseBody = "{\"read_sensitive_data\": true,\"read_basic_data\": true}";
73-
prepareResponse(response -> response.setBody(responseBody)
73+
prepareResponse((response) -> response.setBody(responseBody)
7474
.setHeader("Content-Type", "application/json"));
7575
StepVerifier
7676
.create(this.securityService.getAccessLevel("my-access-token",
7777
"my-app-id"))
78-
.consumeNextWith(accessLevel -> assertThat(accessLevel)
78+
.consumeNextWith((accessLevel) -> assertThat(accessLevel)
7979
.isEqualTo(AccessLevel.FULL))
8080
.expectComplete().verify();
81-
expectRequest(request -> {
81+
expectRequest((request) -> {
8282
assertThat(request.getHeader(HttpHeaders.AUTHORIZATION))
8383
.isEqualTo("bearer my-access-token");
8484
assertThat(request.getPath()).isEqualTo(CLOUD_CONTROLLER_PERMISSIONS);
@@ -89,15 +89,15 @@ public void getAccessLevelWhenSpaceDeveloperShouldReturnFull() throws Exception
8989
public void getAccessLevelWhenNotSpaceDeveloperShouldReturnRestricted()
9090
throws Exception {
9191
String responseBody = "{\"read_sensitive_data\": false,\"read_basic_data\": true}";
92-
prepareResponse(response -> response.setBody(responseBody)
92+
prepareResponse((response) -> response.setBody(responseBody)
9393
.setHeader("Content-Type", "application/json"));
9494
StepVerifier
9595
.create(this.securityService.getAccessLevel("my-access-token",
9696
"my-app-id"))
97-
.consumeNextWith(accessLevel -> assertThat(accessLevel)
97+
.consumeNextWith((accessLevel) -> assertThat(accessLevel)
9898
.isEqualTo(AccessLevel.RESTRICTED))
9999
.expectComplete().verify();
100-
expectRequest(request -> {
100+
expectRequest((request) -> {
101101
assertThat(request.getHeader(HttpHeaders.AUTHORIZATION))
102102
.isEqualTo("bearer my-access-token");
103103
assertThat(request.getPath()).isEqualTo(CLOUD_CONTROLLER_PERMISSIONS);
@@ -106,17 +106,17 @@ public void getAccessLevelWhenNotSpaceDeveloperShouldReturnRestricted()
106106

107107
@Test
108108
public void getAccessLevelWhenTokenIsNotValidShouldThrowException() throws Exception {
109-
prepareResponse(response -> response.setResponseCode(401));
109+
prepareResponse((response) -> response.setResponseCode(401));
110110
StepVerifier.create(
111111
this.securityService.getAccessLevel("my-access-token", "my-app-id"))
112-
.consumeErrorWith(throwable -> {
112+
.consumeErrorWith((throwable) -> {
113113
assertThat(throwable)
114114
.isInstanceOf(CloudFoundryAuthorizationException.class);
115115
assertThat(
116116
((CloudFoundryAuthorizationException) throwable).getReason())
117117
.isEqualTo(Reason.INVALID_TOKEN);
118118
}).verify();
119-
expectRequest(request -> {
119+
expectRequest((request) -> {
120120
assertThat(request.getHeader(HttpHeaders.AUTHORIZATION))
121121
.isEqualTo("bearer my-access-token");
122122
assertThat(request.getPath()).isEqualTo(CLOUD_CONTROLLER_PERMISSIONS);
@@ -125,17 +125,17 @@ public void getAccessLevelWhenTokenIsNotValidShouldThrowException() throws Excep
125125

126126
@Test
127127
public void getAccessLevelWhenForbiddenShouldThrowException() throws Exception {
128-
prepareResponse(response -> response.setResponseCode(403));
128+
prepareResponse((response) -> response.setResponseCode(403));
129129
StepVerifier.create(
130130
this.securityService.getAccessLevel("my-access-token", "my-app-id"))
131-
.consumeErrorWith(throwable -> {
131+
.consumeErrorWith((throwable) -> {
132132
assertThat(throwable)
133133
.isInstanceOf(CloudFoundryAuthorizationException.class);
134134
assertThat(
135135
((CloudFoundryAuthorizationException) throwable).getReason())
136136
.isEqualTo(Reason.ACCESS_DENIED);
137137
}).verify();
138-
expectRequest(request -> {
138+
expectRequest((request) -> {
139139
assertThat(request.getHeader(HttpHeaders.AUTHORIZATION))
140140
.isEqualTo("bearer my-access-token");
141141
assertThat(request.getPath()).isEqualTo(CLOUD_CONTROLLER_PERMISSIONS);
@@ -145,17 +145,17 @@ public void getAccessLevelWhenForbiddenShouldThrowException() throws Exception {
145145
@Test
146146
public void getAccessLevelWhenCloudControllerIsNotReachableThrowsException()
147147
throws Exception {
148-
prepareResponse(response -> response.setResponseCode(500));
148+
prepareResponse((response) -> response.setResponseCode(500));
149149
StepVerifier.create(
150150
this.securityService.getAccessLevel("my-access-token", "my-app-id"))
151-
.consumeErrorWith(throwable -> {
151+
.consumeErrorWith((throwable) -> {
152152
assertThat(throwable)
153153
.isInstanceOf(CloudFoundryAuthorizationException.class);
154154
assertThat(
155155
((CloudFoundryAuthorizationException) throwable).getReason())
156156
.isEqualTo(Reason.SERVICE_UNAVAILABLE);
157157
}).verify();
158-
expectRequest(request -> {
158+
expectRequest((request) -> {
159159
assertThat(request.getHeader(HttpHeaders.AUTHORIZATION))
160160
.isEqualTo("bearer my-access-token");
161161
assertThat(request.getPath()).isEqualTo(CLOUD_CONTROLLER_PERMISSIONS);
@@ -173,95 +173,93 @@ public void fetchTokenKeysWhenSuccessfulShouldReturnListOfKeysFromUAA()
173173
+ "kqwIn7Glry9n9Suxygbf8g5AzpWcusZgDLIIZ7JTUldBb8qU2a0Dl4mvLZOn4wPo\n"
174174
+ "jfj9Cw2QICsc5+Pwf21fP+hzf+1WSRHbnYv8uanRO0gZ8ekGaghM/2H6gqJbo2nI\n"
175175
+ "JwIDAQAB\n-----END PUBLIC KEY-----";
176-
prepareResponse(response -> {
176+
prepareResponse((response) -> {
177177
response.setBody("{\"token_endpoint\":\"/my-uaa.com\"}");
178178
response.setHeader("Content-Type", "application/json");
179179
});
180180
String responseBody = "{\"keys\" : [ {\"kid\":\"test-key\",\"value\" : \""
181181
+ tokenKeyValue.replace("\n", "\\n") + "\"} ]}";
182-
prepareResponse(response -> {
182+
prepareResponse((response) -> {
183183
response.setBody(responseBody);
184184
response.setHeader("Content-Type", "application/json");
185185
});
186186
StepVerifier.create(this.securityService.fetchTokenKeys())
187-
.consumeNextWith(tokenKeys -> assertThat(tokenKeys.get("test-key"))
187+
.consumeNextWith((tokenKeys) -> assertThat(tokenKeys.get("test-key"))
188188
.isEqualTo(tokenKeyValue))
189189
.expectComplete().verify();
190-
expectRequest(request -> assertThat(request.getPath())
190+
expectRequest((request) -> assertThat(request.getPath())
191191
.isEqualTo("/my-cloud-controller.com/info"));
192-
expectRequest(request -> assertThat(request.getPath())
192+
expectRequest((request) -> assertThat(request.getPath())
193193
.isEqualTo("/my-uaa.com/token_keys"));
194194
}
195195

196196
@Test
197197
public void fetchTokenKeysWhenNoKeysReturnedFromUAA() throws Exception {
198-
prepareResponse(response -> {
198+
prepareResponse((response) -> {
199199
response.setBody("{\"token_endpoint\":\"/my-uaa.com\"}");
200200
response.setHeader("Content-Type", "application/json");
201201
});
202202
String responseBody = "{\"keys\": []}";
203-
prepareResponse(response -> {
203+
prepareResponse((response) -> {
204204
response.setBody(responseBody);
205205
response.setHeader("Content-Type", "application/json");
206206
});
207207
StepVerifier.create(this.securityService.fetchTokenKeys())
208-
.consumeNextWith(tokenKeys -> assertThat(tokenKeys).hasSize(0))
208+
.consumeNextWith((tokenKeys) -> assertThat(tokenKeys).hasSize(0))
209209
.expectComplete().verify();
210-
expectRequest(request -> assertThat(request.getPath())
210+
expectRequest((request) -> assertThat(request.getPath())
211211
.isEqualTo("/my-cloud-controller.com/info"));
212-
expectRequest(request -> assertThat(request.getPath())
212+
expectRequest((request) -> assertThat(request.getPath())
213213
.isEqualTo("/my-uaa.com/token_keys"));
214214
}
215215

216216
@Test
217217
public void fetchTokenKeysWhenUnsuccessfulShouldThrowException() throws Exception {
218-
prepareResponse(response -> {
218+
prepareResponse((response) -> {
219219
response.setBody("{\"token_endpoint\":\"/my-uaa.com\"}");
220220
response.setHeader("Content-Type", "application/json");
221221
});
222-
prepareResponse(response -> {
223-
response.setResponseCode(500);
224-
});
222+
prepareResponse((response) -> response.setResponseCode(500));
225223
StepVerifier.create(this.securityService.fetchTokenKeys())
226-
.consumeErrorWith(throwable -> assertThat(
224+
.consumeErrorWith((throwable) -> assertThat(
227225
((CloudFoundryAuthorizationException) throwable).getReason())
228226
.isEqualTo(Reason.SERVICE_UNAVAILABLE))
229227
.verify();
230-
expectRequest(request -> assertThat(request.getPath())
228+
expectRequest((request) -> assertThat(request.getPath())
231229
.isEqualTo("/my-cloud-controller.com/info"));
232-
expectRequest(request -> assertThat(request.getPath())
230+
expectRequest((request) -> assertThat(request.getPath())
233231
.isEqualTo("/my-uaa.com/token_keys"));
234232
}
235233

236234
@Test
237235
public void getUaaUrlShouldCallCloudControllerInfoOnlyOnce() throws Exception {
238-
prepareResponse(response -> {
236+
prepareResponse((response) -> {
239237
response.setBody("{\"token_endpoint\":\"" + UAA_URL + "\"}");
240238
response.setHeader("Content-Type", "application/json");
241239
});
242240
StepVerifier.create(this.securityService.getUaaUrl())
243-
.consumeNextWith(uaaUrl -> assertThat(uaaUrl).isEqualTo(UAA_URL))
241+
.consumeNextWith((uaaUrl) -> assertThat(uaaUrl).isEqualTo(UAA_URL))
244242
.expectComplete().verify();
245243
// this.securityService.getUaaUrl().block(); //FIXME subscribe again to check that
246244
// it isn't called again
247-
expectRequest(request -> assertThat(request.getPath())
245+
expectRequest((request) -> assertThat(request.getPath())
248246
.isEqualTo(CLOUD_CONTROLLER + "/info"));
249247
expectRequestCount(1);
250248
}
251249

252250
@Test
253251
public void getUaaUrlWhenCloudControllerUrlIsNotReachableShouldThrowException()
254252
throws Exception {
255-
prepareResponse(response -> response.setResponseCode(500));
253+
prepareResponse((response) -> response.setResponseCode(500));
256254
StepVerifier.create(this.securityService.getUaaUrl())
257-
.consumeErrorWith(throwable -> {
255+
.consumeErrorWith((throwable) -> {
258256
assertThat(throwable)
259257
.isInstanceOf(CloudFoundryAuthorizationException.class);
260258
assertThat(
261259
((CloudFoundryAuthorizationException) throwable).getReason())
262260
.isEqualTo(Reason.SERVICE_UNAVAILABLE);
263261
}).verify();
264-
expectRequest(request -> assertThat(request.getPath())
262+
expectRequest((request) -> assertThat(request.getPath())
265263
.isEqualTo(CLOUD_CONTROLLER + "/info"));
266264
}
267265

‎spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/client/MetricsRestTemplateCustomizerTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ registry, new DefaultRestTemplateExchangeTagsProvider(),
6060
String result = restTemplate.getForObject("/test/{id}", String.class, 123);
6161
MockClock.clock(registry).add(SimpleConfig.DEFAULT_STEP);
6262
assertThat(registry.find("http.client.requests")
63-
.meters()).anySatisfy(m -> assertThat(
63+
.meters()).anySatisfy((m) -> assertThat(
6464
StreamSupport.stream(m.getId().getTags().spliterator(), false)
6565
.map(Tag::getKey)).doesNotContain("bucket"));
6666
assertThat(registry.find("http.client.requests")

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ protected Mono<ServerResponse> renderErrorView(ServerRequest request) {
123123
"error/" + SERIES_VIEWS.get(errorStatus.series()), "error/error")
124124
.flatMap((viewName) -> renderErrorView(viewName, response, error))
125125
.switchIfEmpty(renderDefaultErrorView(response, error)).next()
126-
.doOnNext(resp -> logError(request, errorStatus));
126+
.doOnNext((resp) -> logError(request, errorStatus));
127127
}
128128

129129
/**
@@ -138,7 +138,7 @@ protected Mono<ServerResponse> renderErrorResponse(ServerRequest request) {
138138
return ServerResponse.status(getHttpStatus(error))
139139
.contentType(MediaType.APPLICATION_JSON_UTF8)
140140
.body(BodyInserters.fromObject(error))
141-
.doOnNext(resp -> logError(request, errorStatus));
141+
.doOnNext((resp) -> logError(request, errorStatus));
142142
}
143143

144144
/**

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/city/City.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818

1919
import java.io.Serializable;
2020

21-
import org.neo4j.ogm.annotation.GraphId;
21+
import org.neo4j.ogm.annotation.GeneratedValue;
22+
import org.neo4j.ogm.annotation.Id;
2223
import org.neo4j.ogm.annotation.NodeEntity;
2324

2425
import org.springframework.boot.autoconfigure.data.neo4j.country.Country;
@@ -28,7 +29,8 @@ public class City implements Serializable {
2829

2930
private static final long serialVersionUID = 1L;
3031

31-
@GraphId
32+
@Id
33+
@GeneratedValue
3234
private Long id;
3335

3436
private String name;

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/country/Country.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,17 @@
1818

1919
import java.io.Serializable;
2020

21-
import org.neo4j.ogm.annotation.GraphId;
21+
import org.neo4j.ogm.annotation.GeneratedValue;
22+
import org.neo4j.ogm.annotation.Id;
2223
import org.neo4j.ogm.annotation.NodeEntity;
2324

2425
@NodeEntity
2526
public class Country implements Serializable {
2627

2728
private static final long serialVersionUID = 1L;
2829

29-
@GraphId
30+
@Id
31+
@GeneratedValue
3032
private Long id;
3133

3234
private String name;

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2WebSecurityConfigurationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public void securityConfigurerBacksOffWhenOtherWebSecurityAdapterPresent()
9393
@Test
9494
public void configurationRegistersAuthorizedClientServiceBean() throws Exception {
9595
this.contextRunner.withUserConfiguration(ClientRepositoryConfiguration.class,
96-
OAuth2WebSecurityConfiguration.class).run(context -> {
96+
OAuth2WebSecurityConfiguration.class).run((context) -> {
9797
OAuth2AuthorizedClientService bean = context
9898
.getBean(OAuth2AuthorizedClientService.class);
9999
OAuth2AuthorizedClientService authorizedClientService = (OAuth2AuthorizedClientService) ReflectionTestUtils
@@ -108,7 +108,7 @@ public void authorizedClientServiceBeanIsConditionalOnMissingBean() throws Excep
108108
this.contextRunner
109109
.withUserConfiguration(OAuth2AuthorizedClientServiceConfiguration.class,
110110
OAuth2WebSecurityConfiguration.class)
111-
.run(context -> {
111+
.run((context) -> {
112112
OAuth2AuthorizedClientService bean = context
113113
.getBean(OAuth2AuthorizedClientService.class);
114114
OAuth2AuthorizedClientService authorizedClientService = (OAuth2AuthorizedClientService) ReflectionTestUtils

‎spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/ExampleGraph.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616

1717
package org.springframework.boot.test.autoconfigure.data.neo4j;
1818

19-
import org.neo4j.ogm.annotation.GraphId;
19+
import org.neo4j.ogm.annotation.GeneratedValue;
20+
import org.neo4j.ogm.annotation.Id;
2021
import org.neo4j.ogm.annotation.NodeEntity;
2122
import org.neo4j.ogm.annotation.Property;
2223

@@ -28,7 +29,8 @@
2829
@NodeEntity
2930
public class ExampleGraph {
3031

31-
@GraphId
32+
@Id
33+
@GeneratedValue
3234
private Long id;
3335

3436
@Property

0 commit comments

Comments
 (0)