update for spring boot 3.5.7 (#21)

* - Refactor Gradle dependencies to use version catalogs for consistency and maintainability.
- Add and improve class-level Javadoc for better documentation and clarity of purpose.
- Update Gradle wrapper to version 8.10.2 for compatibility with newer tools.
- Update dependencies for compatibility with Spring Boot 3.5.7

* Removed some erroneously committed stuff

Author: brandstaetter

.gitignore

@@ -52,4 +52,3 @@ gradle-app.setting
 # gradle/wrapper/gradle-wrapper.properties
 
 # End of https://www.gitignore.io/api/gradle
-

build.gradle.kts

@@ -44,6 +44,7 @@ subprojects {
             if (!name.endsWith("-client")) {
                 dependencies {
                     "implementation"(libs.micronaut.testresources.testcontainers)
+                    "compileOnly"(libs.micronaut.core)
                     "implementation"(libs.testcontainers.junit4.mock)
                 }
             }

gradle/libs.versions.toml

@@ -1,19 +1,32 @@
 [versions]
-micronaut-testresources = "1.2.5"
-spring-boot = "3.0.5"
-junit = "5.8.1"
+micronaut-testresources = "1.2.6"
+spring-boot = "3.5.7"
+quarkus-junit-mock = "3.30.3"
+micronaut = "3.8.7"
+
+junit = "5.9.1"
+assertj = "3.27.6"
+azurite = "5.24.1"
 
 [libraries]
 
 micronaut-testresources-client = { module = "io.micronaut.testresources:micronaut-test-resources-client", version.ref = "micronaut-testresources" }
 micronaut-testresources-testcontainers = { module = "io.micronaut.testresources:micronaut-test-resources-testcontainers", version.ref = "micronaut-testresources" }
+micronaut-core = { module = "io.micronaut:micronaut-core", version.ref = "micronaut" }
+micronaut-http-client = { module = "io.micronaut:micronaut-http-client", version.ref = "micronaut" }
 
 spring-boot = { module = "org.springframework.boot:spring-boot", version.ref = "spring-boot" }
-spring-bootbom = { module = "org.springframework.boot:spring-boot-dependencies", version.ref = "spring-boot" }
 
 jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
 jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
 
-assertj = { module = "org.assertj:assertj-core", version = "3.23.1" }
-testcontainers-elasticsearch = { module = "org.testcontainers:elasticsearch", version = "" }
-testcontainers-junit4-mock = { module = "io.quarkus:quarkus-junit4-mock", version = "2.9.2.Final" }
+assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
+testcontainers-elasticsearch = { module = "org.testcontainers:elasticsearch" }
+testcontainers-jdbc = { module = "org.testcontainers:jdbc" }
+testcontainers-mariadb = { module = "org.testcontainers:mariadb" }
+testcontainers-mssqlserver = { module = "org.testcontainers:mssqlserver" }
+testcontainers-postgresql = { module = "org.testcontainers:postgresql" }
+testcontainers-rabbitmq = { module = "org.testcontainers:rabbitmq" }
+testcontainers-junit4-mock = { module = "io.quarkus:quarkus-junit4-mock", version.ref = "quarkus-junit-mock" }
+
+spring-cloud-azure-starter-storage-blob = { module = "com.azure.spring:spring-cloud-azure-starter-storage-blob", version.ref = "azurite" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

springboot-testresources-azurite/src/main/java/io/cloudflight/testresources/springboot/azurite/AzuriteTestResourceProvider.java

@@ -6,6 +6,9 @@
 
 import java.util.*;
 
+/**
+ * Test container provider for Azure Blob Storage Emulator.
+ */
 public class AzuriteTestResourceProvider extends AbstractTestContainersProvider<GenericContainer<?>> {
 
     private static final String PREFIX = "spring.cloud.azure.storage.blob.";

springboot-testresources-client/build.gradle.kts

@@ -2,6 +2,7 @@ description = "Client library for Spring Boot integration tests to connect to th
 
 dependencies {
     implementation(libs.micronaut.testresources.client)
+    implementation(libs.micronaut.http.client)
 
     compileOnly(libs.spring.boot)
 }

springboot-testresources-client/src/main/java/io/cloudflight/testresources/springboot/client/TestResourcesEnvironmentPostProcessor.java

@@ -11,6 +11,24 @@
 
 import java.util.Optional;
 
+/**
+ * The TestResourcesEnvironmentPostProcessor class is a Spring EnvironmentPostProcessor
+ * that integrates with the test resources service and modifies the application's
+ * environment configuration accordingly.
+ *
+ * This processor attempts to instantiate a TestResourcesClient from system
+ * properties using the {@link TestResourcesClientFactory#fromSystemProperties()}
+ * method. If successful, it adds a custom {@link TestResourcesPropertySource}
+ * to the environment's property sources to resolve properties from the test
+ * resources service.
+ *
+ * If the TestResourcesClient cannot be created, an ApplicationContextException
+ * is thrown indicating that the TestResources service is unavailable, and the
+ * Test-Resources Build plugin for Maven or Gradle may not be active.
+ *
+ * The processor is set to execute with the lowest precedence to ensure it interacts
+ * with an already configured environment.
+ */
 @Order(Ordered.LOWEST_PRECEDENCE)
 public class TestResourcesEnvironmentPostProcessor implements EnvironmentPostProcessor {
     @Override

springboot-testresources-client/src/main/java/io/cloudflight/testresources/springboot/client/TestResourcesPropertySource.java

@@ -11,13 +11,21 @@
 
 import static java.util.Collections.emptyMap;
 
+/**
+ * Property source that exposes the test resources configuration as properties.
+ */
 public class TestResourcesPropertySource extends PropertySource<TestResourcesClient> {
 
     private static final String NAME = "testresources";
     private static final String TEST_RESOURCES_PROPERTY_PREFIX = "test-resources.";
     private final ConfigurableEnvironment environment;
     private static Map<String, Object> testResourcesConfiguration;
 
+    /**
+     * Constructor.
+     * @param client .
+     * @param environment .
+     */
     public TestResourcesPropertySource(TestResourcesClient client, ConfigurableEnvironment environment) {
         super(NAME, client);
         this.environment = environment;

springboot-testresources-client/src/main/java/io/cloudflight/testresources/springboot/client/micronaut/TestResourcesClientFactory.java

@@ -18,6 +18,10 @@
  */
 public class TestResourcesClientFactory {
 
+    /**
+     * Tries to create a {@link TestResourcesClient} from the system properties.
+     * @return The {@link TestResourcesClient} if it could be created, otherwise {@link Optional#empty()}
+     */
     public static Optional<TestResourcesClient> fromSystemProperties() {
         String serverUri = System.getProperty(ConfigFinder.systemPropertyNameOf(TestResourcesClient.SERVER_URI));
         if (serverUri != null) {

springboot-testresources-elasticsearch/build.gradle.kts

@@ -2,5 +2,5 @@
 description = "Spring Boot TestResourceProvider for Elasticsearc"
 
 dependencies {
-    implementation("org.testcontainers:elasticsearch")
+    implementation(libs.testcontainers.elasticsearch)
 }