Fixed toString methods

Author: julien

subprojects/testcontainers-redis-junit/src/main/java/com/redis/testcontainers/junit/RedisTestContext.java

@@ -22,6 +22,11 @@ public RedisTestContext(RedisServer server) {
 		this.server = server;
 	}
 
+	@Override
+	public String toString() {
+		return server.toString();
+	}
+
 	public RedisServer getServer() {
 		return server;
 	}

subprojects/testcontainers-redis/src/main/java/com/redis/testcontainers/AbstractRedisContainer.java

@@ -35,4 +35,8 @@ public String toString() {
 		return ClassUtils.getShortClassName(getClass()) + " active=" + isActive();
 	}
 
+	public static boolean isActive(String envName) {
+		return !Boolean.parseBoolean(System.getenv(envName));
+	}
+
 }

subprojects/testcontainers-redis/src/main/java/com/redis/testcontainers/RedisClusterContainer.java

@@ -2,17 +2,13 @@
 
 import java.util.Objects;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.shaded.org.apache.commons.lang.ClassUtils;
 import org.testcontainers.utility.DockerImageName;
 
 public class RedisClusterContainer extends GenericContainer<RedisClusterContainer> implements RedisServer {
 
-	private static final Logger log = LoggerFactory.getLogger(RedisClusterContainer.class);
-
 	public static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("grokzen/redis-cluster");
 	public static final String DEFAULT_TAG = "6.2.1";
 	public static final int DEFAULT_INITIAL_PORT = 7000;
@@ -141,10 +137,7 @@ public boolean equals(Object obj) {
 
 	@Override
 	public boolean isActive() {
-		String skipValue = System.getenv(ENV_SKIP_TESTS);
-		boolean active = !Boolean.parseBoolean(skipValue);
-		log.info("Active: {} ({}='{}'}", active, ENV_SKIP_TESTS, skipValue);
-		return active;
+		return AbstractRedisContainer.isActive(ENV_SKIP_TESTS);
 	}
 
 }

subprojects/testcontainers-redis/src/main/java/com/redis/testcontainers/RedisContainer.java

@@ -1,14 +1,10 @@
 package com.redis.testcontainers;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
 
 public class RedisContainer extends AbstractRedisContainer<RedisContainer> {
 
-	private static final Logger log = LoggerFactory.getLogger(RedisContainer.class);
-
 	public static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("redis");
 	public static final String DEFAULT_TAG = "6.2.6";
 	public static final String ENV_SKIP_TESTS = "skipRedisTests";
@@ -48,10 +44,7 @@ public <C extends RedisContainer> C withKeyspaceNotifications() {
 
 	@Override
 	public boolean isActive() {
-		String skipValue = System.getenv(ENV_SKIP_TESTS);
-		boolean active = !Boolean.parseBoolean(skipValue);
-		log.info("Active: {} ({}='{}'}", active, ENV_SKIP_TESTS, skipValue);
-		return active;
+		return AbstractRedisContainer.isActive(ENV_SKIP_TESTS);
 	}
 
 }

subprojects/testcontainers-redis/src/main/java/com/redis/testcontainers/RedisEnterpriseContainer.java

@@ -225,10 +225,7 @@ public boolean equals(Object obj) {
 
 	@Override
 	public boolean isActive() {
-		String skipValue = System.getenv(ENV_SKIP_TESTS);
-		boolean active = !Boolean.parseBoolean(skipValue);
-		log.info("Active: {} ({}='{}'}", active, ENV_SKIP_TESTS, skipValue);
-		return active;
+		return AbstractRedisContainer.isActive(ENV_SKIP_TESTS);
 	}
 
 }

subprojects/testcontainers-redis/src/main/java/com/redis/testcontainers/RedisModulesContainer.java

@@ -1,13 +1,9 @@
 package com.redis.testcontainers;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.testcontainers.utility.DockerImageName;
 
 public class RedisModulesContainer extends AbstractRedisContainer<RedisModulesContainer> {
 
-	private static final Logger log = LoggerFactory.getLogger(RedisModulesContainer.class);
-
 	public static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("redislabs/redismod");
 	public static final String DEFAULT_TAG = "latest";
 	public static final String ENV_SKIP_TESTS = "skipRedisModulesTests";
@@ -39,10 +35,7 @@ public boolean isCluster() {
 
 	@Override
 	public boolean isActive() {
-		String skipValue = System.getenv(ENV_SKIP_TESTS);
-		boolean active = !Boolean.parseBoolean(skipValue);
-		log.info("Active: {} ({}='{}'}", active, ENV_SKIP_TESTS, skipValue);
-		return active;
+		return AbstractRedisContainer.isActive(ENV_SKIP_TESTS);
 	}
 
 }