Polish gh-1907

jgrandja · jgrandja · commit 5bd47b6c2da4 · 2025-03-04T06:17:14.000-05:00
diff --git a/docs/src/main/java/sample/extgrant/CustomCodeGrantAuthenticationProvider.java b/docs/src/main/java/sample/extgrant/CustomCodeGrantAuthenticationProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 the original author or authors.
+ * Copyright 2020-2025 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-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2AuthorizationEndpointFilter.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2AuthorizationEndpointFilter.java
@@ -173,9 +173,8 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 
 		try {
 			Authentication authentication = this.authenticationConverter.convert(request);
-			if (authentication instanceof AbstractAuthenticationToken abstractAuthenticationToken) {
-				abstractAuthenticationToken
-					.setDetails(this.authenticationDetailsSource.buildDetails(request));
+			if (authentication instanceof AbstractAuthenticationToken authenticationToken) {
+				authenticationToken.setDetails(this.authenticationDetailsSource.buildDetails(request));
 			}
 			Authentication authenticationResult = this.authenticationManager.authenticate(authentication);
 
@@ -188,13 +187,13 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 				return;
 			}
 
-			if (authenticationResult instanceof OAuth2AuthorizationConsentAuthenticationToken oAuth2AuthorizationConsentAuthenticationToken) {
+			if (authenticationResult instanceof OAuth2AuthorizationConsentAuthenticationToken authorizationConsentAuthenticationToken) {
 				if (this.logger.isTraceEnabled()) {
 					this.logger.trace("Authorization consent is required");
 				}
 				sendAuthorizationConsent(request, response,
 						(OAuth2AuthorizationCodeRequestAuthenticationToken) authentication,
-						oAuth2AuthorizationConsentAuthenticationToken);
+						authorizationConsentAuthenticationToken);
 				return;
 			}
 
diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2ClientAuthenticationFilter.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2ClientAuthenticationFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-2025 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.
@@ -132,9 +132,8 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 
 		try {
 			Authentication authenticationRequest = this.authenticationConverter.convert(request);
-			if (authenticationRequest instanceof AbstractAuthenticationToken abstractAuthenticationToken) {
-				abstractAuthenticationToken
-					.setDetails(this.authenticationDetailsSource.buildDetails(request));
+			if (authenticationRequest instanceof AbstractAuthenticationToken authenticationToken) {
+				authenticationToken.setDetails(this.authenticationDetailsSource.buildDetails(request));
 			}
 			if (authenticationRequest != null) {
 				validateClientIdentifier(authenticationRequest);
diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2DeviceAuthorizationEndpointFilter.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2DeviceAuthorizationEndpointFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-2025 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.
@@ -129,9 +129,8 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 
 		try {
 			Authentication deviceAuthorizationRequestAuthentication = this.authenticationConverter.convert(request);
-			if (deviceAuthorizationRequestAuthentication instanceof AbstractAuthenticationToken abstractAuthenticationToken) {
-				abstractAuthenticationToken
-					.setDetails(this.authenticationDetailsSource.buildDetails(request));
+			if (deviceAuthorizationRequestAuthentication instanceof AbstractAuthenticationToken authenticationToken) {
+				authenticationToken.setDetails(this.authenticationDetailsSource.buildDetails(request));
 			}
 
 			Authentication deviceAuthorizationRequestAuthenticationResult = this.authenticationManager
diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2DeviceVerificationEndpointFilter.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2DeviceVerificationEndpointFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-2025 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.
@@ -155,9 +155,8 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 
 		try {
 			Authentication authentication = this.authenticationConverter.convert(request);
-			if (authentication instanceof AbstractAuthenticationToken abstractAuthenticationToken) {
-				abstractAuthenticationToken
-					.setDetails(this.authenticationDetailsSource.buildDetails(request));
+			if (authentication instanceof AbstractAuthenticationToken authenticationToken) {
+				authenticationToken.setDetails(this.authenticationDetailsSource.buildDetails(request));
 			}
 
 			Authentication authenticationResult = this.authenticationManager.authenticate(authentication);
diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenEndpointFilter.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenEndpointFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-2025 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.
@@ -161,9 +161,8 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 			if (authorizationGrantAuthentication == null) {
 				throwError(OAuth2ErrorCodes.UNSUPPORTED_GRANT_TYPE, OAuth2ParameterNames.GRANT_TYPE);
 			}
-			if (authorizationGrantAuthentication instanceof AbstractAuthenticationToken abstractAuthenticationToken) {
-				abstractAuthenticationToken
-					.setDetails(this.authenticationDetailsSource.buildDetails(request));
+			if (authorizationGrantAuthentication instanceof AbstractAuthenticationToken authenticationToken) {
+				authenticationToken.setDetails(this.authenticationDetailsSource.buildDetails(request));
 			}
 
 			OAuth2AccessTokenAuthenticationToken accessTokenAuthentication = (OAuth2AccessTokenAuthenticationToken) this.authenticationManager
diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenRevocationEndpointFilter.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenRevocationEndpointFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-2025 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.
@@ -114,9 +114,8 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 
 		try {
 			Authentication tokenRevocationAuthentication = this.authenticationConverter.convert(request);
-			if (tokenRevocationAuthentication instanceof AbstractAuthenticationToken abstractAuthenticationToken) {
-				abstractAuthenticationToken
-					.setDetails(this.authenticationDetailsSource.buildDetails(request));
+			if (tokenRevocationAuthentication instanceof AbstractAuthenticationToken authenticationToken) {
+				authenticationToken.setDetails(this.authenticationDetailsSource.buildDetails(request));
 			}
 
 			Authentication tokenRevocationAuthenticationResult = this.authenticationManager
diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2ErrorAuthenticationFailureHandler.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2ErrorAuthenticationFailureHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 the original author or authors.
+ * Copyright 2020-2025 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.
@@ -55,8 +55,8 @@ public void onAuthenticationFailure(HttpServletRequest request, HttpServletRespo
 		ServletServerHttpResponse httpResponse = new ServletServerHttpResponse(response);
 		httpResponse.setStatusCode(HttpStatus.BAD_REQUEST);
 
-		if (authenticationException instanceof OAuth2AuthenticationException oAuth2AuthenticationException) {
-			OAuth2Error error = oAuth2AuthenticationException.getError();
+		if (authenticationException instanceof OAuth2AuthenticationException oauth2AuthenticationException) {
+			OAuth2Error error = oauth2AuthenticationException.getError();
 			this.errorResponseConverter.write(error, null, httpResponse);
 		}
 		else {
diff --git a/samples/demo-authorizationserver/src/main/java/sample/federation/FederatedIdentityAuthenticationSuccessHandler.java b/samples/demo-authorizationserver/src/main/java/sample/federation/FederatedIdentityAuthenticationSuccessHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 the original author or authors.
+ * Copyright 2020-2025 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.
@@ -52,8 +52,8 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
 		if (authentication instanceof OAuth2AuthenticationToken) {
 			if (authentication.getPrincipal() instanceof OidcUser oidcUser) {
 				this.oidcUserHandler.accept(oidcUser);
-			} else if (authentication.getPrincipal() instanceof OAuth2User oAuth2User) {
-				this.oauth2UserHandler.accept(oAuth2User);
+			} else if (authentication.getPrincipal() instanceof OAuth2User oauth2User) {
+				this.oauth2UserHandler.accept(oauth2User);
 			}
 		}
 
diff --git a/samples/demo-authorizationserver/src/main/java/sample/federation/FederatedIdentityIdTokenCustomizer.java b/samples/demo-authorizationserver/src/main/java/sample/federation/FederatedIdentityIdTokenCustomizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 the original author or authors.
+ * Copyright 2020-2025 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 2020-2023 the original author or authors.`
	`2`	`+ * Copyright 2020-2025 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.`
Original file line number	Diff line number	Diff line change
`@@ -173,9 +173,8 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse`
`173`	`173`
`174`	`174`	`try {`
`175`	`175`	`Authentication authentication = this.authenticationConverter.convert(request);`
`176`		`- if (authentication instanceof AbstractAuthenticationToken abstractAuthenticationToken) {`
`177`		`- abstractAuthenticationToken`
`178`		`- .setDetails(this.authenticationDetailsSource.buildDetails(request));`
	`176`	`+ if (authentication instanceof AbstractAuthenticationToken authenticationToken) {`
	`177`	`+ authenticationToken.setDetails(this.authenticationDetailsSource.buildDetails(request));`
`179`	`178`	`}`
`180`	`179`	`Authentication authenticationResult = this.authenticationManager.authenticate(authentication);`
`181`	`180`
`@@ -188,13 +187,13 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse`
`188`	`187`	`return;`
`189`	`188`	`}`
`190`	`189`
`191`		`- if (authenticationResult instanceof OAuth2AuthorizationConsentAuthenticationToken oAuth2AuthorizationConsentAuthenticationToken) {`
	`190`	`+ if (authenticationResult instanceof OAuth2AuthorizationConsentAuthenticationToken authorizationConsentAuthenticationToken) {`
`192`	`191`	`if (this.logger.isTraceEnabled()) {`
`193`	`192`	`this.logger.trace("Authorization consent is required");`
`194`	`193`	`}`
`195`	`194`	`sendAuthorizationConsent(request, response,`
`196`	`195`	`(OAuth2AuthorizationCodeRequestAuthenticationToken) authentication,`
`197`		`- oAuth2AuthorizationConsentAuthenticationToken);`
	`196`	`+ authorizationConsentAuthenticationToken);`
`198`	`197`	`return;`
`199`	`198`	`}`
`200`	`199`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2020-2024 the original author or authors.`
	`2`	`+ * Copyright 2020-2025 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.`
`@@ -161,9 +161,8 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse`
`161`	`161`	`if (authorizationGrantAuthentication == null) {`
`162`	`162`	`throwError(OAuth2ErrorCodes.UNSUPPORTED_GRANT_TYPE, OAuth2ParameterNames.GRANT_TYPE);`
`163`	`163`	`}`
`164`		`- if (authorizationGrantAuthentication instanceof AbstractAuthenticationToken abstractAuthenticationToken) {`
`165`		`- abstractAuthenticationToken`
`166`		`- .setDetails(this.authenticationDetailsSource.buildDetails(request));`
	`164`	`+ if (authorizationGrantAuthentication instanceof AbstractAuthenticationToken authenticationToken) {`
	`165`	`+ authenticationToken.setDetails(this.authenticationDetailsSource.buildDetails(request));`
`167`	`166`	`}`
`168`	`167`
`169`	`168`	`OAuth2AccessTokenAuthenticationToken accessTokenAuthentication = (OAuth2AccessTokenAuthenticationToken) this.authenticationManager`