diff --git a/spring-session-docs/src/test/java/docs/security/RememberMeSecurityConfiguration.java b/spring-session-docs/src/test/java/docs/security/RememberMeSecurityConfiguration.java index b120d26e..d8061e30 100644 --- a/spring-session-docs/src/test/java/docs/security/RememberMeSecurityConfiguration.java +++ b/spring-session-docs/src/test/java/docs/security/RememberMeSecurityConfiguration.java @@ -19,6 +19,7 @@ package docs.security; import java.util.concurrent.ConcurrentHashMap; import org.springframework.context.annotation.Bean; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; @@ -41,14 +42,16 @@ public class RememberMeSecurityConfiguration extends WebSecurityConfigurerAdapte protected void configure(HttpSecurity http) throws Exception { http // ... additional configuration ... - .rememberMe() - .rememberMeServices(rememberMeServices()); + .rememberMe((rememberMe) -> rememberMe + .rememberMeServices(rememberMeServices()) + ); // end::http-rememberme[] http - .formLogin().and() - .authorizeRequests() - .anyRequest().authenticated(); + .formLogin(Customizer.withDefaults()) + .authorizeRequests((authorize) -> authorize + .anyRequest().authenticated() + ); } // tag::rememberme-bean[] diff --git a/spring-session-docs/src/test/java/docs/security/SecurityConfiguration.java b/spring-session-docs/src/test/java/docs/security/SecurityConfiguration.java index f59f6698..a5498bd0 100644 --- a/spring-session-docs/src/test/java/docs/security/SecurityConfiguration.java +++ b/spring-session-docs/src/test/java/docs/security/SecurityConfiguration.java @@ -40,9 +40,10 @@ public class SecurityConfiguration extends WebSecurityConfigu // @formatter:off http // other config goes here... - .sessionManagement() + .sessionManagement((sessionManagement) -> sessionManagement .maximumSessions(2) - .sessionRegistry(sessionRegistry()); + .sessionRegistry(sessionRegistry()) + ); // @formatter:on } diff --git a/spring-session-samples/spring-session-sample-boot-findbyusername/src/main/java/sample/config/SecurityConfig.java b/spring-session-samples/spring-session-sample-boot-findbyusername/src/main/java/sample/config/SecurityConfig.java index cc3b9db3..45c5b995 100644 --- a/spring-session-samples/spring-session-sample-boot-findbyusername/src/main/java/sample/config/SecurityConfig.java +++ b/spring-session-samples/spring-session-sample-boot-findbyusername/src/main/java/sample/config/SecurityConfig.java @@ -35,13 +35,14 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { @Override protected void configure(HttpSecurity http) throws Exception { http - .authorizeRequests() + .authorizeRequests((authorize) -> authorize .requestMatchers(PathRequest.toStaticResources().atCommonLocations()).permitAll() .anyRequest().authenticated() - .and() - .formLogin() + ) + .formLogin((formLogin) -> formLogin .loginPage("/login") - .permitAll(); + .permitAll() + ); } // end::config[] // @formatter:on diff --git a/spring-session-samples/spring-session-sample-boot-jdbc/src/main/java/sample/config/SecurityConfig.java b/spring-session-samples/spring-session-sample-boot-jdbc/src/main/java/sample/config/SecurityConfig.java index f80d0992..308377e8 100644 --- a/spring-session-samples/spring-session-sample-boot-jdbc/src/main/java/sample/config/SecurityConfig.java +++ b/spring-session-samples/spring-session-sample-boot-jdbc/src/main/java/sample/config/SecurityConfig.java @@ -44,12 +44,13 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { @Override protected void configure(HttpSecurity http) throws Exception { http - .authorizeRequests() + .authorizeRequests((authorize) -> authorize .requestMatchers(PathRequest.toStaticResources().atCommonLocations()).permitAll() .anyRequest().authenticated() - .and() - .formLogin() - .permitAll(); + ) + .formLogin((formLogin) -> formLogin + .permitAll() + ); } // end::config[] // @formatter:on diff --git a/spring-session-samples/spring-session-sample-boot-redis-json/src/main/java/sample/config/SecurityConfig.java b/spring-session-samples/spring-session-sample-boot-redis-json/src/main/java/sample/config/SecurityConfig.java index 480027ff..3f970e3b 100644 --- a/spring-session-samples/spring-session-sample-boot-redis-json/src/main/java/sample/config/SecurityConfig.java +++ b/spring-session-samples/spring-session-sample-boot-redis-json/src/main/java/sample/config/SecurityConfig.java @@ -34,13 +34,14 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { @Override protected void configure(HttpSecurity http) throws Exception { http - .authorizeRequests() + .authorizeRequests((authorize) -> authorize .requestMatchers(PathRequest.toStaticResources().atCommonLocations()).permitAll() .anyRequest().authenticated() - .and() - .formLogin() + ) + .formLogin((formLogin) -> formLogin .loginPage("/login") - .permitAll(); + .permitAll() + ); } // @formatter:on diff --git a/spring-session-samples/spring-session-sample-boot-redis-simple/src/main/java/sample/config/SecurityConfig.java b/spring-session-samples/spring-session-sample-boot-redis-simple/src/main/java/sample/config/SecurityConfig.java index 3d6b979e..be8cd8e0 100644 --- a/spring-session-samples/spring-session-sample-boot-redis-simple/src/main/java/sample/config/SecurityConfig.java +++ b/spring-session-samples/spring-session-sample-boot-redis-simple/src/main/java/sample/config/SecurityConfig.java @@ -28,12 +28,13 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { @Override protected void configure(HttpSecurity http) throws Exception { http - .authorizeRequests() + .authorizeRequests((authorize) -> authorize .requestMatchers(PathRequest.toStaticResources().atCommonLocations()).permitAll() .anyRequest().authenticated() - .and() - .formLogin() - .permitAll(); + ) + .formLogin((formLogin) -> formLogin + .permitAll() + ); } // @formatter:on diff --git a/spring-session-samples/spring-session-sample-boot-redis/src/main/java/sample/config/SecurityConfig.java b/spring-session-samples/spring-session-sample-boot-redis/src/main/java/sample/config/SecurityConfig.java index 53ec10d5..775c4ebf 100644 --- a/spring-session-samples/spring-session-sample-boot-redis/src/main/java/sample/config/SecurityConfig.java +++ b/spring-session-samples/spring-session-sample-boot-redis/src/main/java/sample/config/SecurityConfig.java @@ -35,12 +35,13 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { @Override protected void configure(HttpSecurity http) throws Exception { http - .authorizeRequests() + .authorizeRequests((authorize) -> authorize .requestMatchers(PathRequest.toStaticResources().atCommonLocations()).permitAll() .anyRequest().authenticated() - .and() - .formLogin() - .permitAll(); + ) + .formLogin((formLogin) -> formLogin + .permitAll() + ); } // end::config[] // @formatter:on diff --git a/spring-session-samples/spring-session-sample-boot-websocket/src/main/java/sample/config/WebSecurityConfig.java b/spring-session-samples/spring-session-sample-boot-websocket/src/main/java/sample/config/WebSecurityConfig.java index 20698c15..71d881f5 100644 --- a/spring-session-samples/spring-session-sample-boot-websocket/src/main/java/sample/config/WebSecurityConfig.java +++ b/spring-session-samples/spring-session-sample-boot-websocket/src/main/java/sample/config/WebSecurityConfig.java @@ -53,12 +53,13 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { @Override protected void configure(HttpSecurity http) throws Exception { http - .authorizeRequests() + .authorizeRequests((authorize) -> authorize .requestMatchers(PathRequest.toStaticResources().atCommonLocations()).permitAll() .anyRequest().authenticated() - .and() - .formLogin() - .permitAll(); + ) + .formLogin((formLogin) -> formLogin + .permitAll() + ); } // @formatter:on diff --git a/spring-session-samples/spring-session-sample-javaconfig-rest/src/main/java/sample/SecurityConfig.java b/spring-session-samples/spring-session-sample-javaconfig-rest/src/main/java/sample/SecurityConfig.java index 5844d675..6a2ecf46 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-rest/src/main/java/sample/SecurityConfig.java +++ b/spring-session-samples/spring-session-sample-javaconfig-rest/src/main/java/sample/SecurityConfig.java @@ -17,6 +17,7 @@ package sample; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; @@ -31,13 +32,13 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { @Override protected void configure(HttpSecurity http) throws Exception { http - .authorizeRequests() + .authorizeRequests((authorize) -> authorize .anyRequest().authenticated() - .and() - .requestCache() + ) + .requestCache((requestCache) -> requestCache .requestCache(new NullRequestCache()) - .and() - .httpBasic(); + ) + .httpBasic(Customizer.withDefaults()); } // @formatter:on