#1 add postgres support (#5)

klu2 · web-flow · commit bed253c110ea · 2023-01-09T19:44:05.000+01:00
diff --git a/README.md b/README.md
@@ -243,6 +243,24 @@ dependencies {
   * `spring.datasource.password`
   * `spring.datasource.driver-class-name`
 
+## Postgres
+
+* **Module-ID**: postgres
+* **Default-Image**: postgres
+
+````kotlin
+dependencies {
+    testResourcesImplementation ("io.cloudflight.testresources.springboot:springboot-testresources-jdbc-postgres:0.0.3")
+}
+````
+
+* **Provided properties**:
+  * `spring.datasource.url`
+  * `spring.datasource.username`
+  * `spring.datasource.password`
+  * `spring.datasource.driver-class-name`
+
+
 ## MinIO
 
 * **Module-ID**: minio
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -10,8 +10,6 @@ micronaut-testresources-testcontainers = { module = "io.micronaut.testresources:
 
 spring-boot = { module = "org.springframework.boot:spring-boot", version.ref = "spring-boot" }
 
-testcontainers-mariadb = { module = "org.testcontainers:mariadb", version = "" }
-
 jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
 jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -6,7 +6,11 @@ rootProject.name = "springboot-testresources"
 
 include("springboot-testresources-client")
 include("springboot-testresources-minio")
-include("springboot-testresources-jdbc-mariadb")
+include("springboot-testresources-jdbc")
+include("springboot-testresources-jdbc:springboot-testresources-jdbc-mariadb")
+include("springboot-testresources-jdbc:springboot-testresources-jdbc-postgres")
 
 include("testprojects:jdbc:mariadb")
+include("testprojects:jdbc:postgres")
 include("testprojects:minio")
+
diff --git a/springboot-testresources-jdbc-mariadb/build.gradle.kts b/springboot-testresources-jdbc-mariadb/build.gradle.kts
diff --git a/springboot-testresources-jdbc/build.gradle.kts b/springboot-testresources-jdbc/build.gradle.kts
@@ -0,0 +1,3 @@
+dependencies {
+    implementation("org.testcontainers:jdbc")
+}
diff --git a/springboot-testresources-jdbc/springboot-testresources-jdbc-mariadb/build.gradle.kts b/springboot-testresources-jdbc/springboot-testresources-jdbc-mariadb/build.gradle.kts
@@ -0,0 +1,6 @@
+description = "Spring Boot TestResourceProvider for MariaDB"
+
+dependencies {
+    implementation(project(":springboot-testresources-jdbc"))
+    implementation("org.testcontainers:mariadb")
+}
diff --git a/springboot-testresources-jdbc/springboot-testresources-jdbc-mariadb/src/main/java/io/cloudflight/testresources/springboot/jdbc/mariadb/MariaDbTestResourcesProvider.java b/springboot-testresources-jdbc/springboot-testresources-jdbc-mariadb/src/main/java/io/cloudflight/testresources/springboot/jdbc/mariadb/MariaDbTestResourcesProvider.java
@@ -1,14 +1,15 @@
 package io.cloudflight.testresources.springboot.jdbc.mariadb;
 
+import io.cloudflight.testresources.springboot.jdbc.AbstractJdbcTestResourceProvider;
 import org.testcontainers.containers.MariaDBContainer;
 import org.testcontainers.utility.DockerImageName;
 
 import java.util.Map;
 
 public class MariaDbTestResourcesProvider extends AbstractJdbcTestResourceProvider<MariaDBContainer<?>> {
 
-    public static final String DEFAULT_IMAGE = "mariadb";
-    public static final String SIMPLE_NAME = "mariadb";
+    private static final String DEFAULT_IMAGE = "mariadb";
+    private static final String SIMPLE_NAME = "mariadb";
 
 
     @Override
diff --git a/springboot-testresources-jdbc/springboot-testresources-jdbc-mariadb/src/main/resources/META-INF/services/io.micronaut.testresources.core.TestResourcesResolver b/springboot-testresources-jdbc/springboot-testresources-jdbc-mariadb/src/main/resources/META-INF/services/io.micronaut.testresources.core.TestResourcesResolver
diff --git a/springboot-testresources-jdbc/springboot-testresources-jdbc-mariadb/src/test/java/io/cloudflight/testresources/springboot/jdbc/mariadb/MariaDbTestResourcesProviderTest.java b/springboot-testresources-jdbc/springboot-testresources-jdbc-mariadb/src/test/java/io/cloudflight/testresources/springboot/jdbc/mariadb/MariaDbTestResourcesProviderTest.java
@@ -1,6 +1,5 @@
 package io.cloudflight.testresources.springboot.jdbc.mariadb;
 
-import io.cloudflight.testresources.springboot.jdbc.mariadb.MariaDbTestResourcesProvider;
 import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
diff --git a/springboot-testresources-jdbc/springboot-testresources-jdbc-postgres/build.gradle.kts b/springboot-testresources-jdbc/springboot-testresources-jdbc-postgres/build.gradle.kts
@@ -0,0 +1,6 @@
+description = "Spring Boot TestResourceProvider for Postgres"
+
+dependencies {
+    implementation(project(":springboot-testresources-jdbc"))
+    implementation("org.testcontainers:postgresql")
+}
diff --git a/springboot-testresources-jdbc/springboot-testresources-jdbc-postgres/src/main/java/io/cloudflight/testresources/springboot/jdbc/postgres/PostgresTestResourcesProvider.java b/springboot-testresources-jdbc/springboot-testresources-jdbc-postgres/src/main/java/io/cloudflight/testresources/springboot/jdbc/postgres/PostgresTestResourcesProvider.java
@@ -0,0 +1,29 @@
+package io.cloudflight.testresources.springboot.jdbc.postgres;
+
+import io.cloudflight.testresources.springboot.jdbc.AbstractJdbcTestResourceProvider;
+import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.utility.DockerImageName;
+
+import java.util.Map;
+
+public class PostgresTestResourcesProvider extends AbstractJdbcTestResourceProvider<PostgreSQLContainer<?>> {
+
+    private static final String DEFAULT_IMAGE = "postgres";
+    private static final String SIMPLE_NAME = "postgres";
+
+    @Override
+    protected String getSimpleName() {
+        return SIMPLE_NAME;
+    }
+
+    @Override
+    protected String getDefaultImageName() {
+        return DEFAULT_IMAGE;
+    }
+
+    @Override
+    protected PostgreSQLContainer<?> createContainer(DockerImageName imageName, Map<String, Object> requestedProperties, Map<String, Object> testResourcesConfiguration) {
+        return new PostgreSQLContainer<>(imageName);
+    }
+
+}
diff --git a/springboot-testresources-jdbc/springboot-testresources-jdbc-postgres/src/main/resources/META-INF/services/io.micronaut.testresources.core.TestResourcesResolver b/springboot-testresources-jdbc/springboot-testresources-jdbc-postgres/src/main/resources/META-INF/services/io.micronaut.testresources.core.TestResourcesResolver
@@ -0,0 +1 @@
+io.cloudflight.testresources.springboot.jdbc.postgres.PostgresTestResourcesProvider
diff --git a/springboot-testresources-jdbc/src/main/java/io/cloudflight/testresources/springboot/jdbc/AbstractJdbcTestResourceProvider.java b/springboot-testresources-jdbc/src/main/java/io/cloudflight/testresources/springboot/jdbc/AbstractJdbcTestResourceProvider.java
@@ -1,4 +1,4 @@
-package io.cloudflight.testresources.springboot.jdbc.mariadb;
+package io.cloudflight.testresources.springboot.jdbc;
 
 import io.micronaut.testresources.testcontainers.AbstractTestContainersProvider;
 import org.testcontainers.containers.JdbcDatabaseContainer;
@@ -36,7 +36,7 @@ public List<String> getRequiredPropertyEntries() {
     }
 
     @Override
-    protected boolean shouldAnswer(String propertyName, Map<String, Object> requestedProperties, Map<String, Object> testResourcesConfiguration) {
+    public boolean shouldAnswer(String propertyName, Map<String, Object> requestedProperties, Map<String, Object> testResourcesConfiguration) {
         return propertyName.startsWith(PREFIX);
     }
 
diff --git a/testprojects/jdbc/mariadb/build.gradle.kts b/testprojects/jdbc/mariadb/build.gradle.kts
@@ -11,5 +11,5 @@ dependencies {
     runtimeOnly("org.mariadb.jdbc:mariadb-java-client")
 
     testRuntimeOnly(project(":springboot-testresources-client"))
-    testResourcesImplementation(project(":springboot-testresources-jdbc-mariadb"))
+    testResourcesImplementation(project(":springboot-testresources-jdbc:springboot-testresources-jdbc-mariadb"))
 }
diff --git a/testprojects/jdbc/postgres/build.gradle.kts b/testprojects/jdbc/postgres/build.gradle.kts
@@ -0,0 +1,15 @@
+plugins {
+    id("io.micronaut.test-resources")
+}
+
+dependencies {
+    implementation("org.springframework.boot:spring-boot-starter-data-jpa")
+    runtimeOnly("org.jetbrains.kotlin:kotlin-reflect")
+
+    testImplementation("org.springframework.boot:spring-boot-starter-test")
+
+    runtimeOnly("org.postgresql:postgresql")
+
+    testRuntimeOnly(project(":springboot-testresources-client"))
+    testResourcesImplementation(project(":springboot-testresources-jdbc:springboot-testresources-jdbc-postgres"))
+}
diff --git a/testprojects/jdbc/postgres/src/main/kotlin/io/cloudflight/testresources/springboot/jdbc/postgres/Application.kt b/testprojects/jdbc/postgres/src/main/kotlin/io/cloudflight/testresources/springboot/jdbc/postgres/Application.kt
@@ -0,0 +1,20 @@
+package io.cloudflight.testresources.springboot.jdbc.postgres
+
+import jakarta.persistence.Entity
+import jakarta.persistence.GeneratedValue
+import jakarta.persistence.Id
+import org.springframework.boot.autoconfigure.SpringBootApplication
+import org.springframework.data.jpa.repository.JpaRepository
+
+@SpringBootApplication
+class Application
+
+@Entity
+class Person(var name: String) {
+
+    @Id
+    @GeneratedValue
+    var id: Long = 0
+}
+
+interface PersonRepository : JpaRepository<Person, Long>
diff --git a/testprojects/jdbc/postgres/src/main/resources/application.yml b/testprojects/jdbc/postgres/src/main/resources/application.yml
@@ -0,0 +1,9 @@
+spring:
+  jpa:
+    hibernate:
+      ddl-auto: create-drop
+
+test-resources:
+  containers:
+    mariadb:
+      image-name: mariadb:10.3
diff --git a/testprojects/jdbc/postgres/src/test/kotlin/io/cloudflight/testresources/springboot/jdbc/postgres/ApplicationTest.kt b/testprojects/jdbc/postgres/src/test/kotlin/io/cloudflight/testresources/springboot/jdbc/postgres/ApplicationTest.kt
@@ -0,0 +1,16 @@
+package io.cloudflight.testresources.springboot.jdbc.postgres
+
+import org.junit.jupiter.api.Test
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.context.SpringBootTest
+
+@SpringBootTest
+class ApplicationTest(
+    @Autowired private val repository: PersonRepository
+) {
+
+    @Test
+    fun enterData() {
+        repository.save(Person(name = "Person1"))
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+dependencies {`
	`2`	`+ implementation("org.testcontainers:jdbc")`
	`3`	`+}`