Refactor spring containers to make it more modular (#10)

Author: haiphucnguyen

README.md

@@ -102,7 +102,7 @@ class PostgresSpringTest {
 ### Example 2: Using Spring-TestContainers
 
 ```java
-import io.flowinquiry.testcontainers.jdbc.EnablePostgreSQL;
+import io.flowinquiry.testcontainers.jdbc.postgresql.EnablePostgreSQL;
 import org.junit.jupiter.api.Test;
 
 @ExtendWith(SpringExtension.class)

examples/spring-postgresql/src/test/java/io/flowinquiry/testcontainers/examples/postgresql/PostgresqlTest.java

@@ -7,7 +7,7 @@
 import io.flowinquiry.testcontainers.examples.postgresql.config.PostgresqlConfig;
 import io.flowinquiry.testcontainers.examples.postgresql.entity.Store;
 import io.flowinquiry.testcontainers.examples.postgresql.repository.StoreRepository;
-import io.flowinquiry.testcontainers.jdbc.EnablePostgreSQL;
+import io.flowinquiry.testcontainers.jdbc.postgresql.EnablePostgreSQL;
 import java.util.List;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;

examples/springboot-mysql/src/test/java/io/flowinquiry/testcontainers/examples/mysql/MySqlDemoAppTest.java

@@ -6,7 +6,7 @@
 
 import io.flowinquiry.testcontainers.examples.mysql.entity.Store;
 import io.flowinquiry.testcontainers.examples.mysql.repository.StoreRepository;
-import io.flowinquiry.testcontainers.jdbc.EnableMySQL;
+import io.flowinquiry.testcontainers.jdbc.mysql.EnableMySQL;
 import java.util.List;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;

examples/springboot-postgresql/src/test/java/io/flowinquiry/testcontainers/examples/postgresql/PostgresqlDemoAppTest.java

@@ -6,7 +6,7 @@
 
 import io.flowinquiry.testcontainers.examples.postgresql.entity.Store;
 import io.flowinquiry.testcontainers.examples.postgresql.repository.StoreRepository;
-import io.flowinquiry.testcontainers.jdbc.EnablePostgreSQL;
+import io.flowinquiry.testcontainers.jdbc.postgresql.EnablePostgreSQL;
 import java.util.List;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;

gradle/libs.versions.toml

@@ -3,7 +3,7 @@
 
 [versions]
 junit-jupiter = "5.12.2"
-testcontainers = "1.21.1"
+testcontainers = "1.21.2"
 spotless = "7.0.3"
 logback = "1.5.18"
 slf4j = "2.0.17"
@@ -24,6 +24,7 @@ junit-platform-launcher = { group = "org.junit.platform", name = "junit-platform
 spring-bom = { group = "org.springframework", name = "spring-framework-bom", version.ref = "spring" }
 spring-boot-bom = { group = "org.springframework.boot", name = "spring-boot-dependencies", version.ref = "spring-boot" }
 spring-ai-bom = { group = "org.springframework.ai", name = "spring-ai-bom", version.ref = "spring-ai" }
+testcontainers = { group = "org.testcontainers", name = "testcontainers", version.ref = "testcontainers" }
 testcontainers-jdbc = { group = "org.testcontainers", name = "jdbc", version.ref = "testcontainers" }
 testcontainers-mysql = { group = "org.testcontainers", name = "mysql", version.ref = "testcontainers" }
 testcontainers-postgresql = { group = "org.testcontainers", name = "postgresql", version.ref = "testcontainers" }

modules/jdbc/build.gradle

@@ -0,0 +1,16 @@
+plugins {
+    id("buildlogic.java-library-conventions")
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    api(project(":spring-testcontainers"))
+    api(libs.testcontainers.jdbc)
+}
+
+test {
+    useJUnitPlatform()
+}

spring-testcontainers/src/main/java/io/flowinquiry/testcontainers/jdbc/EnableJdbcContainer.java renamed to modules/jdbc/src/main/java/io/flowinquiry/testcontainers/jdbc/EnableJdbcContainer.java

@@ -1,9 +1,8 @@
 package io.flowinquiry.testcontainers.jdbc;
 
-import static io.flowinquiry.testcontainers.ServiceLoaderContainerFactory.getProvider;
-
 import io.flowinquiry.testcontainers.ContainerLifecycleExtension;
 import io.flowinquiry.testcontainers.ContainerType;
+import io.flowinquiry.testcontainers.ServiceLoaderContainerFactory;
 import io.flowinquiry.testcontainers.SpringAwareContainerProvider;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -39,7 +38,7 @@ protected EnableJdbcContainer getResolvedAnnotation(Class<?> testClass) {
   @Override
   protected SpringAwareContainerProvider<EnableJdbcContainer, ? extends GenericContainer<?>>
       initProvider(EnableJdbcContainer enableJdbcContainer) {
-    return getProvider(
+    return ServiceLoaderContainerFactory.getProvider(
         enableJdbcContainer,
         p -> p.getContainerType() == enableJdbcContainer.rdbms(),
         (prov, ann) -> prov.initContainerInstance(ann));

spring-testcontainers/src/main/java/io/flowinquiry/testcontainers/jdbc/JdbcContainerExtension.java renamed to modules/jdbc/src/main/java/io/flowinquiry/testcontainers/jdbc/JdbcContainerExtension.java

@@ -0,0 +1,19 @@
+plugins {
+    id("buildlogic.java-library-conventions")
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    api(project(":spring-testcontainers"))
+    implementation(platform(libs.spring.bom))
+    testImplementation(platform(libs.junit.bom))
+    testImplementation(libs.junit.jupiter)
+    testImplementation(libs.junit.platform.launcher)
+}
+
+test {
+    useJUnitPlatform()
+}