Polish "Support service connections for redis-stack and redis-stack-server"

See gh-41327

Author: wilkinsona

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/redis/RedisDockerComposeConnectionDetailsFactory.java

@@ -33,13 +33,13 @@
  */
 class RedisDockerComposeConnectionDetailsFactory extends DockerComposeConnectionDetailsFactory<RedisConnectionDetails> {
 
-	private static final String[] REDIS_IMAGE_NAMES = { "redis", "bitnami/redis", "redis/redis-stack",
+	private static final String[] REDIS_CONTAINER_NAMES = { "redis", "bitnami/redis", "redis/redis-stack",
 			"redis/redis-stack-server" };
 
 	private static final int REDIS_PORT = 6379;
 
 	RedisDockerComposeConnectionDetailsFactory() {
-		super(REDIS_IMAGE_NAMES);
+		super(REDIS_CONTAINER_NAMES);
 	}
 
 	@Override

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/testing/testcontainers.adoc

@@ -87,7 +87,7 @@ The following service connection factories are provided in the `spring-boot-test
 | Containers of type `RabbitMQContainer`
 
 | `RedisConnectionDetails`
-| Containers named "redis", "bitnami/redis", "redis/redis-stack" or "redis/redis-stack-server"
+| Containers named "redis", "redis/redis-stack" or "redis/redis-stack-server"
 
 | `ZipkinConnectionDetails`
 | Containers named "openzipkin/zipkin"

spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/redis/BitnamiRedisContainerConnectionDetailsFactoryTests.java

@@ -17,7 +17,6 @@
 package org.springframework.boot.testcontainers.service.connection.redis;
 
 import org.junit.jupiter.api.Test;
-import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -26,6 +25,7 @@
 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.redis.RedisConnectionDetails;
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
+import org.springframework.boot.testsupport.container.RedisStackContainer;
 import org.springframework.boot.testsupport.container.TestImage;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnection;
@@ -46,7 +46,7 @@ class RedisStackContainerConnectionDetailsFactoryTests {
 
 	@Container
 	@ServiceConnection
-	static final GenericContainer<?> redis = TestImage.REDIS_STACK.genericContainer().withExposedPorts(6379);
+	static final RedisStackContainer redis = TestImage.container(RedisStackContainer.class);
 
 	@Autowired(required = false)
 	private RedisConnectionDetails connectionDetails;

spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/redis/RedisStackContainerConnectionDetailsFactoryTests.java

@@ -17,7 +17,6 @@
 package org.springframework.boot.testcontainers.service.connection.redis;
 
 import org.junit.jupiter.api.Test;
-import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -26,6 +25,7 @@
 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.redis.RedisConnectionDetails;
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
+import org.springframework.boot.testsupport.container.RedisStackServerContainer;
 import org.springframework.boot.testsupport.container.TestImage;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnection;
@@ -46,7 +46,7 @@ class RedisStackServerContainerConnectionDetailsFactoryTests {
 
 	@Container
 	@ServiceConnection
-	static final GenericContainer<?> redis = TestImage.REDIS_STACK_SERVER.genericContainer().withExposedPorts(6379);
+	static final RedisStackServerContainer redis = TestImage.container(RedisStackServerContainer.class);
 
 	@Autowired(required = false)
 	private RedisConnectionDetails connectionDetails;

spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/redis/RedisStackServerContainerConnectionDetailsFactoryTests.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2012-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.testsupport.container;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * A {@link GenericContainer} for Redis Stack.
+ *
+ * @author Andy Wilkinson
+ * @author Madhura Bhave
+ */
+public class RedisStackContainer extends GenericContainer<RedisStackContainer> {
+
+	public RedisStackContainer(DockerImageName dockerImageName) {
+		super(dockerImageName);
+		addExposedPorts(6379);
+	}
+
+}

spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/RedisStackContainer.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2012-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.testsupport.container;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * A {@link GenericContainer} for Redis Stack Server.
+ *
+ * @author Andy Wilkinson
+ * @author Madhura Bhave
+ */
+public class RedisStackServerContainer extends GenericContainer<RedisStackServerContainer> {
+
+	public RedisStackServerContainer(DockerImageName dockerImageName) {
+		super(dockerImageName);
+		addExposedPorts(6379);
+	}
+
+}

spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/RedisStackServerContainer.java

@@ -186,12 +186,16 @@ public enum TestImage {
 	/**
 	 * A container image suitable for testing Redis Stack.
 	 */
-	REDIS_STACK("redis/redis-stack", "7.2.0-v11"),
+	REDIS_STACK("redis/redis-stack", "7.2.0-v11", () -> RedisStackContainer.class,
+			(container) -> ((RedisStackContainer) container).withStartupAttempts(5)
+				.withStartupTimeout(Duration.ofMinutes(10))),
 
 	/**
 	 * A container image suitable for testing Redis Stack Server.
 	 */
-	REDIS_STACK_SERVER("redis/redis-stack-server", "7.2.0-v11"),
+	REDIS_STACK_SERVER("redis/redis-stack-server", "7.2.0-v11", () -> RedisStackServerContainer.class,
+			(container) -> ((RedisStackServerContainer) container).withStartupAttempts(5)
+				.withStartupTimeout(Duration.ofMinutes(10))),
 
 	/**
 	 * A container image suitable for testing Redpanda.
@@ -281,6 +285,10 @@ public enum TestImage {
 		this(name, tag, containerClass, null);
 	}
 
+	TestImage(String name, String tag, Consumer<?> containerSetup) {
+		this(name, tag, null, containerSetup);
+	}
+
 	TestImage(String name, String tag, Supplier<Class<?>> containerClass, Consumer<?> containerSetup) {
 		this.name = name;
 		this.tag = tag;