Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Deprecate TestUtils.dockerRegistryFromEnv()

Browse Source 
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
This commit is contained in:
Artem Bilan
2022-05-19 12:41:09 -04:00
parent a614e4bdf9
commit 5a42d7137a
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlContainerTest.java
View File

@@ -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.

4
spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MosquittoContainerTest.java
View File

@@ -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);

6
spring-integration-test-support/src/main/java/org/springframework/integration/test/util/TestUtils.java
View File

@@ -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("");
}