Update testcontainers to 2.0.2

Author: Donnerbart

build.gradle.kts

@@ -78,6 +78,7 @@ testing {
                 implementation(libs.awaitility)
                 implementation(libs.aws.sdkv2.cloudwatch)
                 implementation(libs.hivemq.mqttClient)
+                implementation(libs.testcontainers)
                 implementation(libs.testcontainers.hivemq)
                 implementation(libs.testcontainers.junitJupiter)
                 implementation(libs.testcontainers.localstack)

gradle/libs.versions.toml

@@ -11,7 +11,7 @@ jetbrains-annotations = "26.0.2-1"
 junit-jupiter = "5.10.0"
 logback = "1.5.21"
 mockito = "5.20.0"
-testcontainers = "1.21.3"
+testcontainers = "2.0.2"
 
 [libraries]
 awaitility = { module = "org.awaitility:awaitility", version.ref = "awaitility" }
@@ -24,9 +24,10 @@ jaxb-impl = { module = "com.sun.xml.bind:jaxb-impl", version.ref = "jaxb-impl" }
 jetbrains-annotations = { module = "org.jetbrains:annotations", version.ref = "jetbrains-annotations" }
 logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
 mockito = { module = "org.mockito:mockito-core", version.ref = "mockito" }
-testcontainers-hivemq = { module = "org.testcontainers:hivemq", version.ref = "testcontainers" }
-testcontainers-junitJupiter = { module = "org.testcontainers:junit-jupiter", version.ref = "testcontainers" }
-testcontainers-localstack = { module = "org.testcontainers:localstack", version.ref = "testcontainers" }
+testcontainers = { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" }
+testcontainers-hivemq = { module = "org.testcontainers:testcontainers-hivemq", version.ref = "testcontainers" }
+testcontainers-junitJupiter = { module = "org.testcontainers:testcontainers-junit-jupiter", version.ref = "testcontainers" }
+testcontainers-localstack = { module = "org.testcontainers:testcontainers-localstack", version.ref = "testcontainers" }
 
 [plugins]
 defaults = { id = "io.github.sgtsilvio.gradle.defaults", version = "0.2.0" }

src/integrationTest/java/com/hivemq/extensions/aws/cloudwatch/EndToEndIT.java

@@ -15,7 +15,6 @@
  */
 package com.hivemq.extensions.aws.cloudwatch;
 
-import com.hivemq.client.mqtt.mqtt5.Mqtt5BlockingClient;
 import com.hivemq.client.mqtt.mqtt5.Mqtt5Client;
 import io.github.sgtsilvio.gradle.oci.junit.jupiter.OciImages;
 import org.awaitility.Durations;
@@ -25,9 +24,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 import org.testcontainers.containers.Network;
-import org.testcontainers.containers.localstack.LocalStackContainer;
-import org.testcontainers.containers.localstack.LocalStackContainer.Service;
 import org.testcontainers.hivemq.HiveMQContainer;
+import org.testcontainers.localstack.LocalStackContainer;
 import org.testcontainers.utility.MountableFile;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
@@ -42,7 +40,6 @@
 import java.time.Instant;
 import java.util.Collections;
 import java.util.List;
-import java.util.OptionalDouble;
 import java.util.concurrent.TimeUnit;
 
 import static org.awaitility.Awaitility.await;
@@ -52,18 +49,19 @@ class EndToEndIT {
     private final @NotNull Network network = org.testcontainers.containers.Network.newNetwork();
 
     private final @NotNull LocalStackContainer localStack =
-            new LocalStackContainer(OciImages.getImageName("localstack/localstack")).withServices(Service.CLOUDWATCH)
+            new LocalStackContainer(OciImages.getImageName("localstack/localstack")).withServices("cloudwatch")
                     .withNetwork(network)
                     .withNetworkAliases("localstack");
 
     private final @NotNull HiveMQContainer hivemq =
             new HiveMQContainer(OciImages.getImageName("hivemq/extensions/hivemq-aws-cloudwatch-extension")
-                    .asCompatibleSubstituteFor("hivemq/hivemq4")).withCopyToContainer(MountableFile.forClasspathResource(
-                                    "extension-config.xml"),
+                    .asCompatibleSubstituteFor("hivemq/hivemq4")) //
+                    .withCopyToContainer(MountableFile.forClasspathResource("extension-config.xml"),
                             "/opt/hivemq/extensions/hivemq-aws-cloudwatch-extension/extension-config.xml")
                     .withEnv("AWS_REGION", localStack.getRegion())
                     .withEnv("AWS_ACCESS_KEY_ID", localStack.getAccessKey())
                     .withEnv("AWS_SECRET_ACCESS_KEY", localStack.getSecretKey())
+                    .withEnv("HIVEMQ_DISABLE_STATISTICS", "true")
                     .withLogConsumer(outputFrame -> System.out.println("HIVEMQ: " +
                             outputFrame.getUtf8StringWithoutLineEnding()))
                     .withNetwork(network);
@@ -84,13 +82,13 @@ void tearDown() {
     @Test
     @Timeout(value = 5, unit = TimeUnit.MINUTES)
     void endToEnd() {
-        final StaticCredentialsProvider credentialsProvider =
+        final var credentialsProvider =
                 StaticCredentialsProvider.create(AwsBasicCredentials.create(localStack.getAccessKey(),
                         localStack.getSecretKey()));
 
-        final CloudWatchClient cloudWatchClient = CloudWatchClient.builder()
+        final var cloudWatchClient = CloudWatchClient.builder()
                 .credentialsProvider(credentialsProvider)
-                .endpointOverride(localStack.getEndpointOverride(Service.CLOUDWATCH))
+                .endpointOverride(localStack.getEndpoint())
                 .region(Region.of(localStack.getRegion()))
                 .build();
 
@@ -100,17 +98,16 @@ void endToEnd() {
                         .stream()
                         .anyMatch(metric -> "com.hivemq.messages.incoming.publish.count".equals(metric.metricName())));
 
-        final Metric metric = Metric.builder()
+        final var metric = Metric.builder()
                 .namespace("hivemq-metrics")
                 .metricName("com.hivemq.messages.incoming.publish.count")
                 .dimensions(Collections.emptyList())
                 .build();
 
-        final MetricStat metricStat =
+        final var metricStat =
                 MetricStat.builder().stat(Statistic.MAXIMUM.toString()).period(60).metric(metric).build();
 
-        final MetricDataQuery metricDataQuery =
-                MetricDataQuery.builder().id("m1").metricStat(metricStat).returnData(true).build();
+        final var metricDataQuery = MetricDataQuery.builder().id("m1").metricStat(metricStat).returnData(true).build();
 
         await().timeout(Durations.FIVE_MINUTES).until(() -> {
             final GetMetricDataRequest request = GetMetricDataRequest.builder()
@@ -119,27 +116,27 @@ void endToEnd() {
                     .metricDataQueries(List.of(metricDataQuery))
                     .build();
             final var response = cloudWatchClient.getMetricData(request);
-            final OptionalDouble maxValue = response.metricDataResults()
+            final var maxValue = response.metricDataResults()
                     .stream()
                     .flatMap(result -> result.values().stream())
                     .mapToDouble(Double::doubleValue)
                     .max();
             return maxValue.isPresent() && maxValue.getAsDouble() == 0.0;
         });
 
-        final Mqtt5BlockingClient mqttClient =
+        final var mqttClient =
                 Mqtt5Client.builder().serverHost(hivemq.getHost()).serverPort(hivemq.getMqttPort()).buildBlocking();
         mqttClient.connect();
         mqttClient.publishWith().topic("wabern").send();
 
         await().timeout(Durations.FIVE_MINUTES).until(() -> {
-            final GetMetricDataRequest request = GetMetricDataRequest.builder()
+            final var request = GetMetricDataRequest.builder()
                     .startTime(Instant.now().minusSeconds(3600))
                     .endTime(Instant.now())
                     .metricDataQueries(List.of(metricDataQuery))
                     .build();
             final var response = cloudWatchClient.getMetricData(request);
-            final OptionalDouble maxValue = response.metricDataResults()
+            final var maxValue = response.metricDataResults()
                     .stream()
                     .flatMap(result -> result.values().stream())
                     .mapToDouble(Double::doubleValue)