From 13d3567eb4add08b9ce599e4bbe11cba27ec37a3 Mon Sep 17 00:00:00 2001 From: Steve Riesenberg Date: Tue, 14 Dec 2021 17:15:59 -0600 Subject: [PATCH] Polish gh-490 --- .../OAuth2TokenRevocationEndpointConfigurer.java | 15 +++++++-------- .../web/OAuth2TokenRevocationEndpointFilter.java | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2TokenRevocationEndpointConfigurer.java b/oauth2-authorization-server/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2TokenRevocationEndpointConfigurer.java index 0d73361d..2999bc06 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2TokenRevocationEndpointConfigurer.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2TokenRevocationEndpointConfigurer.java @@ -15,6 +15,12 @@ */ package org.springframework.security.config.annotation.web.configurers.oauth2.server.authorization; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; + import org.springframework.http.HttpMethod; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.AuthenticationProvider; @@ -33,11 +39,6 @@ import org.springframework.security.web.authentication.AuthenticationSuccessHand import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import org.springframework.security.web.util.matcher.RequestMatcher; -import javax.servlet.http.HttpServletRequest; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - /** * Configurer for the OAuth 2.0 Token Revocation Endpoint. * @@ -127,9 +128,7 @@ public final class OAuth2TokenRevocationEndpointConfigurer extends AbstractOAuth OAuth2TokenRevocationEndpointFilter revocationEndpointFilter = new OAuth2TokenRevocationEndpointFilter( - authenticationManager, - providerSettings.getTokenRevocationEndpoint() - ); + authenticationManager, providerSettings.getTokenRevocationEndpoint()); if (this.revocationRequestConverter != null) { revocationEndpointFilter.setRevocationRequestConverter(this.revocationRequestConverter); } 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 a45e1b87..01649997 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 @@ -21,6 +21,7 @@ import javax.servlet.FilterChain; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.converter.HttpMessageConverter; @@ -117,7 +118,6 @@ public final class OAuth2TokenRevocationEndpointFilter extends OncePerRequestFil } } - /** * Sets the {@link AuthenticationConverter} used when attempting to extract a Revoke Token Request from {@link HttpServletRequest} * to an instance of {@link OAuth2TokenRevocationAuthenticationToken} used for authenticating the client.