Skip to content

Commit afb1cac

Browse files
committed
Fix formatting violations
Issue gh-15885
1 parent 92b67ae commit afb1cac

File tree

4 files changed

+21
-23
lines changed

4 files changed

+21
-23
lines changed

oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/DefaultBearerTokenResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public String resolve(final HttpServletRequest request) {
6666
if (parameterToken != null && isParameterTokenEnabledForRequest(request)) {
6767
if (!StringUtils.hasText(parameterToken)) {
6868
final BearerTokenError error = BearerTokenErrors
69-
.invalidRequest("The requested token parameter is an empty string");
69+
.invalidRequest("The requested token parameter is an empty string");
7070
throw new OAuth2AuthenticationException(error);
7171
}
7272
return parameterToken;

oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/server/authentication/ServerBearerTokenAuthenticationConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ private String token(ServerHttpRequest request) {
8080
if (parameterToken != null && isParameterTokenSupportedForRequest(request)) {
8181
if (!StringUtils.hasText(parameterToken)) {
8282
final BearerTokenError error = BearerTokenErrors
83-
.invalidRequest("The requested token parameter is an empty string");
83+
.invalidRequest("The requested token parameter is an empty string");
8484
throw new OAuth2AuthenticationException(error);
8585
}
8686
return parameterToken;

oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/web/DefaultBearerTokenResolverTests.java

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -266,15 +266,14 @@ public void resolveWhenQueryParameterIsPresentAndEmptyStringThenTokenIsNotResolv
266266
this.resolver.setAllowUriQueryParameter(true);
267267
MockHttpServletRequest request = new MockHttpServletRequest();
268268
request.setMethod("GET");
269-
request.setQueryString("access_token=");
270269
request.addParameter("access_token", "");
271270
assertThatExceptionOfType(OAuth2AuthenticationException.class).isThrownBy(() -> this.resolver.resolve(request))
272-
.withMessageContaining("The requested token parameter is an empty string")
273-
.satisfies(e -> {
274-
BearerTokenError error = (BearerTokenError) e.getError();
275-
assertThat(error.getErrorCode()).isEqualTo(BearerTokenErrorCodes.INVALID_REQUEST);
276-
assertThat(error.getHttpStatus()).isEqualTo(HttpStatus.BAD_REQUEST);
277-
});
271+
.withMessageContaining("The requested token parameter is an empty string")
272+
.satisfies((e) -> {
273+
BearerTokenError error = (BearerTokenError) e.getError();
274+
assertThat(error.getErrorCode()).isEqualTo(BearerTokenErrorCodes.INVALID_REQUEST);
275+
assertThat(error.getHttpStatus()).isEqualTo(HttpStatus.BAD_REQUEST);
276+
});
278277
}
279278

280279
@Test
@@ -285,12 +284,12 @@ public void resolveWhenFormParameterIsPresentAndEmptyStringThenTokenIsNotResolve
285284
request.setContentType("application/x-www-form-urlencoded");
286285
request.addParameter("access_token", "");
287286
assertThatExceptionOfType(OAuth2AuthenticationException.class).isThrownBy(() -> this.resolver.resolve(request))
288-
.withMessageContaining("The requested token parameter is an empty string")
289-
.satisfies(e -> {
290-
BearerTokenError error = (BearerTokenError) e.getError();
291-
assertThat(error.getErrorCode()).isEqualTo(BearerTokenErrorCodes.INVALID_REQUEST);
292-
assertThat(error.getHttpStatus()).isEqualTo(HttpStatus.BAD_REQUEST);
293-
});
287+
.withMessageContaining("The requested token parameter is an empty string")
288+
.satisfies((e) -> {
289+
BearerTokenError error = (BearerTokenError) e.getError();
290+
assertThat(error.getErrorCode()).isEqualTo(BearerTokenErrorCodes.INVALID_REQUEST);
291+
assertThat(error.getHttpStatus()).isEqualTo(HttpStatus.BAD_REQUEST);
292+
});
294293
}
295294

296295
}

oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/web/server/authentication/ServerBearerTokenAuthenticationConverterTests.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -220,15 +220,14 @@ void resolveWhenQueryParameterHasMultipleAccessTokensThenOAuth2AuthenticationExc
220220
@Test
221221
public void resolveWhenQueryParameterIsPresentAndEmptyStringThenTokenIsNotResolved() {
222222
this.converter.setAllowUriQueryParameter(true);
223-
MockServerHttpRequest.BaseBuilder<?> request = MockServerHttpRequest.get("/")
224-
.queryParam("access_token", "");
223+
MockServerHttpRequest.BaseBuilder<?> request = MockServerHttpRequest.get("/").queryParam("access_token", "");
225224
assertThatExceptionOfType(OAuth2AuthenticationException.class).isThrownBy(() -> convertToToken(request))
226-
.withMessageContaining("The requested token parameter is an empty string")
227-
.satisfies(e -> {
228-
BearerTokenError error = (BearerTokenError) e.getError();
229-
assertThat(error.getErrorCode()).isEqualTo(BearerTokenErrorCodes.INVALID_REQUEST);
230-
assertThat(error.getHttpStatus()).isEqualTo(HttpStatus.BAD_REQUEST);
231-
});
225+
.withMessageContaining("The requested token parameter is an empty string")
226+
.satisfies((e) -> {
227+
BearerTokenError error = (BearerTokenError) e.getError();
228+
assertThat(error.getErrorCode()).isEqualTo(BearerTokenErrorCodes.INVALID_REQUEST);
229+
assertThat(error.getHttpStatus()).isEqualTo(HttpStatus.BAD_REQUEST);
230+
});
232231
}
233232

234233
private BearerTokenAuthenticationToken convertToToken(MockServerHttpRequest.BaseBuilder<?> request) {

0 commit comments

Comments
 (0)