From b1e91c942e90fdd3f229fc792ef7e038e2b28839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Thu, 23 Jul 2026 17:17:20 +0200 Subject: [PATCH] Add support for creating a container from a TestImage value This commit improves TestImage so that an explicit image can trigger the creation of the container, with optional additional setup. This removes the need of creating additional container types for images that have multiple flavors, and to please the static method that can only create a container based on a single match. Closes gh-51082 --- ...ootBuildImageRegistryIntegrationTests.java | 2 +- .../BuildImageRegistryIntegrationTests.java | 2 +- .../ImportTestcontainersTests.java | 8 +- ...adTimeWeaverAwareBeanIntegrationTests.java | 2 +- ...tainersLifecycleOrderIntegrationTests.java | 2 +- ...fecycleOrderWithScopeIntegrationTests.java | 2 +- ...ainersParallelStartupIntegrationTests.java | 6 +- ...hImportTestcontainersIntegrationTests.java | 6 +- ...sPropertySourceAutoConfigurationTests.java | 4 +- ...rviceConnectionAutoConfigurationTests.java | 4 +- ...nStartsConnectionOnceIntegrationTests.java | 2 +- ...nectionDetailsFactoryIntegrationTests.java | 4 +- ...nectionDetailsFactoryIntegrationTests.java | 4 +- ...nectionDetailsFactoryIntegrationTests.java | 2 +- ...nectionDetailsFactoryIntegrationTests.java | 2 +- ...nectionDetailsFactoryIntegrationTests.java | 4 +- .../cache/metrics/RedisCacheMetricsTests.java | 2 +- ...ndraAutoConfigurationIntegrationTests.java | 2 +- ...asswordAuthenticationIntegrationTests.java | 2 +- ...ontainerConnectionDetailsFactoryTests.java | 2 +- ...baseAutoConfigurationIntegrationTests.java | 2 +- ...ontainerConnectionDetailsFactoryTests.java | 2 +- .../DataCassandraTestIntegrationTests.java | 2 +- ...TestWithIncludeFilterIntegrationTests.java | 2 +- ...ndraAutoConfigurationIntegrationTests.java | 2 +- .../DataCouchbaseTestIntegrationTests.java | 2 +- ...CouchbaseTestReactiveIntegrationTests.java | 2 +- ...TestWithIncludeFilterIntegrationTests.java | 2 +- ...DataElasticsearchTestIntegrationTests.java | 2 +- ...csearchTestPropertiesIntegrationTests.java | 2 +- ...ticsearchTestReactiveIntegrationTests.java | 2 +- ...TestWithIncludeFilterIntegrationTests.java | 2 +- ...archAutoConfigurationIntegrationTests.java | 2 +- ...iveRepositoriesAutoConfigurationTests.java | 2 +- ...rchRepositoriesAutoConfigurationTests.java | 2 +- ...toConfigurationDialectResolutionTests.java | 2 +- .../DataLdapTestDockerTests.java | 3 +- .../DataMongoTestIntegrationTests.java | 2 +- ...DataMongoTestReactiveIntegrationTests.java | 2 +- ...TestWithIncludeFilterIntegrationTests.java | 2 +- ...actionalDataMongoTestIntegrationTests.java | 2 +- .../DataNeo4jTestIntegrationTests.java | 2 +- ...taNeo4jTestPropertiesIntegrationTests.java | 2 +- ...DataNeo4jTestReactiveIntegrationTests.java | 2 +- ...TestWithIncludeFilterIntegrationTests.java | 2 +- ...riesAutoConfigurationIntegrationTests.java | 2 +- .../DataRedisTestIntegrationTests.java | 2 +- ...taRedisTestPropertiesIntegrationTests.java | 2 +- ...DataRedisTestReactiveIntegrationTests.java | 2 +- ...TestWithIncludeFilterIntegrationTests.java | 2 +- ...disRepositoriesAutoConfigurationTests.java | 2 +- ...ontainerConnectionDetailsFactoryTests.java | 2 +- ...ontainerConnectionDetailsFactoryTests.java | 2 +- ...ontainerConnectionDetailsFactoryTests.java | 2 +- ...ientAutoConfigurationIntegrationTests.java | 2 +- ...ientAutoConfigurationIntegrationTests.java | 2 +- ...ontainerConnectionDetailsFactoryTests.java | 6 +- ...ontainerConnectionDetailsFactoryTests.java | 2 +- ...nectionDetailsFactoryIntegrationTests.java | 2 +- ...nectionDetailsFactoryIntegrationTests.java | 2 +- ...DynamicPropertySourceIntegrationTests.java | 2 +- ...tabaseNonTestDatabaseIntegrationTests.java | 2 +- ...baseServiceConnectionIntegrationTests.java | 2 +- ...ontainerConnectionDetailsFactoryTests.java | 2 +- ...nectionDetailsFactoryIntegrationTests.java | 2 +- ...nectionDetailsFactoryIntegrationTests.java | 2 +- ...nectionDetailsFactoryIntegrationTests.java | 2 +- ...nectionDetailsFactoryIntegrationTests.java | 2 +- ...nectionDetailsFactoryIntegrationTests.java | 3 +- ...ontainerConnectionDetailsFactoryTests.java | 2 +- ...nderAutoConfigurationIntegrationTests.java | 4 +- ...nectionDetailsFactoryIntegrationTests.java | 2 +- ...nectionDetailsFactoryIntegrationTests.java | 8 +- ...nectionDetailsFactoryIntegrationTests.java | 2 +- ...nectionDetailsFactoryIntegrationTests.java | 4 +- .../MongoHealthIndicatorIntegrationTests.java | 2 +- ...activeHealthIndicatorIntegrationTests.java | 2 +- ...ontainerConnectionDetailsFactoryTests.java | 2 +- ...nectionDetailsFactoryIntegrationTests.java | 2 +- ...eo4jAutoConfigurationIntegrationTests.java | 2 +- ...activeHealthIndicatorIntegrationTests.java | 2 +- ...nectionDetailsFactoryIntegrationTests.java | 2 +- ...ontainerConnectionDetailsFactoryTests.java | 2 +- ...ontainerConnectionDetailsFactoryTests.java | 4 +- ...lsarAutoConfigurationIntegrationTests.java | 2 +- ...nectionDetailsFactoryIntegrationTests.java | 2 +- ...nectionDetailsFactoryIntegrationTests.java | 2 +- ...nectionDetailsFactoryIntegrationTests.java | 2 +- ...nectionDetailsFactoryIntegrationTests.java | 2 +- ...essionDataRedisAutoConfigurationTests.java | 2 +- ...taRedisReactiveAutoConfigurationTests.java | 2 +- ...nectionDetailsFactoryIntegrationTests.java | 2 +- .../activemq/SampleActiveMqTests.java | 4 +- .../SampleAmqpSimpleApplicationSslTests.java | 2 +- .../SampleAmqpSimpleApplicationTests.java | 2 +- .../smoketest/artemis/SampleArtemisTests.java | 4 +- .../SampleCacheApplicationRedisTests.java | 2 +- ...aCassandraApplicationReactiveSslTests.java | 2 +- ...ampleDataCassandraApplicationSslTests.java | 2 +- ...aCouchbaseApplicationReactiveSslTests.java | 2 +- ...ampleDataCouchbaseApplicationSslTests.java | 2 +- ...mpleDataElasticsearchApplicationTests.java | 2 +- ...eDataElasticsearchSslApplicationTests.java | 2 +- ...eDataMongoApplicationReactiveSslTests.java | 2 +- .../SampleMongoApplicationSslTests.java | 2 +- .../data/r2dbc/CityRepositoryTests.java | 2 +- .../data/r2dbc/CityRepositoryTests.java | 2 +- .../SampleRedisApplicationJedisSslTests.java | 2 +- ...ampleRedisApplicationReactiveSslTests.java | 2 +- .../redis/SampleRedisApplicationSslTests.java | 2 +- .../ssl/SampleKafkaSslApplicationTests.java | 2 +- .../pulsar/SamplePulsarApplicationTests.java | 2 +- ...leSessionWebFluxRedisApplicationTests.java | 2 +- .../SampleSessionRedisApplicationTests.java | 2 +- ...esImportSampleSessionRedisApplication.java | 2 +- ...opertiesSampleSessionRedisApplication.java | 2 +- ...onImportSampleSessionRedisApplication.java | 2 +- ...nnectionSampleSessionRedisApplication.java | 2 +- .../container/ActiveMQClassicContainer.java | 33 -------- .../container/ActiveMQContainer.java | 32 -------- .../container/ArtemisContainer.java | 32 -------- .../container/ArtemisLegacyContainer.java | 33 -------- .../container/ElasticsearchContainer9.java | 34 --------- .../container/SymptomaActiveMQContainer.java | 36 --------- .../boot/testsupport/container/TestImage.java | 75 +++++++++++++++---- 125 files changed, 201 insertions(+), 356 deletions(-) delete mode 100644 test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/ActiveMQClassicContainer.java delete mode 100644 test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/ActiveMQContainer.java delete mode 100644 test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/ArtemisContainer.java delete mode 100644 test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/ArtemisLegacyContainer.java delete mode 100644 test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/ElasticsearchContainer9.java delete mode 100644 test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/SymptomaActiveMQContainer.java diff --git a/build-plugin/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageRegistryIntegrationTests.java b/build-plugin/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageRegistryIntegrationTests.java index 1b454b92413..13942365361 100644 --- a/build-plugin/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageRegistryIntegrationTests.java +++ b/build-plugin/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageRegistryIntegrationTests.java @@ -52,7 +52,7 @@ import static org.assertj.core.api.Assertions.assertThat; class BootBuildImageRegistryIntegrationTests { @Container - static final RegistryContainer registry = TestImage.container(RegistryContainer.class); + static final RegistryContainer registry = TestImage.forContainer(RegistryContainer.class); String registryAddress; diff --git a/build-plugin/spring-boot-maven-plugin/src/dockerTest/java/org/springframework/boot/maven/BuildImageRegistryIntegrationTests.java b/build-plugin/spring-boot-maven-plugin/src/dockerTest/java/org/springframework/boot/maven/BuildImageRegistryIntegrationTests.java index 4eaee971eac..feb031d6971 100644 --- a/build-plugin/spring-boot-maven-plugin/src/dockerTest/java/org/springframework/boot/maven/BuildImageRegistryIntegrationTests.java +++ b/build-plugin/spring-boot-maven-plugin/src/dockerTest/java/org/springframework/boot/maven/BuildImageRegistryIntegrationTests.java @@ -44,7 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat; class BuildImageRegistryIntegrationTests extends AbstractArchiveIntegrationTests { @Container - static final RegistryContainer registry = TestImage.container(RegistryContainer.class); + static final RegistryContainer registry = TestImage.forContainer(RegistryContainer.class); DockerClient dockerClient; diff --git a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/ImportTestcontainersTests.java b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/ImportTestcontainersTests.java index ccdfae3c019..f98a0b79ae3 100644 --- a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/ImportTestcontainersTests.java +++ b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/ImportTestcontainersTests.java @@ -127,7 +127,7 @@ class ImportTestcontainersTests { static class ImportWithoutValue { @ContainerAnnotation - static PostgreSQLContainer container = TestImage.container(PostgreSQLContainer.class); + static PostgreSQLContainer container = TestImage.forContainer(PostgreSQLContainer.class); } @@ -151,14 +151,14 @@ class ImportTestcontainersTests { @ImportTestcontainers static class NonStaticContainer { - PostgreSQLContainer container = TestImage.container(PostgreSQLContainer.class); + PostgreSQLContainer container = TestImage.forContainer(PostgreSQLContainer.class); } interface ContainerDefinitions { @ContainerAnnotation - PostgreSQLContainer container = TestImage.container(PostgreSQLContainer.class); + PostgreSQLContainer container = TestImage.forContainer(PostgreSQLContainer.class); } @@ -170,7 +170,7 @@ class ImportTestcontainersTests { @ImportTestcontainers static class ContainerDefinitionsWithDynamicPropertySource { - static PostgreSQLContainer container = TestImage.container(PostgreSQLContainer.class); + static PostgreSQLContainer container = TestImage.forContainer(PostgreSQLContainer.class); @DynamicPropertySource static void containerProperties(DynamicPropertyRegistry registry) { diff --git a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersImportWithPropertiesInjectedIntoLoadTimeWeaverAwareBeanIntegrationTests.java b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersImportWithPropertiesInjectedIntoLoadTimeWeaverAwareBeanIntegrationTests.java index b652f6d7621..a7f6a6ce857 100644 --- a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersImportWithPropertiesInjectedIntoLoadTimeWeaverAwareBeanIntegrationTests.java +++ b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersImportWithPropertiesInjectedIntoLoadTimeWeaverAwareBeanIntegrationTests.java @@ -90,7 +90,7 @@ class TestcontainersImportWithPropertiesInjectedIntoLoadTimeWeaverAwareBeanInteg static class Containers { @Container - static PostgreSQLContainer container = TestImage.container(PostgreSQLContainer.class); + static PostgreSQLContainer container = TestImage.forContainer(PostgreSQLContainer.class); @DynamicPropertySource static void setConnectionProperties(DynamicPropertyRegistry registry) { diff --git a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleOrderIntegrationTests.java b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleOrderIntegrationTests.java index 5ef18078a09..e8c4dc2fa21 100644 --- a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleOrderIntegrationTests.java +++ b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleOrderIntegrationTests.java @@ -65,7 +65,7 @@ class TestcontainersLifecycleOrderIntegrationTests { @Bean @ServiceConnection RedisContainer redisContainer() { - return TestImage.container(EventRecordingRedisContainer.class); + return TestImage.forContainer(EventRecordingRedisContainer.class); } } diff --git a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleOrderWithScopeIntegrationTests.java b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleOrderWithScopeIntegrationTests.java index b826e2f2be9..3ffa0326031 100644 --- a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleOrderWithScopeIntegrationTests.java +++ b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleOrderWithScopeIntegrationTests.java @@ -77,7 +77,7 @@ class TestcontainersLifecycleOrderWithScopeIntegrationTests { @Scope("custom") @ServiceConnection RedisContainer redisContainer() { - return TestImage.container(EventRecordingRedisContainer.class); + return TestImage.forContainer(EventRecordingRedisContainer.class); } } diff --git a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersParallelStartupIntegrationTests.java b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersParallelStartupIntegrationTests.java index dcb3b347209..c65c3ac54d5 100644 --- a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersParallelStartupIntegrationTests.java +++ b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersParallelStartupIntegrationTests.java @@ -55,17 +55,17 @@ class TestcontainersParallelStartupIntegrationTests { @Bean static PostgreSQLContainer container1() { - return TestImage.container(PostgreSQLContainer.class); + return TestImage.forContainer(PostgreSQLContainer.class); } @Bean static PostgreSQLContainer container2() { - return TestImage.container(PostgreSQLContainer.class); + return TestImage.forContainer(PostgreSQLContainer.class); } @Bean static PostgreSQLContainer container3() { - return TestImage.container(PostgreSQLContainer.class); + return TestImage.forContainer(PostgreSQLContainer.class); } } diff --git a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersParallelStartupWithImportTestcontainersIntegrationTests.java b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersParallelStartupWithImportTestcontainersIntegrationTests.java index 7c6dd61ad5e..1a4d346b309 100644 --- a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersParallelStartupWithImportTestcontainersIntegrationTests.java +++ b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersParallelStartupWithImportTestcontainersIntegrationTests.java @@ -52,13 +52,13 @@ class TestcontainersParallelStartupWithImportTestcontainersIntegrationTests { static class Containers { @Container - static PostgreSQLContainer container1 = TestImage.container(PostgreSQLContainer.class); + static PostgreSQLContainer container1 = TestImage.forContainer(PostgreSQLContainer.class); @Container - static PostgreSQLContainer container2 = TestImage.container(PostgreSQLContainer.class); + static PostgreSQLContainer container2 = TestImage.forContainer(PostgreSQLContainer.class); @Container - static PostgreSQLContainer container3 = TestImage.container(PostgreSQLContainer.class); + static PostgreSQLContainer container3 = TestImage.forContainer(PostgreSQLContainer.class); } diff --git a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/properties/TestcontainersPropertySourceAutoConfigurationTests.java b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/properties/TestcontainersPropertySourceAutoConfigurationTests.java index 04eae9e0ed1..67911d7eb91 100644 --- a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/properties/TestcontainersPropertySourceAutoConfigurationTests.java +++ b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/properties/TestcontainersPropertySourceAutoConfigurationTests.java @@ -67,7 +67,7 @@ class TestcontainersPropertySourceAutoConfigurationTests { @Bean RedisContainer redisContainer(DynamicPropertyRegistry properties) { - RedisContainer container = TestImage.container(RedisContainer.class); + RedisContainer container = TestImage.forContainer(RedisContainer.class); properties.add("container.port", container::getFirstMappedPort); return container; } @@ -81,7 +81,7 @@ class TestcontainersPropertySourceAutoConfigurationTests { @Bean RedisContainer redisContainer() { - return TestImage.container(RedisContainer.class); + return TestImage.forContainer(RedisContainer.class); } @Bean diff --git a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationTests.java b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationTests.java index 721da9ab485..3d36071c544 100644 --- a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationTests.java +++ b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationTests.java @@ -143,7 +143,7 @@ class ServiceConnectionAutoConfigurationTests { @Bean @ServiceConnection PostgreSQLContainer postgresContainer() { - return TestImage.container(PostgreSQLContainer.class); + return TestImage.forContainer(PostgreSQLContainer.class); } } @@ -176,7 +176,7 @@ class ServiceConnectionAutoConfigurationTests { static class TestcontainersRootBeanDefinition extends RootBeanDefinition implements TestcontainerBeanDefinition { - private final PostgreSQLContainer container = TestImage.container(PostgreSQLContainer.class); + private final PostgreSQLContainer container = TestImage.forContainer(PostgreSQLContainer.class); TestcontainersRootBeanDefinition() { setBeanClass(PostgreSQLContainer.class); diff --git a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionStartsConnectionOnceIntegrationTests.java b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionStartsConnectionOnceIntegrationTests.java index 8fafcb9f92c..71fb323f5fd 100644 --- a/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionStartsConnectionOnceIntegrationTests.java +++ b/core/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionStartsConnectionOnceIntegrationTests.java @@ -46,7 +46,7 @@ class ServiceConnectionStartsConnectionOnceIntegrationTests { @Container @ServiceConnection - static final StartCountingPostgreSQLContainer postgres = TestImage + static final StartCountingPostgreSQLContainer postgres = TestImage.POSTGRESQL .container(StartCountingPostgreSQLContainer.class); @Test diff --git a/module/spring-boot-activemq/src/dockerTest/java/org/springframework/boot/activemq/testcontainers/ActiveMQClassicContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-activemq/src/dockerTest/java/org/springframework/boot/activemq/testcontainers/ActiveMQClassicContainerConnectionDetailsFactoryIntegrationTests.java index 1f7f707bd6e..d34f8d19d13 100644 --- a/module/spring-boot-activemq/src/dockerTest/java/org/springframework/boot/activemq/testcontainers/ActiveMQClassicContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-activemq/src/dockerTest/java/org/springframework/boot/activemq/testcontainers/ActiveMQClassicContainerConnectionDetailsFactoryIntegrationTests.java @@ -22,6 +22,7 @@ import java.util.List; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; +import org.testcontainers.activemq.ActiveMQContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; @@ -30,7 +31,6 @@ import org.springframework.boot.activemq.autoconfigure.ActiveMQAutoConfiguration import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.jms.autoconfigure.JmsAutoConfiguration; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; -import org.springframework.boot.testsupport.container.ActiveMQClassicContainer; import org.springframework.boot.testsupport.container.TestImage; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -51,7 +51,7 @@ class ActiveMQClassicContainerConnectionDetailsFactoryIntegrationTests { @Container @ServiceConnection - static final ActiveMQClassicContainer activemq = TestImage.container(ActiveMQClassicContainer.class); + static final ActiveMQContainer activemq = TestImage.ACTIVE_MQ_CLASSIC.container(); @Autowired private JmsClient jmsClient; diff --git a/module/spring-boot-activemq/src/dockerTest/java/org/springframework/boot/activemq/testcontainers/ActiveMQContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-activemq/src/dockerTest/java/org/springframework/boot/activemq/testcontainers/ActiveMQContainerConnectionDetailsFactoryIntegrationTests.java index fa0f574b83c..de593b72f4c 100644 --- a/module/spring-boot-activemq/src/dockerTest/java/org/springframework/boot/activemq/testcontainers/ActiveMQContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-activemq/src/dockerTest/java/org/springframework/boot/activemq/testcontainers/ActiveMQContainerConnectionDetailsFactoryIntegrationTests.java @@ -22,6 +22,7 @@ import java.util.List; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; +import org.testcontainers.containers.GenericContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; @@ -30,7 +31,6 @@ import org.springframework.boot.activemq.autoconfigure.ActiveMQAutoConfiguration import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.jms.autoconfigure.JmsAutoConfiguration; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; -import org.springframework.boot.testsupport.container.SymptomaActiveMQContainer; import org.springframework.boot.testsupport.container.TestImage; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -51,7 +51,7 @@ class ActiveMQContainerConnectionDetailsFactoryIntegrationTests { @Container @ServiceConnection - static final SymptomaActiveMQContainer activemq = TestImage.container(SymptomaActiveMQContainer.class); + static final GenericContainer activemq = TestImage.ACTIVE_MQ_SYMPTOMA.container(); @Autowired private JmsClient jmsClient; diff --git a/module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/DeprecatedRabbitContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/DeprecatedRabbitContainerConnectionDetailsFactoryIntegrationTests.java index 51e32711184..5e358b844df 100644 --- a/module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/DeprecatedRabbitContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/DeprecatedRabbitContainerConnectionDetailsFactoryIntegrationTests.java @@ -57,7 +57,7 @@ class DeprecatedRabbitContainerConnectionDetailsFactoryIntegrationTests { @Container @ServiceConnection - static final RabbitMQContainer rabbit = TestImage.container(RabbitMQContainer.class); + static final RabbitMQContainer rabbit = TestImage.forContainer(RabbitMQContainer.class); @Autowired(required = false) private RabbitConnectionDetails connectionDetails; diff --git a/module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/RabbitContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/RabbitContainerConnectionDetailsFactoryIntegrationTests.java index 898f9fad3dc..e59e54a3583 100644 --- a/module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/RabbitContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/RabbitContainerConnectionDetailsFactoryIntegrationTests.java @@ -54,7 +54,7 @@ class RabbitContainerConnectionDetailsFactoryIntegrationTests { @Container @ServiceConnection - static final RabbitMQContainer rabbit = TestImage.container(RabbitMQContainer.class); + static final RabbitMQContainer rabbit = TestImage.forContainer(RabbitMQContainer.class); @Autowired(required = false) private RabbitConnectionDetails connectionDetails; diff --git a/module/spring-boot-artemis/src/dockerTest/java/org/springframework/boot/artemis/testcontainers/ArtemisContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-artemis/src/dockerTest/java/org/springframework/boot/artemis/testcontainers/ArtemisContainerConnectionDetailsFactoryIntegrationTests.java index 82f4e2e0c80..1c9a15db990 100644 --- a/module/spring-boot-artemis/src/dockerTest/java/org/springframework/boot/artemis/testcontainers/ArtemisContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-artemis/src/dockerTest/java/org/springframework/boot/artemis/testcontainers/ArtemisContainerConnectionDetailsFactoryIntegrationTests.java @@ -22,6 +22,7 @@ import java.util.List; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; +import org.testcontainers.activemq.ArtemisContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; @@ -30,7 +31,6 @@ import org.springframework.boot.artemis.autoconfigure.ArtemisAutoConfiguration; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.jms.autoconfigure.JmsAutoConfiguration; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; -import org.springframework.boot.testsupport.container.ArtemisLegacyContainer; import org.springframework.boot.testsupport.container.TestImage; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -51,7 +51,7 @@ class ArtemisContainerConnectionDetailsFactoryIntegrationTests { @Container @ServiceConnection - static final ArtemisLegacyContainer artemis = TestImage.container(ArtemisLegacyContainer.class); + static final ArtemisContainer artemis = TestImage.ARTEMIS_LEGACY.container(); @Autowired private JmsClient jmsClient; diff --git a/module/spring-boot-cache/src/dockerTest/java/org/springframework/boot/cache/metrics/RedisCacheMetricsTests.java b/module/spring-boot-cache/src/dockerTest/java/org/springframework/boot/cache/metrics/RedisCacheMetricsTests.java index 3d098e44666..453795d3fe2 100644 --- a/module/spring-boot-cache/src/dockerTest/java/org/springframework/boot/cache/metrics/RedisCacheMetricsTests.java +++ b/module/spring-boot-cache/src/dockerTest/java/org/springframework/boot/cache/metrics/RedisCacheMetricsTests.java @@ -50,7 +50,7 @@ import static org.assertj.core.api.Assertions.assertThat; class RedisCacheMetricsTests { @Container - static final RedisContainer redis = TestImage.container(RedisContainer.class); + static final RedisContainer redis = TestImage.forContainer(RedisContainer.class); private static final Tags TAGS = Tags.of("app", "test").and("cache", "test"); diff --git a/module/spring-boot-cassandra/src/dockerTest/java/org/springframework/boot/cassandra/autoconfigure/CassandraAutoConfigurationIntegrationTests.java b/module/spring-boot-cassandra/src/dockerTest/java/org/springframework/boot/cassandra/autoconfigure/CassandraAutoConfigurationIntegrationTests.java index 7e76c16a1e9..aec9e292c69 100644 --- a/module/spring-boot-cassandra/src/dockerTest/java/org/springframework/boot/cassandra/autoconfigure/CassandraAutoConfigurationIntegrationTests.java +++ b/module/spring-boot-cassandra/src/dockerTest/java/org/springframework/boot/cassandra/autoconfigure/CassandraAutoConfigurationIntegrationTests.java @@ -44,7 +44,7 @@ import static org.mockito.Mockito.spy; class CassandraAutoConfigurationIntegrationTests { @Container - static final CassandraContainer cassandra = TestImage.container(CassandraContainer.class); + static final CassandraContainer cassandra = TestImage.forContainer(CassandraContainer.class); private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() .withConfiguration(AutoConfigurations.of(CassandraAutoConfiguration.class)) diff --git a/module/spring-boot-cassandra/src/dockerTest/java/org/springframework/boot/cassandra/autoconfigure/CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests.java b/module/spring-boot-cassandra/src/dockerTest/java/org/springframework/boot/cassandra/autoconfigure/CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests.java index 09880e9100b..9d673b5b653 100644 --- a/module/spring-boot-cassandra/src/dockerTest/java/org/springframework/boot/cassandra/autoconfigure/CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests.java +++ b/module/spring-boot-cassandra/src/dockerTest/java/org/springframework/boot/cassandra/autoconfigure/CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests.java @@ -53,7 +53,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; class CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests { @Container - static final CassandraContainer cassandra = TestImage.container(PasswordAuthenticatorCassandraContainer.class) + static final CassandraContainer cassandra = TestImage.forContainer(PasswordAuthenticatorCassandraContainer.class) .withStartupAttempts(5) .waitingFor(new CassandraWaitStrategy()); diff --git a/module/spring-boot-cassandra/src/dockerTest/java/org/springframework/boot/cassandra/testcontainers/CassandraContainerConnectionDetailsFactoryTests.java b/module/spring-boot-cassandra/src/dockerTest/java/org/springframework/boot/cassandra/testcontainers/CassandraContainerConnectionDetailsFactoryTests.java index 7cbd5440cad..06f61623b98 100644 --- a/module/spring-boot-cassandra/src/dockerTest/java/org/springframework/boot/cassandra/testcontainers/CassandraContainerConnectionDetailsFactoryTests.java +++ b/module/spring-boot-cassandra/src/dockerTest/java/org/springframework/boot/cassandra/testcontainers/CassandraContainerConnectionDetailsFactoryTests.java @@ -44,7 +44,7 @@ class CassandraContainerConnectionDetailsFactoryTests { @Container @ServiceConnection - static final CassandraContainer cassandra = TestImage.container(CassandraContainer.class); + static final CassandraContainer cassandra = TestImage.forContainer(CassandraContainer.class); @Autowired(required = false) private CassandraConnectionDetails connectionDetails; diff --git a/module/spring-boot-couchbase/src/dockerTest/java/org/springframework/boot/couchbase/autoconfigure/CouchbaseAutoConfigurationIntegrationTests.java b/module/spring-boot-couchbase/src/dockerTest/java/org/springframework/boot/couchbase/autoconfigure/CouchbaseAutoConfigurationIntegrationTests.java index 2f870dc92fa..47efed11460 100644 --- a/module/spring-boot-couchbase/src/dockerTest/java/org/springframework/boot/couchbase/autoconfigure/CouchbaseAutoConfigurationIntegrationTests.java +++ b/module/spring-boot-couchbase/src/dockerTest/java/org/springframework/boot/couchbase/autoconfigure/CouchbaseAutoConfigurationIntegrationTests.java @@ -51,7 +51,7 @@ class CouchbaseAutoConfigurationIntegrationTests { private static final String BUCKET_NAME = "cbbucket"; @Container - static final CouchbaseContainer couchbase = TestImage.container(CouchbaseContainer.class) + static final CouchbaseContainer couchbase = TestImage.forContainer(CouchbaseContainer.class) .withEnabledServices(CouchbaseService.KV) .withCredentials("spring", "password") .withBucket(new BucketDefinition(BUCKET_NAME).withPrimaryIndex(false)); diff --git a/module/spring-boot-couchbase/src/dockerTest/java/org/springframework/boot/couchbase/testcontainers/CouchbaseContainerConnectionDetailsFactoryTests.java b/module/spring-boot-couchbase/src/dockerTest/java/org/springframework/boot/couchbase/testcontainers/CouchbaseContainerConnectionDetailsFactoryTests.java index 25cd97f25e4..a02f0faabf7 100644 --- a/module/spring-boot-couchbase/src/dockerTest/java/org/springframework/boot/couchbase/testcontainers/CouchbaseContainerConnectionDetailsFactoryTests.java +++ b/module/spring-boot-couchbase/src/dockerTest/java/org/springframework/boot/couchbase/testcontainers/CouchbaseContainerConnectionDetailsFactoryTests.java @@ -46,7 +46,7 @@ class CouchbaseContainerConnectionDetailsFactoryTests { @Container @ServiceConnection - static final CouchbaseContainer couchbase = TestImage.container(CouchbaseContainer.class) + static final CouchbaseContainer couchbase = TestImage.forContainer(CouchbaseContainer.class) .withEnabledServices(CouchbaseService.KV, CouchbaseService.INDEX, CouchbaseService.QUERY) .withBucket(new BucketDefinition("cbbucket")); diff --git a/module/spring-boot-data-cassandra-test/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestIntegrationTests.java b/module/spring-boot-data-cassandra-test/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestIntegrationTests.java index ba7ed737ce0..4e65414dec0 100644 --- a/module/spring-boot-data-cassandra-test/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestIntegrationTests.java +++ b/module/spring-boot-data-cassandra-test/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestIntegrationTests.java @@ -56,7 +56,7 @@ class DataCassandraTestIntegrationTests { @Container @ServiceConnection - static final CassandraContainer cassandra = TestImage.container(CassandraContainer.class); + static final CassandraContainer cassandra = TestImage.forContainer(CassandraContainer.class); @Autowired private CassandraTemplate cassandraTemplate; diff --git a/module/spring-boot-data-cassandra-test/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestWithIncludeFilterIntegrationTests.java b/module/spring-boot-data-cassandra-test/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestWithIncludeFilterIntegrationTests.java index 516165a59a5..acf15eb7626 100644 --- a/module/spring-boot-data-cassandra-test/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestWithIncludeFilterIntegrationTests.java +++ b/module/spring-boot-data-cassandra-test/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestWithIncludeFilterIntegrationTests.java @@ -54,7 +54,7 @@ class DataCassandraTestWithIncludeFilterIntegrationTests { @Container @ServiceConnection - static final CassandraContainer cassandra = TestImage.container(CassandraContainer.class); + static final CassandraContainer cassandra = TestImage.forContainer(CassandraContainer.class); @Autowired private ExampleRepository exampleRepository; diff --git a/module/spring-boot-data-cassandra/src/dockerTest/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraAutoConfigurationIntegrationTests.java b/module/spring-boot-data-cassandra/src/dockerTest/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraAutoConfigurationIntegrationTests.java index 9df16dfca50..0c0b11b9c1f 100644 --- a/module/spring-boot-data-cassandra/src/dockerTest/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraAutoConfigurationIntegrationTests.java +++ b/module/spring-boot-data-cassandra/src/dockerTest/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraAutoConfigurationIntegrationTests.java @@ -47,7 +47,7 @@ import static org.assertj.core.api.Assertions.assertThat; class DataCassandraAutoConfigurationIntegrationTests { @Container - static final CassandraContainer cassandra = TestImage.container(CassandraContainer.class); + static final CassandraContainer cassandra = TestImage.forContainer(CassandraContainer.class); private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() .withConfiguration( diff --git a/module/spring-boot-data-couchbase-test/src/dockerTest/java/org/springframework/boot/data/couchbase/test/autoconfigure/DataCouchbaseTestIntegrationTests.java b/module/spring-boot-data-couchbase-test/src/dockerTest/java/org/springframework/boot/data/couchbase/test/autoconfigure/DataCouchbaseTestIntegrationTests.java index 6afa70cd579..c27c89d4b5a 100644 --- a/module/spring-boot-data-couchbase-test/src/dockerTest/java/org/springframework/boot/data/couchbase/test/autoconfigure/DataCouchbaseTestIntegrationTests.java +++ b/module/spring-boot-data-couchbase-test/src/dockerTest/java/org/springframework/boot/data/couchbase/test/autoconfigure/DataCouchbaseTestIntegrationTests.java @@ -52,7 +52,7 @@ class DataCouchbaseTestIntegrationTests { @Container @ServiceConnection - static final CouchbaseContainer couchbase = TestImage.container(CouchbaseContainer.class) + static final CouchbaseContainer couchbase = TestImage.forContainer(CouchbaseContainer.class) .withEnabledServices(CouchbaseService.KV, CouchbaseService.INDEX, CouchbaseService.QUERY) .withBucket(new BucketDefinition(BUCKET_NAME)); diff --git a/module/spring-boot-data-couchbase-test/src/dockerTest/java/org/springframework/boot/data/couchbase/test/autoconfigure/DataCouchbaseTestReactiveIntegrationTests.java b/module/spring-boot-data-couchbase-test/src/dockerTest/java/org/springframework/boot/data/couchbase/test/autoconfigure/DataCouchbaseTestReactiveIntegrationTests.java index bd588204b32..ef578e3f5ab 100644 --- a/module/spring-boot-data-couchbase-test/src/dockerTest/java/org/springframework/boot/data/couchbase/test/autoconfigure/DataCouchbaseTestReactiveIntegrationTests.java +++ b/module/spring-boot-data-couchbase-test/src/dockerTest/java/org/springframework/boot/data/couchbase/test/autoconfigure/DataCouchbaseTestReactiveIntegrationTests.java @@ -50,7 +50,7 @@ class DataCouchbaseTestReactiveIntegrationTests { @Container @ServiceConnection - static final CouchbaseContainer couchbase = TestImage.container(CouchbaseContainer.class) + static final CouchbaseContainer couchbase = TestImage.forContainer(CouchbaseContainer.class) .withEnabledServices(CouchbaseService.KV, CouchbaseService.INDEX, CouchbaseService.QUERY) .withBucket(new BucketDefinition(BUCKET_NAME)); diff --git a/module/spring-boot-data-couchbase-test/src/dockerTest/java/org/springframework/boot/data/couchbase/test/autoconfigure/DataCouchbaseTestWithIncludeFilterIntegrationTests.java b/module/spring-boot-data-couchbase-test/src/dockerTest/java/org/springframework/boot/data/couchbase/test/autoconfigure/DataCouchbaseTestWithIncludeFilterIntegrationTests.java index 1e0f7789f6b..b44978c0f69 100644 --- a/module/spring-boot-data-couchbase-test/src/dockerTest/java/org/springframework/boot/data/couchbase/test/autoconfigure/DataCouchbaseTestWithIncludeFilterIntegrationTests.java +++ b/module/spring-boot-data-couchbase-test/src/dockerTest/java/org/springframework/boot/data/couchbase/test/autoconfigure/DataCouchbaseTestWithIncludeFilterIntegrationTests.java @@ -48,7 +48,7 @@ class DataCouchbaseTestWithIncludeFilterIntegrationTests { @Container @ServiceConnection - static final CouchbaseContainer couchbase = TestImage.container(CouchbaseContainer.class) + static final CouchbaseContainer couchbase = TestImage.forContainer(CouchbaseContainer.class) .withEnabledServices(CouchbaseService.KV, CouchbaseService.INDEX, CouchbaseService.QUERY) .withBucket(new BucketDefinition("cbbucket")); diff --git a/module/spring-boot-data-elasticsearch-test/src/dockerTest/java/org/springframework/boot/data/elasticsearch/test/autoconfigure/DataElasticsearchTestIntegrationTests.java b/module/spring-boot-data-elasticsearch-test/src/dockerTest/java/org/springframework/boot/data/elasticsearch/test/autoconfigure/DataElasticsearchTestIntegrationTests.java index 9cddef69865..74b47d6f488 100644 --- a/module/spring-boot-data-elasticsearch-test/src/dockerTest/java/org/springframework/boot/data/elasticsearch/test/autoconfigure/DataElasticsearchTestIntegrationTests.java +++ b/module/spring-boot-data-elasticsearch-test/src/dockerTest/java/org/springframework/boot/data/elasticsearch/test/autoconfigure/DataElasticsearchTestIntegrationTests.java @@ -49,7 +49,7 @@ class DataElasticsearchTestIntegrationTests { @Container @ServiceConnection - static final ElasticsearchContainer elasticsearch = TestImage.container(ElasticsearchContainer.class); + static final ElasticsearchContainer elasticsearch = TestImage.forContainer(ElasticsearchContainer.class); @Autowired private ElasticsearchTemplate elasticsearchTemplate; diff --git a/module/spring-boot-data-elasticsearch-test/src/dockerTest/java/org/springframework/boot/data/elasticsearch/test/autoconfigure/DataElasticsearchTestPropertiesIntegrationTests.java b/module/spring-boot-data-elasticsearch-test/src/dockerTest/java/org/springframework/boot/data/elasticsearch/test/autoconfigure/DataElasticsearchTestPropertiesIntegrationTests.java index 35e4d72b828..b1b2fd77235 100644 --- a/module/spring-boot-data-elasticsearch-test/src/dockerTest/java/org/springframework/boot/data/elasticsearch/test/autoconfigure/DataElasticsearchTestPropertiesIntegrationTests.java +++ b/module/spring-boot-data-elasticsearch-test/src/dockerTest/java/org/springframework/boot/data/elasticsearch/test/autoconfigure/DataElasticsearchTestPropertiesIntegrationTests.java @@ -44,7 +44,7 @@ class DataElasticsearchTestPropertiesIntegrationTests { @Container @ServiceConnection - static final ElasticsearchContainer elasticsearch = TestImage.container(ElasticsearchContainer.class); + static final ElasticsearchContainer elasticsearch = TestImage.forContainer(ElasticsearchContainer.class); @Autowired private Environment environment; diff --git a/module/spring-boot-data-elasticsearch-test/src/dockerTest/java/org/springframework/boot/data/elasticsearch/test/autoconfigure/DataElasticsearchTestReactiveIntegrationTests.java b/module/spring-boot-data-elasticsearch-test/src/dockerTest/java/org/springframework/boot/data/elasticsearch/test/autoconfigure/DataElasticsearchTestReactiveIntegrationTests.java index c9898959ceb..1f4eac52c49 100644 --- a/module/spring-boot-data-elasticsearch-test/src/dockerTest/java/org/springframework/boot/data/elasticsearch/test/autoconfigure/DataElasticsearchTestReactiveIntegrationTests.java +++ b/module/spring-boot-data-elasticsearch-test/src/dockerTest/java/org/springframework/boot/data/elasticsearch/test/autoconfigure/DataElasticsearchTestReactiveIntegrationTests.java @@ -45,7 +45,7 @@ class DataElasticsearchTestReactiveIntegrationTests { @Container @ServiceConnection - static final ElasticsearchContainer elasticsearch = TestImage.container(ElasticsearchContainer.class); + static final ElasticsearchContainer elasticsearch = TestImage.forContainer(ElasticsearchContainer.class); @Autowired private ReactiveElasticsearchTemplate elasticsearchTemplate; diff --git a/module/spring-boot-data-elasticsearch-test/src/dockerTest/java/org/springframework/boot/data/elasticsearch/test/autoconfigure/DataElasticsearchTestWithIncludeFilterIntegrationTests.java b/module/spring-boot-data-elasticsearch-test/src/dockerTest/java/org/springframework/boot/data/elasticsearch/test/autoconfigure/DataElasticsearchTestWithIncludeFilterIntegrationTests.java index ece922ebd26..1c83dfb03a6 100644 --- a/module/spring-boot-data-elasticsearch-test/src/dockerTest/java/org/springframework/boot/data/elasticsearch/test/autoconfigure/DataElasticsearchTestWithIncludeFilterIntegrationTests.java +++ b/module/spring-boot-data-elasticsearch-test/src/dockerTest/java/org/springframework/boot/data/elasticsearch/test/autoconfigure/DataElasticsearchTestWithIncludeFilterIntegrationTests.java @@ -46,7 +46,7 @@ class DataElasticsearchTestWithIncludeFilterIntegrationTests { @Container @ServiceConnection - static final ElasticsearchContainer elasticsearch = TestImage.container(ElasticsearchContainer.class); + static final ElasticsearchContainer elasticsearch = TestImage.forContainer(ElasticsearchContainer.class); @Autowired private ExampleRepository exampleRepository; diff --git a/module/spring-boot-data-elasticsearch/src/dockerTest/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchAutoConfigurationIntegrationTests.java b/module/spring-boot-data-elasticsearch/src/dockerTest/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchAutoConfigurationIntegrationTests.java index 850049a652a..e4ac93c3ac5 100644 --- a/module/spring-boot-data-elasticsearch/src/dockerTest/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchAutoConfigurationIntegrationTests.java +++ b/module/spring-boot-data-elasticsearch/src/dockerTest/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchAutoConfigurationIntegrationTests.java @@ -45,7 +45,7 @@ import static org.assertj.core.api.Assertions.assertThat; class DataElasticsearchAutoConfigurationIntegrationTests { @Container - static final ElasticsearchContainer elasticsearch = TestImage.container(ElasticsearchContainer.class); + static final ElasticsearchContainer elasticsearch = TestImage.ELASTICSEARCH.container(); private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() .withConfiguration(AutoConfigurations.of(ElasticsearchRestClientAutoConfiguration.class, diff --git a/module/spring-boot-data-elasticsearch/src/dockerTest/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchReactiveRepositoriesAutoConfigurationTests.java b/module/spring-boot-data-elasticsearch/src/dockerTest/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchReactiveRepositoriesAutoConfigurationTests.java index 253c33adde8..38fcbdb691b 100644 --- a/module/spring-boot-data-elasticsearch/src/dockerTest/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchReactiveRepositoriesAutoConfigurationTests.java +++ b/module/spring-boot-data-elasticsearch/src/dockerTest/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchReactiveRepositoriesAutoConfigurationTests.java @@ -51,7 +51,7 @@ import static org.assertj.core.api.Assertions.assertThat; class DataElasticsearchReactiveRepositoriesAutoConfigurationTests { @Container - static final ElasticsearchContainer elasticsearch = TestImage.container(ElasticsearchContainer.class); + static final ElasticsearchContainer elasticsearch = TestImage.forContainer(ElasticsearchContainer.class); private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() .withConfiguration(AutoConfigurations.of(ElasticsearchClientAutoConfiguration.class, diff --git a/module/spring-boot-data-elasticsearch/src/dockerTest/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchRepositoriesAutoConfigurationTests.java b/module/spring-boot-data-elasticsearch/src/dockerTest/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchRepositoriesAutoConfigurationTests.java index 57ed2121dce..d080081b9af 100644 --- a/module/spring-boot-data-elasticsearch/src/dockerTest/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchRepositoriesAutoConfigurationTests.java +++ b/module/spring-boot-data-elasticsearch/src/dockerTest/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchRepositoriesAutoConfigurationTests.java @@ -49,7 +49,7 @@ import static org.assertj.core.api.Assertions.assertThat; class DataElasticsearchRepositoriesAutoConfigurationTests { @Container - static final ElasticsearchContainer elasticsearch = TestImage.container(ElasticsearchContainer.class); + static final ElasticsearchContainer elasticsearch = TestImage.forContainer(ElasticsearchContainer.class); private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() .withConfiguration(AutoConfigurations.of(ElasticsearchRestClientAutoConfiguration.class, diff --git a/module/spring-boot-data-jdbc/src/dockerTest/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcRepositoriesAutoConfigurationDialectResolutionTests.java b/module/spring-boot-data-jdbc/src/dockerTest/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcRepositoriesAutoConfigurationDialectResolutionTests.java index 651dab9a796..df82498abe8 100644 --- a/module/spring-boot-data-jdbc/src/dockerTest/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcRepositoriesAutoConfigurationDialectResolutionTests.java +++ b/module/spring-boot-data-jdbc/src/dockerTest/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcRepositoriesAutoConfigurationDialectResolutionTests.java @@ -68,7 +68,7 @@ class DataJdbcRepositoriesAutoConfigurationDialectResolutionTests { private > void withContainer(Class containerType, ThrowingConsumer callback) { - C container = TestImage.container(containerType); + C container = TestImage.forContainer(containerType); try { container.start(); ApplicationContextRunner contextRunner = new ApplicationContextRunner() diff --git a/module/spring-boot-data-ldap-test/src/dockerTest/java/org/springframework/boot/data/ldap/test/autoconfigure/DataLdapTestDockerTests.java b/module/spring-boot-data-ldap-test/src/dockerTest/java/org/springframework/boot/data/ldap/test/autoconfigure/DataLdapTestDockerTests.java index 36d489c9a1a..a5208df107c 100644 --- a/module/spring-boot-data-ldap-test/src/dockerTest/java/org/springframework/boot/data/ldap/test/autoconfigure/DataLdapTestDockerTests.java +++ b/module/spring-boot-data-ldap-test/src/dockerTest/java/org/springframework/boot/data/ldap/test/autoconfigure/DataLdapTestDockerTests.java @@ -46,7 +46,8 @@ class DataLdapTestDockerTests { @Container @ServiceConnection - static final OpenLdapContainer openLdap = TestImage.container(OpenLdapContainer.class).withEnv("LDAP_TLS", "false"); + static final OpenLdapContainer openLdap = TestImage.forContainer(OpenLdapContainer.class) + .withEnv("LDAP_TLS", "false"); @Autowired private ApplicationContext applicationContext; diff --git a/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestIntegrationTests.java b/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestIntegrationTests.java index 5f836867b2c..dd4be38e73a 100644 --- a/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestIntegrationTests.java +++ b/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestIntegrationTests.java @@ -49,7 +49,7 @@ class DataMongoTestIntegrationTests { @Container @ServiceConnection - static final MongoDBContainer mongoDb = TestImage.container(MongoDBContainer.class); + static final MongoDBContainer mongoDb = TestImage.forContainer(MongoDBContainer.class); @Autowired private MongoTemplate mongoTemplate; diff --git a/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestReactiveIntegrationTests.java b/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestReactiveIntegrationTests.java index ec607b4b91d..2728be84729 100644 --- a/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestReactiveIntegrationTests.java +++ b/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestReactiveIntegrationTests.java @@ -44,7 +44,7 @@ class DataMongoTestReactiveIntegrationTests { @Container @ServiceConnection - static final MongoDBContainer mongoDb = TestImage.container(MongoDBContainer.class); + static final MongoDBContainer mongoDb = TestImage.forContainer(MongoDBContainer.class); @Autowired private ReactiveMongoTemplate mongoTemplate; diff --git a/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestWithIncludeFilterIntegrationTests.java b/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestWithIncludeFilterIntegrationTests.java index 297c6b5d33f..9cf23c0ed28 100644 --- a/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestWithIncludeFilterIntegrationTests.java +++ b/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/DataMongoTestWithIncludeFilterIntegrationTests.java @@ -43,7 +43,7 @@ class DataMongoTestWithIncludeFilterIntegrationTests { @Container @ServiceConnection - static final MongoDBContainer mongoDb = TestImage.container(MongoDBContainer.class); + static final MongoDBContainer mongoDb = TestImage.forContainer(MongoDBContainer.class); @Autowired private ExampleService service; diff --git a/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/TransactionalDataMongoTestIntegrationTests.java b/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/TransactionalDataMongoTestIntegrationTests.java index 7f5b5406a1b..269394ae1a8 100644 --- a/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/TransactionalDataMongoTestIntegrationTests.java +++ b/module/spring-boot-data-mongodb-test/src/dockerTest/java/org/springframework/boot/data/mongodb/test/autoconfigure/TransactionalDataMongoTestIntegrationTests.java @@ -48,7 +48,7 @@ class TransactionalDataMongoTestIntegrationTests { @Container @ServiceConnection - static final MongoDBContainer mongoDb = TestImage.container(MongoDBContainer.class).withReplicaSet(); + static final MongoDBContainer mongoDb = TestImage.forContainer(MongoDBContainer.class).withReplicaSet(); @Autowired private ExampleRepository exampleRepository; diff --git a/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestIntegrationTests.java b/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestIntegrationTests.java index 6e721c7d399..9e0d44c0f0c 100644 --- a/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestIntegrationTests.java +++ b/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestIntegrationTests.java @@ -51,7 +51,7 @@ class DataNeo4jTestIntegrationTests { @Container @ServiceConnection - static final Neo4jContainer neo4j = TestImage.container(Neo4jContainer.class); + static final Neo4jContainer neo4j = TestImage.forContainer(Neo4jContainer.class); @Autowired private Neo4jTemplate neo4jTemplate; diff --git a/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestPropertiesIntegrationTests.java b/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestPropertiesIntegrationTests.java index 20772d2b63f..2129e2b780e 100644 --- a/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestPropertiesIntegrationTests.java +++ b/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestPropertiesIntegrationTests.java @@ -44,7 +44,7 @@ class DataNeo4jTestPropertiesIntegrationTests { @Container @ServiceConnection - static final Neo4jContainer neo4j = TestImage.container(Neo4jContainer.class).withoutAuthentication(); + static final Neo4jContainer neo4j = TestImage.forContainer(Neo4jContainer.class).withoutAuthentication(); @Autowired private Environment environment; diff --git a/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestReactiveIntegrationTests.java b/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestReactiveIntegrationTests.java index 8d2786270c0..55a77070bfd 100644 --- a/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestReactiveIntegrationTests.java +++ b/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestReactiveIntegrationTests.java @@ -57,7 +57,7 @@ class DataNeo4jTestReactiveIntegrationTests { @Container @ServiceConnection - static final Neo4jContainer neo4j = TestImage.container(Neo4jContainer.class).withoutAuthentication(); + static final Neo4jContainer neo4j = TestImage.forContainer(Neo4jContainer.class).withoutAuthentication(); @Autowired private ReactiveNeo4jTemplate neo4jTemplate; diff --git a/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestWithIncludeFilterIntegrationTests.java b/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestWithIncludeFilterIntegrationTests.java index 5885dd1998f..e011413df41 100644 --- a/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestWithIncludeFilterIntegrationTests.java +++ b/module/spring-boot-data-neo4j-test/src/dockerTest/java/org/springframework/boot/data/neo4j/test/autoconfigure/DataNeo4jTestWithIncludeFilterIntegrationTests.java @@ -44,7 +44,7 @@ class DataNeo4jTestWithIncludeFilterIntegrationTests { @Container @ServiceConnection - static final Neo4jContainer neo4j = TestImage.container(Neo4jContainer.class).withoutAuthentication(); + static final Neo4jContainer neo4j = TestImage.forContainer(Neo4jContainer.class).withoutAuthentication(); @Autowired private ExampleService service; diff --git a/module/spring-boot-data-neo4j/src/dockerTest/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jRepositoriesAutoConfigurationIntegrationTests.java b/module/spring-boot-data-neo4j/src/dockerTest/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jRepositoriesAutoConfigurationIntegrationTests.java index f3108c1c21c..273b9f141d5 100644 --- a/module/spring-boot-data-neo4j/src/dockerTest/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jRepositoriesAutoConfigurationIntegrationTests.java +++ b/module/spring-boot-data-neo4j/src/dockerTest/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jRepositoriesAutoConfigurationIntegrationTests.java @@ -44,7 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat; class Neo4jRepositoriesAutoConfigurationIntegrationTests { @Container - static final Neo4jContainer neo4j = TestImage.container(Neo4jContainer.class); + static final Neo4jContainer neo4j = TestImage.forContainer(Neo4jContainer.class); @DynamicPropertySource static void neo4jProperties(DynamicPropertyRegistry registry) { diff --git a/module/spring-boot-data-redis-test/src/dockerTest/java/org/springframework/boot/data/redis/test/autoconfigure/DataRedisTestIntegrationTests.java b/module/spring-boot-data-redis-test/src/dockerTest/java/org/springframework/boot/data/redis/test/autoconfigure/DataRedisTestIntegrationTests.java index 39aeb529ad1..eca340cd4d5 100644 --- a/module/spring-boot-data-redis-test/src/dockerTest/java/org/springframework/boot/data/redis/test/autoconfigure/DataRedisTestIntegrationTests.java +++ b/module/spring-boot-data-redis-test/src/dockerTest/java/org/springframework/boot/data/redis/test/autoconfigure/DataRedisTestIntegrationTests.java @@ -52,7 +52,7 @@ class DataRedisTestIntegrationTests { @Container @ServiceConnection - static RedisContainer redis = TestImage.container(RedisContainer.class); + static RedisContainer redis = TestImage.forContainer(RedisContainer.class); @Autowired private RedisOperations operations; diff --git a/module/spring-boot-data-redis-test/src/dockerTest/java/org/springframework/boot/data/redis/test/autoconfigure/DataRedisTestPropertiesIntegrationTests.java b/module/spring-boot-data-redis-test/src/dockerTest/java/org/springframework/boot/data/redis/test/autoconfigure/DataRedisTestPropertiesIntegrationTests.java index 28a5507ac50..6fcb5ab4f00 100644 --- a/module/spring-boot-data-redis-test/src/dockerTest/java/org/springframework/boot/data/redis/test/autoconfigure/DataRedisTestPropertiesIntegrationTests.java +++ b/module/spring-boot-data-redis-test/src/dockerTest/java/org/springframework/boot/data/redis/test/autoconfigure/DataRedisTestPropertiesIntegrationTests.java @@ -44,7 +44,7 @@ class DataRedisTestPropertiesIntegrationTests { @Container @ServiceConnection - static final RedisContainer redis = TestImage.container(RedisContainer.class); + static final RedisContainer redis = TestImage.forContainer(RedisContainer.class); @Autowired private Environment environment; diff --git a/module/spring-boot-data-redis-test/src/dockerTest/java/org/springframework/boot/data/redis/test/autoconfigure/DataRedisTestReactiveIntegrationTests.java b/module/spring-boot-data-redis-test/src/dockerTest/java/org/springframework/boot/data/redis/test/autoconfigure/DataRedisTestReactiveIntegrationTests.java index 105329c41d3..aa3a4c0420b 100644 --- a/module/spring-boot-data-redis-test/src/dockerTest/java/org/springframework/boot/data/redis/test/autoconfigure/DataRedisTestReactiveIntegrationTests.java +++ b/module/spring-boot-data-redis-test/src/dockerTest/java/org/springframework/boot/data/redis/test/autoconfigure/DataRedisTestReactiveIntegrationTests.java @@ -48,7 +48,7 @@ class DataRedisTestReactiveIntegrationTests { @Container @ServiceConnection - static RedisContainer redis = TestImage.container(RedisContainer.class); + static RedisContainer redis = TestImage.forContainer(RedisContainer.class); @Autowired private ReactiveRedisOperations operations; diff --git a/module/spring-boot-data-redis-test/src/dockerTest/java/org/springframework/boot/data/redis/test/autoconfigure/DataRedisTestWithIncludeFilterIntegrationTests.java b/module/spring-boot-data-redis-test/src/dockerTest/java/org/springframework/boot/data/redis/test/autoconfigure/DataRedisTestWithIncludeFilterIntegrationTests.java index c219a048e39..22ed6d88d4b 100644 --- a/module/spring-boot-data-redis-test/src/dockerTest/java/org/springframework/boot/data/redis/test/autoconfigure/DataRedisTestWithIncludeFilterIntegrationTests.java +++ b/module/spring-boot-data-redis-test/src/dockerTest/java/org/springframework/boot/data/redis/test/autoconfigure/DataRedisTestWithIncludeFilterIntegrationTests.java @@ -43,7 +43,7 @@ class DataRedisTestWithIncludeFilterIntegrationTests { @Container @ServiceConnection - static final RedisContainer redis = TestImage.container(RedisContainer.class); + static final RedisContainer redis = TestImage.forContainer(RedisContainer.class); @Autowired private ExampleRepository exampleRepository; diff --git a/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/autoconfigure/DataRedisRepositoriesAutoConfigurationTests.java b/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/autoconfigure/DataRedisRepositoriesAutoConfigurationTests.java index 884769a6945..803f34e637a 100644 --- a/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/autoconfigure/DataRedisRepositoriesAutoConfigurationTests.java +++ b/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/autoconfigure/DataRedisRepositoriesAutoConfigurationTests.java @@ -45,7 +45,7 @@ import static org.assertj.core.api.Assertions.assertThat; class DataRedisRepositoriesAutoConfigurationTests { @Container - public static RedisContainer redis = TestImage.container(RedisContainer.class); + public static RedisContainer redis = TestImage.forContainer(RedisContainer.class); private final AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); diff --git a/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/RedisContainerConnectionDetailsFactoryTests.java b/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/RedisContainerConnectionDetailsFactoryTests.java index ceca9ec4392..698498870f5 100644 --- a/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/RedisContainerConnectionDetailsFactoryTests.java +++ b/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/RedisContainerConnectionDetailsFactoryTests.java @@ -45,7 +45,7 @@ class RedisContainerConnectionDetailsFactoryTests { @Container @ServiceConnection - static final RedisContainer redis = TestImage.container(RedisContainer.class); + static final RedisContainer redis = TestImage.forContainer(RedisContainer.class); @Autowired(required = false) private DataRedisConnectionDetails connectionDetails; diff --git a/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/RedisStackContainerConnectionDetailsFactoryTests.java b/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/RedisStackContainerConnectionDetailsFactoryTests.java index d2162dd0042..a9b03b833eb 100644 --- a/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/RedisStackContainerConnectionDetailsFactoryTests.java +++ b/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/RedisStackContainerConnectionDetailsFactoryTests.java @@ -46,7 +46,7 @@ class RedisStackContainerConnectionDetailsFactoryTests { @Container @ServiceConnection - static final RedisStackContainer redis = TestImage.container(RedisStackContainer.class); + static final RedisStackContainer redis = TestImage.forContainer(RedisStackContainer.class); @Autowired(required = false) private DataRedisConnectionDetails connectionDetails; diff --git a/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/RedisStackServerContainerConnectionDetailsFactoryTests.java b/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/RedisStackServerContainerConnectionDetailsFactoryTests.java index 498121bde89..e5e51b0154e 100644 --- a/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/RedisStackServerContainerConnectionDetailsFactoryTests.java +++ b/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/RedisStackServerContainerConnectionDetailsFactoryTests.java @@ -46,7 +46,7 @@ class RedisStackServerContainerConnectionDetailsFactoryTests { @Container @ServiceConnection - static final RedisStackServerContainer redis = TestImage.container(RedisStackServerContainer.class); + static final RedisStackServerContainer redis = TestImage.forContainer(RedisStackServerContainer.class); @Autowired(required = false) private DataRedisConnectionDetails connectionDetails; diff --git a/module/spring-boot-elasticsearch/src/dockerTest/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchClientAutoConfigurationIntegrationTests.java b/module/spring-boot-elasticsearch/src/dockerTest/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchClientAutoConfigurationIntegrationTests.java index 283f3768aab..a4f79da587a 100644 --- a/module/spring-boot-elasticsearch/src/dockerTest/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchClientAutoConfigurationIntegrationTests.java +++ b/module/spring-boot-elasticsearch/src/dockerTest/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchClientAutoConfigurationIntegrationTests.java @@ -41,7 +41,7 @@ import static org.assertj.core.api.Assertions.assertThat; class ElasticsearchClientAutoConfigurationIntegrationTests { @Container - static final ElasticsearchContainer elasticsearch = TestImage.container(ElasticsearchContainer.class); + static final ElasticsearchContainer elasticsearch = TestImage.forContainer(ElasticsearchContainer.class); private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() .withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class, diff --git a/module/spring-boot-elasticsearch/src/dockerTest/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchRestClientAutoConfigurationIntegrationTests.java b/module/spring-boot-elasticsearch/src/dockerTest/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchRestClientAutoConfigurationIntegrationTests.java index e5a85badee0..5f34d1f6100 100644 --- a/module/spring-boot-elasticsearch/src/dockerTest/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchRestClientAutoConfigurationIntegrationTests.java +++ b/module/spring-boot-elasticsearch/src/dockerTest/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchRestClientAutoConfigurationIntegrationTests.java @@ -46,7 +46,7 @@ import static org.assertj.core.api.Assertions.assertThat; class ElasticsearchRestClientAutoConfigurationIntegrationTests { @Container - static final ElasticsearchContainer elasticsearch = TestImage.container(ElasticsearchContainer.class); + static final ElasticsearchContainer elasticsearch = TestImage.forContainer(ElasticsearchContainer.class); private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() .withConfiguration(AutoConfigurations.of(ElasticsearchRestClientAutoConfiguration.class)); diff --git a/module/spring-boot-elasticsearch/src/dockerTest/java/org/springframework/boot/elasticsearch/testcontainers/ElasticsearchContainerConnectionDetailsFactoryTests.java b/module/spring-boot-elasticsearch/src/dockerTest/java/org/springframework/boot/elasticsearch/testcontainers/ElasticsearchContainerConnectionDetailsFactoryTests.java index 4076b83c7a5..4e721b390e2 100644 --- a/module/spring-boot-elasticsearch/src/dockerTest/java/org/springframework/boot/elasticsearch/testcontainers/ElasticsearchContainerConnectionDetailsFactoryTests.java +++ b/module/spring-boot-elasticsearch/src/dockerTest/java/org/springframework/boot/elasticsearch/testcontainers/ElasticsearchContainerConnectionDetailsFactoryTests.java @@ -31,7 +31,7 @@ import org.springframework.boot.elasticsearch.autoconfigure.ElasticsearchClientA import org.springframework.boot.elasticsearch.autoconfigure.ElasticsearchConnectionDetails; import org.springframework.boot.elasticsearch.autoconfigure.ElasticsearchRestClientAutoConfiguration; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; -import org.springframework.boot.testsupport.container.ElasticsearchContainer9; +import org.springframework.boot.testsupport.container.TestImage; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; @@ -48,8 +48,8 @@ class ElasticsearchContainerConnectionDetailsFactoryTests { @Container @ServiceConnection - static final ElasticsearchContainer elasticsearch = new ElasticsearchContainer9().withStartupAttempts(5) - .withStartupTimeout(Duration.ofMinutes(10)); + static final ElasticsearchContainer elasticsearch = TestImage.ELASTICSEARCH_9 + .container((setup) -> setup.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10))); @Autowired(required = false) private ElasticsearchConnectionDetails connectionDetails; diff --git a/module/spring-boot-flyway/src/dockerTest/java/org/springframework/boot/flyway/testcontainers/FlywayContainerConnectionDetailsFactoryTests.java b/module/spring-boot-flyway/src/dockerTest/java/org/springframework/boot/flyway/testcontainers/FlywayContainerConnectionDetailsFactoryTests.java index 78775f54bd4..b5ae4edea2d 100644 --- a/module/spring-boot-flyway/src/dockerTest/java/org/springframework/boot/flyway/testcontainers/FlywayContainerConnectionDetailsFactoryTests.java +++ b/module/spring-boot-flyway/src/dockerTest/java/org/springframework/boot/flyway/testcontainers/FlywayContainerConnectionDetailsFactoryTests.java @@ -46,7 +46,7 @@ class FlywayContainerConnectionDetailsFactoryTests { @Container @ServiceConnection - static final PostgreSQLContainer postgres = TestImage.container(PostgreSQLContainer.class); + static final PostgreSQLContainer postgres = TestImage.forContainer(PostgreSQLContainer.class); @Autowired(required = false) private JdbcConnectionDetails connectionDetails; diff --git a/module/spring-boot-hazelcast/src/dockerTest/java/org/springframework/boot/hazelcast/testcontainers/CustomClusterNameHazelcastContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-hazelcast/src/dockerTest/java/org/springframework/boot/hazelcast/testcontainers/CustomClusterNameHazelcastContainerConnectionDetailsFactoryIntegrationTests.java index 373fba1f365..bfb1929b5a1 100644 --- a/module/spring-boot-hazelcast/src/dockerTest/java/org/springframework/boot/hazelcast/testcontainers/CustomClusterNameHazelcastContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-hazelcast/src/dockerTest/java/org/springframework/boot/hazelcast/testcontainers/CustomClusterNameHazelcastContainerConnectionDetailsFactoryIntegrationTests.java @@ -51,7 +51,7 @@ class CustomClusterNameHazelcastContainerConnectionDetailsFactoryIntegrationTest @Container @ServiceConnection - static final HazelcastContainer hazelcast = TestImage.container(HazelcastContainer.class) + static final HazelcastContainer hazelcast = TestImage.forContainer(HazelcastContainer.class) .withClusterName("spring-boot"); @Autowired(required = false) diff --git a/module/spring-boot-hazelcast/src/dockerTest/java/org/springframework/boot/hazelcast/testcontainers/HazelcastContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-hazelcast/src/dockerTest/java/org/springframework/boot/hazelcast/testcontainers/HazelcastContainerConnectionDetailsFactoryIntegrationTests.java index 202bff95696..af6de1afd17 100644 --- a/module/spring-boot-hazelcast/src/dockerTest/java/org/springframework/boot/hazelcast/testcontainers/HazelcastContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-hazelcast/src/dockerTest/java/org/springframework/boot/hazelcast/testcontainers/HazelcastContainerConnectionDetailsFactoryIntegrationTests.java @@ -47,7 +47,7 @@ class HazelcastContainerConnectionDetailsFactoryIntegrationTests { @Container @ServiceConnection - static final HazelcastContainer hazelcast = TestImage.container(HazelcastContainer.class); + static final HazelcastContainer hazelcast = TestImage.forContainer(HazelcastContainer.class); @Autowired(required = false) private HazelcastConnectionDetails connectionDetails; diff --git a/module/spring-boot-jdbc-test/src/dockerTest/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureTestDatabaseDynamicPropertySourceIntegrationTests.java b/module/spring-boot-jdbc-test/src/dockerTest/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureTestDatabaseDynamicPropertySourceIntegrationTests.java index d7d5b17bae6..485f58fbff2 100644 --- a/module/spring-boot-jdbc-test/src/dockerTest/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureTestDatabaseDynamicPropertySourceIntegrationTests.java +++ b/module/spring-boot-jdbc-test/src/dockerTest/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureTestDatabaseDynamicPropertySourceIntegrationTests.java @@ -50,7 +50,7 @@ import static org.assertj.core.api.Assertions.assertThat; class AutoConfigureTestDatabaseDynamicPropertySourceIntegrationTests { @Container - static PostgreSQLContainer postgres = TestImage.container(PostgreSQLContainer.class); + static PostgreSQLContainer postgres = TestImage.forContainer(PostgreSQLContainer.class); @Autowired private DataSource dataSource; diff --git a/module/spring-boot-jdbc-test/src/dockerTest/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureTestDatabaseNonTestDatabaseIntegrationTests.java b/module/spring-boot-jdbc-test/src/dockerTest/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureTestDatabaseNonTestDatabaseIntegrationTests.java index 4c7571a3169..9201747b904 100644 --- a/module/spring-boot-jdbc-test/src/dockerTest/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureTestDatabaseNonTestDatabaseIntegrationTests.java +++ b/module/spring-boot-jdbc-test/src/dockerTest/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureTestDatabaseNonTestDatabaseIntegrationTests.java @@ -52,7 +52,7 @@ import static org.assertj.core.api.Assertions.assertThat; class AutoConfigureTestDatabaseNonTestDatabaseIntegrationTests { @Container - static PostgreSQLContainer postgres = TestImage.container(PostgreSQLContainer.class); + static PostgreSQLContainer postgres = TestImage.forContainer(PostgreSQLContainer.class); @Autowired private DataSource dataSource; diff --git a/module/spring-boot-jdbc-test/src/dockerTest/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureTestDatabaseServiceConnectionIntegrationTests.java b/module/spring-boot-jdbc-test/src/dockerTest/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureTestDatabaseServiceConnectionIntegrationTests.java index b600936e1e4..7c300ad2082 100644 --- a/module/spring-boot-jdbc-test/src/dockerTest/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureTestDatabaseServiceConnectionIntegrationTests.java +++ b/module/spring-boot-jdbc-test/src/dockerTest/java/org/springframework/boot/jdbc/test/autoconfigure/AutoConfigureTestDatabaseServiceConnectionIntegrationTests.java @@ -51,7 +51,7 @@ class AutoConfigureTestDatabaseServiceConnectionIntegrationTests { @Container @ServiceConnection - static PostgreSQLContainer postgres = TestImage.container(PostgreSQLContainer.class); + static PostgreSQLContainer postgres = TestImage.forContainer(PostgreSQLContainer.class); @Autowired private DataSource dataSource; diff --git a/module/spring-boot-jdbc/src/dockerTest/java/org/springframework/boot/jdbc/testcontainers/JdbcContainerConnectionDetailsFactoryTests.java b/module/spring-boot-jdbc/src/dockerTest/java/org/springframework/boot/jdbc/testcontainers/JdbcContainerConnectionDetailsFactoryTests.java index 26ee0c268d8..f2bf327eb00 100644 --- a/module/spring-boot-jdbc/src/dockerTest/java/org/springframework/boot/jdbc/testcontainers/JdbcContainerConnectionDetailsFactoryTests.java +++ b/module/spring-boot-jdbc/src/dockerTest/java/org/springframework/boot/jdbc/testcontainers/JdbcContainerConnectionDetailsFactoryTests.java @@ -48,7 +48,7 @@ class JdbcContainerConnectionDetailsFactoryTests { @Container @ServiceConnection - static final PostgreSQLContainer postgres = TestImage.container(PostgreSQLContainer.class); + static final PostgreSQLContainer postgres = TestImage.forContainer(PostgreSQLContainer.class); @Autowired(required = false) private JdbcConnectionDetails connectionDetails; diff --git a/module/spring-boot-kafka/src/dockerTest/java/org/springframework/boot/kafka/testcontainers/ApacheKafkaContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-kafka/src/dockerTest/java/org/springframework/boot/kafka/testcontainers/ApacheKafkaContainerConnectionDetailsFactoryIntegrationTests.java index 687ca722201..4a72c5cbc54 100644 --- a/module/spring-boot-kafka/src/dockerTest/java/org/springframework/boot/kafka/testcontainers/ApacheKafkaContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-kafka/src/dockerTest/java/org/springframework/boot/kafka/testcontainers/ApacheKafkaContainerConnectionDetailsFactoryIntegrationTests.java @@ -56,7 +56,7 @@ class ApacheKafkaContainerConnectionDetailsFactoryIntegrationTests { @Container @ServiceConnection - static final KafkaContainer kafka = TestImage.container(KafkaContainer.class); + static final KafkaContainer kafka = TestImage.forContainer(KafkaContainer.class); @Autowired private KafkaTemplate kafkaTemplate; diff --git a/module/spring-boot-kafka/src/dockerTest/java/org/springframework/boot/kafka/testcontainers/ConfluentKafkaContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-kafka/src/dockerTest/java/org/springframework/boot/kafka/testcontainers/ConfluentKafkaContainerConnectionDetailsFactoryIntegrationTests.java index 65dfdf523b8..0de34943817 100644 --- a/module/spring-boot-kafka/src/dockerTest/java/org/springframework/boot/kafka/testcontainers/ConfluentKafkaContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-kafka/src/dockerTest/java/org/springframework/boot/kafka/testcontainers/ConfluentKafkaContainerConnectionDetailsFactoryIntegrationTests.java @@ -55,7 +55,7 @@ class ConfluentKafkaContainerConnectionDetailsFactoryIntegrationTests { @Container @ServiceConnection - static final ConfluentKafkaContainer kafka = TestImage.container(ConfluentKafkaContainer.class); + static final ConfluentKafkaContainer kafka = TestImage.forContainer(ConfluentKafkaContainer.class); @Autowired private KafkaTemplate kafkaTemplate; diff --git a/module/spring-boot-kafka/src/dockerTest/java/org/springframework/boot/kafka/testcontainers/RedpandaContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-kafka/src/dockerTest/java/org/springframework/boot/kafka/testcontainers/RedpandaContainerConnectionDetailsFactoryIntegrationTests.java index 7e6631badfa..c048c7df9d4 100644 --- a/module/spring-boot-kafka/src/dockerTest/java/org/springframework/boot/kafka/testcontainers/RedpandaContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-kafka/src/dockerTest/java/org/springframework/boot/kafka/testcontainers/RedpandaContainerConnectionDetailsFactoryIntegrationTests.java @@ -53,7 +53,7 @@ class RedpandaContainerConnectionDetailsFactoryIntegrationTests { @Container @ServiceConnection - static final RedpandaContainer redpanda = TestImage.container(RedpandaContainer.class); + static final RedpandaContainer redpanda = TestImage.forContainer(RedpandaContainer.class); @Autowired KafkaTemplate kafkaTemplate; diff --git a/module/spring-boot-ldap/src/dockerTest/java/org/springframework/boot/ldap/testcontainers/LLdapContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-ldap/src/dockerTest/java/org/springframework/boot/ldap/testcontainers/LLdapContainerConnectionDetailsFactoryIntegrationTests.java index 8fd4d88f8d8..41822229361 100644 --- a/module/spring-boot-ldap/src/dockerTest/java/org/springframework/boot/ldap/testcontainers/LLdapContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-ldap/src/dockerTest/java/org/springframework/boot/ldap/testcontainers/LLdapContainerConnectionDetailsFactoryIntegrationTests.java @@ -47,7 +47,7 @@ class LLdapContainerConnectionDetailsFactoryIntegrationTests { @Container @ServiceConnection - static final LLdapContainer lldap = TestImage.container(LLdapContainer.class); + static final LLdapContainer lldap = TestImage.forContainer(LLdapContainer.class); @Autowired private LdapTemplate ldapTemplate; diff --git a/module/spring-boot-ldap/src/dockerTest/java/org/springframework/boot/ldap/testcontainers/OpenLdapContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-ldap/src/dockerTest/java/org/springframework/boot/ldap/testcontainers/OpenLdapContainerConnectionDetailsFactoryIntegrationTests.java index ca522aa9910..261b94d7947 100644 --- a/module/spring-boot-ldap/src/dockerTest/java/org/springframework/boot/ldap/testcontainers/OpenLdapContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-ldap/src/dockerTest/java/org/springframework/boot/ldap/testcontainers/OpenLdapContainerConnectionDetailsFactoryIntegrationTests.java @@ -47,7 +47,8 @@ class OpenLdapContainerConnectionDetailsFactoryIntegrationTests { @Container @ServiceConnection - static final OpenLdapContainer openLdap = TestImage.container(OpenLdapContainer.class).withEnv("LDAP_TLS", "false"); + static final OpenLdapContainer openLdap = TestImage.forContainer(OpenLdapContainer.class) + .withEnv("LDAP_TLS", "false"); @Autowired private LdapTemplate ldapTemplate; diff --git a/module/spring-boot-liquibase/src/dockerTest/java/org/springframework/boot/liquibase/testcontainers/LiquibaseContainerConnectionDetailsFactoryTests.java b/module/spring-boot-liquibase/src/dockerTest/java/org/springframework/boot/liquibase/testcontainers/LiquibaseContainerConnectionDetailsFactoryTests.java index ecfa85b0ed4..fdd5b737eb6 100644 --- a/module/spring-boot-liquibase/src/dockerTest/java/org/springframework/boot/liquibase/testcontainers/LiquibaseContainerConnectionDetailsFactoryTests.java +++ b/module/spring-boot-liquibase/src/dockerTest/java/org/springframework/boot/liquibase/testcontainers/LiquibaseContainerConnectionDetailsFactoryTests.java @@ -46,7 +46,7 @@ class LiquibaseContainerConnectionDetailsFactoryTests { @Container @ServiceConnection - static final PostgreSQLContainer postgres = TestImage.container(PostgreSQLContainer.class); + static final PostgreSQLContainer postgres = TestImage.forContainer(PostgreSQLContainer.class); @Autowired(required = false) private JdbcConnectionDetails connectionDetails; diff --git a/module/spring-boot-mail/src/dockerTest/java/org/springframework/boot/mail/autoconfigure/MailSenderAutoConfigurationIntegrationTests.java b/module/spring-boot-mail/src/dockerTest/java/org/springframework/boot/mail/autoconfigure/MailSenderAutoConfigurationIntegrationTests.java index 3424ce816a9..6804d86c569 100644 --- a/module/spring-boot-mail/src/dockerTest/java/org/springframework/boot/mail/autoconfigure/MailSenderAutoConfigurationIntegrationTests.java +++ b/module/spring-boot-mail/src/dockerTest/java/org/springframework/boot/mail/autoconfigure/MailSenderAutoConfigurationIntegrationTests.java @@ -92,7 +92,7 @@ class MailSenderAutoConfigurationIntegrationTests { class ImplicitTlsTests { @Container - private static final MailpitContainer mailpit = TestImage.container(MailpitContainer.class) + private static final MailpitContainer mailpit = TestImage.forContainer(MailpitContainer.class) .withSmtpRequireTls(true) .withSmtpTlsCert(MountableFile .forClasspathResource("/org/springframework/boot/mail/autoconfigure/ssl/test-server.crt")) @@ -153,7 +153,7 @@ class MailSenderAutoConfigurationIntegrationTests { class StarttlsTests { @Container - private static final MailpitContainer mailpit = TestImage.container(MailpitContainer.class) + private static final MailpitContainer mailpit = TestImage.forContainer(MailpitContainer.class) .withSmtpRequireStarttls(true) .withSmtpTlsCert(MountableFile .forClasspathResource("/org/springframework/boot/mail/autoconfigure/ssl/test-server.crt")) diff --git a/module/spring-boot-micrometer-metrics/src/dockerTest/java/org/springframework/boot/micrometer/metrics/testcontainers/otlp/GrafanaOpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-micrometer-metrics/src/dockerTest/java/org/springframework/boot/micrometer/metrics/testcontainers/otlp/GrafanaOpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java index b60cf69ea4e..b6b67fdde32 100644 --- a/module/spring-boot-micrometer-metrics/src/dockerTest/java/org/springframework/boot/micrometer/metrics/testcontainers/otlp/GrafanaOpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-micrometer-metrics/src/dockerTest/java/org/springframework/boot/micrometer/metrics/testcontainers/otlp/GrafanaOpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java @@ -55,7 +55,7 @@ class GrafanaOpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTes @Container @ServiceConnection - static final LgtmStackContainer container = TestImage.container(LgtmStackContainer.class); + static final LgtmStackContainer container = TestImage.forContainer(LgtmStackContainer.class); @Autowired private MeterRegistry meterRegistry; diff --git a/module/spring-boot-micrometer-metrics/src/dockerTest/java/org/springframework/boot/micrometer/metrics/testcontainers/otlp/OpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-micrometer-metrics/src/dockerTest/java/org/springframework/boot/micrometer/metrics/testcontainers/otlp/OpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java index 927165fdb7b..a312360b544 100644 --- a/module/spring-boot-micrometer-metrics/src/dockerTest/java/org/springframework/boot/micrometer/metrics/testcontainers/otlp/OpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-micrometer-metrics/src/dockerTest/java/org/springframework/boot/micrometer/metrics/testcontainers/otlp/OpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java @@ -67,10 +67,10 @@ class OpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests { @Container @ServiceConnection - static final GenericContainer container = TestImage.OTEL_COLLECTOR.genericContainer() - .withCommand("--config=/etc/" + CONFIG_FILE_NAME) - .withCopyToContainer(MountableFile.forClasspathResource(CONFIG_FILE_NAME), "/etc/" + CONFIG_FILE_NAME) - .withExposedPorts(4318, 9090); + static final GenericContainer container = TestImage.OTEL_COLLECTOR + .container((setup) -> setup.withCommand("--config=/etc/" + CONFIG_FILE_NAME) + .withCopyToContainer(MountableFile.forClasspathResource(CONFIG_FILE_NAME), "/etc/" + CONFIG_FILE_NAME) + .withExposedPorts(4318, 9090)); @Autowired private MeterRegistry meterRegistry; diff --git a/module/spring-boot-micrometer-tracing-opentelemetry/src/dockerTest/java/org/springframework/boot/micrometer/tracing/opentelemetry/testcontainers/otlp/GrafanaOpenTelemetryTracingContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-micrometer-tracing-opentelemetry/src/dockerTest/java/org/springframework/boot/micrometer/tracing/opentelemetry/testcontainers/otlp/GrafanaOpenTelemetryTracingContainerConnectionDetailsFactoryIntegrationTests.java index 441bfba6be7..1ada7f91dbe 100644 --- a/module/spring-boot-micrometer-tracing-opentelemetry/src/dockerTest/java/org/springframework/boot/micrometer/tracing/opentelemetry/testcontainers/otlp/GrafanaOpenTelemetryTracingContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-micrometer-tracing-opentelemetry/src/dockerTest/java/org/springframework/boot/micrometer/tracing/opentelemetry/testcontainers/otlp/GrafanaOpenTelemetryTracingContainerConnectionDetailsFactoryIntegrationTests.java @@ -44,7 +44,7 @@ class GrafanaOpenTelemetryTracingContainerConnectionDetailsFactoryIntegrationTes @Container @ServiceConnection - static final LgtmStackContainer container = TestImage.container(LgtmStackContainer.class); + static final LgtmStackContainer container = TestImage.forContainer(LgtmStackContainer.class); @Autowired private OtlpTracingConnectionDetails connectionDetails; diff --git a/module/spring-boot-micrometer-tracing-opentelemetry/src/dockerTest/java/org/springframework/boot/micrometer/tracing/opentelemetry/testcontainers/otlp/OpenTelemetryTracingContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-micrometer-tracing-opentelemetry/src/dockerTest/java/org/springframework/boot/micrometer/tracing/opentelemetry/testcontainers/otlp/OpenTelemetryTracingContainerConnectionDetailsFactoryIntegrationTests.java index a60f875081a..14516de19dc 100644 --- a/module/spring-boot-micrometer-tracing-opentelemetry/src/dockerTest/java/org/springframework/boot/micrometer/tracing/opentelemetry/testcontainers/otlp/OpenTelemetryTracingContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-micrometer-tracing-opentelemetry/src/dockerTest/java/org/springframework/boot/micrometer/tracing/opentelemetry/testcontainers/otlp/OpenTelemetryTracingContainerConnectionDetailsFactoryIntegrationTests.java @@ -44,8 +44,8 @@ class OpenTelemetryTracingContainerConnectionDetailsFactoryIntegrationTests { @Container @ServiceConnection - static final GenericContainer container = TestImage.OTEL_COLLECTOR.genericContainer() - .withExposedPorts(4317, 4318); + static final GenericContainer container = TestImage.OTEL_COLLECTOR + .container((setup) -> setup.withExposedPorts(4317, 4318)); @Autowired private OtlpTracingConnectionDetails connectionDetails; diff --git a/module/spring-boot-mongodb/src/dockerTest/java/org/springframework/boot/mongodb/health/MongoHealthIndicatorIntegrationTests.java b/module/spring-boot-mongodb/src/dockerTest/java/org/springframework/boot/mongodb/health/MongoHealthIndicatorIntegrationTests.java index ffa0916a528..41e303182da 100644 --- a/module/spring-boot-mongodb/src/dockerTest/java/org/springframework/boot/mongodb/health/MongoHealthIndicatorIntegrationTests.java +++ b/module/spring-boot-mongodb/src/dockerTest/java/org/springframework/boot/mongodb/health/MongoHealthIndicatorIntegrationTests.java @@ -45,7 +45,7 @@ import static org.assertj.core.api.Assertions.assertThat; class MongoHealthIndicatorIntegrationTests { @Container - static MongoDBContainer mongo = TestImage.container(MongoDBContainer.class); + static MongoDBContainer mongo = TestImage.forContainer(MongoDBContainer.class); @Test void standardApi() { diff --git a/module/spring-boot-mongodb/src/dockerTest/java/org/springframework/boot/mongodb/health/MongoReactiveHealthIndicatorIntegrationTests.java b/module/spring-boot-mongodb/src/dockerTest/java/org/springframework/boot/mongodb/health/MongoReactiveHealthIndicatorIntegrationTests.java index 692387237be..94cc3e29128 100644 --- a/module/spring-boot-mongodb/src/dockerTest/java/org/springframework/boot/mongodb/health/MongoReactiveHealthIndicatorIntegrationTests.java +++ b/module/spring-boot-mongodb/src/dockerTest/java/org/springframework/boot/mongodb/health/MongoReactiveHealthIndicatorIntegrationTests.java @@ -47,7 +47,7 @@ import static org.assertj.core.api.Assertions.assertThat; class MongoReactiveHealthIndicatorIntegrationTests { @Container - static MongoDBContainer mongo = TestImage.container(MongoDBContainer.class); + static MongoDBContainer mongo = TestImage.forContainer(MongoDBContainer.class); @Test void standardApi() { diff --git a/module/spring-boot-mongodb/src/dockerTest/java/org/springframework/boot/mongodb/testcontainers/DeprecatedMongoDbContainerConnectionDetailsFactoryTests.java b/module/spring-boot-mongodb/src/dockerTest/java/org/springframework/boot/mongodb/testcontainers/DeprecatedMongoDbContainerConnectionDetailsFactoryTests.java index 3f2f433632d..185369ed708 100644 --- a/module/spring-boot-mongodb/src/dockerTest/java/org/springframework/boot/mongodb/testcontainers/DeprecatedMongoDbContainerConnectionDetailsFactoryTests.java +++ b/module/spring-boot-mongodb/src/dockerTest/java/org/springframework/boot/mongodb/testcontainers/DeprecatedMongoDbContainerConnectionDetailsFactoryTests.java @@ -45,7 +45,7 @@ class DeprecatedMongoDbContainerConnectionDetailsFactoryTests { @Container @ServiceConnection - static final MongoDBContainer mongoDb = TestImage.container(MongoDBContainer.class); + static final MongoDBContainer mongoDb = TestImage.forContainer(MongoDBContainer.class); @Autowired(required = false) private MongoConnectionDetails connectionDetails; diff --git a/module/spring-boot-mongodb/src/dockerTest/java/org/springframework/boot/mongodb/testcontainers/MongoDbAtlasLocalContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-mongodb/src/dockerTest/java/org/springframework/boot/mongodb/testcontainers/MongoDbAtlasLocalContainerConnectionDetailsFactoryIntegrationTests.java index 7f96cfab8ea..39d25886cd2 100644 --- a/module/spring-boot-mongodb/src/dockerTest/java/org/springframework/boot/mongodb/testcontainers/MongoDbAtlasLocalContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-mongodb/src/dockerTest/java/org/springframework/boot/mongodb/testcontainers/MongoDbAtlasLocalContainerConnectionDetailsFactoryIntegrationTests.java @@ -42,7 +42,7 @@ class MongoDbAtlasLocalContainerConnectionDetailsFactoryIntegrationTests { @Container @ServiceConnection - static final MongoDBAtlasLocalContainer mongoDb = TestImage.container(MongoDBAtlasLocalContainer.class); + static final MongoDBAtlasLocalContainer mongoDb = TestImage.forContainer(MongoDBAtlasLocalContainer.class); @Autowired(required = false) private MongoConnectionDetails connectionDetails; diff --git a/module/spring-boot-neo4j/src/dockerTest/java/org/springframework/boot/neo4j/autoconfigure/Neo4jAutoConfigurationIntegrationTests.java b/module/spring-boot-neo4j/src/dockerTest/java/org/springframework/boot/neo4j/autoconfigure/Neo4jAutoConfigurationIntegrationTests.java index 06f5c840784..676d1d3ddbc 100644 --- a/module/spring-boot-neo4j/src/dockerTest/java/org/springframework/boot/neo4j/autoconfigure/Neo4jAutoConfigurationIntegrationTests.java +++ b/module/spring-boot-neo4j/src/dockerTest/java/org/springframework/boot/neo4j/autoconfigure/Neo4jAutoConfigurationIntegrationTests.java @@ -53,7 +53,7 @@ import static org.assertj.core.api.Assertions.assertThat; class Neo4jAutoConfigurationIntegrationTests { @Container - private static final Neo4jContainer neo4j = TestImage.container(Neo4jContainer.class); + private static final Neo4jContainer neo4j = TestImage.forContainer(Neo4jContainer.class); @SpringBootTest @Nested diff --git a/module/spring-boot-neo4j/src/dockerTest/java/org/springframework/boot/neo4j/health/Neo4jReactiveHealthIndicatorIntegrationTests.java b/module/spring-boot-neo4j/src/dockerTest/java/org/springframework/boot/neo4j/health/Neo4jReactiveHealthIndicatorIntegrationTests.java index 17fc2a0a347..fb5ad19124d 100644 --- a/module/spring-boot-neo4j/src/dockerTest/java/org/springframework/boot/neo4j/health/Neo4jReactiveHealthIndicatorIntegrationTests.java +++ b/module/spring-boot-neo4j/src/dockerTest/java/org/springframework/boot/neo4j/health/Neo4jReactiveHealthIndicatorIntegrationTests.java @@ -49,7 +49,7 @@ class Neo4jReactiveHealthIndicatorIntegrationTests { // gh-33428 @Container - private static final Neo4jContainer neo4jServer = TestImage.container(Neo4jContainer.class); + private static final Neo4jContainer neo4jServer = TestImage.forContainer(Neo4jContainer.class); @DynamicPropertySource static void neo4jProperties(DynamicPropertyRegistry registry) { diff --git a/module/spring-boot-neo4j/src/dockerTest/java/org/springframework/boot/neo4j/testcontainers/DeprecatedNeo4jContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-neo4j/src/dockerTest/java/org/springframework/boot/neo4j/testcontainers/DeprecatedNeo4jContainerConnectionDetailsFactoryIntegrationTests.java index feeb6ad630d..4a8461b8a79 100644 --- a/module/spring-boot-neo4j/src/dockerTest/java/org/springframework/boot/neo4j/testcontainers/DeprecatedNeo4jContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-neo4j/src/dockerTest/java/org/springframework/boot/neo4j/testcontainers/DeprecatedNeo4jContainerConnectionDetailsFactoryIntegrationTests.java @@ -45,7 +45,7 @@ class DeprecatedNeo4jContainerConnectionDetailsFactoryIntegrationTests { @Container @ServiceConnection - static final Neo4jContainer container = TestImage.container(Neo4jContainer.class); + static final Neo4jContainer container = TestImage.forContainer(Neo4jContainer.class); @Autowired(required = false) private Neo4jConnectionDetails connectionDetails; diff --git a/module/spring-boot-opentelemetry/src/dockerTest/java/org/springframework/boot/opentelemetry/testcontainers/GrafanaOtlpLoggingContainerConnectionDetailsFactoryTests.java b/module/spring-boot-opentelemetry/src/dockerTest/java/org/springframework/boot/opentelemetry/testcontainers/GrafanaOtlpLoggingContainerConnectionDetailsFactoryTests.java index 563755574a6..de55574c8f3 100644 --- a/module/spring-boot-opentelemetry/src/dockerTest/java/org/springframework/boot/opentelemetry/testcontainers/GrafanaOtlpLoggingContainerConnectionDetailsFactoryTests.java +++ b/module/spring-boot-opentelemetry/src/dockerTest/java/org/springframework/boot/opentelemetry/testcontainers/GrafanaOtlpLoggingContainerConnectionDetailsFactoryTests.java @@ -44,7 +44,7 @@ class GrafanaOtlpLoggingContainerConnectionDetailsFactoryTests { @Container @ServiceConnection - static final LgtmStackContainer container = TestImage.container(LgtmStackContainer.class); + static final LgtmStackContainer container = TestImage.forContainer(LgtmStackContainer.class); @Autowired private OtlpLoggingConnectionDetails connectionDetails; diff --git a/module/spring-boot-opentelemetry/src/dockerTest/java/org/springframework/boot/opentelemetry/testcontainers/OtelCollectorOltpLoggingContainerConnectionDetailsFactoryTests.java b/module/spring-boot-opentelemetry/src/dockerTest/java/org/springframework/boot/opentelemetry/testcontainers/OtelCollectorOltpLoggingContainerConnectionDetailsFactoryTests.java index 69aab41c197..b878517e6ca 100644 --- a/module/spring-boot-opentelemetry/src/dockerTest/java/org/springframework/boot/opentelemetry/testcontainers/OtelCollectorOltpLoggingContainerConnectionDetailsFactoryTests.java +++ b/module/spring-boot-opentelemetry/src/dockerTest/java/org/springframework/boot/opentelemetry/testcontainers/OtelCollectorOltpLoggingContainerConnectionDetailsFactoryTests.java @@ -44,8 +44,8 @@ class OtelCollectorOltpLoggingContainerConnectionDetailsFactoryTests { @Container @ServiceConnection - static final GenericContainer container = TestImage.OTEL_COLLECTOR.genericContainer() - .withExposedPorts(4317, 4318); + static final GenericContainer container = TestImage.OTEL_COLLECTOR + .container((setup) -> setup.withExposedPorts(4317, 4318)); @Autowired private OtlpLoggingConnectionDetails connectionDetails; diff --git a/module/spring-boot-pulsar/src/dockerTest/java/org/springframework/boot/pulsar/autoconfigure/PulsarAutoConfigurationIntegrationTests.java b/module/spring-boot-pulsar/src/dockerTest/java/org/springframework/boot/pulsar/autoconfigure/PulsarAutoConfigurationIntegrationTests.java index 3948edce5c3..dd8de7c344b 100644 --- a/module/spring-boot-pulsar/src/dockerTest/java/org/springframework/boot/pulsar/autoconfigure/PulsarAutoConfigurationIntegrationTests.java +++ b/module/spring-boot-pulsar/src/dockerTest/java/org/springframework/boot/pulsar/autoconfigure/PulsarAutoConfigurationIntegrationTests.java @@ -49,7 +49,7 @@ import static org.assertj.core.api.Assertions.assertThat; class PulsarAutoConfigurationIntegrationTests { @Container - static final PulsarContainer pulsar = TestImage.container(PulsarContainer.class); + static final PulsarContainer pulsar = TestImage.forContainer(PulsarContainer.class); private static final CountDownLatch listenLatch = new CountDownLatch(1); diff --git a/module/spring-boot-pulsar/src/dockerTest/java/org/springframework/boot/pulsar/testcontainers/DeprecatedPulsarContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-pulsar/src/dockerTest/java/org/springframework/boot/pulsar/testcontainers/DeprecatedPulsarContainerConnectionDetailsFactoryIntegrationTests.java index ec1edb553b3..4fef2f00529 100644 --- a/module/spring-boot-pulsar/src/dockerTest/java/org/springframework/boot/pulsar/testcontainers/DeprecatedPulsarContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-pulsar/src/dockerTest/java/org/springframework/boot/pulsar/testcontainers/DeprecatedPulsarContainerConnectionDetailsFactoryIntegrationTests.java @@ -57,7 +57,7 @@ class DeprecatedPulsarContainerConnectionDetailsFactoryIntegrationTests { @Container @ServiceConnection @SuppressWarnings("unused") - static final PulsarContainer pulsar = TestImage.container(PulsarContainer.class); + static final PulsarContainer pulsar = TestImage.forContainer(PulsarContainer.class); @Autowired private PulsarTemplate pulsarTemplate; diff --git a/module/spring-boot-pulsar/src/dockerTest/java/org/springframework/boot/pulsar/testcontainers/PulsarContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-pulsar/src/dockerTest/java/org/springframework/boot/pulsar/testcontainers/PulsarContainerConnectionDetailsFactoryIntegrationTests.java index 05e3e3d2857..522762e9cb3 100644 --- a/module/spring-boot-pulsar/src/dockerTest/java/org/springframework/boot/pulsar/testcontainers/PulsarContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-pulsar/src/dockerTest/java/org/springframework/boot/pulsar/testcontainers/PulsarContainerConnectionDetailsFactoryIntegrationTests.java @@ -53,7 +53,7 @@ class PulsarContainerConnectionDetailsFactoryIntegrationTests { @Container @ServiceConnection @SuppressWarnings("unused") - static final PulsarContainer pulsar = TestImage.container(PulsarContainer.class); + static final PulsarContainer pulsar = TestImage.forContainer(PulsarContainer.class); @Autowired private PulsarTemplate pulsarTemplate; diff --git a/module/spring-boot-r2dbc/src/dockerTest/java/org/springframework/boot/r2dbc/testcontainers/OracleFreeR2dbcContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-r2dbc/src/dockerTest/java/org/springframework/boot/r2dbc/testcontainers/OracleFreeR2dbcContainerConnectionDetailsFactoryIntegrationTests.java index fe6ccb58869..978fa764a2b 100644 --- a/module/spring-boot-r2dbc/src/dockerTest/java/org/springframework/boot/r2dbc/testcontainers/OracleFreeR2dbcContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-r2dbc/src/dockerTest/java/org/springframework/boot/r2dbc/testcontainers/OracleFreeR2dbcContainerConnectionDetailsFactoryIntegrationTests.java @@ -47,7 +47,7 @@ class OracleFreeR2dbcContainerConnectionDetailsFactoryIntegrationTests { @Container @ServiceConnection - static final OracleContainer oracle = TestImage.container(OracleContainer.class); + static final OracleContainer oracle = TestImage.forContainer(OracleContainer.class); @Autowired ConnectionFactory connectionFactory; diff --git a/module/spring-boot-r2dbc/src/dockerTest/java/org/springframework/boot/r2dbc/testcontainers/OracleXeR2dbcContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-r2dbc/src/dockerTest/java/org/springframework/boot/r2dbc/testcontainers/OracleXeR2dbcContainerConnectionDetailsFactoryIntegrationTests.java index 8f1af01e387..6ccdefe1cce 100644 --- a/module/spring-boot-r2dbc/src/dockerTest/java/org/springframework/boot/r2dbc/testcontainers/OracleXeR2dbcContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-r2dbc/src/dockerTest/java/org/springframework/boot/r2dbc/testcontainers/OracleXeR2dbcContainerConnectionDetailsFactoryIntegrationTests.java @@ -51,7 +51,7 @@ class OracleXeR2dbcContainerConnectionDetailsFactoryIntegrationTests { @Container @ServiceConnection - static final OracleContainer oracle = TestImage.container(OracleContainer.class); + static final OracleContainer oracle = TestImage.forContainer(OracleContainer.class); @Autowired ConnectionFactory connectionFactory; diff --git a/module/spring-boot-session-data-redis/src/dockerTest/java/org/springframework/boot/session/data/redis/autoconfigure/SessionDataRedisAutoConfigurationTests.java b/module/spring-boot-session-data-redis/src/dockerTest/java/org/springframework/boot/session/data/redis/autoconfigure/SessionDataRedisAutoConfigurationTests.java index 4d895344b49..284e7824626 100644 --- a/module/spring-boot-session-data-redis/src/dockerTest/java/org/springframework/boot/session/data/redis/autoconfigure/SessionDataRedisAutoConfigurationTests.java +++ b/module/spring-boot-session-data-redis/src/dockerTest/java/org/springframework/boot/session/data/redis/autoconfigure/SessionDataRedisAutoConfigurationTests.java @@ -60,7 +60,7 @@ import static org.assertj.core.api.Assertions.entry; class SessionDataRedisAutoConfigurationTests extends AbstractSessionAutoConfigurationTests { @Container - public static RedisContainer redis = TestImage.container(RedisContainer.class); + public static RedisContainer redis = TestImage.forContainer(RedisContainer.class); @BeforeEach void prepareContextRunner() { diff --git a/module/spring-boot-session-data-redis/src/dockerTest/java/org/springframework/boot/session/data/redis/autoconfigure/SessionDataRedisReactiveAutoConfigurationTests.java b/module/spring-boot-session-data-redis/src/dockerTest/java/org/springframework/boot/session/data/redis/autoconfigure/SessionDataRedisReactiveAutoConfigurationTests.java index 333f1687c7f..1bbfcb64ee6 100644 --- a/module/spring-boot-session-data-redis/src/dockerTest/java/org/springframework/boot/session/data/redis/autoconfigure/SessionDataRedisReactiveAutoConfigurationTests.java +++ b/module/spring-boot-session-data-redis/src/dockerTest/java/org/springframework/boot/session/data/redis/autoconfigure/SessionDataRedisReactiveAutoConfigurationTests.java @@ -64,7 +64,7 @@ import static org.assertj.core.api.Assertions.entry; class SessionDataRedisReactiveAutoConfigurationTests extends AbstractSessionReactiveAutoConfigurationTests { @Container - public static RedisContainer redis = TestImage.container(RedisContainer.class); + public static RedisContainer redis = TestImage.forContainer(RedisContainer.class); @BeforeEach void prepareRunner() { diff --git a/module/spring-boot-zipkin/src/dockerTest/java/org/springframework/boot/zipkin/testcontainers/ZipkinContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-zipkin/src/dockerTest/java/org/springframework/boot/zipkin/testcontainers/ZipkinContainerConnectionDetailsFactoryIntegrationTests.java index 76a2802cded..682f6724b70 100644 --- a/module/spring-boot-zipkin/src/dockerTest/java/org/springframework/boot/zipkin/testcontainers/ZipkinContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-zipkin/src/dockerTest/java/org/springframework/boot/zipkin/testcontainers/ZipkinContainerConnectionDetailsFactoryIntegrationTests.java @@ -45,7 +45,7 @@ class ZipkinContainerConnectionDetailsFactoryIntegrationTests { @Container @ServiceConnection - static final GenericContainer zipkin = TestImage.container(ZipkinContainer.class); + static final GenericContainer zipkin = TestImage.forContainer(ZipkinContainer.class); @Autowired(required = false) private ZipkinConnectionDetails connectionDetails; diff --git a/smoke-test/spring-boot-smoke-test-activemq/src/dockerTest/java/smoketest/activemq/SampleActiveMqTests.java b/smoke-test/spring-boot-smoke-test-activemq/src/dockerTest/java/smoketest/activemq/SampleActiveMqTests.java index f2e600e1d85..03a9ca7735e 100644 --- a/smoke-test/spring-boot-smoke-test-activemq/src/dockerTest/java/smoketest/activemq/SampleActiveMqTests.java +++ b/smoke-test/spring-boot-smoke-test-activemq/src/dockerTest/java/smoketest/activemq/SampleActiveMqTests.java @@ -21,6 +21,7 @@ import java.time.Duration; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.testcontainers.activemq.ActiveMQContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; @@ -29,7 +30,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.system.CapturedOutput; import org.springframework.boot.test.system.OutputCaptureExtension; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; -import org.springframework.boot.testsupport.container.ActiveMQClassicContainer; import org.springframework.boot.testsupport.container.TestImage; import static org.assertj.core.api.Assertions.assertThat; @@ -47,7 +47,7 @@ class SampleActiveMqTests { @Container @ServiceConnection - private static final ActiveMQClassicContainer container = TestImage.container(ActiveMQClassicContainer.class); + private static final ActiveMQContainer container = TestImage.ACTIVE_MQ_CLASSIC.container(); @Autowired private Producer producer; diff --git a/smoke-test/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationSslTests.java b/smoke-test/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationSslTests.java index e1acf6319d0..15a87917d21 100644 --- a/smoke-test/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationSslTests.java +++ b/smoke-test/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationSslTests.java @@ -49,7 +49,7 @@ class SampleAmqpSimpleApplicationSslTests { @ServiceConnection @PemKeyStore(certificate = "classpath:ssl/test-client.crt", privateKey = "classpath:ssl/test-client.key") @PemTrustStore("classpath:ssl/test-ca.crt") - static final SecureRabbitMqContainer rabbit = TestImage.container(SecureRabbitMqContainer.class); + static final SecureRabbitMqContainer rabbit = TestImage.forContainer(SecureRabbitMqContainer.class); @Autowired private Sender sender; diff --git a/smoke-test/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationTests.java b/smoke-test/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationTests.java index e763ade7aa0..f07d9b35bd6 100644 --- a/smoke-test/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationTests.java +++ b/smoke-test/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationTests.java @@ -41,7 +41,7 @@ class SampleAmqpSimpleApplicationTests { @Container @ServiceConnection - static final RabbitMQContainer rabbit = TestImage.container(RabbitMQContainer.class); + static final RabbitMQContainer rabbit = TestImage.forContainer(RabbitMQContainer.class); @Autowired private Sender sender; diff --git a/smoke-test/spring-boot-smoke-test-artemis/src/dockerTest/java/smoketest/artemis/SampleArtemisTests.java b/smoke-test/spring-boot-smoke-test-artemis/src/dockerTest/java/smoketest/artemis/SampleArtemisTests.java index 3b86617b147..ca89f92bd9b 100644 --- a/smoke-test/spring-boot-smoke-test-artemis/src/dockerTest/java/smoketest/artemis/SampleArtemisTests.java +++ b/smoke-test/spring-boot-smoke-test-artemis/src/dockerTest/java/smoketest/artemis/SampleArtemisTests.java @@ -21,6 +21,7 @@ import java.time.Duration; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.testcontainers.activemq.ArtemisContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; @@ -29,7 +30,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.system.CapturedOutput; import org.springframework.boot.test.system.OutputCaptureExtension; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; -import org.springframework.boot.testsupport.container.ArtemisLegacyContainer; import org.springframework.boot.testsupport.container.TestImage; import static org.assertj.core.api.Assertions.assertThat; @@ -47,7 +47,7 @@ class SampleArtemisTests { @Container @ServiceConnection - private static final ArtemisLegacyContainer container = TestImage.container(ArtemisLegacyContainer.class); + static final ArtemisContainer container = TestImage.ARTEMIS_LEGACY.container(); @Autowired private Producer producer; diff --git a/smoke-test/spring-boot-smoke-test-cache/src/dockerTest/java/smoketest/cache/SampleCacheApplicationRedisTests.java b/smoke-test/spring-boot-smoke-test-cache/src/dockerTest/java/smoketest/cache/SampleCacheApplicationRedisTests.java index b36661a9320..358858369bc 100644 --- a/smoke-test/spring-boot-smoke-test-cache/src/dockerTest/java/smoketest/cache/SampleCacheApplicationRedisTests.java +++ b/smoke-test/spring-boot-smoke-test-cache/src/dockerTest/java/smoketest/cache/SampleCacheApplicationRedisTests.java @@ -40,7 +40,7 @@ class SampleCacheApplicationRedisTests { @Container @ServiceConnection - private static final RedisContainer redis = TestImage.container(RedisContainer.class); + private static final RedisContainer redis = TestImage.forContainer(RedisContainer.class); @Autowired private CacheManager cacheManager; diff --git a/smoke-test/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SampleDataCassandraApplicationReactiveSslTests.java b/smoke-test/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SampleDataCassandraApplicationReactiveSslTests.java index fb6b3662a7a..51d63c05c5d 100644 --- a/smoke-test/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SampleDataCassandraApplicationReactiveSslTests.java +++ b/smoke-test/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SampleDataCassandraApplicationReactiveSslTests.java @@ -52,7 +52,7 @@ class SampleDataCassandraApplicationReactiveSslTests { @ServiceConnection @JksTrustStore(location = "classpath:ssl/test-ca.p12", password = "password") @JksKeyStore(location = "classpath:ssl/test-client.p12", password = "password") - static final SecureCassandraContainer cassandra = TestImage.container(SecureCassandraContainer.class); + static final SecureCassandraContainer cassandra = TestImage.forContainer(SecureCassandraContainer.class); @Autowired private ReactiveCassandraTemplate cassandraTemplate; diff --git a/smoke-test/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SampleDataCassandraApplicationSslTests.java b/smoke-test/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SampleDataCassandraApplicationSslTests.java index 007fb4f0aeb..bc9af819b77 100644 --- a/smoke-test/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SampleDataCassandraApplicationSslTests.java +++ b/smoke-test/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SampleDataCassandraApplicationSslTests.java @@ -52,7 +52,7 @@ class SampleDataCassandraApplicationSslTests { @ServiceConnection @JksTrustStore(location = "classpath:ssl/test-ca.p12", password = "password") @JksKeyStore(location = "classpath:ssl/test-client.p12", password = "password") - static final SecureCassandraContainer cassandra = TestImage.container(SecureCassandraContainer.class); + static final SecureCassandraContainer cassandra = TestImage.forContainer(SecureCassandraContainer.class); @Autowired private CassandraTemplate cassandraTemplate; diff --git a/smoke-test/spring-boot-smoke-test-data-couchbase/src/dockerTest/java/smoketest/data/couchbase/SampleDataCouchbaseApplicationReactiveSslTests.java b/smoke-test/spring-boot-smoke-test-data-couchbase/src/dockerTest/java/smoketest/data/couchbase/SampleDataCouchbaseApplicationReactiveSslTests.java index 3c33707d134..83d83b02708 100644 --- a/smoke-test/spring-boot-smoke-test-data-couchbase/src/dockerTest/java/smoketest/data/couchbase/SampleDataCouchbaseApplicationReactiveSslTests.java +++ b/smoke-test/spring-boot-smoke-test-data-couchbase/src/dockerTest/java/smoketest/data/couchbase/SampleDataCouchbaseApplicationReactiveSslTests.java @@ -49,7 +49,7 @@ class SampleDataCouchbaseApplicationReactiveSslTests { @ServiceConnection @PemKeyStore(certificate = "classpath:ssl/test-client.crt", privateKey = "classpath:ssl/test-client.key") @PemTrustStore(certificate = "classpath:ssl/test-ca.crt") - static final CouchbaseContainer couchbase = TestImage.container(SecureCouchbaseContainer.class) + static final CouchbaseContainer couchbase = TestImage.forContainer(SecureCouchbaseContainer.class) .withBucket(new BucketDefinition(BUCKET_NAME)); @Autowired diff --git a/smoke-test/spring-boot-smoke-test-data-couchbase/src/dockerTest/java/smoketest/data/couchbase/SampleDataCouchbaseApplicationSslTests.java b/smoke-test/spring-boot-smoke-test-data-couchbase/src/dockerTest/java/smoketest/data/couchbase/SampleDataCouchbaseApplicationSslTests.java index 826e529db9c..aa15145a26f 100644 --- a/smoke-test/spring-boot-smoke-test-data-couchbase/src/dockerTest/java/smoketest/data/couchbase/SampleDataCouchbaseApplicationSslTests.java +++ b/smoke-test/spring-boot-smoke-test-data-couchbase/src/dockerTest/java/smoketest/data/couchbase/SampleDataCouchbaseApplicationSslTests.java @@ -48,7 +48,7 @@ class SampleDataCouchbaseApplicationSslTests { @ServiceConnection @PemKeyStore(certificate = "classpath:ssl/test-client.crt", privateKey = "classpath:ssl/test-client.key") @PemTrustStore(certificate = "classpath:ssl/test-ca.crt") - static final CouchbaseContainer couchbase = TestImage.container(SecureCouchbaseContainer.class) + static final CouchbaseContainer couchbase = TestImage.forContainer(SecureCouchbaseContainer.class) .withBucket(new BucketDefinition(BUCKET_NAME)); @Autowired diff --git a/smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleDataElasticsearchApplicationTests.java b/smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleDataElasticsearchApplicationTests.java index feaf3fc4e30..1aff3ab9197 100644 --- a/smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleDataElasticsearchApplicationTests.java +++ b/smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleDataElasticsearchApplicationTests.java @@ -42,7 +42,7 @@ class SampleDataElasticsearchApplicationTests { @Container @ServiceConnection - static final ElasticsearchContainer elasticSearch = TestImage.container(ElasticsearchContainer.class); + static final ElasticsearchContainer elasticSearch = TestImage.forContainer(ElasticsearchContainer.class); @Autowired private ElasticsearchTemplate elasticsearchTemplate; diff --git a/smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleDataElasticsearchSslApplicationTests.java b/smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleDataElasticsearchSslApplicationTests.java index aa6962a6c8f..e0767c03586 100644 --- a/smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleDataElasticsearchSslApplicationTests.java +++ b/smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleDataElasticsearchSslApplicationTests.java @@ -45,7 +45,7 @@ class SampleDataElasticsearchSslApplicationTests { @Container @ServiceConnection @PemTrustStore(certificate = "classpath:ssl.crt") - static final ElasticsearchContainer elasticSearch = TestImage.container(SecureElasticsearchContainer.class); + static final ElasticsearchContainer elasticSearch = TestImage.forContainer(SecureElasticsearchContainer.class); @Autowired private ElasticsearchTemplate elasticsearchTemplate; diff --git a/smoke-test/spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb/SampleDataMongoApplicationReactiveSslTests.java b/smoke-test/spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb/SampleDataMongoApplicationReactiveSslTests.java index 353d7d4eb45..c4071235c76 100644 --- a/smoke-test/spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb/SampleDataMongoApplicationReactiveSslTests.java +++ b/smoke-test/spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb/SampleDataMongoApplicationReactiveSslTests.java @@ -46,7 +46,7 @@ class SampleDataMongoApplicationReactiveSslTests { @ServiceConnection @PemKeyStore(certificate = "classpath:ssl/test-client.crt", privateKey = "classpath:ssl/test-client.key") @PemTrustStore("classpath:ssl/test-ca.crt") - static final MongoDBContainer mongoDb = TestImage.container(SecureMongoContainer.class); + static final MongoDBContainer mongoDb = TestImage.forContainer(SecureMongoContainer.class); @Autowired private ReactiveMongoTemplate mongoTemplate; diff --git a/smoke-test/spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb/SampleMongoApplicationSslTests.java b/smoke-test/spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb/SampleMongoApplicationSslTests.java index 6f6836f11d8..56ff91fea47 100644 --- a/smoke-test/spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb/SampleMongoApplicationSslTests.java +++ b/smoke-test/spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb/SampleMongoApplicationSslTests.java @@ -45,7 +45,7 @@ class SampleMongoApplicationSslTests { @ServiceConnection @PemKeyStore(certificate = "classpath:ssl/test-client.crt", privateKey = "classpath:ssl/test-client.key") @PemTrustStore("classpath:ssl/test-ca.crt") - static final MongoDBContainer mongoDb = TestImage.container(SecureMongoContainer.class); + static final MongoDBContainer mongoDb = TestImage.forContainer(SecureMongoContainer.class); @Autowired private MongoTemplate mongoTemplate; diff --git a/smoke-test/spring-boot-smoke-test-data-r2dbc-flyway/src/dockerTest/java/smoketest/data/r2dbc/CityRepositoryTests.java b/smoke-test/spring-boot-smoke-test-data-r2dbc-flyway/src/dockerTest/java/smoketest/data/r2dbc/CityRepositoryTests.java index c77f798671f..54782c179ab 100644 --- a/smoke-test/spring-boot-smoke-test-data-r2dbc-flyway/src/dockerTest/java/smoketest/data/r2dbc/CityRepositoryTests.java +++ b/smoke-test/spring-boot-smoke-test-data-r2dbc-flyway/src/dockerTest/java/smoketest/data/r2dbc/CityRepositoryTests.java @@ -44,7 +44,7 @@ class CityRepositoryTests { @Container @ServiceConnection - static PostgreSQLContainer postgresql = TestImage.container(PostgreSQLContainer.class) + static PostgreSQLContainer postgresql = TestImage.forContainer(PostgreSQLContainer.class) .withDatabaseName("test_flyway"); @Autowired diff --git a/smoke-test/spring-boot-smoke-test-data-r2dbc-liquibase/src/dockerTest/java/smoketest/data/r2dbc/CityRepositoryTests.java b/smoke-test/spring-boot-smoke-test-data-r2dbc-liquibase/src/dockerTest/java/smoketest/data/r2dbc/CityRepositoryTests.java index 6b5af56e7d2..c8df4f1c979 100644 --- a/smoke-test/spring-boot-smoke-test-data-r2dbc-liquibase/src/dockerTest/java/smoketest/data/r2dbc/CityRepositoryTests.java +++ b/smoke-test/spring-boot-smoke-test-data-r2dbc-liquibase/src/dockerTest/java/smoketest/data/r2dbc/CityRepositoryTests.java @@ -44,7 +44,7 @@ class CityRepositoryTests { @Container @ServiceConnection - static PostgreSQLContainer postgresql = TestImage.container(PostgreSQLContainer.class) + static PostgreSQLContainer postgresql = TestImage.forContainer(PostgreSQLContainer.class) .withDatabaseName("test_liquibase"); @Autowired diff --git a/smoke-test/spring-boot-smoke-test-data-redis/src/dockerTest/java/smoketest/data/redis/SampleRedisApplicationJedisSslTests.java b/smoke-test/spring-boot-smoke-test-data-redis/src/dockerTest/java/smoketest/data/redis/SampleRedisApplicationJedisSslTests.java index efbd40e2fa4..e70888a775a 100644 --- a/smoke-test/spring-boot-smoke-test-data-redis/src/dockerTest/java/smoketest/data/redis/SampleRedisApplicationJedisSslTests.java +++ b/smoke-test/spring-boot-smoke-test-data-redis/src/dockerTest/java/smoketest/data/redis/SampleRedisApplicationJedisSslTests.java @@ -51,7 +51,7 @@ class SampleRedisApplicationJedisSslTests { @ServiceConnection @PemKeyStore(certificate = "classpath:ssl/test-client.crt", privateKey = "classpath:ssl/test-client.key") @PemTrustStore("classpath:ssl/test-ca.crt") - static RedisContainer redis = TestImage.container(SecureRedisContainer.class); + static RedisContainer redis = TestImage.forContainer(SecureRedisContainer.class); @Autowired private RedisOperations operations; diff --git a/smoke-test/spring-boot-smoke-test-data-redis/src/dockerTest/java/smoketest/data/redis/SampleRedisApplicationReactiveSslTests.java b/smoke-test/spring-boot-smoke-test-data-redis/src/dockerTest/java/smoketest/data/redis/SampleRedisApplicationReactiveSslTests.java index 4f698f73f1e..0d3f2c144cb 100644 --- a/smoke-test/spring-boot-smoke-test-data-redis/src/dockerTest/java/smoketest/data/redis/SampleRedisApplicationReactiveSslTests.java +++ b/smoke-test/spring-boot-smoke-test-data-redis/src/dockerTest/java/smoketest/data/redis/SampleRedisApplicationReactiveSslTests.java @@ -46,7 +46,7 @@ class SampleRedisApplicationReactiveSslTests { @ServiceConnection @PemKeyStore(certificate = "classpath:ssl/test-client.crt", privateKey = "classpath:ssl/test-client.key") @PemTrustStore("classpath:ssl/test-ca.crt") - static RedisContainer redis = TestImage.container(SecureRedisContainer.class); + static RedisContainer redis = TestImage.forContainer(SecureRedisContainer.class); @Autowired private ReactiveRedisOperations operations; diff --git a/smoke-test/spring-boot-smoke-test-data-redis/src/dockerTest/java/smoketest/data/redis/SampleRedisApplicationSslTests.java b/smoke-test/spring-boot-smoke-test-data-redis/src/dockerTest/java/smoketest/data/redis/SampleRedisApplicationSslTests.java index 79dc306170e..77125cf351b 100644 --- a/smoke-test/spring-boot-smoke-test-data-redis/src/dockerTest/java/smoketest/data/redis/SampleRedisApplicationSslTests.java +++ b/smoke-test/spring-boot-smoke-test-data-redis/src/dockerTest/java/smoketest/data/redis/SampleRedisApplicationSslTests.java @@ -49,7 +49,7 @@ class SampleRedisApplicationSslTests { @ServiceConnection @PemKeyStore(certificate = "classpath:ssl/test-client.crt", privateKey = "classpath:ssl/test-client.key") @PemTrustStore("classpath:ssl/test-ca.crt") - static RedisContainer redis = TestImage.container(SecureRedisContainer.class); + static RedisContainer redis = TestImage.forContainer(SecureRedisContainer.class); @Autowired private RedisOperations operations; diff --git a/smoke-test/spring-boot-smoke-test-kafka/src/dockerTest/java/smoketest/kafka/ssl/SampleKafkaSslApplicationTests.java b/smoke-test/spring-boot-smoke-test-kafka/src/dockerTest/java/smoketest/kafka/ssl/SampleKafkaSslApplicationTests.java index 7d7431bd286..7a89716ad25 100644 --- a/smoke-test/spring-boot-smoke-test-kafka/src/dockerTest/java/smoketest/kafka/ssl/SampleKafkaSslApplicationTests.java +++ b/smoke-test/spring-boot-smoke-test-kafka/src/dockerTest/java/smoketest/kafka/ssl/SampleKafkaSslApplicationTests.java @@ -52,7 +52,7 @@ class SampleKafkaSslApplicationTests { @ServiceConnection @JksTrustStore(location = "classpath:ssl/test-ca.p12", password = "password") @JksKeyStore(location = "classpath:ssl/test-client.p12", password = "password") - public static ConfluentKafkaContainer kafka = TestImage.container(SecureKafkaContainer.class); + public static ConfluentKafkaContainer kafka = TestImage.forContainer(SecureKafkaContainer.class); @Autowired private Producer producer; diff --git a/smoke-test/spring-boot-smoke-test-pulsar/src/dockerTest/java/smoketest/pulsar/SamplePulsarApplicationTests.java b/smoke-test/spring-boot-smoke-test-pulsar/src/dockerTest/java/smoketest/pulsar/SamplePulsarApplicationTests.java index 3857d78624c..155a00c2cd4 100644 --- a/smoke-test/spring-boot-smoke-test-pulsar/src/dockerTest/java/smoketest/pulsar/SamplePulsarApplicationTests.java +++ b/smoke-test/spring-boot-smoke-test-pulsar/src/dockerTest/java/smoketest/pulsar/SamplePulsarApplicationTests.java @@ -42,7 +42,7 @@ class SamplePulsarApplicationTests { @Container @ServiceConnection - static final PulsarContainer pulsar = TestImage.container(PulsarContainer.class); + static final PulsarContainer pulsar = TestImage.forContainer(PulsarContainer.class); @Test void appProducesAndConsumesMessages(CapturedOutput output) { diff --git a/smoke-test/spring-boot-smoke-test-session-data-redis-webflux/src/dockerTest/java/smoketest/session/SampleSessionWebFluxRedisApplicationTests.java b/smoke-test/spring-boot-smoke-test-session-data-redis-webflux/src/dockerTest/java/smoketest/session/SampleSessionWebFluxRedisApplicationTests.java index 09df1803495..47545edf676 100644 --- a/smoke-test/spring-boot-smoke-test-session-data-redis-webflux/src/dockerTest/java/smoketest/session/SampleSessionWebFluxRedisApplicationTests.java +++ b/smoke-test/spring-boot-smoke-test-session-data-redis-webflux/src/dockerTest/java/smoketest/session/SampleSessionWebFluxRedisApplicationTests.java @@ -52,7 +52,7 @@ class SampleSessionWebFluxRedisApplicationTests { @Container @ServiceConnection - private static final RedisContainer redis = TestImage.container(RedisContainer.class); + private static final RedisContainer redis = TestImage.forContainer(RedisContainer.class); @LocalServerPort private int port; diff --git a/smoke-test/spring-boot-smoke-test-session-data-redis/src/dockerTest/java/smoketest/session/redis/SampleSessionRedisApplicationTests.java b/smoke-test/spring-boot-smoke-test-session-data-redis/src/dockerTest/java/smoketest/session/redis/SampleSessionRedisApplicationTests.java index f01468e9b0f..6e7780856cd 100644 --- a/smoke-test/spring-boot-smoke-test-session-data-redis/src/dockerTest/java/smoketest/session/redis/SampleSessionRedisApplicationTests.java +++ b/smoke-test/spring-boot-smoke-test-session-data-redis/src/dockerTest/java/smoketest/session/redis/SampleSessionRedisApplicationTests.java @@ -61,7 +61,7 @@ class SampleSessionRedisApplicationTests { @Container @ServiceConnection - static RedisContainer redis = TestImage.container(RedisContainer.class); + static RedisContainer redis = TestImage.forContainer(RedisContainer.class); @Autowired private TestRestTemplate restTemplate; diff --git a/smoke-test/spring-boot-smoke-test-session-data-redis/src/dockerTest/java/smoketest/session/redis/TestPropertiesImportSampleSessionRedisApplication.java b/smoke-test/spring-boot-smoke-test-session-data-redis/src/dockerTest/java/smoketest/session/redis/TestPropertiesImportSampleSessionRedisApplication.java index c81b3efeea3..3bc111bb630 100644 --- a/smoke-test/spring-boot-smoke-test-session-data-redis/src/dockerTest/java/smoketest/session/redis/TestPropertiesImportSampleSessionRedisApplication.java +++ b/smoke-test/spring-boot-smoke-test-session-data-redis/src/dockerTest/java/smoketest/session/redis/TestPropertiesImportSampleSessionRedisApplication.java @@ -33,7 +33,7 @@ public class TestPropertiesImportSampleSessionRedisApplication { @ImportTestcontainers static class ContainerConfiguration { - static RedisContainer container = TestImage.container(RedisContainer.class); + static RedisContainer container = TestImage.forContainer(RedisContainer.class); @DynamicPropertySource static void containerProperties(DynamicPropertyRegistry properties) { diff --git a/smoke-test/spring-boot-smoke-test-session-data-redis/src/dockerTest/java/smoketest/session/redis/TestPropertiesSampleSessionRedisApplication.java b/smoke-test/spring-boot-smoke-test-session-data-redis/src/dockerTest/java/smoketest/session/redis/TestPropertiesSampleSessionRedisApplication.java index 1b1c9be398c..4376f95cc26 100644 --- a/smoke-test/spring-boot-smoke-test-session-data-redis/src/dockerTest/java/smoketest/session/redis/TestPropertiesSampleSessionRedisApplication.java +++ b/smoke-test/spring-boot-smoke-test-session-data-redis/src/dockerTest/java/smoketest/session/redis/TestPropertiesSampleSessionRedisApplication.java @@ -35,7 +35,7 @@ public class TestPropertiesSampleSessionRedisApplication { @Bean RedisContainer redisContainer(DynamicPropertyRegistry properties) { - RedisContainer container = TestImage.container(RedisContainer.class); + RedisContainer container = TestImage.forContainer(RedisContainer.class); properties.add("spring.data.redis.host", container::getHost); properties.add("spring.data.redis.port", container::getFirstMappedPort); return container; diff --git a/smoke-test/spring-boot-smoke-test-session-data-redis/src/dockerTest/java/smoketest/session/redis/TestServiceConnectionImportSampleSessionRedisApplication.java b/smoke-test/spring-boot-smoke-test-session-data-redis/src/dockerTest/java/smoketest/session/redis/TestServiceConnectionImportSampleSessionRedisApplication.java index d689b94ca58..b2ed6fb7fb8 100644 --- a/smoke-test/spring-boot-smoke-test-session-data-redis/src/dockerTest/java/smoketest/session/redis/TestServiceConnectionImportSampleSessionRedisApplication.java +++ b/smoke-test/spring-boot-smoke-test-session-data-redis/src/dockerTest/java/smoketest/session/redis/TestServiceConnectionImportSampleSessionRedisApplication.java @@ -33,7 +33,7 @@ public class TestServiceConnectionImportSampleSessionRedisApplication { static class ContainerConfiguration { @ServiceConnection // We don't need a name here because we have the container - static RedisContainer redisContainer = TestImage.container(RedisContainer.class); + static RedisContainer redisContainer = TestImage.forContainer(RedisContainer.class); } diff --git a/smoke-test/spring-boot-smoke-test-session-data-redis/src/dockerTest/java/smoketest/session/redis/TestServiceConnectionSampleSessionRedisApplication.java b/smoke-test/spring-boot-smoke-test-session-data-redis/src/dockerTest/java/smoketest/session/redis/TestServiceConnectionSampleSessionRedisApplication.java index 707bf0ee35a..4961f697216 100644 --- a/smoke-test/spring-boot-smoke-test-session-data-redis/src/dockerTest/java/smoketest/session/redis/TestServiceConnectionSampleSessionRedisApplication.java +++ b/smoke-test/spring-boot-smoke-test-session-data-redis/src/dockerTest/java/smoketest/session/redis/TestServiceConnectionSampleSessionRedisApplication.java @@ -36,7 +36,7 @@ public class TestServiceConnectionSampleSessionRedisApplication { @Bean @ServiceConnection RedisContainer redisContainer() { - return TestImage.container(RedisContainer.class); + return TestImage.forContainer(RedisContainer.class); } } diff --git a/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/ActiveMQClassicContainer.java b/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/ActiveMQClassicContainer.java deleted file mode 100644 index 563b4b69bd1..00000000000 --- a/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/ActiveMQClassicContainer.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2012-present 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.activemq.ActiveMQContainer; -import org.testcontainers.utility.DockerImageName; - -/** - * An {@link ActiveMQContainer} for ActiveMQ classic. - * - * @author Moritz Halbritter - */ -public final class ActiveMQClassicContainer extends ActiveMQContainer { - - public ActiveMQClassicContainer(DockerImageName dockerImageName) { - super(dockerImageName); - } - -} diff --git a/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/ActiveMQContainer.java b/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/ActiveMQContainer.java deleted file mode 100644 index 28c8bf4915a..00000000000 --- a/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/ActiveMQContainer.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2012-present 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.utility.DockerImageName; - -/** - * An {@link org.testcontainers.activemq.ActiveMQContainer} for ActiveMQ. - * - * @author Moritz Halbritter - */ -public final class ActiveMQContainer extends org.testcontainers.activemq.ActiveMQContainer { - - public ActiveMQContainer(DockerImageName dockerImageName) { - super(dockerImageName); - } - -} diff --git a/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/ArtemisContainer.java b/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/ArtemisContainer.java deleted file mode 100644 index 4e30d5cbf7a..00000000000 --- a/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/ArtemisContainer.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2012-present 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.utility.DockerImageName; - -/** - * An {@link org.testcontainers.activemq.ArtemisContainer} for {@code apache/artemis}. - * - * @author Moritz Halbritter - */ -public final class ArtemisContainer extends org.testcontainers.activemq.ArtemisContainer { - - public ArtemisContainer(DockerImageName dockerImageName) { - super(dockerImageName); - } - -} diff --git a/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/ArtemisLegacyContainer.java b/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/ArtemisLegacyContainer.java deleted file mode 100644 index 2edeeb1ea0b..00000000000 --- a/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/ArtemisLegacyContainer.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2012-present 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.activemq.ArtemisContainer; -import org.testcontainers.utility.DockerImageName; - -/** - * An {@link ArtemisContainer} for {@code apache/activemq-artemis}. - * - * @author Moritz Halbritter - */ -public final class ArtemisLegacyContainer extends ArtemisContainer { - - public ArtemisLegacyContainer(DockerImageName dockerImageName) { - super(dockerImageName); - } - -} diff --git a/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/ElasticsearchContainer9.java b/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/ElasticsearchContainer9.java deleted file mode 100644 index 40443ff1928..00000000000 --- a/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/ElasticsearchContainer9.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2012-present 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.elasticsearch.ElasticsearchContainer; - -/** - * A container suitable for testing Elasticsearch 9. - * - * @author Dmytro Nosan - */ -public class ElasticsearchContainer9 extends ElasticsearchContainer { - - public ElasticsearchContainer9() { - super(TestImage.ELASTICSEARCH_9.toString()); - addEnv("ES_JAVA_OPTS", "-Xms32m -Xmx512m"); - addEnv("xpack.security.enabled", "false"); - } - -} diff --git a/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/SymptomaActiveMQContainer.java b/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/SymptomaActiveMQContainer.java deleted file mode 100644 index 08fe989168a..00000000000 --- a/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/SymptomaActiveMQContainer.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2012-present 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 Symptoma/ActiveMQ. - * - * @author Stephane Nicoll - */ -public final class SymptomaActiveMQContainer extends GenericContainer { - - private static final int DEFAULT_PORT = 61616; - - public SymptomaActiveMQContainer(DockerImageName dockerImageName) { - super(dockerImageName); - addExposedPorts(DEFAULT_PORT); - } - -} diff --git a/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/TestImage.java b/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/TestImage.java index 02e3ec66100..ffaca695989 100644 --- a/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/TestImage.java +++ b/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/TestImage.java @@ -25,6 +25,8 @@ import java.util.function.Supplier; import com.redis.testcontainers.RedisContainer; import com.redis.testcontainers.RedisStackContainer; +import org.testcontainers.activemq.ActiveMQContainer; +import org.testcontainers.activemq.ArtemisContainer; import org.testcontainers.cassandra.CassandraContainer; import org.testcontainers.containers.Container; import org.testcontainers.containers.GenericContainer; @@ -48,8 +50,11 @@ import org.springframework.util.Assert; /** * References to container images used for integration tests. This class also acts a - * central location for tests to {@link #container(Class) create} a correctly configured - * {@link Container testcontainer}. + * central location for {@link #container(Class) creating} a correctly configured + * {@link Container testcontainer}. For uniquely defined containers (one image matching + * one container), {@link #forContainer(Class)} creates a container based on its type. For + * other cases, or to be explicit, use {@link #container(Class)} on the image the test + * requires. * * @author Stephane Nicoll * @author Eddú Meléndez @@ -62,7 +67,8 @@ public enum TestImage { /** * A container image suitable for testing ActiveMQ made by Symptoma. */ - ACTIVE_MQ_SYMPTOMA("symptoma/activemq", "5.18.3", () -> SymptomaActiveMQContainer.class), + ACTIVE_MQ_SYMPTOMA("symptoma/activemq", "5.18.3", + (container) -> ((GenericContainer) container).addExposedPorts(61616)), /** * A container image suitable for testing ActiveMQ. @@ -72,7 +78,7 @@ public enum TestImage { /** * A container image suitable for testing ActiveMQ classic. */ - ACTIVE_MQ_CLASSIC("apache/activemq-classic", "5.18.3", () -> ActiveMQClassicContainer.class), + ACTIVE_MQ_CLASSIC("apache/activemq-classic", "5.18.3", () -> ActiveMQContainer.class), /** * A container image suitable for testing Apache Kafka. @@ -88,7 +94,7 @@ public enum TestImage { * A container image suitable for testing Artemis using the legacy * {@code apache/activemq-artemis} image. */ - ARTEMIS_LEGACY("apache/activemq-artemis", "2.34.0", () -> ArtemisLegacyContainer.class), + ARTEMIS_LEGACY("apache/activemq-artemis", "2.34.0", () -> ArtemisContainer.class), /** * A container image suitable for testing Cassandra. @@ -124,7 +130,11 @@ public enum TestImage { /** * A container image suitable for testing Elasticsearch 9. */ - ELASTICSEARCH_9("elasticsearch", "9.0.2"), + ELASTICSEARCH_9("elasticsearch", "9.0.2", () -> ElasticsearchContainer.class, (container) -> { + ElasticsearchContainer elasticsearchContainer = (ElasticsearchContainer) container; + elasticsearchContainer.addEnv("ES_JAVA_OPTS", "-Xms32m -Xmx512m"); + elasticsearchContainer.addEnv("xpack.security.enabled", "false"); + }), /** * A container image suitable for testing Grafana OTel LGTM. @@ -354,20 +364,45 @@ public enum TestImage { } } - private boolean matchesContainerClass(Class containerClass) { - return this.containerClass != null && this.containerClass.isAssignableFrom(containerClass); + /** + * Create a container with the default container type. + * @param the type of container this instance produces + * @return a container with default settings + */ + public > C container() { + return container((Consumer) null); } /** - * Create a {@link GenericContainer} for the given {@link TestImage}. - * @return a generic container for the test image + * Create a container with the default container type, and customize it before it is + * started. + * @param setup a consumer of the container + * @param the type of container this instance produces + * @return a container with default settings, further customized by the given + * consumer. */ - public GenericContainer genericContainer() { - return createContainer(GenericContainer.class); + @SuppressWarnings({ "rawtypes", "unchecked" }) + public > C container(Consumer setup) { + if (this.containerClass != null) { + return createContainer((Class) this.containerClass, setup); + } + else { + return (C) createContainer(GenericContainer.class, (Consumer) setup); + } + } + + /** + * Create a container for the given {@code containerClass}. + * @param containerClass the container type + * @param the requested type of container + * @return a container with default settings + */ + public > C container(Class containerClass) { + return createContainer(containerClass, null); } @SuppressWarnings({ "rawtypes", "unchecked" }) - private > C createContainer(Class containerClass) { + private > C createContainer(Class containerClass, Consumer userSetup) { DockerImageName dockerImageName = DockerImageName.parse(toString()); try { Constructor constructor = containerClass.getDeclaredConstructor(DockerImageName.class); @@ -376,6 +411,9 @@ public enum TestImage { if (this.containerSetup != null) { ((Consumer) this.containerSetup).accept(container); } + if (userSetup != null) { + userSetup.accept(container); + } return container; } catch (Exception ex) { @@ -394,13 +432,14 @@ public enum TestImage { /** * Factory method to create and configure a {@link Container} using a deduced - * {@link TestImage}. + * {@link TestImage}. At most one {@link TestImage} should match with the given + * {@code containerClass}. * @param the container type * @param containerClass the container type * @return a container instance */ - public static > C container(Class containerClass) { - return forContainerClass(containerClass).createContainer(containerClass); + public static > C forContainer(Class containerClass) { + return forContainerClass(containerClass).createContainer(containerClass, null); } private static TestImage forContainerClass(Class containerClass) { @@ -412,4 +451,8 @@ public enum TestImage { return images.get(0); } + private boolean matchesContainerClass(Class containerClass) { + return this.containerClass != null && this.containerClass.isAssignableFrom(containerClass); + } + }