From 02f5acb03270dbaa3a1ef7fc62a84a46cca384a9 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 12 May 2023 15:51:28 -0700 Subject: [PATCH] Refactor the TestcontainersCassandraConfiguration to again use the Testcontainers 'TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX' environment variable. --- .../crm/config/TestcontainersCassandraConfiguration.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/spring-geode-project/spring-geode/src/test/java/example/app/crm/config/TestcontainersCassandraConfiguration.java b/spring-geode-project/spring-geode/src/test/java/example/app/crm/config/TestcontainersCassandraConfiguration.java index cf2782cc..a74c5a5d 100644 --- a/spring-geode-project/spring-geode/src/test/java/example/app/crm/config/TestcontainersCassandraConfiguration.java +++ b/spring-geode-project/spring-geode/src/test/java/example/app/crm/config/TestcontainersCassandraConfiguration.java @@ -67,6 +67,7 @@ import example.app.crm.model.Customer; public class TestcontainersCassandraConfiguration extends TestCassandraConfiguration { // Apache Cassandra Constants + private static final String CASSANDRA_VERSION = "3.11.15"; private static final String LOCAL_DATACENTER_NAME = "datacenter1"; // Testcontainers Constants @@ -77,7 +78,9 @@ public class TestcontainersCassandraConfiguration extends TestCassandraConfigura //private static final DockerImageName CASSANDRA_DOCKER_IMAGE_NAME = DockerImageName.parse("cassandra:latest"); private static final DockerImageName CASSANDRA_DOCKER_IMAGE_NAME = - DockerImageName.parse(String.format("%scassandra:3.11.15", TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX)); + DockerImageName.parse(String.format("cassandra:%s", CASSANDRA_VERSION)); + //private static final DockerImageName CASSANDRA_DOCKER_IMAGE_NAME = + // DockerImageName.parse(String.format("%scassandra:3.11.15", TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX)); private final Logger logger = LoggerFactory.getLogger(getClass()); @@ -166,8 +169,8 @@ public class TestcontainersCassandraConfiguration extends TestCassandraConfigura return isNotJenkinsEnvironment() ? cassandraContainer.withEnv("TESTCONTAINERS_RYUK_DISABLED", TESTCONTAINERS_RYUK_DISABLED) - //: cassandraContainer.withEnv("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX", TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX) - : cassandraContainer; + : cassandraContainer.withEnv("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX", TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX); + //: cassandraContainer; } private @NonNull GenericContainer withCassandraServer(@NonNull GenericContainer cassandraContainer,