feat : upgrade to spring boot 3.4.0-RC1

jpa/boot-data-multipledatasources/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.5</version>
+        <version>3.4.0-RC1</version>
         <relativePath /> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.example</groupId>
     <artifactId>boot-data-multipledatasources</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>multipledatasources</name>
+    <name>boot-data-multipledatasources</name>
     <description>Demo project for using multiple datasource's in a Spring Boot Application</description>
 
     <properties>
@@ -220,7 +220,7 @@
                 <configuration>
                     <java>
                         <palantirJavaFormat>
-                            <version>2.47.0</version>
+                            <version>2.50.0</version>
                         </palantirJavaFormat>
                         <importOrder />
                         <removeUnusedImports />

jpa/boot-data-multipledatasources/src/main/java/com/example/multipledatasources/bootstrap/DataInitilizer.java

@@ -1,7 +1,7 @@
 package com.example.multipledatasources.bootstrap;
 
-import com.example.multipledatasources.model.cardholder.CardHolder;
-import com.example.multipledatasources.model.member.Member;
+import com.example.multipledatasources.entities.cardholder.CardHolder;
+import com.example.multipledatasources.entities.member.Member;
 import com.example.multipledatasources.repository.cardholder.CardHolderRepository;
 import com.example.multipledatasources.repository.member.MemberRepository;
 import lombok.RequiredArgsConstructor;

jpa/boot-data-multipledatasources/src/main/java/com/example/multipledatasources/configuration/CardHolderDataSourceConfiguration.java

@@ -1,6 +1,6 @@
 package com.example.multipledatasources.configuration;
 
-import com.example.multipledatasources.model.cardholder.CardHolder;
+import com.example.multipledatasources.entities.cardholder.CardHolder;
 import com.example.multipledatasources.repository.cardholder.CardHolderRepository;
 import com.zaxxer.hikari.HikariDataSource;
 import jakarta.persistence.EntityManagerFactory;

jpa/boot-data-multipledatasources/src/main/java/com/example/multipledatasources/configuration/MemberDataSourceConfiguration.java

@@ -1,6 +1,6 @@
 package com.example.multipledatasources.configuration;
 
-import com.example.multipledatasources.model.member.Member;
+import com.example.multipledatasources.entities.member.Member;
 import com.example.multipledatasources.repository.member.MemberRepository;
 import com.zaxxer.hikari.HikariDataSource;
 import jakarta.persistence.EntityManagerFactory;

jpa/boot-data-multipledatasources/src/main/java/com/example/multipledatasources/model/cardholder/CardHolder.java → jpa/boot-data-multipledatasources/src/main/java/com/example/multipledatasources/entities/cardholder/CardHolder.java

@@ -1,4 +1,4 @@
-package com.example.multipledatasources.model.cardholder;
+package com.example.multipledatasources.entities.cardholder;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;

jpa/boot-data-multipledatasources/src/main/java/com/example/multipledatasources/model/member/Member.java → jpa/boot-data-multipledatasources/src/main/java/com/example/multipledatasources/entities/member/Member.java

@@ -1,4 +1,4 @@
-package com.example.multipledatasources.model.member;
+package com.example.multipledatasources.entities.member;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;

jpa/boot-data-multipledatasources/src/main/java/com/example/multipledatasources/repository/cardholder/CardHolderRepository.java

@@ -1,6 +1,6 @@
 package com.example.multipledatasources.repository.cardholder;
 
-import com.example.multipledatasources.model.cardholder.CardHolder;
+import com.example.multipledatasources.entities.cardholder.CardHolder;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 

jpa/boot-data-multipledatasources/src/main/java/com/example/multipledatasources/repository/member/MemberRepository.java

@@ -1,6 +1,6 @@
 package com.example.multipledatasources.repository.member;
 
-import com.example.multipledatasources.model.member.Member;
+import com.example.multipledatasources.entities.member.Member;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 

jpa/boot-data-multipledatasources/src/main/java/com/example/multipledatasources/service/impl/DetailsServiceImpl.java

@@ -1,8 +1,8 @@
 package com.example.multipledatasources.service.impl;
 
 import com.example.multipledatasources.dto.ResponseDto;
