Fix build breaks from dependency upgrades

Author: emilie-robichaud

spring-boot-with-admin/admin/pom.xml

@@ -252,5 +252,16 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-config</artifactId>
+            <version>6.4.5</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>4.0.1</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>

spring-boot-with-admin/admin/src/main/java/bny/training/spring/boot/admin/config/SecurityConfiguration.java

@@ -18,20 +18,23 @@
 
 import de.codecentric.boot.admin.server.config.AdminServerProperties;
 import org.springframework.boot.autoconfigure.security.SecurityProperties;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
 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.WebSecurityConfigurerAdapter;
+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.authentication.SavedRequestAwareAuthenticationSuccessHandler;
 import org.springframework.security.web.csrf.CookieCsrfTokenRepository;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 
 import java.util.UUID;
 
 @Configuration(proxyBeanMethods = false)
-public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+public class SecurityConfiguration {
 
 // TODO: https://codecentric.github.io/spring-boot-admin/current/#_securing_spring_boot_admin_server
 // This configuration is not customized to our apps and provides basic authentication.
@@ -46,17 +49,17 @@ public SecurityConfiguration(AdminServerProperties adminServer, SecurityProperti
         this.security = security;
     }
 
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
+    @Bean
+    public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
         SavedRequestAwareAuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler();
         successHandler.setTargetUrlParameter("redirectTo");
         successHandler.setDefaultTargetUrl(this.adminServer.path("/"));
 
         http.authorizeRequests(
-                        authorizeRequests -> authorizeRequests.antMatchers(this.adminServer.path("/assets/**")).permitAll()
-                                .antMatchers(this.adminServer.path("/actuator/info")).permitAll()
-                                .antMatchers(this.adminServer.path("/actuator/health")).permitAll()
-                                .antMatchers(this.adminServer.path("/login")).permitAll().anyRequest().authenticated()
+                        authorizeRequests -> authorizeRequests.requestMatchers(this.adminServer.path("/assets/**")).permitAll()
+                                .requestMatchers(this.adminServer.path("/actuator/info")).permitAll()
+                                .requestMatchers(this.adminServer.path("/actuator/health")).permitAll()
+                                .requestMatchers(this.adminServer.path("/login")).permitAll().anyRequest().authenticated()
                 ).formLogin(
                         formLogin -> formLogin.loginPage(this.adminServer.path("/login")).successHandler(successHandler).and()
                 ).logout(logout -> logout.logoutUrl(this.adminServer.path("/logout"))).httpBasic(Customizer.withDefaults())
@@ -69,12 +72,17 @@ protected void configure(HttpSecurity http) throws Exception {
                                 new AntPathRequestMatcher(this.adminServer.path("/actuator/**"))
                         ))
                 .rememberMe(rememberMe -> rememberMe.key(UUID.randomUUID().toString()).tokenValiditySeconds(1209600));
+        return http.build();
     }
 
     // Required to provide UserDetailsService for "remember functionality"
-    @Override
-    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-        auth.inMemoryAuthentication().withUser(security.getUser().getName())
-                .password("{noop}" + security.getUser().getPassword()).roles("USER");
+    @Bean
+    protected InMemoryUserDetailsManager userDetailsService() {
+        UserDetails user = User.withDefaultPasswordEncoder()
+                .username(security.getUser().getName())
+                .password(security.getUser().getPassword())
+                .roles("USER")
+                .build();
+        return new InMemoryUserDetailsManager(user);
     }
 }

spring-boot/todo/pom.xml

@@ -275,6 +275,23 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <version>2.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
+            <version>2.2</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

spring-boot/todo/src/test/java/bny/training/spring/boot/todo/AbstractTodoMockSetupTest.java

@@ -25,9 +25,9 @@
 
 import java.util.Arrays;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.isNull;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

spring-framework/ch05_spring-hibernate/src/main/java/bny/training/spring/framework/dao/ColoredShapeDaoImpl.java

@@ -17,6 +17,7 @@
 package bny.training.spring.framework.dao;
 
 import bny.training.spring.framework.model.ColoredShape;
+import java.util.Objects;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,6 +47,10 @@ public ColoredShape findById(final Long id) {
     @Transactional(readOnly = false, propagation = Propagation.REQUIRES_NEW)
     public void save(final ColoredShape coloredShape) {
 
-        getSession().saveOrUpdate(coloredShape);
+        if (Objects.isNull(getSession().find(ColoredShape.class, coloredShape.getId()))) {
+            getSession().persist(coloredShape);
+        } else {
+            getSession().merge(coloredShape);
+        }
     }
 }