Skip to content

Commit 777447e

Browse files
jzheauxjzheaux
committed
Format authorizeHttpRequests Blocks
This commit formats authorizeHttpRequests blocks to use the same parameter name and places the reference on the same line as the parameter. Issue gh-13067
1 parent cf6b52d commit 777447e

File tree

19 files changed

+62
-68
lines changed

19 files changed

+62
-68
lines changed

‎config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,7 @@
125125
* @Bean
126126
* public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
127127
* http
128-
* .authorizeHttpRequests((authorizeHttpRequests) ->
129-
* authorizeHttpRequests
128+
* .authorizeHttpRequests((authorize) -> authorize
130129
* .requestMatchers("/**").hasRole("USER")
131130
* )
132131
* .formLogin(withDefaults());
@@ -785,8 +784,7 @@ public HttpSecurity authorizeRequests(
785784
* @Bean
786785
* public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
787786
* http
788-
* .authorizeHttpRequests((authorizeHttpRequests) ->
789-
* authorizeHttpRequests
787+
* .authorizeHttpRequests((authorize) -> authorize
790788
* .requestMatchers("/**").hasRole("USER")
791789
* )
792790
* .formLogin(withDefaults());
@@ -822,8 +820,7 @@ public HttpSecurity authorizeRequests(
822820
* @Bean
823821
* public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
824822
* http
825-
* .authorizeHttpRequests((authorizeHttpRequests) ->
826-
* authorizeHttpRequests
823+
* .authorizeHttpRequests((authorize) -> authorize
827824
* .requestMatchers("/admin/**").hasRole("ADMIN")
828825
* .requestMatchers("/**").hasRole("USER")
829826
* )
@@ -860,8 +857,7 @@ public HttpSecurity authorizeRequests(
860857
* @Bean
861858
* public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
862859
* http
863-
* .authorizeHttpRequests((authorizeHttpRequests) ->
864-
* authorizeHttpRequests
860+
* .authorizeHttpRequests((authorize) -> authorize
865861
* .requestMatchers("/**").hasRole("USER")
866862
* .requestMatchers("/admin/**").hasRole("ADMIN")
867863
* );

‎config/src/test/java/org/springframework/security/config/annotation/web/configuration/DeferHttpSessionJavaConfigTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Service service() {
7878
DefaultSecurityFilterChain springSecurity(HttpSecurity http) throws Exception {
7979
// @formatter:off
8080
http
81-
.authorizeHttpRequests((requests) -> requests
81+
.authorizeHttpRequests((authorize) -> authorize
8282
.anyRequest().permitAll()
8383
)
8484
.sessionManagement((sessions) -> sessions

‎config/src/test/java/org/springframework/security/config/annotation/web/configuration/HttpSecurityConfigurationTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ static class AuthorizeHttpRequestsBeforeAuthorizeRequestsConfig {
524524
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
525525
// @formatter:off
526526
return http
527-
.authorizeHttpRequests((requests) -> requests
527+
.authorizeHttpRequests((authorize) -> authorize
528528
.anyRequest().authenticated()
529529
)
530530
.authorizeRequests((requests) -> requests
@@ -547,7 +547,7 @@ SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
547547
.authorizeRequests((requests) -> requests
548548
.anyRequest().authenticated()
549549
)
550-
.authorizeHttpRequests((requests) -> requests
550+
.authorizeHttpRequests((authorize) -> authorize
551551
.anyRequest().authenticated()
552552
)
553553
.build();
@@ -634,7 +634,7 @@ static class CustomContentNegotiationStrategyConfig {
634634
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
635635
// @formatter:off
636636
http
637-
.authorizeHttpRequests((requests) -> requests
637+
.authorizeHttpRequests((authorize) -> authorize
638638
.anyRequest().authenticated()
639639
);
640640
// @formatter:on

‎config/src/test/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurationTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -912,7 +912,7 @@ public SecurityFilterChain notAuthorized(HttpSecurity http) throws Exception {
912912
// @formatter:off
913913
http
914914
.securityMatchers((requests) -> requests.requestMatchers(PathPatternRequestMatcher.withDefaults().matcher("/user")))
915-
.authorizeHttpRequests((requests) -> requests.anyRequest().hasRole("USER"));
915+
.authorizeHttpRequests((authorize) -> authorize.anyRequest().hasRole("USER"));
916916
// @formatter:on
917917
return http.build();
918918
}
@@ -923,15 +923,15 @@ public SecurityFilterChain admin(HttpSecurity http) throws Exception {
923923
// @formatter:off
924924
http
925925
.securityMatchers((requests) -> requests.requestMatchers(PathPatternRequestMatcher.withDefaults().matcher("/admin")))
926-
.authorizeHttpRequests((requests) -> requests.anyRequest().hasRole("ADMIN"));
926+
.authorizeHttpRequests((authorize) -> authorize.anyRequest().hasRole("ADMIN"));
927927
// @formatter:on
928928
return http.build();
929929
}
930930

931931
@Bean
932932
@Order(Ordered.LOWEST_PRECEDENCE)
933933
public SecurityFilterChain permitAll(HttpSecurity http) throws Exception {
934-
http.authorizeHttpRequests((requests) -> requests.anyRequest().permitAll());
934+
http.authorizeHttpRequests((authorize) -> authorize.anyRequest().permitAll());
935935
return http.build();
936936
}
937937

‎config/src/test/java/org/springframework/security/config/annotation/web/configurers/AuthorizeHttpRequestsConfigurerTests.java‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -793,7 +793,7 @@ static class IncompleteMappingNoParameterConfig {
793793
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
794794
// @formatter:off
795795
http
796-
.authorizeHttpRequests((requests) -> requests
796+
.authorizeHttpRequests((authorize) -> authorize
797797
.anyRequest());
798798
// @formatter:on
799799

@@ -810,7 +810,7 @@ static class AfterAnyRequestConfig {
810810
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
811811
// @formatter:off
812812
return http
813-
.authorizeHttpRequests((requests) -> requests
813+
.authorizeHttpRequests((authorize) -> authorize
814814
.anyRequest().authenticated()
815815
.requestMatchers("/path").hasRole("USER")
816816
)
@@ -830,7 +830,7 @@ static class CustomAuthorizationManagerConfig {
830830
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
831831
// @formatter:off
832832
return http
833-
.authorizeHttpRequests((requests) -> requests
833+
.authorizeHttpRequests((authorize) -> authorize
834834
.anyRequest().access(authorizationManager)
835835
)
836836
.build();
@@ -849,7 +849,7 @@ static class CustomAuthorizationManagerNoParameterConfig {
849849
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
850850
// @formatter:off
851851
http
852-
.authorizeHttpRequests((requests) -> requests
852+
.authorizeHttpRequests((authorize) -> authorize
853853
.anyRequest().access(authorizationManager));
854854
// @formatter:on
855855

@@ -868,7 +868,7 @@ static class ObjectPostProcessorConfig {
868868
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
869869
// @formatter:off
870870
return http
871-
.authorizeHttpRequests((requests) -> requests
871+
.authorizeHttpRequests((authorize) -> authorize
872872
.anyRequest().authenticated()
873873
)
874874
.build();
@@ -900,7 +900,7 @@ SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
900900
// @formatter:off
901901
return http
902902
.httpBasic(withDefaults())
903-
.authorizeHttpRequests((requests) -> requests
903+
.authorizeHttpRequests((authorize) -> authorize
904904
.anyRequest().hasAnyAuthority("ROLE_USER")
905905
)
906906
.build();
@@ -918,7 +918,7 @@ SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
918918
// @formatter:off
919919
return http
920920
.httpBasic(withDefaults())
921-
.authorizeHttpRequests((requests) -> requests
921+
.authorizeHttpRequests((authorize) -> authorize
922922
.anyRequest().hasAuthority("ROLE_USER")
923923
)
924924
.build();
@@ -936,7 +936,7 @@ SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
936936
// @formatter:off
937937
return http
938938
.httpBasic(withDefaults())
939-
.authorizeHttpRequests((requests) -> requests
939+
.authorizeHttpRequests((authorize) -> authorize
940940
.anyRequest().hasAnyAuthority("ROLE_USER", "ROLE_ADMIN")
941941
)
942942
.build();
@@ -953,7 +953,7 @@ static class RoleUserConfig {
953953
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
954954
// @formatter:off
955955
return http
956-
.authorizeHttpRequests((requests) -> requests
956+
.authorizeHttpRequests((authorize) -> authorize
957957
.anyRequest().hasRole("USER")
958958
)
959959
.build();
@@ -970,7 +970,7 @@ static class RoleHierarchyUserConfig {
970970
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
971971
// @formatter:off
972972
return http
973-
.authorizeHttpRequests((requests) -> requests
973+
.authorizeHttpRequests((authorize) -> authorize
974974
.anyRequest().hasRole("USER")
975975
)
976976
.build();
@@ -994,7 +994,7 @@ static class RoleUserOrAdminConfig {
994994
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
995995
// @formatter:off
996996
return http
997-
.authorizeHttpRequests((requests) -> requests
997+
.authorizeHttpRequests((authorize) -> authorize
998998
.anyRequest().hasAnyRole("USER", "ADMIN")
999999
)
10001000
.build();
@@ -1012,7 +1012,7 @@ SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
10121012
// @formatter:off
10131013
return http
10141014
.httpBasic(withDefaults())
1015-
.authorizeHttpRequests((requests) -> requests
1015+
.authorizeHttpRequests((authorize) -> authorize
10161016
.anyRequest().denyAll()
10171017
)
10181018
.build();
@@ -1029,7 +1029,7 @@ static class PermitAllConfig {
10291029
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
10301030
// @formatter:off
10311031
return http
1032-
.authorizeHttpRequests((requests) -> requests
1032+
.authorizeHttpRequests((authorize) -> authorize
10331033
.anyRequest().permitAll()
10341034
)
10351035
.build();
@@ -1047,7 +1047,7 @@ SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
10471047
// @formatter:off
10481048
return http
10491049
.httpBasic(withDefaults())
1050-
.authorizeHttpRequests((requests) -> requests
1050+
.authorizeHttpRequests((authorize) -> authorize
10511051
.anyRequest().authenticated()
10521052
)
10531053
.authorizeHttpRequests(withDefaults())
@@ -1068,7 +1068,7 @@ SecurityFilterChain filterChain(HttpSecurity http, HandlerMappingIntrospector in
10681068
.servletPath("/spring");
10691069
// @formatter:off
10701070
return http
1071-
.authorizeHttpRequests((requests) -> requests
1071+
.authorizeHttpRequests((authorize) -> authorize
10721072
.requestMatchers(mvcMatcherBuilder.pattern("/")).hasRole("ADMIN")
10731073
)
10741074
.build();
@@ -1086,7 +1086,7 @@ SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
10861086
// @formatter:off
10871087
return http
10881088
.httpBasic(withDefaults())
1089-
.authorizeHttpRequests((requests) -> requests
1089+
.authorizeHttpRequests((authorize) -> authorize
10901090
.anyRequest().authenticated()
10911091
)
10921092
.build();
@@ -1109,7 +1109,7 @@ static class ExpressionRoleUserConfig {
11091109
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
11101110
// @formatter:off
11111111
return http
1112-
.authorizeHttpRequests((requests) -> requests
1112+
.authorizeHttpRequests((authorize) -> authorize
11131113
.anyRequest().access(new WebExpressionAuthorizationManager("hasRole('USER')"))
11141114
)
11151115
.build();
@@ -1126,7 +1126,7 @@ static class ExpressionRoleUserOrAdminConfig {
11261126
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
11271127
// @formatter:off
11281128
return http
1129-
.authorizeHttpRequests((requests) -> requests
1129+
.authorizeHttpRequests((authorize) -> authorize
11301130
.anyRequest().access(new WebExpressionAuthorizationManager("hasRole('USER') or hasRole('ADMIN')"))
11311131
)
11321132
.build();
@@ -1143,7 +1143,7 @@ static class ExpressionIpAddressLocalhostConfig {
11431143
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
11441144
// @formatter:off
11451145
return http
1146-
.authorizeHttpRequests((requests) -> requests
1146+
.authorizeHttpRequests((authorize) -> authorize
11471147
.anyRequest().access(new WebExpressionAuthorizationManager("hasIpAddress('127.0.0.1')"))
11481148
)
11491149
.build();
@@ -1162,7 +1162,7 @@ SecurityFilterChain chain(HttpSecurity http) throws Exception {
11621162
// @formatter:off
11631163
http
11641164
.httpBasic(withDefaults())
1165-
.authorizeHttpRequests((requests) -> requests
1165+
.authorizeHttpRequests((authorize) -> authorize
11661166
.requestMatchers("/user/{username}").access(new WebExpressionAuthorizationManager("#username == 'user'"))
11671167
.requestMatchers("/v2/user/{username}").hasVariable("username").equalTo(Authentication::getName)
11681168
);
@@ -1197,7 +1197,7 @@ SecurityFilterChain chain(HttpSecurity http) throws Exception {
11971197
http
11981198
.httpBasic(withDefaults())
11991199
.rememberMe(withDefaults())
1200-
.authorizeHttpRequests((requests) -> requests
1200+
.authorizeHttpRequests((authorize) -> authorize
12011201
.anyRequest().fullyAuthenticated()
12021202
);
12031203
// @formatter:on
@@ -1221,7 +1221,7 @@ SecurityFilterChain chain(HttpSecurity http) throws Exception {
12211221
http
12221222
.httpBasic(withDefaults())
12231223
.rememberMe(withDefaults())
1224-
.authorizeHttpRequests((requests) -> requests
1224+
.authorizeHttpRequests((authorize) -> authorize
12251225
.anyRequest().rememberMe()
12261226
);
12271227
// @formatter:on
@@ -1244,7 +1244,7 @@ SecurityFilterChain chain(HttpSecurity http) throws Exception {
12441244
// @formatter:off
12451245
http
12461246
.httpBasic(withDefaults())
1247-
.authorizeHttpRequests((requests) -> requests
1247+
.authorizeHttpRequests((authorize) -> authorize
12481248
.anyRequest().anonymous()
12491249
);
12501250
// @formatter:on
@@ -1262,7 +1262,7 @@ SecurityFilterChain chain(HttpSecurity http) throws Exception {
12621262
// @formatter:off
12631263
http
12641264
.httpBasic(withDefaults())
1265-
.authorizeHttpRequests((requests) -> requests
1265+
.authorizeHttpRequests((authorize) -> authorize
12661266
.anyRequest().not().authenticated()
12671267
);
12681268
// @formatter:on

‎config/src/test/java/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurerTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@ static class CustomPortResolverConfig {
724724
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
725725
// @formatter:off
726726
http
727-
.authorizeHttpRequests((requests) -> requests
727+
.authorizeHttpRequests((authorize) -> authorize
728728
.anyRequest().authenticated()
729729
)
730730
.formLogin(withDefaults())

‎config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityObservationTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ static class ObservationRegistryConfig {
8787

8888
@Bean
8989
SecurityFilterChain app(HttpSecurity http) throws Exception {
90-
http.httpBasic(withDefaults()).authorizeHttpRequests((requests) -> requests.anyRequest().authenticated());
90+
http.httpBasic(withDefaults()).authorizeHttpRequests((authorize) -> authorize.anyRequest().authenticated());
9191
return http.build();
9292
}
9393

‎config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecuritySecurityMatchersNoMvcTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ SecurityFilterChain appSecurity(HttpSecurity http) throws Exception {
123123
http
124124
.securityMatcher("/path")
125125
.httpBasic(withDefaults())
126-
.authorizeHttpRequests((requests) -> requests
126+
.authorizeHttpRequests((authorize) -> authorize
127127
.anyRequest().denyAll());
128128
// @formatter:on
129129
return http.build();

‎config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecuritySecurityMatchersTests.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ SecurityFilterChain first(HttpSecurity http) throws Exception {
226226
.requestMatchers("/test-1")
227227
.requestMatchers("/test-2")
228228
.requestMatchers("/test-3"))
229-
.authorizeHttpRequests((requests) -> requests
229+
.authorizeHttpRequests((authorize) -> authorize
230230
.anyRequest().denyAll())
231231
.httpBasic(withDefaults());
232232
// @formatter:on
@@ -239,7 +239,7 @@ SecurityFilterChain second(HttpSecurity http) throws Exception {
239239
http
240240
.securityMatchers((security) -> security
241241
.requestMatchers("/test-1"))
242-
.authorizeHttpRequests((requests) -> requests
242+
.authorizeHttpRequests((authorize) -> authorize
243243
.anyRequest().permitAll());
244244
// @formatter:on
245245
return http.build();
@@ -269,7 +269,7 @@ SecurityFilterChain appSecurity(HttpSecurity http) throws Exception {
269269
http
270270
.securityMatcher("/path")
271271
.httpBasic(withDefaults())
272-
.authorizeHttpRequests((requests) -> requests
272+
.authorizeHttpRequests((authorize) -> authorize
273273
.anyRequest().denyAll());
274274
// @formatter:on
275275
return http.build();
@@ -299,7 +299,7 @@ SecurityFilterChain appSecurity(HttpSecurity http) throws Exception {
299299
http
300300
.securityMatcher("/path")
301301
.httpBasic(withDefaults())
302-
.authorizeHttpRequests((requests) -> requests
302+
.authorizeHttpRequests((authorize) -> authorize
303303
.anyRequest().denyAll());
304304
// @formatter:on
305305
return http.build();
@@ -366,7 +366,7 @@ SecurityFilterChain appSecurity(HttpSecurity http, HandlerMappingIntrospector in
366366
.requestMatchers(mvcMatcherBuilder.pattern("/never-match"))
367367
)
368368
.httpBasic(withDefaults())
369-
.authorizeHttpRequests((requests) -> requests
369+
.authorizeHttpRequests((authorize) -> authorize
370370
.anyRequest().denyAll());
371371
// @formatter:on
372372
return http.build();

‎config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceRememberMeTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ SecurityFilterChain withoutKeyFilterChain(HttpSecurity http) throws Exception {
350350
// @formatter:off
351351
http
352352
.securityMatcher(new AntPathRequestMatcher("/without-key/**"))
353-
.authorizeHttpRequests((requests) -> requests.anyRequest().authenticated())
353+
.authorizeHttpRequests((authorize) -> authorize.anyRequest().authenticated())
354354
.formLogin((login) -> login
355355
.loginProcessingUrl("/without-key/login"))
356356
.rememberMe(withDefaults());

0 commit comments

Comments
 (0)