Skip to content

Commit 9d336eb

Browse files
committed
Fix checkstyle violations for test module in 1.2.x
Issue spring-projectsgh-1624
1 parent 365ae4e commit 9d336eb

File tree

3 files changed

+11
-13
lines changed

3 files changed

+11
-13
lines changed

oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2RefreshTokenGrantTests.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,10 @@
2323
import java.util.List;
2424
import java.util.Set;
2525

26-
import jakarta.servlet.http.HttpServletRequest;
27-
2826
import com.nimbusds.jose.jwk.JWKSet;
2927
import com.nimbusds.jose.jwk.source.JWKSource;
3028
import com.nimbusds.jose.proc.SecurityContext;
29+
import jakarta.servlet.http.HttpServletRequest;
3130
import org.junit.jupiter.api.AfterAll;
3231
import org.junit.jupiter.api.AfterEach;
3332
import org.junit.jupiter.api.BeforeAll;
@@ -376,7 +375,7 @@ SecurityFilterChain authorizationServerSecurityFilterChain(
376375
OAuth2AuthorizationServerConfigurer authorizationServerConfigurer =
377376
new OAuth2AuthorizationServerConfigurer();
378377
authorizationServerConfigurer
379-
.clientAuthentication(clientAuthentication ->
378+
.clientAuthentication((clientAuthentication) ->
380379
clientAuthentication
381380
.authenticationConverter(
382381
new PublicClientRefreshTokenAuthenticationConverter())
@@ -387,10 +386,10 @@ SecurityFilterChain authorizationServerSecurityFilterChain(
387386

388387
http
389388
.securityMatcher(endpointsMatcher)
390-
.authorizeHttpRequests(authorize ->
389+
.authorizeHttpRequests((authorize) ->
391390
authorize.anyRequest().authenticated()
392391
)
393-
.csrf(csrf -> csrf.ignoringRequestMatchers(endpointsMatcher))
392+
.csrf((csrf) -> csrf.ignoringRequestMatchers(endpointsMatcher))
394393
.apply(authorizationServerConfigurer);
395394
return http.build();
396395
}

oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcClientRegistrationTests.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,10 @@
2525

2626
import javax.crypto.spec.SecretKeySpec;
2727

28-
import jakarta.servlet.http.HttpServletResponse;
29-
3028
import com.nimbusds.jose.jwk.JWKSet;
3129
import com.nimbusds.jose.jwk.source.JWKSource;
3230
import com.nimbusds.jose.proc.SecurityContext;
31+
import jakarta.servlet.http.HttpServletResponse;
3332
import okhttp3.mockwebserver.MockResponse;
3433
import okhttp3.mockwebserver.MockWebServer;
3534
import org.junit.jupiter.api.AfterAll;
@@ -685,7 +684,7 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
685684
private Consumer<List<AuthenticationProvider>> configureClientRegistrationConverters() {
686685
// @formatter:off
687686
return (authenticationProviders) ->
688-
authenticationProviders.forEach(authenticationProvider -> {
687+
authenticationProviders.forEach((authenticationProvider) -> {
689688
List<String> supportedCustomClientMetadata = List.of("custom-metadata-name-1", "custom-metadata-name-2");
690689
if (authenticationProvider instanceof OidcClientRegistrationAuthenticationProvider provider) {
691690
provider.setRegisteredClientConverter(new CustomRegisteredClientConverter(supportedCustomClientMetadata));
@@ -769,7 +768,7 @@ PasswordEncoder passwordEncoder() {
769768

770769
}
771770

772-
private static class CustomRegisteredClientConverter
771+
private static final class CustomRegisteredClientConverter
773772
implements Converter<OidcClientRegistration, RegisteredClient> {
774773

775774
private final OidcClientRegistrationRegisteredClientConverter delegate = new OidcClientRegistrationRegisteredClientConverter();
@@ -799,7 +798,7 @@ public RegisteredClient convert(OidcClientRegistration clientRegistration) {
799798

800799
}
801800

802-
private static class CustomClientRegistrationConverter
801+
private static final class CustomClientRegistrationConverter
803802
implements Converter<RegisteredClient, OidcClientRegistration> {
804803

805804
private final RegisteredClientOidcClientRegistrationConverter delegate = new RegisteredClientOidcClientRegistrationConverter();

oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ static class AuthorizationServerConfigurationWithCustomRefreshTokenGenerator
737737

738738
// @formatter:off
739739
@Bean
740-
public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) throws Exception {
740+
SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) throws Exception {
741741
OAuth2AuthorizationServerConfigurer authorizationServerConfigurer =
742742
new OAuth2AuthorizationServerConfigurer();
743743
http.apply(authorizationServerConfigurer);
@@ -750,10 +750,10 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
750750

751751
http
752752
.securityMatcher(endpointsMatcher)
753-
.authorizeHttpRequests(authorize ->
753+
.authorizeHttpRequests((authorize) ->
754754
authorize.anyRequest().authenticated()
755755
)
756-
.csrf(csrf -> csrf.ignoringRequestMatchers(endpointsMatcher));
756+
.csrf((csrf) -> csrf.ignoringRequestMatchers(endpointsMatcher));
757757

758758
return http.build();
759759
}

0 commit comments

Comments
 (0)