diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloRSocketITests.java b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloRSocketITests.java index b46c1e41ae..e8a279480d 100644 --- a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloRSocketITests.java +++ b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloRSocketITests.java @@ -74,8 +74,7 @@ public class HelloRSocketITests { // @formatter:off this.server = RSocketServer.create() .payloadDecoder(PayloadDecoder.ZERO_COPY) - .interceptors((registry) -> - registry.forSocketAcceptor(this.interceptor) + .interceptors((registry) -> registry.forSocketAcceptor(this.interceptor) ) .acceptor(this.handler.responder()) .bind(TcpServerTransport.create("localhost", 0)) diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloRSocketObservationITests.java b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloRSocketObservationITests.java index 9b6cf17b8c..4c838e9278 100644 --- a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloRSocketObservationITests.java +++ b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloRSocketObservationITests.java @@ -87,8 +87,7 @@ public class HelloRSocketObservationITests { // @formatter:off this.server = RSocketServer.create() .payloadDecoder(PayloadDecoder.ZERO_COPY) - .interceptors((registry) -> - registry.forSocketAcceptor(this.interceptor) + .interceptors((registry) -> registry.forSocketAcceptor(this.interceptor) ) .acceptor(this.handler.responder()) .bind(TcpServerTransport.create("localhost", 0)) diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloRSocketWithWebFluxITests.java b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloRSocketWithWebFluxITests.java index 7b298b3c75..72ea1a6beb 100644 --- a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloRSocketWithWebFluxITests.java +++ b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloRSocketWithWebFluxITests.java @@ -74,8 +74,7 @@ public class HelloRSocketWithWebFluxITests { // @formatter:off this.server = RSocketServer.create() .payloadDecoder(PayloadDecoder.ZERO_COPY) - .interceptors((registry) -> - registry.forSocketAcceptor(this.interceptor) + .interceptors((registry) -> registry.forSocketAcceptor(this.interceptor) ) .acceptor(this.handler.responder()) .bind(TcpServerTransport.create("localhost", 0)) diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/JwtITests.java b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/JwtITests.java index 8af9308c29..39f35280b7 100644 --- a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/JwtITests.java +++ b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/JwtITests.java @@ -86,8 +86,7 @@ public class JwtITests { // @formatter:off this.server = RSocketServer.create() .payloadDecoder(PayloadDecoder.ZERO_COPY) - .interceptors((registry) -> - registry.forSocketAcceptor(this.interceptor) + .interceptors((registry) -> registry.forSocketAcceptor(this.interceptor) ) .acceptor(this.handler.responder()) .bind(TcpServerTransport.create("localhost", 0)) diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java index 3e9da24ff8..540b82ba7f 100644 --- a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java +++ b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java @@ -81,8 +81,7 @@ public class RSocketMessageHandlerConnectionITests { // @formatter:off this.server = RSocketServer.create() .payloadDecoder(PayloadDecoder.ZERO_COPY) - .interceptors((registry) -> - registry.forSocketAcceptor(this.interceptor) + .interceptors((registry) -> registry.forSocketAcceptor(this.interceptor) ) .acceptor(this.handler.responder()) .bind(TcpServerTransport.create("localhost", 0)) diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java index ef65fb55c7..1ad42c1666 100644 --- a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java +++ b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java @@ -79,8 +79,7 @@ public class RSocketMessageHandlerITests { // @formatter:off this.server = RSocketServer.create() .payloadDecoder(PayloadDecoder.ZERO_COPY) - .interceptors((registry) -> - registry.forSocketAcceptor(this.interceptor) + .interceptors((registry) -> registry.forSocketAcceptor(this.interceptor) ) .acceptor(this.handler.responder()) .bind(TcpServerTransport.create("localhost", 0)) diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/SimpleAuthenticationITests.java b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/SimpleAuthenticationITests.java index 1e83469801..f6a63acf4b 100644 --- a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/SimpleAuthenticationITests.java +++ b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/SimpleAuthenticationITests.java @@ -79,8 +79,7 @@ public class SimpleAuthenticationITests { // @formatter:off this.server = RSocketServer.create() .payloadDecoder(PayloadDecoder.ZERO_COPY) - .interceptors((registry) -> - registry.forSocketAcceptor(this.interceptor) + .interceptors((registry) -> registry.forSocketAcceptor(this.interceptor) ) .acceptor(this.handler.responder()) .bind(TcpServerTransport.create("localhost", 0)) diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AnonymousConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AnonymousConfigurerTests.java index 7a6d0a94bd..efa7735116 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AnonymousConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AnonymousConfigurerTests.java @@ -129,8 +129,7 @@ public class AnonymousConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .anonymous((anonymous) -> - anonymous + .anonymous((anonymous) -> anonymous .principal("principal") ); return http.build(); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurerTests.java index 21cbc87af8..7e18eb8d23 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurerTests.java @@ -186,8 +186,7 @@ public class ChannelSecurityConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .requiresChannel((requiresChannel) -> - requiresChannel + .requiresChannel((requiresChannel) -> requiresChannel .anyRequest().requiresSecure() ); return http.build(); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerIgnoringRequestMatchersTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerIgnoringRequestMatchersTests.java index bd22ccf67e..377445bb0a 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerIgnoringRequestMatchersTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerIgnoringRequestMatchersTests.java @@ -128,8 +128,7 @@ public class CsrfConfigurerIgnoringRequestMatchersTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .csrf((csrf) -> - csrf + .csrf((csrf) -> csrf .requireCsrfProtectionMatcher(new AntPathRequestMatcher("/path")) .ignoringRequestMatchers(this.requestMatcher) ); @@ -169,8 +168,7 @@ public class CsrfConfigurerIgnoringRequestMatchersTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .csrf((csrf) -> - csrf + .csrf((csrf) -> csrf .ignoringRequestMatchers(new AntPathRequestMatcher("/no-csrf")) .ignoringRequestMatchers(this.requestMatcher) ); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ExceptionHandlingConfigurerAccessDeniedHandlerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ExceptionHandlingConfigurerAccessDeniedHandlerTests.java index b4f9ec3a08..ad1de31fe2 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ExceptionHandlingConfigurerAccessDeniedHandlerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ExceptionHandlingConfigurerAccessDeniedHandlerTests.java @@ -116,8 +116,7 @@ public class ExceptionHandlingConfigurerAccessDeniedHandlerTests { .authorizeRequests((authorize) -> authorize .anyRequest().denyAll() ) - .exceptionHandling((exceptionHandling) -> - exceptionHandling + .exceptionHandling((exceptionHandling) -> exceptionHandling .defaultAccessDeniedHandlerFor( this.teapotDeniedHandler, new AntPathRequestMatcher("/hello/**") diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurerTests.java index 1c13a37377..fff0e7cfba 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurerTests.java @@ -518,8 +518,7 @@ public class FormLoginConfigurerTests { .authorizeRequests((authorize) -> authorize .anyRequest().hasRole("USER") ) - .formLogin((formLogin) -> - formLogin + .formLogin((formLogin) -> formLogin .loginPage("/authenticate") .permitAll() ) @@ -573,15 +572,13 @@ public class FormLoginConfigurerTests { .authorizeRequests((authorize) -> authorize .anyRequest().authenticated() ) - .formLogin((formLogin) -> - formLogin + .formLogin((formLogin) -> formLogin .loginProcessingUrl("/loginCheck") .loginPage("/login") .defaultSuccessUrl("/", true) .permitAll() ) - .logout((logout) -> - logout + .logout((logout) -> logout .logoutSuccessUrl("/login") .logoutUrl("/logout") .deleteCookies("JSESSIONID") diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurerTests.java index 1b68c27628..779754b524 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurerTests.java @@ -630,8 +630,7 @@ public class HeadersConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .headers((headers) -> - headers + .headers((headers) -> headers .defaultsDisabled() .contentTypeOptions(withDefaults()) ); @@ -700,8 +699,7 @@ public class HeadersConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .headers((headers) -> - headers + .headers((headers) -> headers .defaultsDisabled() .cacheControl(withDefaults()) ); @@ -753,8 +751,7 @@ public class HeadersConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .headers((headers) -> - headers + .headers((headers) -> headers .defaultsDisabled() .xssProtection(withDefaults()) ); @@ -772,11 +769,9 @@ public class HeadersConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .headers((headers) -> - headers + .headers((headers) -> headers .defaultsDisabled() - .xssProtection((xXssConfig) -> - xXssConfig.headerValue(XXssProtectionHeaderWriter.HeaderValue.ENABLED_MODE_BLOCK) + .xssProtection((xXssConfig) -> xXssConfig.headerValue(XXssProtectionHeaderWriter.HeaderValue.ENABLED_MODE_BLOCK) ) ); // @formatter:on @@ -808,8 +803,7 @@ public class HeadersConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .headers((headers) -> - headers + .headers((headers) -> headers .frameOptions((frameOptionsConfig) -> frameOptionsConfig.sameOrigin()) ); return http.build(); @@ -976,11 +970,9 @@ public class HeadersConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .headers((headers) -> - headers + .headers((headers) -> headers .defaultsDisabled() - .httpPublicKeyPinning((hpkp) -> - hpkp + .httpPublicKeyPinning((hpkp) -> hpkp .addSha256Pins("d6qzRu9zOECb90Uez27xWltNsj0e1Md7GkYYkVoZWmM=") .reportUri("https://example.net/pkp-report") ) @@ -1035,11 +1027,9 @@ public class HeadersConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .headers((headers) -> - headers + .headers((headers) -> headers .defaultsDisabled() - .contentSecurityPolicy((csp) -> - csp + .contentSecurityPolicy((csp) -> csp .policyDirectives("default-src 'self'; script-src trustedscripts.example.com") .reportOnly() ) @@ -1075,11 +1065,9 @@ public class HeadersConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .headers((headers) -> - headers + .headers((headers) -> headers .defaultsDisabled() - .contentSecurityPolicy((csp) -> - csp.policyDirectives("") + .contentSecurityPolicy((csp) -> csp.policyDirectives("") ) ); return http.build(); @@ -1096,8 +1084,7 @@ public class HeadersConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .headers((headers) -> - headers + .headers((headers) -> headers .defaultsDisabled() .contentSecurityPolicy(withDefaults()) ); @@ -1132,8 +1119,7 @@ public class HeadersConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .headers((headers) -> - headers + .headers((headers) -> headers .defaultsDisabled() .referrerPolicy(Customizer.withDefaults()) ); @@ -1168,11 +1154,9 @@ public class HeadersConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .headers((headers) -> - headers + .headers((headers) -> headers .defaultsDisabled() - .referrerPolicy((referrerPolicy) -> - referrerPolicy.policy(ReferrerPolicy.SAME_ORIGIN) + .referrerPolicy((referrerPolicy) -> referrerPolicy.policy(ReferrerPolicy.SAME_ORIGIN) ) ); return http.build(); @@ -1308,8 +1292,7 @@ public class HeadersConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .headers((headers) -> - headers + .headers((headers) -> headers .defaultsDisabled() .httpStrictTransportSecurity((hstsConfig) -> hstsConfig.preload(true)) ); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityRequestMatchersTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityRequestMatchersTests.java index 747dabafe5..85d7838988 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityRequestMatchersTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityRequestMatchersTests.java @@ -336,8 +336,7 @@ public class HttpSecurityRequestMatchersTests { SecurityFilterChain filterChain(HttpSecurity http, HandlerMappingIntrospector introspector) throws Exception { // @formatter:off http - .securityMatchers((matchers) -> - matchers + .securityMatchers((secure) -> secure .requestMatchers(new MvcRequestMatcher(introspector, "/path")) ) .httpBasic(withDefaults()) @@ -409,8 +408,7 @@ public class HttpSecurityRequestMatchersTests { mvcMatcherBuilder.servletPath("/spring"); // @formatter:off http - .securityMatchers((matchers) -> - matchers + .securityMatchers((secure) -> secure .requestMatchers(mvcMatcherBuilder.pattern("/path")) .requestMatchers("/never-match") ) diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurerTests.java index 930b55b6c5..bd45bfc489 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurerTests.java @@ -212,8 +212,7 @@ public class JeeConfigurerTests { .authorizeRequests((authorize) -> authorize .anyRequest().hasRole("USER") ) - .jee((jee) -> - jee + .jee((jee) -> jee .mappableRoles("USER") ); return http.build(); @@ -233,8 +232,7 @@ public class JeeConfigurerTests { .authorizeRequests((authorize) -> authorize .anyRequest().hasRole("USER") ) - .jee((jee) -> - jee + .jee((jee) -> jee .mappableAuthorities("ROLE_USER") ); return http.build(); @@ -257,8 +255,7 @@ public class JeeConfigurerTests { .authorizeRequests((authorize) -> authorize .anyRequest().hasRole("USER") ) - .jee((jee) -> - jee + .jee((jee) -> jee .authenticatedUserDetailsService(authenticationUserDetailsService) ); return http.build(); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurerTests.java index b8414c53fd..294b962360 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurerTests.java @@ -431,8 +431,7 @@ public class LogoutConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .logout((logout) -> - logout.defaultLogoutSuccessHandlerFor(null, mock(RequestMatcher.class)) + .logout((logout) -> logout.defaultLogoutSuccessHandlerFor(null, mock(RequestMatcher.class)) ); return http.build(); // @formatter:on @@ -464,8 +463,7 @@ public class LogoutConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .logout((logout) -> - logout.defaultLogoutSuccessHandlerFor(mock(LogoutSuccessHandler.class), null) + .logout((logout) -> logout.defaultLogoutSuccessHandlerFor(mock(LogoutSuccessHandler.class), null) ); return http.build(); // @formatter:on diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpBasicTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpBasicTests.java index 2f83d45a13..ae7a9ae97f 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpBasicTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpBasicTests.java @@ -280,8 +280,7 @@ public class NamespaceHttpBasicTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .httpBasic((httpBasicConfig) -> - httpBasicConfig.authenticationDetailsSource(this.authenticationDetailsSource)); + .httpBasic((httpBasicConfig) -> httpBasicConfig.authenticationDetailsSource(this.authenticationDetailsSource)); return http.build(); // @formatter:on } @@ -326,8 +325,7 @@ public class NamespaceHttpBasicTests { .authorizeRequests((authorize) -> authorize .anyRequest().hasRole("USER") ) - .httpBasic((httpBasicConfig) -> - httpBasicConfig.authenticationEntryPoint(this.authenticationEntryPoint)); + .httpBasic((httpBasicConfig) -> httpBasicConfig.authenticationEntryPoint(this.authenticationEntryPoint)); return http.build(); // @formatter:on } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpLogoutTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpLogoutTests.java index 7f8858b964..d690d08632 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpLogoutTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpLogoutTests.java @@ -215,8 +215,7 @@ public class NamespaceHttpLogoutTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .logout((logout) -> - logout.deleteCookies("remove") + .logout((logout) -> logout.deleteCookies("remove") .invalidateHttpSession(false) .logoutUrl("/custom-logout") .logoutSuccessUrl("/logout-success") diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpServerAccessDeniedHandlerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpServerAccessDeniedHandlerTests.java index 67eba03574..ae941164f8 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpServerAccessDeniedHandlerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpServerAccessDeniedHandlerTests.java @@ -133,8 +133,7 @@ public class NamespaceHttpServerAccessDeniedHandlerTests { .authorizeRequests((authorize) -> authorize .anyRequest().denyAll() ) - .exceptionHandling((exceptionHandling) -> - exceptionHandling.accessDeniedPage("/AccessDeniedPageConfig") + .exceptionHandling((exceptionHandling) -> exceptionHandling.accessDeniedPage("/AccessDeniedPageConfig") ); return http.build(); // @formatter:on @@ -178,8 +177,7 @@ public class NamespaceHttpServerAccessDeniedHandlerTests { .authorizeRequests((authorize) -> authorize .anyRequest().denyAll() ) - .exceptionHandling((exceptionHandling) -> - exceptionHandling.accessDeniedHandler(accessDeniedHandler()) + .exceptionHandling((exceptionHandling) -> exceptionHandling.accessDeniedHandler(accessDeniedHandler()) ); return http.build(); // @formatter:on diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/PortMapperConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/PortMapperConfigurerTests.java index 8241948f98..46d22f931f 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/PortMapperConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/PortMapperConfigurerTests.java @@ -93,12 +93,10 @@ public class PortMapperConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .requiresChannel((requiresChannel) -> - requiresChannel + .requiresChannel((requiresChannel) -> requiresChannel .anyRequest().requiresSecure() ) - .portMapper((portMapper) -> - portMapper + .portMapper((portMapper) -> portMapper .http(543).mapsTo(123) ); return http.build(); @@ -117,12 +115,10 @@ public class PortMapperConfigurerTests { customPortMapper.setPortMappings(Collections.singletonMap("543", "123")); // @formatter:off http - .requiresChannel((requiresChannel) -> - requiresChannel + .requiresChannel((requiresChannel) -> requiresChannel .anyRequest().requiresSecure() ) - .portMapper((portMapper) -> - portMapper + .portMapper((portMapper) -> portMapper .portMapper(customPortMapper) ); return http.build(); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurerTests.java index 2859889e26..3694cb7cf6 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurerTests.java @@ -560,8 +560,7 @@ public class RememberMeConfigurerTests { .anyRequest().hasRole("USER") ) .formLogin(withDefaults()) - .rememberMe((rememberMe) -> - rememberMe + .rememberMe((rememberMe) -> rememberMe .rememberMeCookieDomain("spring.io") ); return http.build(); @@ -637,8 +636,7 @@ public class RememberMeConfigurerTests { .authorizeRequests((authorize) -> authorize .anyRequest().hasRole("USER") ) - .sessionManagement((sessionManagement) -> - sessionManagement + .sessionManagement((sessionManagement) -> sessionManagement .maximumSessions(1) ) .formLogin(withDefaults()) diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RequestCacheConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RequestCacheConfigurerTests.java index bd1fcdfd20..32e631a3ee 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RequestCacheConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RequestCacheConfigurerTests.java @@ -454,8 +454,7 @@ public class RequestCacheConfigurerTests { .anyRequest().authenticated() ) .formLogin(withDefaults()) - .requestCache((requestCache) -> - requestCache + .requestCache((requestCache) -> requestCache .requestCache(new NullRequestCache()) ); return http.build(); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RequestMatcherConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RequestMatcherConfigurerTests.java index c6a6f366b4..d28dca2d42 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RequestMatcherConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RequestMatcherConfigurerTests.java @@ -98,12 +98,10 @@ public class RequestMatcherConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .securityMatchers((matchers) -> - matchers + .securityMatchers((secure) -> secure .requestMatchers(new AntPathRequestMatcher("/api/**")) ) - .securityMatchers((matchers) -> - matchers + .securityMatchers((securityMatchers) -> securityMatchers .requestMatchers(new AntPathRequestMatcher("/oauth/**")) ) .authorizeRequests((authorize) -> authorize diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SecurityContextConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SecurityContextConfigurerTests.java index ad14a2c5d1..3db5551fa8 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SecurityContextConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SecurityContextConfigurerTests.java @@ -269,8 +269,7 @@ public class SecurityContextConfigurerTests { // @formatter:off http .formLogin(withDefaults()) - .securityContext((securityContext) -> - securityContext + .securityContext((securityContext) -> securityContext .securityContextRepository(new NullSecurityContextRepository()) ); // @formatter:on diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurerTests.java index e8465e2a5c..a17270793c 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurerTests.java @@ -359,8 +359,7 @@ public class ServletApiConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .servletApi((servletApi) -> - servletApi + .servletApi((servletApi) -> servletApi .rolePrefix("PERMISSION_") ); return http.build(); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerTests.java index 04ce689e96..9cec841c8b 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerTests.java @@ -629,8 +629,7 @@ public class SessionManagementConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .sessionManagement((sessionManagement) -> - sessionManagement + .sessionManagement((sessionManagement) -> sessionManagement .requireExplicitAuthenticationStrategy(false) .sessionFixation(SessionManagementConfigurer.SessionFixationConfigurer::newSession) ) @@ -678,10 +677,8 @@ public class SessionManagementConfigurerTests { // @formatter:off http .formLogin(withDefaults()) - .sessionManagement((sessionManagement) -> - sessionManagement - .sessionConcurrency((sessionConcurrency) -> - sessionConcurrency + .sessionManagement((sessionManagement) -> sessionManagement + .sessionConcurrency((sessionConcurrency) -> sessionConcurrency .maximumSessions(1) .maxSessionsPreventsLogin(true) ) @@ -741,8 +738,7 @@ public class SessionManagementConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .sessionManagement((sessionManagement) -> - sessionManagement + .sessionManagement((sessionManagement) -> sessionManagement .sessionCreationPolicy(SessionCreationPolicy.STATELESS) ); return http.build(); @@ -897,8 +893,7 @@ public class SessionManagementConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .sessionManagement((sessionManagement) -> - sessionManagement + .sessionManagement((sessionManagement) -> sessionManagement .sessionCreationPolicy(SessionCreationPolicy.STATELESS) ) .httpBasic(withDefaults()); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/X509ConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/X509ConfigurerTests.java index 7293eb32fa..8841e76258 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/X509ConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/X509ConfigurerTests.java @@ -280,8 +280,7 @@ public class X509ConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .x509((x509) -> - x509 + .x509((x509) -> x509 .subjectPrincipalRegex("CN=(.*?)@example.com(?:,|$)") ); // @formatter:on diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurerTests.java index 6cfbccb1ea..6428609517 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurerTests.java @@ -827,8 +827,7 @@ public class OAuth2LoginConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .oauth2Login((oauth2Login) -> - oauth2Login + .oauth2Login((oauth2) -> oauth2 .clientRegistrationRepository( new InMemoryClientRegistrationRepository(GOOGLE_CLIENT_REGISTRATION)) ); @@ -1029,11 +1028,9 @@ public class OAuth2LoginConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .oauth2Login((oauth2Login) -> - oauth2Login + .oauth2Login((oauth2) -> oauth2 .clientRegistrationRepository(this.clientRegistrationRepository) - .authorizationEndpoint((authorizationEndpoint) -> - authorizationEndpoint + .authorizationEndpoint((authorizationEndpoint) -> authorizationEndpoint .authorizationRequestResolver(this.resolver) ) ); @@ -1056,11 +1053,9 @@ public class OAuth2LoginConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .oauth2Login((oauth2Login) -> - oauth2Login + .oauth2Login((oauth2) -> oauth2 .clientRegistrationRepository(this.clientRegistrationRepository) - .authorizationEndpoint((authorizationEndpoint) -> - authorizationEndpoint + .authorizationEndpoint((authorizationEndpoint) -> authorizationEndpoint .authorizationRedirectStrategy(this.redirectStrategy) ) ); @@ -1083,11 +1078,9 @@ public class OAuth2LoginConfigurerTests { SecurityFilterChain configureFilterChain(HttpSecurity http) throws Exception { // @formatter:off http - .oauth2Login((oauth2Login) -> - oauth2Login + .oauth2Login((oauth2) -> oauth2 .clientRegistrationRepository(this.clientRegistrationRepository) - .authorizationEndpoint((authorizationEndpoint) -> - authorizationEndpoint + .authorizationEndpoint((authorizationEndpoint) -> authorizationEndpoint .authorizationRedirectStrategy(this.redirectStrategy) ) ); @@ -1159,8 +1152,7 @@ public class OAuth2LoginConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .oauth2Login((oauth2Login) -> - oauth2Login + .oauth2Login((oauth2) -> oauth2 .clientRegistrationRepository( new InMemoryClientRegistrationRepository(GOOGLE_CLIENT_REGISTRATION)) .loginPage("/custom-login") @@ -1343,18 +1335,14 @@ public class OAuth2LoginConfigurerTests { .authorizeHttpRequests((authorize) -> authorize .anyRequest().authenticated() ) - .securityContext((securityContext) -> - securityContext + .securityContext((securityContext) -> securityContext .securityContextRepository(securityContextRepository()) ) - .oauth2Login((oauth2Login) -> - oauth2Login - .tokenEndpoint((tokenEndpoint) -> - tokenEndpoint + .oauth2Login((oauth2) -> oauth2 + .tokenEndpoint((tokenEndpoint) -> tokenEndpoint .accessTokenResponseClient(createOauth2AccessTokenResponseClient()) ) - .userInfoEndpoint((userInfoEndpoint) -> - userInfoEndpoint + .userInfoEndpoint((userInfoEndpoint) -> userInfoEndpoint .userService(createOauth2UserService()) .oidcUserService(createOidcUserService()) ) diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/DPoPAuthenticationConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/DPoPAuthenticationConfigurerTests.java index 5dbdfa89de..703243430f 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/DPoPAuthenticationConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/DPoPAuthenticationConfigurerTests.java @@ -245,8 +245,7 @@ public class DPoPAuthenticationConfigurerTests { .requestMatchers("/resource2").hasAnyAuthority("SCOPE_resource2.read", "SCOPE_resource2.write") .anyRequest().authenticated() ) - .oauth2ResourceServer((oauth2ResourceServer) -> - oauth2ResourceServer + .oauth2ResourceServer((oauth2) -> oauth2 .jwt(Customizer.withDefaults())); // @formatter:on return http.build(); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java index db701a0080..a7d00de5d0 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java @@ -1580,8 +1580,7 @@ public class OAuth2ResourceServerConfigurerTests { .requestMatchers("/requires-read-scope").access("hasAuthority('SCOPE_message:read')") .anyRequest().authenticated() ) - .oauth2ResourceServer((oauth2ResourceServer) -> - oauth2ResourceServer + .oauth2ResourceServer((oauth2) -> oauth2 .jwt(withDefaults()) ); return http.build(); @@ -1632,10 +1631,8 @@ public class OAuth2ResourceServerConfigurerTests { .requestMatchers("/requires-read-scope").access("hasAuthority('SCOPE_message:read')") .anyRequest().authenticated() ) - .oauth2ResourceServer((oauth2ResourceServer) -> - oauth2ResourceServer - .jwt((jwt) -> - jwt + .oauth2ResourceServer((oauth2) -> oauth2 + .jwt((jwt) -> jwt .jwkSetUri(this.jwkSetUri) ) ); @@ -2122,10 +2119,8 @@ public class OAuth2ResourceServerConfigurerTests { .authorizeRequests((authorize) -> authorize .anyRequest().authenticated() ) - .oauth2ResourceServer((oauth2ResourceServer) -> - oauth2ResourceServer - .jwt((jwt) -> - jwt + .oauth2ResourceServer((oauth2) -> oauth2 + .jwt((jwt) -> jwt .decoder(decoder()) ) ); @@ -2386,8 +2381,7 @@ public class OAuth2ResourceServerConfigurerTests { .requestMatchers("/requires-read-scope").hasAuthority("SCOPE_message:read") .anyRequest().authenticated() ) - .oauth2ResourceServer((oauth2ResourceServer) -> - oauth2ResourceServer + .oauth2ResourceServer((oauth2) -> oauth2 .opaqueToken(withDefaults()) ); return http.build(); @@ -2431,10 +2425,8 @@ public class OAuth2ResourceServerConfigurerTests { .authorizeRequests((authorize) -> authorize .anyRequest().authenticated() ) - .oauth2ResourceServer((oauth2ResourceServer) -> - oauth2ResourceServer - .opaqueToken((opaqueToken) -> - opaqueToken + .oauth2ResourceServer((oauth2) -> oauth2 + .opaqueToken((opaqueToken) -> opaqueToken .authenticationManager(authenticationProvider()::authenticate) ) ); diff --git a/config/src/test/java/org/springframework/security/config/web/server/HeaderSpecTests.java b/config/src/test/java/org/springframework/security/config/web/server/HeaderSpecTests.java index 90ebcc1a2f..386f35bf69 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/HeaderSpecTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/HeaderSpecTests.java @@ -333,8 +333,7 @@ public class HeaderSpecTests { this.expectedHeaders.set(XXssProtectionServerHttpHeadersWriter.X_XSS_PROTECTION, "0"); // @formatter:off this.http.headers((headers) -> headers - .xssProtection((xssProtection) -> - xssProtection.headerValue(XXssProtectionServerHttpHeadersWriter.HeaderValue.DISABLED) + .xssProtection((xssProtection) -> xssProtection.headerValue(XXssProtectionServerHttpHeadersWriter.HeaderValue.DISABLED) )); // @formatter:on assertHeaders(); diff --git a/config/src/test/java/org/springframework/security/config/web/server/HttpsRedirectSpecTests.java b/config/src/test/java/org/springframework/security/config/web/server/HttpsRedirectSpecTests.java index f169f3b843..17d377bd31 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/HttpsRedirectSpecTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/HttpsRedirectSpecTests.java @@ -211,8 +211,7 @@ public class HttpsRedirectSpecTests { SecurityWebFilterChain springSecurity(ServerHttpSecurity http) { // @formatter:off http - .redirectToHttps((redirectToHttps) -> - redirectToHttps + .redirectToHttps((redirectToHttps) -> redirectToHttps .httpsRedirectWhen(new PathPatternParserServerWebExchangeMatcher("/secure")) ); // @formatter:on @@ -252,8 +251,7 @@ public class HttpsRedirectSpecTests { SecurityWebFilterChain springSecurity(ServerHttpSecurity http) { // @formatter:off http - .redirectToHttps((redirectToHttps) -> - redirectToHttps + .redirectToHttps((redirectToHttps) -> redirectToHttps .portMapper(portMapper()) ); // @formatter:on diff --git a/config/src/test/java/org/springframework/security/config/web/server/OAuth2ClientSpecTests.java b/config/src/test/java/org/springframework/security/config/web/server/OAuth2ClientSpecTests.java index b8af150999..45fe167cea 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/OAuth2ClientSpecTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/OAuth2ClientSpecTests.java @@ -377,8 +377,7 @@ public class OAuth2ClientSpecTests { SecurityWebFilterChain springSecurityFilter(ServerHttpSecurity http) { // @formatter:off http - .oauth2Client((oauth2Client) -> - oauth2Client + .oauth2Client((oauth2Client) -> oauth2Client .authenticationConverter(this.authenticationConverter) .authenticationManager(this.manager) .authorizationRequestRepository(this.authorizationRequestRepository)) diff --git a/config/src/test/java/org/springframework/security/config/web/server/OAuth2LoginTests.java b/config/src/test/java/org/springframework/security/config/web/server/OAuth2LoginTests.java index e4a6ad711f..33efb51810 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/OAuth2LoginTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/OAuth2LoginTests.java @@ -986,12 +986,10 @@ public class OAuth2LoginTests { SecurityWebFilterChain springSecurityFilter(ServerHttpSecurity http) { // @formatter:off http - .authorizeExchange((exchanges) -> - exchanges + .authorizeExchange((authorizeExchange) -> authorizeExchange .anyExchange().authenticated() ) - .oauth2Login((oauth2Login) -> - oauth2Login + .oauth2Login((oauth2) -> oauth2 .authenticationConverter(this.authenticationConverter) .authenticationManager(this.manager) .authenticationMatcher(this.matcher) diff --git a/config/src/test/java/org/springframework/security/config/web/server/OAuth2ResourceServerSpecTests.java b/config/src/test/java/org/springframework/security/config/web/server/OAuth2ResourceServerSpecTests.java index 2a62230c76..7c8fd3a427 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/OAuth2ResourceServerSpecTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/OAuth2ResourceServerSpecTests.java @@ -701,14 +701,11 @@ public class OAuth2ResourceServerSpecTests { SecurityWebFilterChain springSecurity(ServerHttpSecurity http) { // @formatter:off http - .authorizeExchange((exchanges) -> - exchanges + .authorizeExchange((authorizeExchange) -> authorizeExchange .anyExchange().hasAuthority("SCOPE_message:read") ) - .oauth2ResourceServer((oauth2ResourceServer) -> - oauth2ResourceServer - .jwt((jwt) -> - jwt + .oauth2ResourceServer((oauth2) -> oauth2 + .jwt((jwt) -> jwt .publicKey(publicKey()) ) ); @@ -782,10 +779,8 @@ public class OAuth2ResourceServerSpecTests { String jwkSetUri = mockWebServer().url("/.well-known/jwks.json").toString(); // @formatter:off http - .oauth2ResourceServer((oauth2ResourceServer) -> - oauth2ResourceServer - .jwt((jwt) -> - jwt + .oauth2ResourceServer((oauth2) -> oauth2 + .jwt((jwt) -> jwt .jwkSetUri(jwkSetUri) ) ); @@ -879,10 +874,8 @@ public class OAuth2ResourceServerSpecTests { SecurityWebFilterChain springSecurity(ServerHttpSecurity http) { // @formatter:off http - .oauth2ResourceServer((oauth2ResourceServer) -> - oauth2ResourceServer - .jwt((jwt) -> - jwt + .oauth2ResourceServer((oauth2) -> oauth2 + .jwt((jwt) -> jwt .authenticationManager(authenticationManager()) ) ); @@ -1078,10 +1071,8 @@ public class OAuth2ResourceServerSpecTests { String introspectionUri = mockWebServer().url("/introspect").toString(); // @formatter:off http - .oauth2ResourceServer((oauth2ResourceServer) -> - oauth2ResourceServer - .opaqueToken((opaqueToken) -> - opaqueToken + .oauth2ResourceServer((oauth2) -> oauth2 + .opaqueToken((opaqueToken) -> opaqueToken .introspectionUri(introspectionUri) .introspectionClientCredentials("client", "secret") )