comply with formatting rules

gh-16038

Author: jonah1und1

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

@@ -53,8 +53,8 @@ public final class DefaultBearerTokenResolver implements BearerTokenResolver {
 	@Override
 	public String resolve(final HttpServletRequest request) {
 		final String authorizationHeaderToken = resolveFromAuthorizationHeader(request);
-		final String parameterToken = isParameterTokenEnabledForRequest(request)
-				? resolveFromRequestParameters(request) : null;
+		final String parameterToken = resolveFromRequestParameters(request);
+
 		if (authorizationHeaderToken != null) {
 			if (parameterToken != null) {
 				BearerTokenError error = BearerTokenErrors
@@ -65,7 +65,7 @@ public String resolve(final HttpServletRequest request) {
 		}
 		if (parameterToken != null && !StringUtils.hasText(parameterToken)) {
 			BearerTokenError error = BearerTokenErrors
-											 .invalidRequest("The requested token parameter is an empty string");
+				.invalidRequest("The requested token parameter is an empty string");
 			throw new OAuth2AuthenticationException(error);
 		}
 		return parameterToken;
@@ -119,7 +119,10 @@ private String resolveFromAuthorizationHeader(HttpServletRequest request) {
 		return matcher.group("token");
 	}
 
-	private static String resolveFromRequestParameters(HttpServletRequest request) {
+	private String resolveFromRequestParameters(HttpServletRequest request) {
+		if (!isParameterTokenEnabledForRequest(request)) {
+			return null;
+		}
 		String[] values = request.getParameterValues(ACCESS_TOKEN_PARAMETER_NAME);
 		if (values == null || values.length == 0) {
 			return null;

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

@@ -79,7 +79,7 @@ private String token(ServerHttpRequest request) {
 		}
 		if (parameterToken != null && !StringUtils.hasText(parameterToken)) {
 			BearerTokenError error = BearerTokenErrors
-											 .invalidRequest("The requested token parameter is an empty string");
+				.invalidRequest("The requested token parameter is an empty string");
 			throw new OAuth2AuthenticationException(error);
 		}
 		return parameterToken;

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

@@ -219,12 +219,12 @@ void resolveWhenQueryParameterHasMultipleAccessTokensThenOAuth2AuthenticationExc
 
 	}
 
-	//gh-16038
+	// gh-16038
 	@Test
 	void resoleWhenAllowUriQueryParameterIsFalseThenQueryParameterIsIgnored() {
 		this.converter.setAllowUriQueryParameter(false);
 		MockServerHttpRequest.BaseBuilder<?> request = MockServerHttpRequest.get("/")
-																			.queryParam("access_token", TEST_TOKEN);
+			.queryParam("access_token", TEST_TOKEN);
 		assertThat(convertToToken(request)).isNull();
 	}