From 5a42d7137a9009c355ef7b5c1a74cb876f519560 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 19 May 2022 12:41:09 -0400 Subject: [PATCH] Deprecate `TestUtils.dockerRegistryFromEnv()` The Testcontainers rely on the `TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX` ENV var and build proper image name automatically. * Deprecate `TestUtils.dockerRegistryFromEnv()` and remove its usage in the project --- .../integration/jdbc/mysql/MySqlContainerTest.java | 3 --- .../integration/mqtt/MosquittoContainerTest.java | 4 +--- .../springframework/integration/test/util/TestUtils.java | 6 ++++++ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlContainerTest.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlContainerTest.java index 8854b6efd9..62478237d7 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlContainerTest.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlContainerTest.java @@ -19,9 +19,6 @@ package org.springframework.integration.jdbc.mysql; import org.junit.jupiter.api.BeforeAll; import org.testcontainers.containers.MySQLContainer; import org.testcontainers.junit.jupiter.Testcontainers; -import org.testcontainers.utility.DockerImageName; - -import org.springframework.integration.test.util.TestUtils; /** * The base contract for JUnit tests based on the container for MqSQL. diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MosquittoContainerTest.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MosquittoContainerTest.java index 353da21e77..621a601051 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MosquittoContainerTest.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MosquittoContainerTest.java @@ -20,8 +20,6 @@ import org.junit.jupiter.api.BeforeAll; import org.testcontainers.containers.GenericContainer; import org.testcontainers.junit.jupiter.Testcontainers; -import org.springframework.integration.test.util.TestUtils; - /** * The base contract for JUnit tests based on the container for MQTT Mosquitto broker. * The Testcontainers 'reuse' option must be disabled,so, Ryuk container is started @@ -37,7 +35,7 @@ import org.springframework.integration.test.util.TestUtils; public interface MosquittoContainerTest { GenericContainer MOSQUITTO_CONTAINER = - new GenericContainer<>(TestUtils.dockerRegistryFromEnv() + "eclipse-mosquitto:2.0.12") + new GenericContainer<>("eclipse-mosquitto:2.0.12") .withCommand("mosquitto -c /mosquitto-no-auth.conf") .withExposedPorts(1883); diff --git a/spring-integration-test-support/src/main/java/org/springframework/integration/test/util/TestUtils.java b/spring-integration-test-support/src/main/java/org/springframework/integration/test/util/TestUtils.java index d4ca636537..5fdfacb254 100644 --- a/spring-integration-test-support/src/main/java/org/springframework/integration/test/util/TestUtils.java +++ b/spring-integration-test-support/src/main/java/org/springframework/integration/test/util/TestUtils.java @@ -375,6 +375,12 @@ public abstract class TestUtils { ctx.updateLoggers(); } + /** + * Take a Docker Hub url from ENV var. + * @return a Docker Hub url from ENV var. + * @deprecated since 5.5.13 in favor of standard {@code TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX} ENV var + */ + @Deprecated public static String dockerRegistryFromEnv() { return Optional.ofNullable(System.getenv("DOCKER_REGISTRY_URL")).orElse(""); }