Skip to content

Commit 413363b

Browse files
committed
Polish gh-1667
1 parent 1125b37 commit 413363b

File tree

2 files changed

+18
-11
lines changed

2 files changed

+18
-11
lines changed

oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenRevocationEndpointFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
116116
Authentication tokenRevocationAuthentication = this.authenticationConverter.convert(request);
117117
if (tokenRevocationAuthentication instanceof AbstractAuthenticationToken) {
118118
((AbstractAuthenticationToken) tokenRevocationAuthentication)
119-
.setDetails(this.authenticationDetailsSource.buildDetails(request));
119+
.setDetails(this.authenticationDetailsSource.buildDetails(request));
120120
}
121121

122122
Authentication tokenRevocationAuthenticationResult = this.authenticationManager

oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenRevocationEndpointFilterTests.java

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,19 @@
1515
*/
1616
package org.springframework.security.oauth2.server.authorization.web;
1717

18+
import java.time.Duration;
19+
import java.time.Instant;
20+
import java.util.Arrays;
21+
import java.util.HashSet;
22+
import java.util.function.Consumer;
23+
1824
import jakarta.servlet.FilterChain;
1925
import jakarta.servlet.http.HttpServletRequest;
2026
import jakarta.servlet.http.HttpServletResponse;
2127
import org.junit.jupiter.api.AfterEach;
2228
import org.junit.jupiter.api.BeforeEach;
2329
import org.junit.jupiter.api.Test;
30+
2431
import org.springframework.http.HttpStatus;
2532
import org.springframework.http.converter.HttpMessageConverter;
2633
import org.springframework.mock.http.client.MockClientHttpResponse;
@@ -31,7 +38,11 @@
3138
import org.springframework.security.core.Authentication;
3239
import org.springframework.security.core.context.SecurityContext;
3340
import org.springframework.security.core.context.SecurityContextHolder;
34-
import org.springframework.security.oauth2.core.*;
41+
import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
42+
import org.springframework.security.oauth2.core.OAuth2AccessToken;
43+
import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
44+
import org.springframework.security.oauth2.core.OAuth2Error;
45+
import org.springframework.security.oauth2.core.OAuth2ErrorCodes;
3546
import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
3647
import org.springframework.security.oauth2.core.http.converter.OAuth2ErrorHttpMessageConverter;
3748
import org.springframework.security.oauth2.server.authorization.OAuth2TokenType;
@@ -44,17 +55,13 @@
4455
import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
4556
import org.springframework.security.web.authentication.WebAuthenticationDetails;
4657

47-
import java.time.Duration;
48-
import java.time.Instant;
49-
import java.util.Arrays;
50-
import java.util.HashSet;
51-
import java.util.function.Consumer;
52-
5358
import static org.assertj.core.api.Assertions.assertThat;
5459
import static org.assertj.core.api.Assertions.assertThatThrownBy;
5560
import static org.mockito.ArgumentMatchers.any;
5661
import static org.mockito.BDDMockito.given;
57-
import static org.mockito.Mockito.*;
62+
import static org.mockito.Mockito.mock;
63+
import static org.mockito.Mockito.verify;
64+
import static org.mockito.Mockito.verifyNoInteractions;
5865

5966
/**
6067
* Tests for {@link OAuth2TokenRevocationEndpointFilter}.
@@ -100,8 +107,8 @@ public void constructorWhenTokenRevocationEndpointUriNullThenThrowIllegalArgumen
100107
@Test
101108
public void setAuthenticationDetailsSourceWhenNullThenThrowIllegalArgumentException() {
102109
assertThatThrownBy(() -> this.filter.setAuthenticationDetailsSource(null))
103-
.isInstanceOf(IllegalArgumentException.class)
104-
.hasMessage("authenticationDetailsSource cannot be null");
110+
.isInstanceOf(IllegalArgumentException.class)
111+
.hasMessage("authenticationDetailsSource cannot be null");
105112
}
106113

107114
@Test

0 commit comments

Comments
 (0)