JAVA-29304 Upgrade spring-security-web-boot-1 (#15488)

* JAVA-29304 Upgrade spring-security-web-boot-1

* JAVA-29304 Removing explicit version for rest-assured

---------

Co-authored-by: timis1 <noreplay@yahoo.com>

spring-security-modules/spring-security-web-boot-1/pom.xml

@@ -11,8 +11,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>spring-security-modules</artifactId>
+        <artifactId>parent-boot-3</artifactId>
         <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-3</relativePath>
     </parent>
 
     <dependencies>
@@ -34,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>org.thymeleaf.extras</groupId>
-            <artifactId>thymeleaf-extras-springsecurity5</artifactId>
+            <artifactId>thymeleaf-extras-springsecurity6</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -81,11 +82,6 @@
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet.jsp.jstl</groupId>
-            <artifactId>jstl-api</artifactId>
-            <version>${jstl.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-config</artifactId>
@@ -100,6 +96,11 @@
             <version>${ehcache-core.version}</version>
             <type>jar</type>
         </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

spring-security-modules/spring-security-web-boot-1/src/main/java/com/baeldung/relationships/AppConfig.java

@@ -15,14 +15,14 @@ import org.springframework.jdbc.datasource.DriverManagerDataSource;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @SpringBootApplication
 @PropertySource({"classpath:persistence-h2.properties", "classpath:application-defaults.properties"})
 @EnableJpaRepositories(basePackages = {"com.baeldung.relationships.repositories"})
 @EnableWebMvc
 @Import(SpringSecurityConfig.class)
-public class AppConfig extends WebMvcConfigurerAdapter {
+public class AppConfig implements WebMvcConfigurer {
 
     @Autowired
     private Environment env;
@@ -41,7 +41,7 @@ public class AppConfig extends WebMvcConfigurerAdapter {
     public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
         final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
         em.setDataSource(dataSource());
-        em.setPackagesToScan(new String[] { "com.baeldung.relationships.models" });
+        em.setPackagesToScan("com.baeldung.relationships.models");
         em.setJpaVendorAdapter(new HibernateJpaVendorAdapter());
         em.setJpaProperties(additionalProperties());
         return em;

spring-security-modules/spring-security-web-boot-1/src/main/java/com/baeldung/relationships/SpringSecurityConfig.java

@@ -1,6 +1,6 @@
 package com.baeldung.relationships;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import javax.sql.DataSource;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +13,7 @@ import org.springframework.security.config.annotation.authentication.builders.Au
 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.WebSecurityCustomizer;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.data.repository.query.SecurityEvaluationContextExtension;
@@ -47,12 +48,10 @@ public class SpringSecurityConfig {
 
     @Bean
     public UserDetailsManager users(HttpSecurity http) throws Exception {
-        AuthenticationManager authenticationManager = http.getSharedObject(AuthenticationManagerBuilder.class)
+        AuthenticationManagerBuilder authenticationManagerBuilder = http.getSharedObject(AuthenticationManagerBuilder.class);
-            .userDetailsService(userDetailsService)
+        authenticationManagerBuilder.userDetailsService(userDetailsService).passwordEncoder(encoder());
-            .passwordEncoder(encoder())
+        authenticationManagerBuilder.authenticationProvider(authenticationProvider());
-            .and()
+        AuthenticationManager authenticationManager = authenticationManagerBuilder.build();
-            .authenticationProvider(authenticationProvider())
-            .build();
 
         JdbcUserDetailsManager jdbcUserDetailsManager = new JdbcUserDetailsManager(dataSource);
         jdbcUserDetailsManager.setAuthenticationManager(authenticationManager);
@@ -61,22 +60,16 @@ public class SpringSecurityConfig {
 
     @Bean
     public WebSecurityCustomizer webSecurityCustomizer() {
-        return (web) -> web.ignoring()
+        return web -> web.ignoring().requestMatchers("/resources/**");
-            .antMatchers("/resources/**");
     }
 
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-        http.authorizeRequests()
+        http.authorizeHttpRequests(authorizationManagerRequestMatcherRegistry ->
-            .antMatchers("/login")
+                        authorizationManagerRequestMatcherRegistry.requestMatchers("/login").permitAll())
-            .permitAll()
+            .formLogin(httpSecurityFormLoginConfigurer ->
-            .and()
+                    httpSecurityFormLoginConfigurer.permitAll().successHandler(successHandler))
-            .formLogin()
+            .csrf(AbstractHttpConfigurer::disable);
-            .permitAll()
-            .successHandler(successHandler)
-            .and()
-            .csrf()
-            .disable();
         return http.build();
     }
 

spring-security-modules/spring-security-web-boot-1/src/main/java/com/baeldung/relationships/models/AppUser.java

@@ -2,12 +2,12 @@ package com.baeldung.relationships.models;
 
 import java.util.Date;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "users")

spring-security-modules/spring-security-web-boot-1/src/main/java/com/baeldung/relationships/models/Tweet.java

@@ -3,14 +3,14 @@ package com.baeldung.relationships.models;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.CollectionTable;
+import jakarta.persistence.CollectionTable;
-import javax.persistence.ElementCollection;
+import jakarta.persistence.ElementCollection;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.FetchType;
+import jakarta.persistence.FetchType;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "Tweet")

spring-security-modules/spring-security-web-boot-1/src/main/java/com/baeldung/relationships/repositories/TweetRepository.java

@@ -3,11 +3,12 @@ package com.baeldung.relationships.repositories;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
 import com.baeldung.relationships.models.Tweet;
 
-public interface TweetRepository extends PagingAndSortingRepository<Tweet, Long> {
+public interface TweetRepository extends PagingAndSortingRepository<Tweet, Long>, CrudRepository<Tweet, Long> {
 
     @Query("SELECT twt FROM Tweet twt JOIN twt.likes AS lk WHERE lk = ?#{ principal?.username } OR twt.owner = ?#{ principal?.username }")
     Page<Tweet> getMyTweetsAndTheOnesILiked(Pageable pageable);

spring-security-modules/spring-security-web-boot-1/src/main/java/com/baeldung/relationships/security/AuthenticationSuccessHandlerImpl.java

@@ -2,8 +2,8 @@ package com.baeldung.relationships.security;
 
 import java.util.Date;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;

spring-security-modules/spring-security-web-boot-1/src/main/java/com/baeldung/relationships/security/CustomUserDetailsService.java

@@ -1,6 +1,6 @@
 package com.baeldung.relationships.security;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.userdetails.UserDetails;

spring-security-modules/spring-security-web-boot-1/src/main/java/com/baeldung/roles/custom/config/SecurityConfig.java

@@ -2,8 +2,11 @@ package com.baeldung.roles.custom.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+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.configurers.AbstractAuthenticationFilterConfigurer;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.SecurityFilterChain;
@@ -14,14 +17,9 @@ public class SecurityConfig {
 
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-        http.csrf()
+        http.csrf(AbstractHttpConfigurer::disable)
-            .disable()
+            .authorizeHttpRequests(authorizationManagerRequestMatcherRegistry -> authorizationManagerRequestMatcherRegistry.anyRequest().authenticated())
-            .authorizeRequests()
+            .formLogin(AbstractAuthenticationFilterConfigurer::permitAll);
-            .anyRequest()
-            .authenticated()
-            .and()
-            .formLogin()
-            .permitAll();
         return http.build();
     }
 

spring-security-modules/spring-security-web-boot-1/src/main/java/com/baeldung/roles/custom/persistence/SetupData.java

@@ -3,7 +3,7 @@ package com.baeldung.roles.custom.persistence;
 import java.util.Arrays;
 import java.util.HashSet;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import com.baeldung.roles.custom.persistence.dao.OrganizationRepository;
 import com.baeldung.roles.custom.persistence.dao.PrivilegeRepository;

spring-security-modules/spring-security-web-boot-1/src/main/java/com/baeldung/roles/custom/persistence/model/Foo.java

@@ -1,10 +1,10 @@
 package com.baeldung.roles.custom.persistence.model;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
 
 @Entity
 public class Foo {

spring-security-modules/spring-security-web-boot-1/src/main/java/com/baeldung/roles/custom/persistence/model/Organization.java

@@ -1,10 +1,10 @@
 package com.baeldung.roles.custom.persistence.model;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
 
 @Entity
 public class Organization {

spring-security-modules/spring-security-web-boot-1/src/main/java/com/baeldung/roles/custom/persistence/model/Privilege.java

@@ -1,10 +1,10 @@
 package com.baeldung.roles.custom.persistence.model;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
 
 @Entity
 public class Privilege {

spring-security-modules/spring-security-web-boot-1/src/main/java/com/baeldung/roles/custom/persistence/model/User.java

@@ -2,17 +2,17 @@ package com.baeldung.roles.custom.persistence.model;
 
 import java.util.Set;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.FetchType;
+import jakarta.persistence.FetchType;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.JoinColumn;
+import jakarta.persistence.JoinColumn;
-import javax.persistence.JoinTable;
+import jakarta.persistence.JoinTable;
-import javax.persistence.ManyToMany;
+import jakarta.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "user_table")
@@ -28,7 +28,9 @@ public class User {
     private String password;
 
     @ManyToMany(fetch = FetchType.EAGER)
-    @JoinTable(name = "users_privileges", joinColumns = @JoinColumn(name = "user_id", referencedColumnName = "id"), inverseJoinColumns = @JoinColumn(name = "privilege_id", referencedColumnName = "id"))
+    @JoinTable(name = "users_privileges", joinColumns =
+    @JoinColumn(name = "user_id", referencedColumnName = "id"),
+            inverseJoinColumns = @JoinColumn(name = "privilege_id", referencedColumnName = "id"))
     private Set<Privilege> privileges;
 
     @ManyToOne(fetch = FetchType.EAGER)

spring-security-modules/spring-security-web-boot-1/src/main/java/com/baeldung/roles/ip/config/SecurityConfig.java

@@ -6,10 +6,13 @@ import org.springframework.context.annotation.Configuration;
 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;
+import org.springframework.security.config.annotation.web.configurers.AbstractAuthenticationFilterConfigurer;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.access.expression.WebExpressionAuthorizationManager;
 
 @Configuration
 @EnableWebSecurity
@@ -32,19 +35,12 @@ public class SecurityConfig {
 
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-        http.authorizeRequests()
+        http.authorizeHttpRequests(
-            .antMatchers("/login")
+                authorizationManagerRequestMatcherRegistry -> authorizationManagerRequestMatcherRegistry.requestMatchers("/login").permitAll()
-            .permitAll()
+                        .requestMatchers("/foos/**")
-            .antMatchers("/foos/**")
+                        .access(new WebExpressionAuthorizationManager("isAuthenticated() and hasIpAddress('11.11.11.11')")).anyRequest().authenticated())
-            .access("isAuthenticated() and hasIpAddress('11.11.11.11')")
+            .formLogin(AbstractAuthenticationFilterConfigurer::permitAll)
-            .anyRequest()
+            .csrf(AbstractHttpConfigurer::disable);
-            .authenticated()
-            .and()
-            .formLogin()
-            .permitAll()
-            .and()
-            .csrf()
-            .disable();
         return http.build();
     }
 }

spring-security-modules/spring-security-web-boot-1/src/main/java/com/baeldung/roles/ip/web/MainController.java

@@ -2,8 +2,8 @@ package com.baeldung.roles.ip.web;
 
 import java.util.List;
 
-import javax.servlet.Filter;
+import jakarta.servlet.Filter;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import com.baeldung.roles.custom.persistence.model.Foo;
 import org.springframework.beans.factory.annotation.Autowired;

spring-security-modules/spring-security-web-boot-1/src/main/java/com/baeldung/roles/rolesauthorities/MyLogoutSuccessHandler.java

@@ -2,9 +2,9 @@ package com.baeldung.roles.rolesauthorities;
 
 import java.io.IOException;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;

spring-security-modules/spring-security-web-boot-1/src/main/java/com/baeldung/roles/rolesauthorities/config/SecurityConfig.java

@@ -10,6 +10,7 @@ import org.springframework.security.config.annotation.authentication.builders.Au
 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.WebSecurityCustomizer;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -42,33 +43,22 @@ public class SecurityConfig {
 
     @Bean
     public WebSecurityCustomizer webSecurityCustomizer() {
-        return (web) -> web.ignoring()
+        return (web) -> web.ignoring().requestMatchers("/resources/**");
-            .antMatchers("/resources/**");
     }
     
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-        http.csrf()
+        http.csrf(AbstractHttpConfigurer::disable)
-            .disable()
+            .authorizeHttpRequests(
-            .authorizeRequests()
+                    authorizationManagerRequestMatcherRegistry ->
-            .antMatchers("/login*", "/logout*", "/protectedbynothing*", "/home*")
+                            authorizationManagerRequestMatcherRegistry.requestMatchers("/login*", "/logout*", "/protectedbynothing*", "/home*").permitAll()
-            .permitAll()
+                                    .requestMatchers("/protectedbyrole").hasRole("USER")
-            .antMatchers("/protectedbyrole")
+                                    .requestMatchers("/protectedbyauthority").hasAuthority("READ_PRIVILEGE"))
-            .hasRole("USER")
+            .formLogin(httpSecurityFormLoginConfigurer ->
-            .antMatchers("/protectedbyauthority")
+                    httpSecurityFormLoginConfigurer.loginPage("/login").failureUrl("/login?error=true").permitAll())
-            .hasAuthority("READ_PRIVILEGE")
+            .logout(httpSecurityLogoutConfigurer ->
-            .and()
+                    httpSecurityLogoutConfigurer.logoutSuccessHandler(myLogoutSuccessHandler).invalidateHttpSession(false)
-            .formLogin()
+                            .logoutSuccessUrl("/logout.html?logSucc=true").deleteCookies("JSESSIONID").permitAll());
-            .loginPage("/login")
-            .failureUrl("/login?error=true")
-            .permitAll()
-            .and()
-            .logout()
-            .logoutSuccessHandler(myLogoutSuccessHandler)
-            .invalidateHttpSession(false)
-            .logoutSuccessUrl("/logout.html?logSucc=true")
-            .deleteCookies("JSESSIONID")
-            .permitAll();
         return http.build();
     }
 

spring-security-modules/spring-security-web-boot-1/src/main/java/com/baeldung/roles/rolesauthorities/model/Privilege.java

@@ -2,11 +2,11 @@ package com.baeldung.roles.rolesauthorities.model;
 
 import java.util.Collection;
 
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.ManyToMany;
+import jakarta.persistence.ManyToMany;
 
 @Entity
 public class Privilege {

spring-security-modules/spring-security-web-boot-1/src/main/java/com/baeldung/roles/rolesauthorities/model/Role.java

@@ -2,13 +2,13 @@ package com.baeldung.roles.rolesauthorities.model;
 
 import java.util.Collection;
 
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.JoinColumn;
+import jakarta.persistence.JoinColumn;
-import javax.persistence.JoinTable;
+import jakarta.persistence.JoinTable;
-import javax.persistence.ManyToMany;
+import jakarta.persistence.ManyToMany;
 
 @Entity
 public class Role {

spring-security-modules/spring-security-web-boot-1/src/main/java/com/baeldung/roles/rolesauthorities/model/User.java

@@ -2,17 +2,16 @@ package com.baeldung.roles.rolesauthorities.model;
 
 import java.util.Collection;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.FetchType;
+import jakarta.persistence.FetchType;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.JoinColumn;
+import jakarta.persistence.JoinColumn;
-import javax.persistence.JoinTable;
+import jakarta.persistence.JoinTable;
-import javax.persistence.ManyToMany;
+import jakarta.persistence.ManyToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
-
 
 @Entity
 @Table(name = "user_account")

spring-security-modules/spring-security-web-boot-1/src/main/java/com/baeldung/roles/rolesauthorities/persistence/UserService.java

@@ -1,6 +1,6 @@
 package com.baeldung.roles.rolesauthorities.persistence;
 
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
 
 import com.baeldung.roles.rolesauthorities.model.User;
 import org.springframework.beans.factory.annotation.Autowired;

spring-security-modules/spring-security-web-boot-1/src/main/java/com/baeldung/roles/voter/MinuteBasedVoter.java

@@ -1,33 +1,28 @@
 package com.baeldung.roles.voter;
 
 import java.time.LocalDateTime;
-import java.util.Collection;
+import java.util.function.Supplier;
 
-import org.springframework.security.access.AccessDecisionVoter;
+import org.springframework.security.authorization.AuthorizationDecision;
-import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.authorization.AuthorizationManager;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.web.access.intercept.RequestAuthorizationContext;
 
-public class MinuteBasedVoter implements AccessDecisionVoter {
+public class MinuteBasedVoter implements AuthorizationManager<RequestAuthorizationContext> {
 
     @Override
-    public boolean supports(ConfigAttribute attribute) {
+    public void verify(Supplier<Authentication> authentication, RequestAuthorizationContext object) {
-        return true;
+        AuthorizationManager.super.verify(authentication, object);
     }
 
     @Override
-    public boolean supports(Class clazz) {
+    public AuthorizationDecision check(Supplier<Authentication> authentication, RequestAuthorizationContext object) {
-        return true;
+        return authentication.get().getAuthorities()
-    }
-
-    @Override
-    public int vote(Authentication authentication, Object object, Collection collection) {
-        return authentication.getAuthorities()
                 .stream()
                 .map(GrantedAuthority::getAuthority)
                 .filter(r -> "ROLE_USER".equals(r) && LocalDateTime.now().getMinute() % 2 != 0)
-                .findAny()
+                .findAny().map(s -> new AuthorizationDecision(false))
-                .map(s -> ACCESS_DENIED)
+                .orElse(new AuthorizationDecision(true));
-                .orElse(ACCESS_ABSTAIN);
     }
 }

spring-security-modules/spring-security-web-boot-1/src/main/java/com/baeldung/roles/voter/WebSecurityConfig.java

@@ -1,23 +1,19 @@
 package com.baeldung.roles.voter;
 
-import java.util.Arrays;
-import java.util.List;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.security.access.AccessDecisionManager;
+import org.springframework.security.authorization.AuthorizationManager;
-import org.springframework.security.access.AccessDecisionVoter;
+import org.springframework.security.authorization.AuthorizationManagers;
-import org.springframework.security.access.vote.AuthenticatedVoter;
-import org.springframework.security.access.vote.RoleVoter;
-import org.springframework.security.access.vote.UnanimousBased;
 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;
+import org.springframework.security.config.annotation.web.configurers.AbstractAuthenticationFilterConfigurer;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.SecurityFilterChain;
-import org.springframework.security.web.access.expression.WebExpressionVoter;
+import org.springframework.security.web.access.intercept.RequestAuthorizationContext;
 
 @Configuration
 @EnableWebSecurity
@@ -38,32 +34,20 @@ public class WebSecurityConfig {
 
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-        http.csrf()
+        http.csrf(AbstractHttpConfigurer::disable)
-            .disable()
+            .authorizeHttpRequests(authorizationManagerRequestMatcherRegistry ->
-            .authorizeRequests()
+                    authorizationManagerRequestMatcherRegistry.anyRequest().authenticated()
-            .anyRequest()
+                            .anyRequest().access(accessDecisionManager()))
-            .authenticated()
+            .formLogin(AbstractAuthenticationFilterConfigurer::permitAll)
-            .accessDecisionManager(accessDecisionManager())
+            .logout(httpSecurityLogoutConfigurer ->
-            .and()
+                    httpSecurityLogoutConfigurer.permitAll().deleteCookies("JSESSIONID")
-            .formLogin()
+                            .logoutSuccessUrl("/login"));
-            .permitAll()
-            .and()
-            .logout()
-            .permitAll()
-            .deleteCookies("JSESSIONID")
-            .logoutSuccessUrl("/login");
         return http.build();
     }
 
     @Bean
-    public AccessDecisionManager accessDecisionManager() {
+    public AuthorizationManager<RequestAuthorizationContext> accessDecisionManager() {
-        List<AccessDecisionVoter<?>> decisionVoters = Arrays.asList(
+        return AuthorizationManagers.allOf(new MinuteBasedVoter());
-                new WebExpressionVoter(),
-                new RoleVoter(),
-                new AuthenticatedVoter(),
-                new MinuteBasedVoter());
-
-        return new UnanimousBased(decisionVoters);
     }
     
     @Bean

spring-security-modules/spring-security-web-boot-1/src/test/java/com/baeldung/relationships/SpringDataWithSecurityIntegrationTest.java

@@ -11,9 +11,9 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
+import org.springframework.expression.spel.SpelEvaluationException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
@@ -25,7 +25,7 @@ import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.test.jdbc.JdbcTestUtils;
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 import java.util.Date;
 import java.util.List;
 
@@ -83,7 +83,7 @@ public class SpringDataWithSecurityIntegrationTest {
         userRepository.updateLastLogin(new Date());
     }
 
-    @Test(expected = InvalidDataAccessApiUsageException.class)
+    @Test(expected = SpelEvaluationException.class)
     public void givenNoAppUserInSecurityContext_whenUpdateLastLoginAttempted_shouldFail() {
         userRepository.updateLastLogin(new Date());
     }
@@ -104,7 +104,7 @@ public class SpringDataWithSecurityIntegrationTest {
         } while (page.hasNext());
     }
 
-    @Test(expected = InvalidDataAccessApiUsageException.class)
+    @Test(expected = SpelEvaluationException.class)
     public void givenNoAppUser_whenPaginatedResultsRetrievalAttempted_shouldFail() {
         Page<Tweet> page = null;
         do {

spring-security-modules/spring-security-web-boot-1/src/test/java/com/baeldung/roles/web/CustomUserDetailsServiceIntegrationTest.java

@@ -6,13 +6,13 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import org.apache.http.HttpHeaders;
 import com.baeldung.roles.custom.Application;
 import com.baeldung.roles.custom.persistence.model.Foo;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.security.test.context.support.WithAnonymousUser;
 import org.springframework.security.test.context.support.WithUserDetails;