-import com.example.multipledatasources.model.cardholder.CardHolder;
-import com.example.multipledatasources.model.member.Member;
+import com.example.multipledatasources.entities.cardholder.CardHolder;
+import com.example.multipledatasources.entities.member.Member;
 import com.example.multipledatasources.repository.cardholder.CardHolderRepository;
 import com.example.multipledatasources.repository.member.MemberRepository;
 import com.example.multipledatasources.service.DetailsService;

jpa/boot-data-multipledatasources/src/test/java/com/example/multipledatasources/ApplicationIntegrationTest.java

@@ -5,42 +5,20 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
+import com.example.multipledatasources.common.ContainersConfiguration;
 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.MediaType;
-import org.springframework.test.context.DynamicPropertyRegistry;
-import org.springframework.test.context.DynamicPropertySource;
 import org.springframework.test.web.servlet.MockMvc;
-import org.testcontainers.containers.MySQLContainer;
-import org.testcontainers.containers.PostgreSQLContainer;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
-import org.testcontainers.utility.DockerImageName;
 
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@SpringBootTest(
+        webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+        classes = {ContainersConfiguration.class, MultipleDataSourcesApplication.class})
 @AutoConfigureMockMvc
-@Testcontainers(disabledWithoutDocker = true, parallel = true)
 class ApplicationIntegrationTest {
 
-    @Container
-    private static final MySQLContainer<?> MY_SQL_CONTAINER = new MySQLContainer<>("mysql:9.0");
-
-    @Container
-    private static final PostgreSQLContainer<?> POSTGRE_SQL_CONTAINER =
-            new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.3-alpine"));
-
-    @DynamicPropertySource
-    static void registerDynamicProperties(DynamicPropertyRegistry registry) {
-        registry.add("app.datasource.cardholder.url", MY_SQL_CONTAINER::getJdbcUrl);
-        registry.add("app.datasource.cardholder.username", MY_SQL_CONTAINER::getUsername);
-        registry.add("app.datasource.cardholder.password", MY_SQL_CONTAINER::getPassword);
-        registry.add("app.datasource.member.url", POSTGRE_SQL_CONTAINER::getJdbcUrl);
-        registry.add("app.datasource.member.username", POSTGRE_SQL_CONTAINER::getUsername);
-        registry.add("app.datasource.member.password", POSTGRE_SQL_CONTAINER::getPassword);
-    }
-
     @Autowired
     private MockMvc mockMvc;
 

jpa/boot-data-multipledatasources/src/test/java/com/example/multipledatasources/TestMultipleDataSourcesApplication.java

@@ -1,38 +1,13 @@
 package com.example.multipledatasources;
 
+import com.example.multipledatasources.common.ContainersConfiguration;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.test.context.TestConfiguration;
-import org.testcontainers.containers.MySQLContainer;
-import org.testcontainers.containers.PostgreSQLContainer;
-import org.testcontainers.lifecycle.Startables;
-import org.testcontainers.utility.DockerImageName;
 
-@TestConfiguration
-public class TestMultipleDataSourcesApplication {
-
-    private static final MySQLContainer<?> MY_SQL_CONTAINER =
-            new MySQLContainer<>(DockerImageName.parse("mysql").withTag("9.1"));
-
-    private static final PostgreSQLContainer<?> POSTGRE_SQL_CONTAINER =
-            new PostgreSQLContainer<>(DockerImageName.parse("postgres").withTag("17.0-alpine"));
-
-    static {
-        Startables.deepStart(MY_SQL_CONTAINER, POSTGRE_SQL_CONTAINER).join();
-        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
-            MY_SQL_CONTAINER.stop();
-            POSTGRE_SQL_CONTAINER.stop();
-        }));
-    }
+class TestMultipleDataSourcesApplication {
 
     public static void main(String[] args) {
-        System.setProperty("app.datasource.cardholder.url", MY_SQL_CONTAINER.getJdbcUrl());
-        System.setProperty("app.datasource.cardholder.username", MY_SQL_CONTAINER.getUsername());
-        System.setProperty("app.datasource.cardholder.password", MY_SQL_CONTAINER.getPassword());
-        System.setProperty("app.datasource.member.url", POSTGRE_SQL_CONTAINER.getJdbcUrl());
-        System.setProperty("app.datasource.member.username", POSTGRE_SQL_CONTAINER.getUsername());
-        System.setProperty("app.datasource.member.password", POSTGRE_SQL_CONTAINER.getPassword());
         SpringApplication.from(MultipleDataSourcesApplication::main)
-                .with(TestMultipleDataSourcesApplication.class)
+                .with(ContainersConfiguration.class)
                 .run(args);
     }
 }

