Add TestContainers sample for Doma Spring Boot

doma-spring-boot-samples/doma-spring-boot-sample-testcontainers/pom.xml

@@ -43,12 +43,6 @@
             <artifactId>postgresql</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <!-- H2 for local development -->
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -59,30 +53,16 @@
             <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
-        <!-- TestContainers dependencies -->
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>testcontainers</artifactId>
-            <version>1.19.7</version>
-            <scope>test</scope>
-        </dependency>
+        <!-- Spring Boot manages TestContainers dependencies -->
         <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <version>1.19.7</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-testcontainers</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>postgresql</artifactId>
-            <version>1.19.7</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-testcontainers</artifactId>
             <scope>test</scope>
-            <version>${spring-boot.version}</version>
         </dependency>
     </dependencies>
 

doma-spring-boot-samples/doma-spring-boot-sample-testcontainers/src/main/resources/application.properties

@@ -1,11 +1,7 @@
-# Development configuration using H2
-spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
-spring.datasource.driver-class-name=org.h2.Driver
-spring.datasource.username=sa
-spring.datasource.password=
+# Development configuration using TestContainers
 spring.sql.init.mode=always
 
 # Doma configuration
-doma.dialect=H2
+doma.dialect=POSTGRES
 doma.naming=SNAKE_LOWER_CASE
 logging.level.org.springframework.jdbc.datasource.DataSourceTransactionManager=DEBUG

doma-spring-boot-samples/doma-spring-boot-sample-testcontainers/src/test/java/org/seasar/doma/boot/sample/ApplicationTest.java

@@ -4,49 +4,56 @@
 
 import java.util.List;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.context.annotation.Import;
 import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpMethod;
+import org.springframework.web.client.RestClient;
 import org.springframework.web.util.UriComponentsBuilder;
 
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 @Import(TestcontainersConfiguration.class)
 class ApplicationTest {
-	@Autowired
-	private TestRestTemplate restTemplate;
+	private RestClient restClient;
 	private final ParameterizedTypeReference<List<Message>> typedReference = new ParameterizedTypeReference<List<Message>>() {
 	};
 	@LocalServerPort
 	private int port;
 
+	@BeforeEach
+	void setUp(@Autowired RestClient.Builder restClientBuilder) {
+		this.restClient = restClientBuilder.defaultStatusHandler(__ -> true, (req, res) -> {
+		}).build();
+	}
+
 	@Test
 	void testWithTestContainers() {
-		Message message1 = restTemplate.getForObject(
-				UriComponentsBuilder.fromUriString("http://localhost").port(port)
-						.queryParam("text", "hello").build().toUri(),
-				Message.class);
+		Message message1 = restClient.get()
+				.uri(UriComponentsBuilder.fromUriString("http://localhost").port(port)
+						.queryParam("text", "hello").build().toUri())
+				.retrieve()
+				.body(Message.class);
 		assertEquals(1, message1.id);
 		assertEquals("hello", message1.text);
-		Message message2 = restTemplate.getForObject(
-				UriComponentsBuilder.fromUriString("http://localhost").port(port)
-						.queryParam("text", "world").build().toUri(),
-				Message.class);
+
+		Message message2 = restClient.get()
+				.uri(UriComponentsBuilder.fromUriString("http://localhost").port(port)
+						.queryParam("text", "world").build().toUri())
+				.retrieve()
+				.body(Message.class);
 		assertEquals(2, message2.id);
 		assertEquals("world", message2.text);
 
 		{
-			List<Message> messages = restTemplate.exchange(
-					UriComponentsBuilder.fromUriString("http://localhost").port(port)
-							.build().toUri(),
-					HttpMethod.GET, HttpEntity.EMPTY,
-					typedReference).getBody();
+			List<Message> messages = restClient.get()
+					.uri(UriComponentsBuilder.fromUriString("http://localhost").port(port)
+							.build().toUri())
+					.retrieve()
+					.body(typedReference);
 			assertEquals(2, messages.size());
 			assertEquals(message1.id, messages.get(0).id);
 			assertEquals(message1.text, messages.get(0).text);
@@ -55,12 +62,12 @@ void testWithTestContainers() {
 		}
 
 		{
-			List<Message> messages = restTemplate.exchange(
-					UriComponentsBuilder.fromUriString("http://localhost").port(port)
+			List<Message> messages = restClient.get()
+					.uri(UriComponentsBuilder.fromUriString("http://localhost").port(port)
 							.queryParam("page", "1").queryParam("size", "1").build()
-							.toUri(),
-					HttpMethod.GET, HttpEntity.EMPTY, typedReference)
-					.getBody();
+							.toUri())
+					.retrieve()
+					.body(typedReference);
 			assertEquals(1, messages.size());
 			assertEquals(message2.id, messages.get(0).id);
 			assertEquals(message2.text, messages.get(0).text);