Polish gh-15940

sjohnr · sjohnr · commit 86f3cd6dc7c7 · 2024-11-04T13:34:12.000-06:00
Closes gh-15885
diff --git a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/DefaultBearerTokenResolver.java b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/DefaultBearerTokenResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,15 +57,15 @@ public String resolve(final HttpServletRequest request) {
 				? resolveFromRequestParameters(request) : null;
 		if (authorizationHeaderToken != null) {
 			if (parameterToken != null) {
-				final BearerTokenError error = BearerTokenErrors
+				BearerTokenError error = BearerTokenErrors
 					.invalidRequest("Found multiple bearer tokens in the request");
 				throw new OAuth2AuthenticationException(error);
 			}
 			return authorizationHeaderToken;
 		}
 		if (parameterToken != null && isParameterTokenEnabledForRequest(request)) {
 			if (!StringUtils.hasText(parameterToken)) {
-				final BearerTokenError error = BearerTokenErrors
+				BearerTokenError error = BearerTokenErrors
 					.invalidRequest("The requested token parameter is an empty string");
 				throw new OAuth2AuthenticationException(error);
 			}
diff --git a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/server/authentication/ServerBearerTokenAuthenticationConverter.java b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/web/server/authentication/ServerBearerTokenAuthenticationConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -79,7 +79,7 @@ private String token(ServerHttpRequest request) {
 		}
 		if (parameterToken != null && isParameterTokenSupportedForRequest(request)) {
 			if (!StringUtils.hasText(parameterToken)) {
-				final BearerTokenError error = BearerTokenErrors
+				BearerTokenError error = BearerTokenErrors
 					.invalidRequest("The requested token parameter is an empty string");
 				throw new OAuth2AuthenticationException(error);
 			}
diff --git a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/web/DefaultBearerTokenResolverTests.java b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/web/DefaultBearerTokenResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/web/server/authentication/ServerBearerTokenAuthenticationConverterTests.java b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/web/server/authentication/ServerBearerTokenAuthenticationConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2023 the original author or authors.`
	`2`	`+ * Copyright 2002-2024 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -57,15 +57,15 @@ public String resolve(final HttpServletRequest request) {`
`57`	`57`	`? resolveFromRequestParameters(request) : null;`
`58`	`58`	`if (authorizationHeaderToken != null) {`
`59`	`59`	`if (parameterToken != null) {`
`60`		`- final BearerTokenError error = BearerTokenErrors`
	`60`	`+ BearerTokenError error = BearerTokenErrors`
`61`	`61`	`.invalidRequest("Found multiple bearer tokens in the request");`
`62`	`62`	`throw new OAuth2AuthenticationException(error);`
`63`	`63`	`}`
`64`	`64`	`return authorizationHeaderToken;`
`65`	`65`	`}`
`66`	`66`	`if (parameterToken != null && isParameterTokenEnabledForRequest(request)) {`
`67`	`67`	`if (!StringUtils.hasText(parameterToken)) {`
`68`		`- final BearerTokenError error = BearerTokenErrors`
	`68`	`+ BearerTokenError error = BearerTokenErrors`
`69`	`69`	`.invalidRequest("The requested token parameter is an empty string");`
`70`	`70`	`throw new OAuth2AuthenticationException(error);`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2021 the original author or authors.`
	`2`	`+ * Copyright 2002-2024 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -79,7 +79,7 @@ private String token(ServerHttpRequest request) {`
`79`	`79`	`}`
`80`	`80`	`if (parameterToken != null && isParameterTokenSupportedForRequest(request)) {`
`81`	`81`	`if (!StringUtils.hasText(parameterToken)) {`
`82`		`- final BearerTokenError error = BearerTokenErrors`
	`82`	`+ BearerTokenError error = BearerTokenErrors`
`83`	`83`	`.invalidRequest("The requested token parameter is an empty string");`
`84`	`84`	`throw new OAuth2AuthenticationException(error);`
`85`	`85`	`}`