refactor!: Introduced AbstractRedisContainer

Author: jruaux

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

@@ -1,37 +1,31 @@
 package com.redis.testcontainers;
 
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.shaded.org.apache.commons.lang3.ClassUtils;
 import org.testcontainers.utility.DockerImageName;
 
-abstract class AbstractRedisContainer<C extends AbstractRedisContainer<C>> extends GenericContainer<C>
-		implements RedisServer {
-
-	public static final int REDIS_PORT = 6379;
+public abstract class AbstractRedisContainer<C extends AbstractRedisContainer<C>> extends GenericContainer<C> {
 
 	protected AbstractRedisContainer(final DockerImageName dockerImageName) {
-		this(dockerImageName, REDIS_PORT);
-	}
-
-	protected AbstractRedisContainer(final DockerImageName dockerImageName, int port) {
 		super(dockerImageName);
-		withExposedPorts(port);
-		waitingFor(Wait.forLogMessage(".*Ready to accept connections.*\\n", 1));
 	}
 
 	/**
 	 * Get Redis URI.
 	 *
 	 * @return Redis URI.
 	 */
-	@Override
-	public String getRedisURI() {
-		return RedisServer.redisURI(this);
+	public abstract String getRedisURI();
+	
+	public abstract boolean isCluster();
+	
+	protected String redisURI(String host, int port) {
+		return "redis://" + host + ":" + port;
 	}
 
 	@Override
 	public String toString() {
-		return RedisServer.toString(this);
+		return ClassUtils.getShortClassName(getClass());
 	}
 
 }

core/testcontainers-redis/src/main/java/com/redis/testcontainers/AbstractRedisServerContainer.java

@@ -0,0 +1,44 @@
+package com.redis.testcontainers;
+
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
+
+public abstract class AbstractRedisServerContainer<C extends AbstractRedisServerContainer<C>> extends AbstractRedisContainer<C> {
+
+	public static final int REDIS_PORT = 6379;
+
+	protected AbstractRedisServerContainer(String dockerImageName) {
+		this(DockerImageName.parse(dockerImageName));
+	}
+
+	protected AbstractRedisServerContainer(final DockerImageName dockerImageName) {
+		super(dockerImageName);
+		addExposedPorts(REDIS_PORT);
+		waitingFor(Wait.forLogMessage(".*Ready to accept connections.*\\n", 1));
+	}
+
+	@SuppressWarnings("unchecked")
+	public C withKeyspaceNotifications() {
+		withCopyFileToContainer(MountableFile.forClasspathResource("redis-keyspace-notifications.conf"),
+				"/data/redis.conf");
+		withCommand("redis-server", "/data/redis.conf");
+		return (C) this;
+	}
+
+	/**
+	 * Get Redis URI.
+	 *
+	 * @return Redis URI.
+	 */
+	@Override
+	public String getRedisURI() {
+		return redisURI(getHost(), getFirstMappedPort());
+	}
+
+	@Override
+	public boolean isCluster() {
+		return false;
+	}
+
+}

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

@@ -1,50 +1,19 @@
 package com.redis.testcontainers;
 
 import org.testcontainers.utility.DockerImageName;
-import org.testcontainers.utility.MountableFile;
 
-public class RedisContainer extends AbstractRedisContainer<RedisContainer> {
+public class RedisContainer extends AbstractRedisServerContainer<RedisContainer> {
 
 	public static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("redis");
-	public static final String DEFAULT_TAG = "6.2.6";
-	public static final String ENV_ENABLED_SUFFIX = "REDIS";
+	
+	public static final String DEFAULT_TAG = "latest";
 
-	/**
-	 * @deprecated use {@link RedisContainer(DockerImageName)} instead
-	 */
-	@Deprecated
-	public RedisContainer() {
-		this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
+	public RedisContainer(String dockerImageName) {
+		super(dockerImageName);
 	}
 
 	public RedisContainer(final DockerImageName dockerImageName) {
 		super(dockerImageName);
 	}
 
-	/**
-	 * @deprecated use {@link RedisContainer(DockerImageName)} instead
-	 */
-	@Deprecated
-	public RedisContainer(final String tag) {
-		this(DEFAULT_IMAGE_NAME.withTag(tag));
-	}
-
-	@Override
-	public boolean isCluster() {
-		return false;
-	}
-
-	@SuppressWarnings("unchecked")
-	public <C extends RedisContainer> C withKeyspaceNotifications() {
-		withCopyFileToContainer(MountableFile.forClasspathResource("redis-keyspace-notifications.conf"),
-				"/data/redis.conf");
-		withCommand("redis-server", "/data/redis.conf");
-		return (C) this;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		return RedisServer.isEnabled(ENV_ENABLED_SUFFIX);
-	}
-
 }