diff --git a/docs/src/main/java/sample/extgrant/CustomCodeGrantAuthenticationProvider.java b/docs/src/main/java/sample/extgrant/CustomCodeGrantAuthenticationProvider.java index b70e07f6c..69faec74a 100644 --- 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 index bbd04464e..b240fa8b4 100644 --- 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 jwkJson = (Map) 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 index 5e5cf2806..46707ba56 100644 --- 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 @@ -178,8 +178,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); @@ -193,13 +193,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 index f074534ea..765ae842f 100644 --- 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 index 27dd4f6e7..c7bc0bacc 100644 --- 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 index e670ad9e1..7172ce1dc 100644 --- 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 index 4fc4ec715..a62ab7425 100644 --- 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 index cb649ac7d..5b6ce9dbf 100644 --- 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 index 30c9bf117..9731cea84 100644 --- 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 index ed4c2409e..50fe5be89 100644 --- 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 index 0929ed41e..2e17a81ad 100644 --- 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 extractClaims(Authentication principal) { Map 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();