Polish gh-1667

spring-projects · Jul 19, 2024 · 413363b · 413363b
1 parent 1125b37
commit 413363b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/...amework/security/oauth2/server/authorization/web/OAuth2TokenRevocationEndpointFilter.java b/...amework/security/oauth2/server/authorization/web/OAuth2TokenRevocationEndpointFilter.java
@@ -116,7 +116,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 			Authentication tokenRevocationAuthentication = this.authenticationConverter.convert(request);
 			if (tokenRevocationAuthentication instanceof AbstractAuthenticationToken) {
 				((AbstractAuthenticationToken) tokenRevocationAuthentication)
-						.setDetails(this.authenticationDetailsSource.buildDetails(request));
+					.setDetails(this.authenticationDetailsSource.buildDetails(request));
 			}
 
 			Authentication tokenRevocationAuthenticationResult = this.authenticationManager

diff --git a/...rk/security/oauth2/server/authorization/web/OAuth2TokenRevocationEndpointFilterTests.java b/...rk/security/oauth2/server/authorization/web/OAuth2TokenRevocationEndpointFilterTests.java
@@ -15,12 +15,19 @@
  */
 package org.springframework.security.oauth2.server.authorization.web;
 
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.function.Consumer;
+
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+
 import org.springframework.http.HttpStatus;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.mock.http.client.MockClientHttpResponse;
@@ -31,7 +38,11 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.oauth2.core.*;
+import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
+import org.springframework.security.oauth2.core.OAuth2AccessToken;
+import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
+import org.springframework.security.oauth2.core.OAuth2Error;
+import org.springframework.security.oauth2.core.OAuth2ErrorCodes;
 import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
 import org.springframework.security.oauth2.core.http.converter.OAuth2ErrorHttpMessageConverter;
 import org.springframework.security.oauth2.server.authorization.OAuth2TokenType;
@@ -44,17 +55,13 @@
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
 import org.springframework.security.web.authentication.WebAuthenticationDetails;
 
-import java.time.Duration;
-import java.time.Instant;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.function.Consumer;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
 
 /**
  * Tests for {@link OAuth2TokenRevocationEndpointFilter}.
@@ -100,8 +107,8 @@ public void constructorWhenTokenRevocationEndpointUriNullThenThrowIllegalArgumen
 	@Test
 	public void setAuthenticationDetailsSourceWhenNullThenThrowIllegalArgumentException() {
 		assertThatThrownBy(() -> this.filter.setAuthenticationDetailsSource(null))
-				.isInstanceOf(IllegalArgumentException.class)
-				.hasMessage("authenticationDetailsSource cannot be null");
+			.isInstanceOf(IllegalArgumentException.class)
+			.hasMessage("authenticationDetailsSource cannot be null");
 	}
 
 	@Test