From 0dda28c5dec66ca2d2353096b5bc87d89180bd11 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Thu, 27 Feb 2025 00:37:39 +0900 Subject: [PATCH] Polish Signed-off-by: Johnny Lim --- ...sReactiveHealthContributorAutoConfiguration.java | 5 +---- ...ompositeHealthContributorConfigurationTests.java | 3 --- .../actuate/endpoint/SanitizingFunctionTests.java | 6 +++--- .../boot/autoconfigure/AutoConfigureBefore.java | 2 +- ...CassandraReactiveDataAutoConfigurationTests.java | 1 - .../ldap/LdapAutoConfigurationTests.java | 13 ++++++------- .../boot/buildpack/platform/build/Builder.java | 2 +- .../boot/buildpack/platform/docker/DockerApi.java | 4 ++-- .../boot/buildpack/platform/docker/DockerLog.java | 4 ++-- .../boot/buildpack/platform/build/BuilderTests.java | 6 ++---- .../boot/logging/log4j2/Log4J2LoggingSystem.java | 2 +- .../context/ServletWebServerApplicationContext.java | 12 ++++++------ .../StructuredLoggingJsonPropertiesTests.java | 2 +- .../ReactiveWebServerApplicationContextTests.java | 3 ++- .../ServletWebServerApplicationContextTests.java | 3 ++- .../AbstractServletWebServerFactoryTests.java | 4 ++-- .../build.gradle | 2 +- ...va => SampleElasticsearch8ApplicationTests.java} | 2 +- ...ava => SampleElasticsearchApplicationTests.java} | 2 +- ... => SampleElasticsearchSslApplicationTests.java} | 2 +- 20 files changed, 36 insertions(+), 44 deletions(-) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/{SampleElasticSearch8ApplicationTests.java => SampleElasticsearch8ApplicationTests.java} (98%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/{SampleElasticSearchApplicationTests.java => SampleElasticsearchApplicationTests.java} (98%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/{SampleElasticSearchSslApplicationTests.java => SampleElasticsearchSslApplicationTests.java} (98%) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/data/redis/RedisReactiveHealthContributorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/data/redis/RedisReactiveHealthContributorAutoConfiguration.java index 3c06fd843ff8..1b69195ad0c6 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/data/redis/RedisReactiveHealthContributorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/data/redis/RedisReactiveHealthContributorAutoConfiguration.java @@ -16,8 +16,6 @@ package org.springframework.boot.actuate.autoconfigure.data.redis; -import java.util.Map; - import reactor.core.publisher.Flux; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; @@ -51,8 +49,7 @@ public class RedisReactiveHealthContributorAutoConfiguration extends CompositeReactiveHealthContributorConfiguration { - RedisReactiveHealthContributorAutoConfiguration( - Map redisConnectionFactories) { + RedisReactiveHealthContributorAutoConfiguration() { super(RedisReactiveHealthIndicator::new); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/AbstractCompositeHealthContributorConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/AbstractCompositeHealthContributorConfigurationTests.java index c9eea1eab301..01281465fd47 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/AbstractCompositeHealthContributorConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/AbstractCompositeHealthContributorConfigurationTests.java @@ -123,13 +123,11 @@ TestBean standard() { @Bean(defaultCandidate = false) TestBean nonDefault() { return new TestBean(); - } @Bean(autowireCandidate = false) TestBean nonAutowire() { return new TestBean(); - } } @@ -145,7 +143,6 @@ TestBean standard() { @Bean(autowireCandidate = false) TestBean nonAutowire() { return new TestBean(); - } } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/SanitizingFunctionTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/SanitizingFunctionTests.java index dabeceb25087..00a552e942e3 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/SanitizingFunctionTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/SanitizingFunctionTests.java @@ -60,7 +60,7 @@ void applyUnlessFilteredWhenHasFilterTestingFalseReturnsUnfiltered() { void ifLikelySensitiveFiltersExpected() { SanitizingFunction function = SanitizingFunction.sanitizeValue().ifLikelySensitive(); assertThat(function).satisfies(this::likelyCredentialChecks, this::likelyUriChecks, - this::likelySenstivePropertyChecks, this::vcapServicesChecks); + this::likelySensitivePropertyChecks, this::vcapServicesChecks); } @Test @@ -103,10 +103,10 @@ private void likelyUriChecks(SanitizingFunction function) { @Test void ifLikelySensitivePropertyFiltersExpected() { SanitizingFunction function = SanitizingFunction.sanitizeValue().ifLikelySensitiveProperty(); - assertThat(function).satisfies(this::likelySenstivePropertyChecks); + assertThat(function).satisfies(this::likelySensitivePropertyChecks); } - private void likelySenstivePropertyChecks(SanitizingFunction function) { + private void likelySensitivePropertyChecks(SanitizingFunction function) { assertThatApplyingToKey(function, "sun.java.command").has(sanitizedValue()); assertThatApplyingToKey(function, "spring.application.json").has(sanitizedValue()); assertThatApplyingToKey(function, "SPRING_APPLICATION_JSON").has(sanitizedValue()); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigureBefore.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigureBefore.java index 3a21439df3c8..dfa81a438c5f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigureBefore.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigureBefore.java @@ -44,7 +44,7 @@ public @interface AutoConfigureBefore { /** - * The auto-configure classes that should have not yet been applied. + * The auto-configuration classes that should have not yet been applied. * @return the classes */ Class[] value() default {}; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfigurationTests.java index d7bb019514cb..deabd435d53b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfigurationTests.java @@ -79,7 +79,6 @@ void entityScanShouldSetManagedTypes() { @Test void userTypeResolverShouldBeSet() { this.contextRunner.run((context) -> { - assertThat(context).hasSingleBean(CassandraConverter.class); assertThat(context).hasSingleBean(CassandraConverter.class); assertThat(context.getBean(CassandraConverter.class)).extracting("userTypeResolver") .isInstanceOf(SimpleUserTypeResolver.class); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfigurationTests.java index fd22d5001e35..6bdbb2352718 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfigurationTests.java @@ -142,13 +142,12 @@ void objectDirectoryMapperExists() { this.contextRunner.withPropertyValues("spring.ldap.urls:ldap://localhost:389").run((context) -> { assertThat(context).hasSingleBean(ObjectDirectoryMapper.class); ObjectDirectoryMapper objectDirectoryMapper = context.getBean(ObjectDirectoryMapper.class); - ApplicationConversionService conversionService = assertThat(objectDirectoryMapper) - .extracting("converterManager") - .extracting("conversionService") - .asInstanceOf(InstanceOfAssertFactories.type(ApplicationConversionService.class)) - .actual(); - assertThat(conversionService.canConvert(String.class, Name.class)).isTrue(); - assertThat(conversionService.canConvert(Name.class, String.class)).isTrue(); + assertThat(objectDirectoryMapper).extracting("converterManager") + .extracting("conversionService", InstanceOfAssertFactories.type(ApplicationConversionService.class)) + .satisfies((conversionService) -> { + assertThat(conversionService.canConvert(String.class, Name.class)).isTrue(); + assertThat(conversionService.canConvert(Name.class, String.class)).isTrue(); + }); }); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/Builder.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/Builder.java index 9dc84712b982..e112028511e5 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/Builder.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/Builder.java @@ -280,7 +280,7 @@ public void log(String message) { } /** - * Creates{@link DockerLog} instance based on the provided {@link BuildLog}. + * Creates {@link DockerLog} instance based on the provided {@link BuildLog}. *

* If the provided {@link BuildLog} instance is an {@link AbstractBuildLog}, the * method returns a {@link BuildLogAdapter}, otherwise it returns a default diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java index c20664fc14d9..a447df912099 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java @@ -87,7 +87,7 @@ public class DockerApi { * Create a new {@link DockerApi} instance. */ public DockerApi() { - this(HttpTransport.create(null), DockerLog.toSystemOut()); + this(null); } /** @@ -96,7 +96,7 @@ public DockerApi() { * @since 2.4.0 */ public DockerApi(DockerHostConfiguration dockerHost) { - this(HttpTransport.create(dockerHost), DockerLog.toSystemOut()); + this(dockerHost, DockerLog.toSystemOut()); } /** diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerLog.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerLog.java index 1a3eb0c3e1a0..a0cad1660326 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerLog.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerLog.java @@ -34,7 +34,7 @@ public interface DockerLog { void log(String message); /** - * Factory method that returns a {@link DockerLog} the outputs to {@link System#out}. + * Factory method that returns a {@link DockerLog} that outputs to {@link System#out}. * @return {@link DockerLog} instance that logs to system out */ static DockerLog toSystemOut() { @@ -42,7 +42,7 @@ static DockerLog toSystemOut() { } /** - * Factory method that returns a {@link DockerLog} the outputs to a given + * Factory method that returns a {@link DockerLog} that outputs to a given * {@link PrintStream}. * @param out the print stream used to output the log * @return {@link DockerLog} instance that logs to the given print stream diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuilderTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuilderTests.java index 5db918a25b66..7cba312d72e5 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuilderTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuilderTests.java @@ -47,6 +47,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.Assertions.assertThatIllegalStateException; +import static org.assertj.core.api.Assertions.assertThatNoException; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.isNull; @@ -73,14 +74,12 @@ void createWhenLogIsNullThrowsException() { @Test void createWithDockerConfiguration() { - Builder builder = new Builder(BuildLog.toSystemOut()); - assertThat(builder).isNotNull(); + assertThatNoException().isThrownBy(() -> new Builder(BuildLog.toSystemOut())); } @Test void createDockerApiWithLogDockerLogDelegate() { Builder builder = new Builder(BuildLog.toSystemOut()); - assertThat(builder).isNotNull(); assertThat(builder).extracting("docker") .extracting("system") .extracting("log") @@ -90,7 +89,6 @@ void createDockerApiWithLogDockerLogDelegate() { @Test void createDockerApiWithLogDockerSystemOutDelegate() { Builder builder = new Builder(mock(BuildLog.class)); - assertThat(builder).isNotNull(); assertThat(builder).extracting("docker") .extracting("system") .extracting("log") diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java index e6fbdc74182d..b1493bbbccc7 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java @@ -445,7 +445,7 @@ public void cleanUp() { super.cleanUp(); LoggerContext loggerContext = getLoggerContext(); markAsUninitialized(loggerContext); - StatusConsoleListener listener = (StatusConsoleListener) getLoggerContext().getObject(STATUS_LISTENER_KEY); + StatusConsoleListener listener = (StatusConsoleListener) loggerContext.getObject(STATUS_LISTENER_KEY); if (listener != null) { StatusLogger.getLogger().removeListener(listener); loggerContext.removeObject(STATUS_LISTENER_KEY); diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContext.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContext.java index cc8e6a9650bc..45e3958d1d0b 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContext.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContext.java @@ -146,15 +146,15 @@ public final void refresh() throws BeansException, IllegalStateException { super.refresh(); } catch (RuntimeException ex) { - try { - WebServer webServer = this.webServer; - if (webServer != null) { + WebServer webServer = this.webServer; + if (webServer != null) { + try { webServer.stop(); webServer.destroy(); } - } - catch (RuntimeException stopOrDestroyEx) { - ex.addSuppressed(stopOrDestroyEx); + catch (RuntimeException stopOrDestroyEx) { + ex.addSuppressed(stopOrDestroyEx); + } } throw ex; } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/structured/StructuredLoggingJsonPropertiesTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/structured/StructuredLoggingJsonPropertiesTests.java index e1b2cafcfa1f..e283199b2e34 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/structured/StructuredLoggingJsonPropertiesTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/structured/StructuredLoggingJsonPropertiesTests.java @@ -187,7 +187,7 @@ void createPrinterWhenClassNameInjectsConfiguredPrinter() { } @Test - void shouldReturnFalseWhenPrinterIsEmpty() { + void hasCustomPrinterShouldReturnFalseWhenPrinterIsEmpty() { StackTrace stackTrace = new StackTrace("", null, null, null, null, null); assertThat(stackTrace.hasCustomPrinter()).isFalse(); } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/context/ReactiveWebServerApplicationContextTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/context/ReactiveWebServerApplicationContextTests.java index 1c91af3fe14b..01809b3bfb01 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/context/ReactiveWebServerApplicationContextTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/context/ReactiveWebServerApplicationContextTests.java @@ -44,6 +44,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException; import static org.mockito.BDDMockito.then; import static org.mockito.BDDMockito.willThrow; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; /** @@ -148,7 +149,7 @@ void whenContextRefreshFailedThenWebServerStopFailedCatchStopException() { .withStackTraceContaining("WebServer has failed to stop"); WebServer webServer = this.context.getWebServer(); then(webServer).should().stop(); - then(webServer).should(times(0)).destroy(); + then(webServer).should(never()).destroy(); } @Test diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContextTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContextTests.java index d474256bf607..9b78cc1fe64b 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContextTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContextTests.java @@ -86,6 +86,7 @@ import static org.mockito.Mockito.atMost; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.withSettings; @@ -236,7 +237,7 @@ void whenContextRefreshFailedThenWebServerStopFailedCatchStopException() { .withStackTraceContaining("WebServer has failed to stop"); WebServer webServer = this.context.getWebServer(); then(webServer).should().stop(); - then(webServer).should(times(0)).destroy(); + then(webServer).should(never()).destroy(); } @Test diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java index 6bf32b920832..65f183e05b67 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java @@ -167,7 +167,7 @@ import static org.mockito.BDDMockito.then; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; +import static org.mockito.Mockito.never; /** * Base for testing classes that extends {@link AbstractServletWebServerFactory}. @@ -1183,7 +1183,7 @@ protected void servletContextListenerContextDestroyedIsNotCalledWhenContainerIsS this.webServer = getFactory().getWebServer((servletContext) -> servletContext.addListener(listener)); this.webServer.start(); this.webServer.stop(); - then(listener).should(times(0)).contextDestroyed(any(ServletContextEvent.class)); + then(listener).should(never()).contextDestroyed(any(ServletContextEvent.class)); } @Test diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/build.gradle index d5650c243c50..6a4f8f17a8b3 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/build.gradle @@ -4,7 +4,7 @@ plugins { id "org.springframework.boot.docker-test" } -description = "Spring Boot Data ElasticSearch smoke test" +description = "Spring Boot Data Elasticsearch smoke test" dependencies { dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleElasticSearch8ApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleElasticsearch8ApplicationTests.java similarity index 98% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleElasticSearch8ApplicationTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleElasticsearch8ApplicationTests.java index 2954b4879915..c5daee550228 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleElasticSearch8ApplicationTests.java +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleElasticsearch8ApplicationTests.java @@ -39,7 +39,7 @@ */ @Testcontainers(disabledWithoutDocker = true) @DataElasticsearchTest -class SampleElasticSearch8ApplicationTests { +class SampleElasticsearch8ApplicationTests { @Container @ServiceConnection diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleElasticSearchApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleElasticsearchApplicationTests.java similarity index 98% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleElasticSearchApplicationTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleElasticsearchApplicationTests.java index 357a7fad247e..4219ba9a80ee 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleElasticSearchApplicationTests.java +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleElasticsearchApplicationTests.java @@ -38,7 +38,7 @@ */ @Testcontainers(disabledWithoutDocker = true) @DataElasticsearchTest -class SampleElasticSearchApplicationTests { +class SampleElasticsearchApplicationTests { @Container @ServiceConnection diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleElasticSearchSslApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleElasticsearchSslApplicationTests.java similarity index 98% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleElasticSearchSslApplicationTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleElasticsearchSslApplicationTests.java index 7b092a265d36..8ec45bc39d58 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleElasticSearchSslApplicationTests.java +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleElasticsearchSslApplicationTests.java @@ -40,7 +40,7 @@ @Testcontainers(disabledWithoutDocker = true) @DataElasticsearchTest( properties = { "spring.elasticsearch.connection-timeout=120s", "spring.elasticsearch.socket-timeout=120s" }) -class SampleElasticSearchSslApplicationTests { +class SampleElasticsearchSslApplicationTests { @Container @ServiceConnection