diff --git a/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2RefreshTokenGrantTests.java b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2RefreshTokenGrantTests.java index c70876fb..2153b774 100644 --- a/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2RefreshTokenGrantTests.java +++ b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2RefreshTokenGrantTests.java @@ -23,11 +23,10 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import jakarta.servlet.http.HttpServletRequest; - import com.nimbusds.jose.jwk.JWKSet; import com.nimbusds.jose.jwk.source.JWKSource; import com.nimbusds.jose.proc.SecurityContext; +import jakarta.servlet.http.HttpServletRequest; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; @@ -376,7 +375,7 @@ public class OAuth2RefreshTokenGrantTests { OAuth2AuthorizationServerConfigurer authorizationServerConfigurer = new OAuth2AuthorizationServerConfigurer(); authorizationServerConfigurer - .clientAuthentication(clientAuthentication -> + .clientAuthentication((clientAuthentication) -> clientAuthentication .authenticationConverter( new PublicClientRefreshTokenAuthenticationConverter()) @@ -387,10 +386,10 @@ public class OAuth2RefreshTokenGrantTests { http .securityMatcher(endpointsMatcher) - .authorizeHttpRequests(authorize -> + .authorizeHttpRequests((authorize) -> authorize.anyRequest().authenticated() ) - .csrf(csrf -> csrf.ignoringRequestMatchers(endpointsMatcher)) + .csrf((csrf) -> csrf.ignoringRequestMatchers(endpointsMatcher)) .apply(authorizationServerConfigurer); return http.build(); } diff --git a/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcClientRegistrationTests.java b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcClientRegistrationTests.java index 736bdd4c..fb81cef3 100644 --- a/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcClientRegistrationTests.java +++ b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcClientRegistrationTests.java @@ -25,11 +25,10 @@ import java.util.function.Consumer; import javax.crypto.spec.SecretKeySpec; -import jakarta.servlet.http.HttpServletResponse; - import com.nimbusds.jose.jwk.JWKSet; import com.nimbusds.jose.jwk.source.JWKSource; import com.nimbusds.jose.proc.SecurityContext; +import jakarta.servlet.http.HttpServletResponse; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; import org.junit.jupiter.api.AfterAll; @@ -685,7 +684,7 @@ public class OidcClientRegistrationTests { private Consumer> configureClientRegistrationConverters() { // @formatter:off return (authenticationProviders) -> - authenticationProviders.forEach(authenticationProvider -> { + authenticationProviders.forEach((authenticationProvider) -> { List supportedCustomClientMetadata = List.of("custom-metadata-name-1", "custom-metadata-name-2"); if (authenticationProvider instanceof OidcClientRegistrationAuthenticationProvider provider) { provider.setRegisteredClientConverter(new CustomRegisteredClientConverter(supportedCustomClientMetadata)); @@ -769,7 +768,7 @@ public class OidcClientRegistrationTests { } - private static class CustomRegisteredClientConverter + private static final class CustomRegisteredClientConverter implements Converter { private final OidcClientRegistrationRegisteredClientConverter delegate = new OidcClientRegistrationRegisteredClientConverter(); @@ -799,7 +798,7 @@ public class OidcClientRegistrationTests { } - private static class CustomClientRegistrationConverter + private static final class CustomClientRegistrationConverter implements Converter { private final RegisteredClientOidcClientRegistrationConverter delegate = new RegisteredClientOidcClientRegistrationConverter(); diff --git a/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcTests.java b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcTests.java index 5a3e8d17..82c7e6c4 100644 --- a/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcTests.java +++ b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcTests.java @@ -737,7 +737,7 @@ public class OidcTests { // @formatter:off @Bean - public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) throws Exception { + SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) throws Exception { OAuth2AuthorizationServerConfigurer authorizationServerConfigurer = new OAuth2AuthorizationServerConfigurer(); http.apply(authorizationServerConfigurer); @@ -750,10 +750,10 @@ public class OidcTests { http .securityMatcher(endpointsMatcher) - .authorizeHttpRequests(authorize -> + .authorizeHttpRequests((authorize) -> authorize.anyRequest().authenticated() ) - .csrf(csrf -> csrf.ignoringRequestMatchers(endpointsMatcher)); + .csrf((csrf) -> csrf.ignoringRequestMatchers(endpointsMatcher)); return http.build(); }