From cf6b52d6f75bf957cda6adf10201ce9e4acb69ce Mon Sep 17 00:00:00 2001 From: Josh Cummings <3627351+jzheaux@users.noreply.github.com> Date: Thu, 19 Jun 2025 16:55:21 -0600 Subject: [PATCH] Format authorizeRequests Blocks This commit changes all auhorizeRequests declarations to use the same variable name and declare the lambda parameter and reference on the same line. Issue gh-13067 --- .../configurers/AnonymousConfigurerTests.java | 6 ++--- .../configurers/AuthorizeRequestsTests.java | 12 ++++------ .../web/configurers/CorsConfigurerTests.java | 9 +++----- ...ingConfigurerAccessDeniedHandlerTests.java | 3 +-- .../configurers/FormLoginConfigurerTests.java | 9 +++----- .../configurers/HttpBasicConfigurerTests.java | 3 +-- .../HttpSecurityRequestMatchersTests.java | 6 ++--- .../web/configurers/JeeConfigurerTests.java | 9 +++----- .../configurers/NamespaceHttpBasicTests.java | 9 +++----- ...aceHttpServerAccessDeniedHandlerTests.java | 6 ++--- .../RememberMeConfigurerTests.java | 9 +++----- .../RequestCacheConfigurerTests.java | 9 +++----- .../RequestMatcherConfigurerTests.java | 3 +-- .../client/OAuth2ClientConfigurerTests.java | 3 +-- .../OAuth2ResourceServerConfigurerTests.java | 22 +++++++------------ 15 files changed, 40 insertions(+), 78 deletions(-) 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 49b5d7d962..7a6d0a94bd 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 @@ -147,8 +147,7 @@ public class AnonymousConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .anyRequest().permitAll() ) .anonymous(AbstractHttpConfigurer::disable); @@ -171,8 +170,7 @@ public class AnonymousConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .anyRequest().permitAll() ) .anonymous(withDefaults()); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AuthorizeRequestsTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AuthorizeRequestsTests.java index 0b79c086a7..992dc0de1f 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AuthorizeRequestsTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AuthorizeRequestsTests.java @@ -219,8 +219,7 @@ public class AuthorizeRequestsTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .requestMatchers(new AntPathRequestMatcher("/**", HttpMethod.POST.name())).denyAll() ); // @formatter:on @@ -349,8 +348,7 @@ public class AuthorizeRequestsTests { // @formatter:off http .httpBasic(withDefaults()) - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .requestMatchers("/path").denyAll() ); // @formatter:on @@ -421,8 +419,7 @@ public class AuthorizeRequestsTests { // @formatter:off http .httpBasic(withDefaults()) - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .requestMatchers(mvcMatcherBuilder.pattern("/path")).denyAll() ); // @formatter:on @@ -489,8 +486,7 @@ public class AuthorizeRequestsTests { // @formatter:off http .httpBasic(withDefaults()) - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .requestMatchers("/user/{userName}").access("#userName == 'user'") ); // @formatter:on diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CorsConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CorsConfigurerTests.java index a7935fdde5..bcb7e2e82b 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CorsConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CorsConfigurerTests.java @@ -251,8 +251,7 @@ public class CorsConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .anyRequest().authenticated() ) .cors(withDefaults()); @@ -308,8 +307,7 @@ public class CorsConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .anyRequest().authenticated() ) .cors(withDefaults()); @@ -364,8 +362,7 @@ public class CorsConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .anyRequest().authenticated() ) .cors(withDefaults()); 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 5b92a1af89..b4f9ec3a08 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 @@ -113,8 +113,7 @@ public class ExceptionHandlingConfigurerAccessDeniedHandlerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .anyRequest().denyAll() ) .exceptionHandling((exceptionHandling) -> 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 8401ef354e..2adfb030b0 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 @@ -453,8 +453,7 @@ public class FormLoginConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .anyRequest().hasRole("USER") ) .formLogin(withDefaults()); @@ -516,8 +515,7 @@ public class FormLoginConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .anyRequest().hasRole("USER") ) .formLogin((formLogin) -> @@ -572,8 +570,7 @@ public class FormLoginConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .anyRequest().authenticated() ) .formLogin((formLogin) -> diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurerTests.java index ce019a7f1d..c898e973c7 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurerTests.java @@ -250,8 +250,7 @@ public class HttpBasicConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .anyRequest().authenticated() ) .httpBasic(withDefaults()); 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 73a03f4cad..747dabafe5 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 @@ -341,8 +341,7 @@ public class HttpSecurityRequestMatchersTests { .requestMatchers(new MvcRequestMatcher(introspector, "/path")) ) .httpBasic(withDefaults()) - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .anyRequest().denyAll() ); return http.build(); @@ -416,8 +415,7 @@ public class HttpSecurityRequestMatchersTests { .requestMatchers("/never-match") ) .httpBasic(withDefaults()) - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .anyRequest().denyAll() ); return http.build(); 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 527933f178..930b55b6c5 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 @@ -209,8 +209,7 @@ public class JeeConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .anyRequest().hasRole("USER") ) .jee((jee) -> @@ -231,8 +230,7 @@ public class JeeConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .anyRequest().hasRole("USER") ) .jee((jee) -> @@ -256,8 +254,7 @@ public class JeeConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .anyRequest().hasRole("USER") ) .jee((jee) -> 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 c1fa89078a..2f83d45a13 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 @@ -200,8 +200,7 @@ public class NamespaceHttpBasicTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .anyRequest().hasRole("USER") ) .httpBasic(withDefaults()); @@ -236,8 +235,7 @@ public class NamespaceHttpBasicTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .anyRequest().hasRole("USER") ) .httpBasic((httpBasicConfig) -> httpBasicConfig.realmName("Custom Realm")); @@ -325,8 +323,7 @@ public class NamespaceHttpBasicTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .anyRequest().hasRole("USER") ) .httpBasic((httpBasicConfig) -> 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 8980c95c8c..67eba03574 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 @@ -130,8 +130,7 @@ public class NamespaceHttpServerAccessDeniedHandlerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .anyRequest().denyAll() ) .exceptionHandling((exceptionHandling) -> @@ -176,8 +175,7 @@ public class NamespaceHttpServerAccessDeniedHandlerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .anyRequest().denyAll() ) .exceptionHandling((exceptionHandling) -> 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 73be687d53..2859889e26 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 @@ -508,8 +508,7 @@ public class RememberMeConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .anyRequest().hasRole("USER") ) .formLogin(withDefaults()) @@ -557,8 +556,7 @@ public class RememberMeConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .anyRequest().hasRole("USER") ) .formLogin(withDefaults()) @@ -636,8 +634,7 @@ public class RememberMeConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .anyRequest().hasRole("USER") ) .sessionManagement((sessionManagement) -> 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 f22d69e1a3..3c30f762a4 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 @@ -412,8 +412,7 @@ public class RequestCacheConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .anyRequest().authenticated() ) .formLogin(withDefaults()) @@ -432,8 +431,7 @@ public class RequestCacheConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .anyRequest().authenticated() ) .formLogin(withDefaults()) @@ -452,8 +450,7 @@ public class RequestCacheConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .anyRequest().authenticated() ) .formLogin(withDefaults()) 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 f8b18381be..c6a6f366b4 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 @@ -106,8 +106,7 @@ public class RequestMatcherConfigurerTests { matchers .requestMatchers(new AntPathRequestMatcher("/oauth/**")) ) - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .anyRequest().denyAll() ); return http.build(); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2ClientConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2ClientConfigurerTests.java index 15f011de74..e33f1f9760 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2ClientConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2ClientConfigurerTests.java @@ -399,8 +399,7 @@ public class OAuth2ClientConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .anyRequest().authenticated() ) .oauth2Client(withDefaults()); 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 c7c31aa5e4..db701a0080 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 @@ -1395,10 +1395,9 @@ public class OAuth2ResourceServerConfigurerTests { context.registerBean("converterOne", JwtAuthenticationConverter.class, () -> converterBean); context.registerBean("converterTwo", JwtAuthenticationConverter.class, () -> converterBean); this.spring.context(context).autowire(); - new OAuth2ResourceServerConfigurer(context).jwt((jwt) -> { - assertThatExceptionOfType(NoUniqueBeanDefinitionException.class) - .isThrownBy(jwt::getJwtAuthenticationConverter); - }); + new OAuth2ResourceServerConfigurer(context) + .jwt((jwt) -> assertThatExceptionOfType(NoUniqueBeanDefinitionException.class) + .isThrownBy(jwt::getJwtAuthenticationConverter)); } @Test @@ -1577,8 +1576,7 @@ public class OAuth2ResourceServerConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .requestMatchers("/requires-read-scope").access("hasAuthority('SCOPE_message:read')") .anyRequest().authenticated() ) @@ -1630,8 +1628,7 @@ public class OAuth2ResourceServerConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .requestMatchers("/requires-read-scope").access("hasAuthority('SCOPE_message:read')") .anyRequest().authenticated() ) @@ -2122,8 +2119,7 @@ public class OAuth2ResourceServerConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .anyRequest().authenticated() ) .oauth2ResourceServer((oauth2ResourceServer) -> @@ -2386,8 +2382,7 @@ public class OAuth2ResourceServerConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .requestMatchers("/requires-read-scope").hasAuthority("SCOPE_message:read") .anyRequest().authenticated() ) @@ -2433,8 +2428,7 @@ public class OAuth2ResourceServerConfigurerTests { SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .authorizeRequests((authorizeRequests) -> - authorizeRequests + .authorizeRequests((authorize) -> authorize .anyRequest().authenticated() ) .oauth2ResourceServer((oauth2ResourceServer) ->