Use pattern matching

Closes gh-1907

Signed-off-by: arefbehboudi <behboodiaref@gmail.com>
This commit is contained in:
arefbehboudi
2025-02-15 15:36:39 +03:30
committed by Joe Grandja
parent 904a7eaf7b
commit 2e9fe7e99e
11 changed files with 26 additions and 28 deletions

View File

@@ -96,8 +96,8 @@ final class DefaultOAuth2TokenCustomizers {
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) {

View File

@@ -173,8 +173,8 @@ public final class OAuth2AuthorizationEndpointFilter extends OncePerRequestFilte
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 @@ public final class OAuth2AuthorizationEndpointFilter extends OncePerRequestFilte
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;
}

View File

@@ -132,8 +132,8 @@ public final class OAuth2ClientAuthenticationFilter extends OncePerRequestFilter
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) {

View File

@@ -129,8 +129,8 @@ public final class OAuth2DeviceAuthorizationEndpointFilter extends OncePerReques
try {
Authentication deviceAuthorizationRequestAuthentication = this.authenticationConverter.convert(request);
if (deviceAuthorizationRequestAuthentication instanceof AbstractAuthenticationToken) {
((AbstractAuthenticationToken) deviceAuthorizationRequestAuthentication)
if (deviceAuthorizationRequestAuthentication instanceof AbstractAuthenticationToken abstractAuthenticationToken) {
abstractAuthenticationToken
.setDetails(this.authenticationDetailsSource.buildDetails(request));
}

View File

@@ -155,8 +155,8 @@ public final class OAuth2DeviceVerificationEndpointFilter extends OncePerRequest
try {
Authentication authentication = this.authenticationConverter.convert(request);
if (authentication instanceof AbstractAuthenticationToken) {
((AbstractAuthenticationToken) authentication)
if (authentication instanceof AbstractAuthenticationToken abstractAuthenticationToken) {
abstractAuthenticationToken
.setDetails(this.authenticationDetailsSource.buildDetails(request));
}

View File

@@ -161,8 +161,8 @@ public final class OAuth2TokenEndpointFilter extends OncePerRequestFilter {
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));
}

View File

@@ -114,8 +114,8 @@ public final class OAuth2TokenRevocationEndpointFilter extends OncePerRequestFil
try {
Authentication tokenRevocationAuthentication = this.authenticationConverter.convert(request);
if (tokenRevocationAuthentication instanceof AbstractAuthenticationToken) {
((AbstractAuthenticationToken) tokenRevocationAuthentication)
if (tokenRevocationAuthentication instanceof AbstractAuthenticationToken abstractAuthenticationToken) {
abstractAuthenticationToken
.setDetails(this.authenticationDetailsSource.buildDetails(request));
}

View File

@@ -55,8 +55,8 @@ public final class OAuth2ErrorAuthenticationFailureHandler implements Authentica
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 {