From 4fc987180d597fd866294d832095cebc04c10cfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Tue, 8 Sep 2026 18:17:44 +0200 Subject: [PATCH] Polish "Add support for creating a container from a TestImage value" See gh-51082 --- .../autoconfigure/DataElasticsearchTestIntegrationTests.java | 2 +- .../DataElasticsearchTestPropertiesIntegrationTests.java | 2 +- .../DataElasticsearchTestReactiveIntegrationTests.java | 2 +- ...DataElasticsearchTestWithIncludeFilterIntegrationTests.java | 2 +- ...lasticsearchReactiveRepositoriesAutoConfigurationTests.java | 2 +- .../DataElasticsearchRepositoriesAutoConfigurationTests.java | 2 +- .../ElasticsearchClientAutoConfigurationIntegrationTests.java | 2 +- ...asticsearchRestClientAutoConfigurationIntegrationTests.java | 2 +- .../elasticsearch/SampleDataElasticsearchApplicationTests.java | 2 +- .../SampleDataElasticsearchSslApplicationTests.java | 3 ++- 10 files changed, 11 insertions(+), 10 deletions(-) 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 74b47d6f488..a39b189369a 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.forContainer(ElasticsearchContainer.class); + static final ElasticsearchContainer elasticsearch = TestImage.ELASTICSEARCH.container(); @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 b1b2fd77235..9d9ac9ce910 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.forContainer(ElasticsearchContainer.class); + static final ElasticsearchContainer elasticsearch = TestImage.ELASTICSEARCH.container(); @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 1f4eac52c49..74bca4626ed 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.forContainer(ElasticsearchContainer.class); + static final ElasticsearchContainer elasticsearch = TestImage.ELASTICSEARCH.container(); @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 1c83dfb03a6..4d00e04bce2 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.forContainer(ElasticsearchContainer.class); + static final ElasticsearchContainer elasticsearch = TestImage.ELASTICSEARCH.container(); @Autowired private ExampleRepository exampleRepository; 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 38fcbdb691b..f56447bdf62 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.forContainer(ElasticsearchContainer.class); + static final ElasticsearchContainer elasticsearch = TestImage.ELASTICSEARCH.container(); 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 d080081b9af..10e0c7e6786 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.forContainer(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-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 a4f79da587a..23b660e40ac 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.forContainer(ElasticsearchContainer.class); + static final ElasticsearchContainer elasticsearch = TestImage.ELASTICSEARCH.container(); 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 5f34d1f6100..fa7c1abfccd 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.forContainer(ElasticsearchContainer.class); + static final ElasticsearchContainer elasticsearch = TestImage.ELASTICSEARCH.container(); private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() .withConfiguration(AutoConfigurations.of(ElasticsearchRestClientAutoConfiguration.class)); 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 1aff3ab9197..0765973fd34 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.forContainer(ElasticsearchContainer.class); + static final ElasticsearchContainer elasticSearch = TestImage.ELASTICSEARCH.container(); @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 e0767c03586..fdd453e5910 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,8 @@ class SampleDataElasticsearchSslApplicationTests { @Container @ServiceConnection @PemTrustStore(certificate = "classpath:ssl.crt") - static final ElasticsearchContainer elasticSearch = TestImage.forContainer(SecureElasticsearchContainer.class); + static final ElasticsearchContainer elasticSearch = TestImage.ELASTICSEARCH + .container(SecureElasticsearchContainer.class); @Autowired private ElasticsearchTemplate elasticsearchTemplate;