Use pattern matching

arefbehboudi · jgrandja · commit 2e9fe7e99e69 · 2025-03-04T06:17:13.000-05:00
Closes gh-1907 Signed-off-by: arefbehboudi <behboodiaref@gmail.com>
diff --git a/docs/src/main/java/sample/extgrant/CustomCodeGrantAuthenticationProvider.java b/docs/src/main/java/sample/extgrant/CustomCodeGrantAuthenticationProvider.java
@@ -91,11 +91,11 @@ public Authentication authenticate(Authentication authentication) throws Authent
 		OAuth2Authorization.Builder authorizationBuilder = OAuth2Authorization.withRegisteredClient(registeredClient)
 				.principalName(clientPrincipal.getName())
 				.authorizationGrantType(customCodeGrantAuthentication.getGrantType());
-		if (generatedAccessToken instanceof ClaimAccessor) {
+		if (generatedAccessToken instanceof ClaimAccessor claimAccessor) {
 			authorizationBuilder.token(accessToken, (metadata) ->
 				metadata.put(
 					OAuth2Authorization.Token.CLAIMS_METADATA_NAME,
-					((ClaimAccessor) generatedAccessToken).getClaims())
+					claimAccessor.getClaims())
 			);
 		} else {
 			authorizationBuilder.accessToken(accessToken);
diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/DefaultOAuth2TokenCustomizers.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/DefaultOAuth2TokenCustomizers.java
@@ -96,8 +96,8 @@ private static void customize(OAuth2TokenContext tokenContext, Map<String, Objec
 			Map<String, Object> jwkJson = (Map<String, Object>) dPoPProofJwt.getHeaders().get("jwk");
 			try {
 				JWK jwk = JWK.parse(jwkJson);
-				if (jwk instanceof AsymmetricJWK) {
-					publicKey = ((AsymmetricJWK) jwk).toPublicKey();
+				if (jwk instanceof AsymmetricJWK asymmetricJWK) {
+					publicKey = asymmetricJWK.toPublicKey();
 				}
 			}
 			catch (Exception ignored) {
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,8 +173,8 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 
 		try {
 			Authentication authentication = this.authenticationConverter.convert(request);
-			if (authentication instanceof AbstractAuthenticationToken) {
-				((AbstractAuthenticationToken) authentication)
+			if (authentication instanceof AbstractAuthenticationToken abstractAuthenticationToken) {
+				abstractAuthenticationToken
 					.setDetails(this.authenticationDetailsSource.buildDetails(request));
 			}
 			Authentication authenticationResult = this.authenticationManager.authenticate(authentication);
@@ -188,13 +188,13 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 				return;
 			}
 
-			if (authenticationResult instanceof OAuth2AuthorizationConsentAuthenticationToken) {
+			if (authenticationResult instanceof OAuth2AuthorizationConsentAuthenticationToken oAuth2AuthorizationConsentAuthenticationToken) {
 				if (this.logger.isTraceEnabled()) {
 					this.logger.trace("Authorization consent is required");
 				}
 				sendAuthorizationConsent(request, response,
 						(OAuth2AuthorizationCodeRequestAuthenticationToken) authentication,
-						(OAuth2AuthorizationConsentAuthenticationToken) authenticationResult);
+						oAuth2AuthorizationConsentAuthenticationToken);
 				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
@@ -132,8 +132,8 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 
 		try {
 			Authentication authenticationRequest = this.authenticationConverter.convert(request);
-			if (authenticationRequest instanceof AbstractAuthenticationToken) {
-				((AbstractAuthenticationToken) authenticationRequest)
+			if (authenticationRequest instanceof AbstractAuthenticationToken abstractAuthenticationToken) {
+				abstractAuthenticationToken
 					.setDetails(this.authenticationDetailsSource.buildDetails(request));
 			}
 			if (authenticationRequest != null) {
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
@@ -129,8 +129,8 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 
 		try {
 			Authentication deviceAuthorizationRequestAuthentication = this.authenticationConverter.convert(request);
-			if (deviceAuthorizationRequestAuthentication instanceof AbstractAuthenticationToken) {
-				((AbstractAuthenticationToken) deviceAuthorizationRequestAuthentication)
+			if (deviceAuthorizationRequestAuthentication instanceof AbstractAuthenticationToken abstractAuthenticationToken) {
+				abstractAuthenticationToken
 					.setDetails(this.authenticationDetailsSource.buildDetails(request));
 			}
 
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
@@ -155,8 +155,8 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 
 		try {
 			Authentication authentication = this.authenticationConverter.convert(request);
-			if (authentication instanceof AbstractAuthenticationToken) {
-				((AbstractAuthenticationToken) authentication)
+			if (authentication instanceof AbstractAuthenticationToken abstractAuthenticationToken) {
+				abstractAuthenticationToken
 					.setDetails(this.authenticationDetailsSource.buildDetails(request));
 			}
 
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
@@ -161,8 +161,8 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 			if (authorizationGrantAuthentication == null) {
 				throwError(OAuth2ErrorCodes.UNSUPPORTED_GRANT_TYPE, OAuth2ParameterNames.GRANT_TYPE);
 			}
-			if (authorizationGrantAuthentication instanceof AbstractAuthenticationToken) {
-				((AbstractAuthenticationToken) authorizationGrantAuthentication)
+			if (authorizationGrantAuthentication instanceof AbstractAuthenticationToken abstractAuthenticationToken) {
+				abstractAuthenticationToken
 					.setDetails(this.authenticationDetailsSource.buildDetails(request));
 			}
 
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
@@ -114,8 +114,8 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 
 		try {
 			Authentication tokenRevocationAuthentication = this.authenticationConverter.convert(request);
-			if (tokenRevocationAuthentication instanceof AbstractAuthenticationToken) {
-				((AbstractAuthenticationToken) tokenRevocationAuthentication)
+			if (tokenRevocationAuthentication instanceof AbstractAuthenticationToken abstractAuthenticationToken) {
+				abstractAuthenticationToken
 					.setDetails(this.authenticationDetailsSource.buildDetails(request));
 			}
 
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
@@ -55,8 +55,8 @@ public void onAuthenticationFailure(HttpServletRequest request, HttpServletRespo
 		ServletServerHttpResponse httpResponse = new ServletServerHttpResponse(response);
 		httpResponse.setStatusCode(HttpStatus.BAD_REQUEST);
 
-		if (authenticationException instanceof OAuth2AuthenticationException) {
-			OAuth2Error error = ((OAuth2AuthenticationException) authenticationException).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
@@ -50,10 +50,10 @@ public final class FederatedIdentityAuthenticationSuccessHandler implements Auth
 	@Override
 	public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException {
 		if (authentication instanceof OAuth2AuthenticationToken) {
-			if (authentication.getPrincipal() instanceof OidcUser) {
-				this.oidcUserHandler.accept((OidcUser) authentication.getPrincipal());
-			} else if (authentication.getPrincipal() instanceof OAuth2User) {
-				this.oauth2UserHandler.accept((OAuth2User) authentication.getPrincipal());
+			if (authentication.getPrincipal() instanceof OidcUser oidcUser) {
+				this.oidcUserHandler.accept(oidcUser);
+			} 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
@@ -77,12 +77,10 @@ public void customize(JwtEncodingContext context) {
 
 	private Map<String, Object> extractClaims(Authentication principal) {
 		Map<String, Object> claims;
-		if (principal.getPrincipal() instanceof OidcUser) {
-			OidcUser oidcUser = (OidcUser) principal.getPrincipal();
+		if (principal.getPrincipal() instanceof OidcUser oidcUser) {
 			OidcIdToken idToken = oidcUser.getIdToken();
 			claims = idToken.getClaims();
-		} else if (principal.getPrincipal() instanceof OAuth2User) {
-			OAuth2User oauth2User = (OAuth2User) principal.getPrincipal();
+		} else if (principal.getPrincipal() instanceof OAuth2User oauth2User) {
 			claims = oauth2User.getAttributes();
 		} else {
 			claims = Collections.emptyMap();

Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,8 @@ private static void customize(OAuth2TokenContext tokenContext, Map<String, Objec`
`96`	`96`	`Map<String, Object> jwkJson = (Map<String, Object>) dPoPProofJwt.getHeaders().get("jwk");`
`97`	`97`	`try {`
`98`	`98`	`JWK jwk = JWK.parse(jwkJson);`
`99`		`- if (jwk instanceof AsymmetricJWK) {`
`100`		`- publicKey = ((AsymmetricJWK) jwk).toPublicKey();`
	`99`	`+ if (jwk instanceof AsymmetricJWK asymmetricJWK) {`
	`100`	`+ publicKey = asymmetricJWK.toPublicKey();`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`	`catch (Exception ignored) {`
Original file line number	Diff line number	Diff line change
`@@ -173,8 +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) {`
`177`		`- ((AbstractAuthenticationToken) authentication)`
	`176`	`+ if (authentication instanceof AbstractAuthenticationToken abstractAuthenticationToken) {`
	`177`	`+ abstractAuthenticationToken`
`178`	`178`	`.setDetails(this.authenticationDetailsSource.buildDetails(request));`
`179`	`179`	`}`
`180`	`180`	`Authentication authenticationResult = this.authenticationManager.authenticate(authentication);`
`@@ -188,13 +188,13 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse`
`188`	`188`	`return;`
`189`	`189`	`}`
`190`	`190`
`191`		`- if (authenticationResult instanceof OAuth2AuthorizationConsentAuthenticationToken) {`
	`191`	`+ if (authenticationResult instanceof OAuth2AuthorizationConsentAuthenticationToken oAuth2AuthorizationConsentAuthenticationToken) {`
`192`	`192`	`if (this.logger.isTraceEnabled()) {`
`193`	`193`	`this.logger.trace("Authorization consent is required");`
`194`	`194`	`}`
`195`	`195`	`sendAuthorizationConsent(request, response,`
`196`	`196`	`(OAuth2AuthorizationCodeRequestAuthenticationToken) authentication,`
`197`		`- (OAuth2AuthorizationConsentAuthenticationToken) authenticationResult);`
	`197`	`+ oAuth2AuthorizationConsentAuthenticationToken);`
`198`	`198`	`return;`
`199`	`199`	`}`
`200`	`200`
Original file line number	Diff line number	Diff line change
`@@ -129,8 +129,8 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse`
`129`	`129`
`130`	`130`	`try {`
`131`	`131`	`Authentication deviceAuthorizationRequestAuthentication = this.authenticationConverter.convert(request);`
`132`		`- if (deviceAuthorizationRequestAuthentication instanceof AbstractAuthenticationToken) {`
`133`		`- ((AbstractAuthenticationToken) deviceAuthorizationRequestAuthentication)`
	`132`	`+ if (deviceAuthorizationRequestAuthentication instanceof AbstractAuthenticationToken abstractAuthenticationToken) {`
	`133`	`+ abstractAuthenticationToken`
`134`	`134`	`.setDetails(this.authenticationDetailsSource.buildDetails(request));`
`135`	`135`	`}`
`136`	`136`
Original file line number	Diff line number	Diff line change
`@@ -155,8 +155,8 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse`
`155`	`155`
`156`	`156`	`try {`
`157`	`157`	`Authentication authentication = this.authenticationConverter.convert(request);`
`158`		`- if (authentication instanceof AbstractAuthenticationToken) {`
`159`		`- ((AbstractAuthenticationToken) authentication)`
	`158`	`+ if (authentication instanceof AbstractAuthenticationToken abstractAuthenticationToken) {`
	`159`	`+ abstractAuthenticationToken`
`160`	`160`	`.setDetails(this.authenticationDetailsSource.buildDetails(request));`
`161`	`161`	`}`
`162`	`162`
Original file line number	Diff line number	Diff line change
`@@ -161,8 +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) {`
`165`		`- ((AbstractAuthenticationToken) authorizationGrantAuthentication)`
	`164`	`+ if (authorizationGrantAuthentication instanceof AbstractAuthenticationToken abstractAuthenticationToken) {`
	`165`	`+ abstractAuthenticationToken`
`166`	`166`	`.setDetails(this.authenticationDetailsSource.buildDetails(request));`
`167`	`167`	`}`
`168`	`168`
Original file line number	Diff line number	Diff line change
`@@ -114,8 +114,8 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse`
`114`	`114`
`115`	`115`	`try {`
`116`	`116`	`Authentication tokenRevocationAuthentication = this.authenticationConverter.convert(request);`
`117`		`- if (tokenRevocationAuthentication instanceof AbstractAuthenticationToken) {`
`118`		`- ((AbstractAuthenticationToken) tokenRevocationAuthentication)`
	`117`	`+ if (tokenRevocationAuthentication instanceof AbstractAuthenticationToken abstractAuthenticationToken) {`
	`118`	`+ abstractAuthenticationToken`
`119`	`119`	`.setDetails(this.authenticationDetailsSource.buildDetails(request));`
`120`	`120`	`}`
`121`	`121`
Original file line number	Diff line number	Diff line change
`@@ -50,10 +50,10 @@ public final class FederatedIdentityAuthenticationSuccessHandler implements Auth`
`50`	`50`	`@Override`
`51`	`51`	`public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException {`
`52`	`52`	`if (authentication instanceof OAuth2AuthenticationToken) {`
`53`		`- if (authentication.getPrincipal() instanceof OidcUser) {`
`54`		`- this.oidcUserHandler.accept((OidcUser) authentication.getPrincipal());`
`55`		`- } else if (authentication.getPrincipal() instanceof OAuth2User) {`
`56`		`- this.oauth2UserHandler.accept((OAuth2User) authentication.getPrincipal());`
	`53`	`+ if (authentication.getPrincipal() instanceof OidcUser oidcUser) {`
	`54`	`+ this.oidcUserHandler.accept(oidcUser);`
	`55`	`+ } else if (authentication.getPrincipal() instanceof OAuth2User oAuth2User) {`
	`56`	`+ this.oauth2UserHandler.accept(oAuth2User);`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`