Migrating to Spring Boot 3.2

Author: lucasvsme

build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    id("org.springframework.boot") version "3.0.0-M3"
-    id("io.spring.dependency-management") version "1.0.11.RELEASE"
+    id("org.springframework.boot") version "3.2.0"
+    id("io.spring.dependency-management") version "1.1.4"
     java
 }
 
@@ -15,11 +15,10 @@ configurations {
 
 repositories {
     mavenCentral()
-    maven(url = "https://repo.spring.io/milestone")
 }
 
 ext {
-    set("testcontainersVersion", "1.17.3")
+    set("testcontainersVersion", "1.19.3")
 }
 
 dependencies {
@@ -31,6 +30,7 @@ dependencies {
     compileOnly("org.projectlombok:lombok")
     runtimeOnly("org.postgresql:postgresql")
     annotationProcessor("org.projectlombok:lombok")
+    testImplementation("org.springframework.boot:spring-boot-testcontainers")
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     testImplementation("org.testcontainers:junit-jupiter")
     testImplementation("org.testcontainers:postgresql")

settings.gradle.kts

@@ -60,9 +60,9 @@ public ResponseEntity<PersonResponse> findOnePerson(@PathVariable UUID personId)
 
     @ExceptionHandler(PersonNotFoundException.class)
     public ResponseEntity<ProblemDetail> personNotFoundException(PersonNotFoundException exception) {
-        final var responseBody = ProblemDetail.forStatus(404)
-                .withTitle("Person not found by ID")
-                .withDetail("No person with ID " + exception.getPersonId() + " exists");
+        final var responseBody = ProblemDetail.forStatus(404);
+        responseBody.setTitle("Person not found by ID");
+        responseBody.setDetail("No person with ID " + exception.getPersonId() + " exists");
 
         return ResponseEntity.status(responseBody.getStatus())
                 .body(responseBody);

src/main/java/com/example/person/api/PersonController.java

@@ -12,19 +12,22 @@
 import org.junit.jupiter.params.provider.NullAndEmptySource;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.data.redis.RedisConnectionDetails;
+import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails;
 import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
-import org.springframework.test.context.DynamicPropertyRegistry;
-import org.springframework.test.context.DynamicPropertySource;
 import org.springframework.test.web.reactive.server.EntityExchangeResult;
 import org.springframework.test.web.reactive.server.WebTestClient;
 import org.springframework.web.reactive.function.BodyInserters;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.PostgreSQLContainer;
-import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 import org.testcontainers.utility.DockerImageName;
 
@@ -34,29 +37,12 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@Import(ApplicationTest.TestConfig.class)
 @AutoConfigureWebTestClient
 @Testcontainers
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 class ApplicationTest {
 
-    @Container
-    private static final PostgreSQLContainer<?> POSTGRES_CONTAINER =
-            new PostgreSQLContainer<>(DockerImageName.parse("postgres"));
-
-    @Container
-    private static final GenericContainer<?> REDIS_CONTAINER =
-            new GenericContainer<>(DockerImageName.parse("redis"))
-                    .withExposedPorts(6379);
-
-    @DynamicPropertySource
-    private static void setApplicationProperties(DynamicPropertyRegistry registry) {
-        registry.add("spring.datasource.url", POSTGRES_CONTAINER::getJdbcUrl);
-        registry.add("spring.datasource.username", POSTGRES_CONTAINER::getUsername);
-        registry.add("spring.datasource.password", POSTGRES_CONTAINER::getPassword);
-        registry.add("spring.redis.host", REDIS_CONTAINER::getHost);
-        registry.add("spring.redis.port", REDIS_CONTAINER::getFirstMappedPort);
-    }
-
     private static PersonRequest personRequest;
     private static UUID personId;
 
@@ -184,4 +170,21 @@ private UUID getPersonIdFromLocationHeader(EntityExchangeResult<Void> exchangeRe
 
         return UUID.fromString(lastSegment);
     }
+
+    @TestConfiguration
+    static class TestConfig {
+
+        @Bean
+        @ServiceConnection(type = JdbcConnectionDetails.class)
+        PostgreSQLContainer<?> POSTGRES_CONTAINER() {
+            return new PostgreSQLContainer<>(DockerImageName.parse("postgres"));
+        }
+
+        @Bean
+        @ServiceConnection(name = "redis", type = RedisConnectionDetails.class)
+        GenericContainer<?> REDIS_CONTAINER() {
+            return new GenericContainer<>(DockerImageName.parse("redis"))
+                    .withExposedPorts(6379);
+        }
+    }
 }