jpa/boot-data-multipledatasources/src/test/java/com/example/multipledatasources/common/ContainersConfiguration.java

@@ -0,0 +1,60 @@
+package com.example.multipledatasources.common;
+
+import jakarta.annotation.PreDestroy;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.test.context.DynamicPropertyRegistrar;
+import org.testcontainers.containers.MySQLContainer;
+import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Test configuration class that manages MySQL and PostgreSQL containers for integration testing.
+ * This class is responsible for starting the containers, registering their connection properties,
+ * and ensuring proper cleanup on shutdown.
+ */
+@TestConfiguration(proxyBeanMethods = false)
+public class ContainersConfiguration {
+
+    private MySQLContainer<?> mySQLContainer;
+    private PostgreSQLContainer<?> postgreSQLContainer;
+
+    @Bean
+    MySQLContainer<?> mySQLContainer() {
+        mySQLContainer = new MySQLContainer<>(DockerImageName.parse("mysql").withTag("9.1"));
+        mySQLContainer.start();
+        return mySQLContainer;
+    }
+
+    @Bean
+    PostgreSQLContainer<?> postgreSQLContainer() {
+        postgreSQLContainer =
+                new PostgreSQLContainer<>(DockerImageName.parse("postgres").withTag("17.0-alpine"));
+        postgreSQLContainer.start();
+        return postgreSQLContainer;
+    }
+
+    @Bean
+    public DynamicPropertyRegistrar databaseProperties(
+            MySQLContainer<?> mySQLContainer, PostgreSQLContainer<?> postgreSQLContainer) {
+        return (properties) -> {
+            // Connect our Spring application to our Testcontainers instances
+            properties.add("app.datasource.cardholder.url", mySQLContainer::getJdbcUrl);
+            properties.add("app.datasource.cardholder.username", mySQLContainer::getUsername);
+            properties.add("app.datasource.cardholder.password", mySQLContainer::getPassword);
+            properties.add("app.datasource.member.url", postgreSQLContainer::getJdbcUrl);
+            properties.add("app.datasource.member.username", postgreSQLContainer::getUsername);
+            properties.add("app.datasource.member.password", postgreSQLContainer::getPassword);
+        };
+    }
+
+    @PreDestroy
+    public void cleanup() {
+        if (mySQLContainer != null && mySQLContainer.isRunning()) {
+            mySQLContainer.stop();
+        }
+        if (postgreSQLContainer != null && postgreSQLContainer.isRunning()) {
+            postgreSQLContainer.stop();
+        }
+    }
+}

jpa/boot-data-multipledatasources/src/test/java/com/example/multipledatasources/controller/DetailsControllerTest.java

@@ -10,8 +10,8 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 
 @WebMvcTest(controllers = DetailsController.class)
@@ -20,7 +20,7 @@ class DetailsControllerTest {
     @Autowired
     private MockMvc mockMvc;
 
-    @MockBean
+    @MockitoBean
     private DetailsService detailsService;
 
     @Test

jpa/boot-data-multipledatasources/src/test/java/com/example/multipledatasources/service/impl/DetailsServiceImplTest.java

@@ -4,8 +4,8 @@
 import static org.mockito.BDDMockito.given;
 
 import com.example.multipledatasources.dto.ResponseDto;
-import com.example.multipledatasources.model.cardholder.CardHolder;
-import com.example.multipledatasources.model.member.Member;
+import com.example.multipledatasources.entities.cardholder.CardHolder;
+import com.example.multipledatasources.entities.member.Member;
 import com.example.multipledatasources.repository.cardholder.CardHolderRepository;
 import com.example.multipledatasources.repository.member.MemberRepository;
 import java.util.Optional;