Update HttpSecurity Formatting

reactive/webflux/java/authentication/username-password/form/src/main/java/example/WebfluxFormSecurityConfiguration.java

@@ -53,7 +53,7 @@ public class WebfluxFormSecurityConfiguration {
 	SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) {
 		// @formatter:off
 		http
-			.authorizeExchange((exchanges) -> exchanges
+			.authorizeExchange((authorize) -> authorize
 				.pathMatchers("/login").permitAll()
 				.anyExchange().authenticated()
 			)

reactive/webflux/java/authentication/x509/src/main/java/example/WebfluxX509Application.java

@@ -53,7 +53,7 @@ public class WebfluxX509Application {
 		// @formatter:off
 		http
 			.x509(withDefaults())
-			.authorizeExchange((exchanges) -> exchanges
+			.authorizeExchange((authorize) -> authorize
 				.anyExchange().authenticated()
 			);
 		// @formatter:on

reactive/webflux/java/hello-security-explicit/src/main/java/example/SecurityConfiguration.java

@@ -39,7 +39,7 @@ public class SecurityConfiguration {
 	SecurityWebFilterChain springWebFilterChain(ServerHttpSecurity http) {
 		// @formatter:off
 		http
-			.authorizeExchange((exchanges) -> exchanges
+			.authorizeExchange((authorize) -> authorize
 				.anyExchange().authenticated()
 			)
 			.formLogin(withDefaults());

reactive/webflux/java/method/src/main/java/example/SecurityConfiguration.java

@@ -45,7 +45,7 @@ public class SecurityConfiguration {
 		http
 			// Demonstrate that method security works
 			// Best practice to use both for defense in depth
-			.authorizeExchange((exchanges) -> exchanges
+			.authorizeExchange((authorize) -> authorize
 				.anyExchange().permitAll()
 			)
 			.httpBasic(withDefaults());

reactive/webflux/java/oauth2/resource-server/src/main/java/example/SecurityConfiguration.java

@@ -37,7 +37,7 @@ public class SecurityConfiguration {
 	SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) {
 		// @formatter:off
 		http
-			.authorizeExchange((exchanges) -> exchanges
+			.authorizeExchange((authorize) -> authorize
 				.pathMatchers(HttpMethod.GET, "/message/**").hasAuthority("SCOPE_message:read")
 				.pathMatchers(HttpMethod.POST, "/message/**").hasAuthority("SCOPE_message:write")
 				.anyExchange().authenticated()

reactive/webflux/java/oauth2/webclient/src/main/java/example/SecurityConfiguration.java

@@ -37,7 +37,7 @@ public class SecurityConfiguration {
 	SecurityWebFilterChain configure(ServerHttpSecurity http) {
 		// @formatter:off
 		http
-			.authorizeExchange((exchanges) -> exchanges
+			.authorizeExchange((authorize) -> authorize
 				.pathMatchers("/", "/public/**").permitAll()
 				.anyExchange().authenticated()
 			)

servlet/java-configuration/authentication/preauth/src/main/java/example/SecurityConfiguration.java

@@ -31,15 +31,11 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
 	@Override
 	protected void configure(HttpSecurity http) throws Exception {
 		http
-				.authorizeRequests((authorizeRequests) ->
+			.authorizeRequests((authorize) -> authorize
-						authorizeRequests
+				.antMatchers("/login", "/resources/**").permitAll()
-								.antMatchers("/login", "/resources/**").permitAll()
+				.anyRequest().authenticated()
-								.anyRequest().authenticated()
+			)
-				)
+			.jee((jee) -> jee.mappableRoles("USER", "ADMIN"));
-				.jee((jee) ->
-						jee
-								.mappableRoles("USER", "ADMIN")
-				);
 	}
 	// @formatter:on
 

servlet/java-configuration/authentication/remember-me/src/main/java/example/SecurityConfiguration.java

@@ -33,8 +33,8 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
 	// @formatter:off
 	protected void configure(HttpSecurity http) throws Exception {
 		http
-			.authorizeRequests((requests) -> requests
+			.authorizeRequests((authorize) -> authorize
-					.anyRequest().authenticated()
+				.anyRequest().authenticated()
 			)
 			.formLogin((form) -> form
 				.loginPage("/login")

servlet/java-configuration/authentication/username-password/form/src/main/java/example/SecurityConfiguration.java

@@ -31,7 +31,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
 	// @formatter:off
 	protected void configure(HttpSecurity http) throws Exception {
 		http
-			.authorizeRequests((requests) -> requests
+			.authorizeRequests((authorize) -> authorize
 				.anyRequest().authenticated()
 			)
 			.formLogin((form) -> form

servlet/java-configuration/authentication/x509/src/main/java/example/SecurityConfiguration.java

@@ -33,9 +33,8 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
 	// @formatter:off
 	protected void configure(HttpSecurity http) throws Exception {
 		http
-			.authorizeRequests((authorizeRequests) ->
+			.authorizeRequests((authorize) -> authorize
-					authorizeRequests
+				.anyRequest().authenticated()
-							.anyRequest().authenticated()
 			)
 			.x509(withDefaults());
 	}

servlet/java-configuration/hello-mvc-security/src/main/java/example/SecurityConfiguration.java

@@ -33,11 +33,11 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
 	// @formatter:off
 	protected void configure(HttpSecurity http) throws Exception {
 		http
-				.authorizeRequests((requests) -> requests
+			.authorizeRequests((authorize) -> authorize
-						.anyRequest().authenticated()
+				.anyRequest().authenticated()
-				)
+			)
-				.httpBasic(withDefaults())
+			.httpBasic(withDefaults())
-				.formLogin(withDefaults());
+			.formLogin(withDefaults());
 	}
 	// @formatter:on
 

servlet/java-configuration/hello-security-explicit/src/main/java/example/SecurityConfiguration.java

@@ -33,11 +33,11 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
 	// @formatter:off
 	protected void configure(HttpSecurity http) throws Exception {
 		http
-				.authorizeRequests((requests) -> requests
+			.authorizeRequests((authorize) -> authorize
-						.anyRequest().authenticated()
+				.anyRequest().authenticated()
-				)
+			)
-				.httpBasic(withDefaults())
+			.httpBasic(withDefaults())
-				.formLogin(withDefaults());
+			.formLogin(withDefaults());
 	}
 	// @formatter:on
 

servlet/java-configuration/max-sessions/src/main/java/example/SecurityConfiguration.java

@@ -48,7 +48,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
 	@Override
 	protected void configure(HttpSecurity http) throws Exception {
 		http
-			.authorizeRequests((requests) -> requests
+			.authorizeRequests((authorize) -> authorize
 				.anyRequest().authenticated()
 			)
 			.formLogin(withDefaults())

servlet/spring-boot/java/authentication/username-password/mfa/src/main/java/example/SecurityConfig.java

@@ -44,19 +44,26 @@ public class SecurityConfig {
 	SecurityFilterChain web(HttpSecurity http,
 			AuthorizationManager<RequestAuthorizationContext> mfaAuthorizationManager) throws Exception {
 		MfaAuthenticationHandler mfaAuthenticationHandler = new MfaAuthenticationHandler("/second-factor");
-		http.authorizeHttpRequests((authz) -> authz.mvcMatchers("/second-factor", "/third-factor")
+		// @formatter:off
-				.access(mfaAuthorizationManager).anyRequest().authenticated())
+		http
-				.formLogin((form) -> form.successHandler(mfaAuthenticationHandler)
+			.authorizeHttpRequests((authorize) -> authorize
-						.failureHandler(mfaAuthenticationHandler))
+				.mvcMatchers("/second-factor", "/third-factor").access(mfaAuthorizationManager)
-				.exceptionHandling((exceptions) -> exceptions
+				.anyRequest().authenticated()
-						.withObjectPostProcessor(new ObjectPostProcessor<ExceptionTranslationFilter>() {
+			)
-							@Override
+			.formLogin((form) -> form
-							public <O extends ExceptionTranslationFilter> O postProcess(O filter) {
+				.successHandler(mfaAuthenticationHandler)
-								filter.setAuthenticationTrustResolver(new MfaTrustResolver());
+				.failureHandler(mfaAuthenticationHandler)
-								return filter;
+			)
-							}
+			.exceptionHandling((exceptions) -> exceptions
-						}));
+				.withObjectPostProcessor(new ObjectPostProcessor<ExceptionTranslationFilter>() {
-
+					@Override
+					public <O extends ExceptionTranslationFilter> O postProcess(O filter) {
+						filter.setAuthenticationTrustResolver(new MfaTrustResolver());
+						return filter;
+					}
+				})
+			);
+		// @formatter:on
 		return http.build();
 	}
 

servlet/spring-boot/java/hello-security-explicit/src/main/java/example/SecurityConfiguration.java

@@ -40,7 +40,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
 	// @formatter:off
 	protected void configure(HttpSecurity http) throws Exception {
 		http
-			.authorizeRequests((requests) -> requests
+			.authorizeRequests((authorize) -> authorize
 				.anyRequest().authenticated()
 			)
 			.httpBasic(withDefaults())

servlet/spring-boot/java/jwt/login/src/main/java/example/RestConfig.java

@@ -61,7 +61,10 @@ public class RestConfig extends WebSecurityConfigurerAdapter {
 	@Override
 	protected void configure(HttpSecurity http) throws Exception {
 		// @formatter:off
-		http.authorizeRequests((authz) -> authz.anyRequest().authenticated())
+		http
+			.authorizeRequests((authorize) -> authorize
+				.anyRequest().authenticated()
+			)
 			.csrf((csrf) -> csrf.ignoringAntMatchers("/token"))
 			.httpBasic(Customizer.withDefaults())
 			.oauth2ResourceServer(OAuth2ResourceServerConfigurer::jwt)

servlet/spring-boot/java/oauth2/authorization-server/src/main/java/example/OAuth2AuthorizationServerSecurityConfiguration.java

@@ -72,7 +72,9 @@ public class OAuth2AuthorizationServerSecurityConfiguration {
 	public SecurityFilterChain standardSecurityFilterChain(HttpSecurity http) throws Exception {
 		// @formatter:off
 		http
-			.authorizeRequests((requests) -> requests.anyRequest().authenticated())
+			.authorizeRequests((authorize) -> authorize
+				.anyRequest().authenticated()
+			)
 			.formLogin(Customizer.withDefaults());
 		// @formatter:on
 

servlet/spring-boot/java/oauth2/login/src/integTest/java/example/OAuth2LoginApplicationTests.java

@@ -334,16 +334,12 @@ public class OAuth2LoginApplicationTests {
 		@Override
 		protected void configure(HttpSecurity http) throws Exception {
 			http
-				.authorizeRequests((requests) -> requests
+				.authorizeRequests((authorize) -> authorize
 					.anyRequest().authenticated()
 				)
 				.oauth2Login((oauth2) -> oauth2
-					.tokenEndpoint((tokens) -> tokens
+					.tokenEndpoint((token) -> token.accessTokenResponseClient(mockAccessTokenResponseClient()))
-						.accessTokenResponseClient(this.mockAccessTokenResponseClient())
+					.userInfoEndpoint((userInfo) -> userInfo.userService(mockUserService()))
-					)
-					.userInfoEndpoint((userInfo) -> userInfo
-						.userService(this.mockUserService())
-					)
 				);
 		}
 		// @formatter:on

servlet/spring-boot/java/oauth2/resource-server/hello-security/src/main/java/example/OAuth2ResourceServerSecurityConfiguration.java

@@ -40,11 +40,10 @@ public class OAuth2ResourceServerSecurityConfiguration extends WebSecurityConfig
 	protected void configure(HttpSecurity http) throws Exception {
 		// @formatter:off
 		http
-			.authorizeRequests((requests) ->
+			.authorizeRequests((authorize) -> authorize
-				requests
+				.antMatchers(HttpMethod.GET, "/message/**").hasAuthority("SCOPE_message:read")
-					.antMatchers(HttpMethod.GET, "/message/**").hasAuthority("SCOPE_message:read")
+				.antMatchers(HttpMethod.POST, "/message/**").hasAuthority("SCOPE_message:write")
-					.antMatchers(HttpMethod.POST, "/message/**").hasAuthority("SCOPE_message:write")
+				.anyRequest().authenticated()
-					.anyRequest().authenticated()
 			)
 			.oauth2ResourceServer(OAuth2ResourceServerConfigurer::jwt);
 		// @formatter:on

servlet/spring-boot/java/oauth2/resource-server/jwe/src/main/java/example/OAuth2ResourceServerSecurityConfiguration.java

@@ -72,15 +72,11 @@ public class OAuth2ResourceServerSecurityConfiguration extends WebSecurityConfig
 	protected void configure(HttpSecurity http) throws Exception {
 		// @formatter:off
 		http
-			.authorizeRequests((requests) ->
+			.authorizeRequests((authorize) -> authorize
-				requests
+				.antMatchers("/message/**").hasAuthority("SCOPE_message:read")
-					.antMatchers("/message/**").hasAuthority("SCOPE_message:read")
+				.anyRequest().authenticated()
-					.anyRequest().authenticated()
 			)
-			.oauth2ResourceServer((resourceServer) ->
+			.oauth2ResourceServer((oauth2) -> oauth2.jwt(withDefaults()));
-				resourceServer
-					.jwt(withDefaults())
-			);
 		// @formatter:on
 	}
 

servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/src/main/java/example/OAuth2ResourceServerSecurityConfiguration.java

@@ -47,11 +47,11 @@ public class OAuth2ResourceServerSecurityConfiguration {
 			AuthenticationManagerResolver<HttpServletRequest> authenticationManagerResolver) throws Exception {
 		// @formatter:off
 		http
-			.authorizeRequests((requests) -> requests
+			.authorizeRequests((authorize) -> authorize
 				.mvcMatchers("/**/message/**").hasAuthority("SCOPE_message:read")
 				.anyRequest().authenticated()
 			)
-			.oauth2ResourceServer((resourceServer) -> resourceServer
+			.oauth2ResourceServer((oauth2) -> oauth2
 				.authenticationManagerResolver(authenticationManagerResolver)
 			);
 		// @formatter:on

servlet/spring-boot/java/oauth2/resource-server/opaque/src/main/java/example/OAuth2ResourceServerSecurityConfiguration.java

@@ -42,16 +42,16 @@ public class OAuth2ResourceServerSecurityConfiguration extends WebSecurityConfig
 	protected void configure(HttpSecurity http) throws Exception {
 		// @formatter:off
 		http
-			.authorizeRequests((requests) -> requests
+			.authorizeRequests((authorize) -> authorize
-					.mvcMatchers(HttpMethod.GET, "/message/**").hasAuthority("SCOPE_message:read")
+				.mvcMatchers(HttpMethod.GET, "/message/**").hasAuthority("SCOPE_message:read")
-					.mvcMatchers(HttpMethod.POST, "/message/**").hasAuthority("SCOPE_message:write")
+				.mvcMatchers(HttpMethod.POST, "/message/**").hasAuthority("SCOPE_message:write")
-					.anyRequest().authenticated()
+				.anyRequest().authenticated()
 			)
-			.oauth2ResourceServer((resourceServer) -> resourceServer
+			.oauth2ResourceServer((oauth2) -> oauth2
-					.opaqueToken((opaqueToken) -> opaqueToken
+				.opaqueToken((opaque) -> opaque
-						.introspectionUri(this.introspectionUri)
+					.introspectionUri(this.introspectionUri)
-						.introspectionClientCredentials(this.clientId, this.clientSecret)
+					.introspectionClientCredentials(this.clientId, this.clientSecret)
-					)
+				)
 			);
 		// @formatter:on
 	}

servlet/spring-boot/java/oauth2/resource-server/static/src/main/java/example/OAuth2ResourceServerSecurityConfiguration.java

@@ -40,14 +40,12 @@ public class OAuth2ResourceServerSecurityConfiguration extends WebSecurityConfig
 	protected void configure(HttpSecurity http) throws Exception {
 		// @formatter:off
 		http
-			.authorizeRequests((requests) -> requests
+			.authorizeRequests((authorize) -> authorize
-					.mvcMatchers("/message/**").hasAuthority("SCOPE_message:read")
+				.mvcMatchers("/message/**").hasAuthority("SCOPE_message:read")
-					.anyRequest().authenticated()
+				.anyRequest().authenticated()
 			)
-			.oauth2ResourceServer((resourceServer) -> resourceServer
+			.oauth2ResourceServer((oauth2) -> oauth2
-					.jwt((jwt) -> jwt
+				.jwt((jwt) -> jwt.decoder(jwtDecoder()))
-							.decoder(jwtDecoder())
-					)
 			);
 		// @formatter:on
 	}

servlet/spring-boot/java/oauth2/webclient/src/main/java/example/SecurityConfiguration.java

@@ -38,9 +38,9 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
 	protected void configure(HttpSecurity http) throws Exception {
 		// @formatter:off
 		http
-			.authorizeRequests((requests) -> requests
+			.authorizeRequests((authorize) -> authorize
-					.mvcMatchers("/", "/public/**").permitAll()
+				.mvcMatchers("/", "/public/**").permitAll()
-					.anyRequest().authenticated()
+				.anyRequest().authenticated()
 			)
 			.formLogin(withDefaults())
 			.oauth2Login(withDefaults())

servlet/spring-boot/java/saml2/login-single-tenant/src/main/java/example/SecurityConfiguration.java

@@ -36,11 +36,11 @@ public class SecurityConfiguration {
 	SecurityFilterChain app(HttpSecurity http) throws Exception {
 		// @formatter:off
 		http
-				.authorizeRequests((authorize) -> authorize
+			.authorizeRequests((authorize) -> authorize
-					.anyRequest().authenticated()
+				.anyRequest().authenticated()
-				)
+			)
-				.saml2Login((saml2) -> saml2.loginProcessingUrl("/login/saml2/sso"))
+			.saml2Login((saml2) -> saml2.loginProcessingUrl("/login/saml2/sso"))
-				.saml2Logout(Customizer.withDefaults());
+			.saml2Logout(Customizer.withDefaults());
 		// @formatter:on
 
 		return http.build();

servlet/spring-boot/java/saml2/login/src/main/java/example/SecurityConfiguration.java

@@ -35,11 +35,11 @@ public class SecurityConfiguration {
 	SecurityFilterChain app(HttpSecurity http) throws Exception {
 		// @formatter:off
 		http
-				.authorizeRequests((authorize) -> authorize
+			.authorizeRequests((authorize) -> authorize
-					.anyRequest().authenticated()
+				.anyRequest().authenticated()
-				)
+			)
-				.saml2Login(Customizer.withDefaults())
+			.saml2Login(Customizer.withDefaults())
-				.saml2Logout(Customizer.withDefaults());
+			.saml2Logout(Customizer.withDefaults());
 		// @formatter:on
 
 		return http.build();

servlet/spring-boot/java/saml2/refreshable-metadata/src/main/java/example/SecurityConfiguration.java

@@ -30,7 +30,9 @@ public class SecurityConfiguration {
 	SecurityFilterChain app(HttpSecurity http) throws Exception {
 		// @formatter:off
 		http
-			.authorizeRequests((authorize) -> authorize.anyRequest().authenticated())
+			.authorizeRequests((authorize) -> authorize
+				.anyRequest().authenticated()
+			)
 			.saml2Login(withDefaults())
 			.saml2Logout(withDefaults());
 		// @formatter:on