Skip to content

Commit cf6b52d

Browse files
jzheauxjzheaux
committed
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
1 parent 5dd40a7 commit cf6b52d

15 files changed

+40
-78
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,7 @@ static class AnonymousDisabledInLambdaConfig {
147147
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
148148
// @formatter:off
149149
http
150-
.authorizeRequests((authorizeRequests) ->
151-
authorizeRequests
150+
.authorizeRequests((authorize) -> authorize
152151
.anyRequest().permitAll()
153152
)
154153
.anonymous(AbstractHttpConfigurer::disable);
@@ -171,8 +170,7 @@ static class AnonymousWithDefaultsInLambdaConfig {
171170
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
172171
// @formatter:off
173172
http
174-
.authorizeRequests((authorizeRequests) ->
175-
authorizeRequests
173+
.authorizeRequests((authorize) -> authorize
176174
.anyRequest().permitAll()
177175
)
178176
.anonymous(withDefaults());

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,7 @@ static class AntMatchersNoPatternsInLambdaConfig {
219219
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
220220
// @formatter:off
221221
http
222-
.authorizeRequests((authorizeRequests) ->
223-
authorizeRequests
222+
.authorizeRequests((authorize) -> authorize
224223
.requestMatchers(new AntPathRequestMatcher("/**", HttpMethod.POST.name())).denyAll()
225224
);
226225
// @formatter:on
@@ -349,8 +348,7 @@ SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
349348
// @formatter:off
350349
http
351350
.httpBasic(withDefaults())
352-
.authorizeRequests((authorizeRequests) ->
353-
authorizeRequests
351+
.authorizeRequests((authorize) -> authorize
354352
.requestMatchers("/path").denyAll()
355353
);
356354
// @formatter:on
@@ -421,8 +419,7 @@ SecurityFilterChain filterChain(HttpSecurity http, HandlerMappingIntrospector in
421419
// @formatter:off
422420
http
423421
.httpBasic(withDefaults())
424-
.authorizeRequests((authorizeRequests) ->
425-
authorizeRequests
422+
.authorizeRequests((authorize) -> authorize
426423
.requestMatchers(mvcMatcherBuilder.pattern("/path")).denyAll()
427424
);
428425
// @formatter:on
@@ -489,8 +486,7 @@ SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
489486
// @formatter:off
490487
http
491488
.httpBasic(withDefaults())
492-
.authorizeRequests((authorizeRequests) ->
493-
authorizeRequests
489+
.authorizeRequests((authorize) -> authorize
494490
.requestMatchers("/user/{userName}").access("#userName == 'user'")
495491
);
496492
// @formatter:on

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,7 @@ static class MvcCorsInLambdaConfig {
251251
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
252252
// @formatter:off
253253
http
254-
.authorizeRequests((authorizeRequests) ->
255-
authorizeRequests
254+
.authorizeRequests((authorize) -> authorize
256255
.anyRequest().authenticated()
257256
)
258257
.cors(withDefaults());
@@ -308,8 +307,7 @@ static class ConfigSourceInLambdaConfig {
308307
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
309308
// @formatter:off
310309
http
311-
.authorizeRequests((authorizeRequests) ->
312-
authorizeRequests
310+
.authorizeRequests((authorize) -> authorize
313311
.anyRequest().authenticated()
314312
)
315313
.cors(withDefaults());
@@ -364,8 +362,7 @@ static class CorsFilterInLambdaConfig {
364362
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
365363
// @formatter:off
366364
http
367-
.authorizeRequests((authorizeRequests) ->
368-
authorizeRequests
365+
.authorizeRequests((authorize) -> authorize
369366
.anyRequest().authenticated()
370367
)
371368
.cors(withDefaults());

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ static class RequestMatcherBasedAccessDeniedHandlerInLambdaConfig {
113113
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
114114
// @formatter:off
115115
http
116-
.authorizeRequests((authorizeRequests) ->
117-
authorizeRequests
116+
.authorizeRequests((authorize) -> authorize
118117
.anyRequest().denyAll()
119118
)
120119
.exceptionHandling((exceptionHandling) ->

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -453,8 +453,7 @@ static class FormLoginInLambdaConfig {
453453
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
454454
// @formatter:off
455455
http
456-
.authorizeRequests((authorizeRequests) ->
457-
authorizeRequests
456+
.authorizeRequests((authorize) -> authorize
458457
.anyRequest().hasRole("USER")
459458
)
460459
.formLogin(withDefaults());
@@ -516,8 +515,7 @@ static class FormLoginDefaultsInLambdaConfig {
516515
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
517516
// @formatter:off
518517
http
519-
.authorizeRequests((authorizeRequests) ->
520-
authorizeRequests
518+
.authorizeRequests((authorize) -> authorize
521519
.anyRequest().hasRole("USER")
522520
)
523521
.formLogin((formLogin) ->
@@ -572,8 +570,7 @@ static class FormLoginLoginProcessingUrlInLambdaConfig {
572570
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
573571
// @formatter:off
574572
http
575-
.authorizeRequests((authorizeRequests) ->
576-
authorizeRequests
573+
.authorizeRequests((authorize) -> authorize
577574
.anyRequest().authenticated()
578575
)
579576
.formLogin((formLogin) ->

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,7 @@ static class DefaultsLambdaEntryPointConfig {
250250
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
251251
// @formatter:off
252252
http
253-
.authorizeRequests((authorizeRequests) ->
254-
authorizeRequests
253+
.authorizeRequests((authorize) -> authorize
255254
.anyRequest().authenticated()
256255
)
257256
.httpBasic(withDefaults());

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -341,8 +341,7 @@ SecurityFilterChain filterChain(HttpSecurity http, HandlerMappingIntrospector in
341341
.requestMatchers(new MvcRequestMatcher(introspector, "/path"))
342342
)
343343
.httpBasic(withDefaults())
344-
.authorizeRequests((authorizeRequests) ->
345-
authorizeRequests
344+
.authorizeRequests((authorize) -> authorize
346345
.anyRequest().denyAll()
347346
);
348347
return http.build();
@@ -416,8 +415,7 @@ SecurityFilterChain filterChain(HttpSecurity http, HandlerMappingIntrospector in
416415
.requestMatchers("/never-match")
417416
)
418417
.httpBasic(withDefaults())
419-
.authorizeRequests((authorizeRequests) ->
420-
authorizeRequests
418+
.authorizeRequests((authorize) -> authorize
421419
.anyRequest().denyAll()
422420
);
423421
return http.build();

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,7 @@ public static class JeeMappableRolesConfig {
209209
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
210210
// @formatter:off
211211
http
212-
.authorizeRequests((authorizeRequests) ->
213-
authorizeRequests
212+
.authorizeRequests((authorize) -> authorize
214213
.anyRequest().hasRole("USER")
215214
)
216215
.jee((jee) ->
@@ -231,8 +230,7 @@ public static class JeeMappableAuthoritiesConfig {
231230
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
232231
// @formatter:off
233232
http
234-
.authorizeRequests((authorizeRequests) ->
235-
authorizeRequests
233+
.authorizeRequests((authorize) -> authorize
236234
.anyRequest().hasRole("USER")
237235
)
238236
.jee((jee) ->
@@ -256,8 +254,7 @@ public static class JeeCustomAuthenticatedUserDetailsServiceConfig {
256254
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
257255
// @formatter:off
258256
http
259-
.authorizeRequests((authorizeRequests) ->
260-
authorizeRequests
257+
.authorizeRequests((authorize) -> authorize
261258
.anyRequest().hasRole("USER")
262259
)
263260
.jee((jee) ->

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,7 @@ static class HttpBasicLambdaConfig {
200200
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
201201
// @formatter:off
202202
http
203-
.authorizeRequests((authorizeRequests) ->
204-
authorizeRequests
203+
.authorizeRequests((authorize) -> authorize
205204
.anyRequest().hasRole("USER")
206205
)
207206
.httpBasic(withDefaults());
@@ -236,8 +235,7 @@ static class CustomHttpBasicLambdaConfig {
236235
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
237236
// @formatter:off
238237
http
239-
.authorizeRequests((authorizeRequests) ->
240-
authorizeRequests
238+
.authorizeRequests((authorize) -> authorize
241239
.anyRequest().hasRole("USER")
242240
)
243241
.httpBasic((httpBasicConfig) -> httpBasicConfig.realmName("Custom Realm"));
@@ -325,8 +323,7 @@ static class EntryPointRefHttpBasicLambdaConfig {
325323
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
326324
// @formatter:off
327325
http
328-
.authorizeRequests((authorizeRequests) ->
329-
authorizeRequests
326+
.authorizeRequests((authorize) -> authorize
330327
.anyRequest().hasRole("USER")
331328
)
332329
.httpBasic((httpBasicConfig) ->

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,7 @@ static class AccessDeniedPageInLambdaConfig {
130130
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
131131
// @formatter:off
132132
http
133-
.authorizeRequests((authorizeRequests) ->
134-
authorizeRequests
133+
.authorizeRequests((authorize) -> authorize
135134
.anyRequest().denyAll()
136135
)
137136
.exceptionHandling((exceptionHandling) ->
@@ -176,8 +175,7 @@ static class AccessDeniedHandlerRefInLambdaConfig {
176175
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
177176
// @formatter:off
178177
http
179-
.authorizeRequests((authorizeRequests) ->
180-
authorizeRequests
178+
.authorizeRequests((authorize) -> authorize
181179
.anyRequest().denyAll()
182180
)
183181
.exceptionHandling((exceptionHandling) ->

0 commit comments

Comments
 (0)