From 9bd1a460a1c363055e583b8dfce81e2e8c05158a Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 7 Jan 2026 13:15:45 +0000 Subject: [PATCH] Correct packaging of test code Closes gh-48699 --- .../MyEnvironmentPostProcessorTests.java | 3 +- .../MyDataSourceConfigurationTests.java | 3 +- .../MyDataSourceConfigurationTests.java | 3 +- .../MyDataSourceConfigurationTests.java | 3 +- .../CacheAutoConfigurationTests.java | 3 +- .../CachesEndpointAutoConfigurationTests.java | 3 +- .../autoconfigure}/MockCachingProvider.java | 20 ++++--- .../services/javax.cache.spi.CachingProvider | 2 +- .../endpoint/FlywayEndpointTests.java | 3 +- .../FlywayEndpointAutoConfigurationTests.java | 3 +- ...tomHibernateJpaAutoConfigurationTests.java | 2 +- .../HibernateJpaAutoConfigurationTests.java | 8 +-- .../mapping/NonAnnotatedEntity.java | 2 +- .../autoconfigure/test/city/City.java | 2 +- .../autoconfigure/test/city/CityListener.java | 2 +- .../autoconfigure/test/country/Country.java | 2 +- .../IntegrationGraphEndpointTests.java | 3 +- ...ationGraphEndpointWebIntegrationTests.java | 3 +- ...onGraphEndpointAutoConfigurationTests.java | 4 +- .../test/autoconfigure}/ExampleComponent.java | 2 +- .../ExampleJooqApplication.java | 3 +- .../JooqTestIntegrationTests.java | 3 +- .../JooqTestPropertiesIntegrationTests.java | 3 +- ...ConfigureTestDatabaseIntegrationTests.java | 3 +- .../endpoint/LiquibaseEndpointTests.java | 60 +++++++++++-------- ...quibaseEndpointAutoConfigurationTests.java | 4 +- ...althContributorAutoConfigurationTests.java | 3 +- ...althContributorAutoConfigurationTests.java | 4 +- ...lsarAutoConfigurationIntegrationTests.java | 3 +- ...ientObservationAutoConfigurationTests.java | 4 +- ...nAutoConfigurationWithoutMetricsTests.java | 4 +- ...lateObservationAutoConfigurationTests.java | 4 +- ...nAutoConfigurationWithoutMetricsTests.java | 4 +- ...TomcatManagementServerPropertiesTests.java | 4 +- .../autoconfigure}/ServerPropertiesTests.java | 3 +- ...FluxObservationAutoConfigurationTests.java | 4 +- ...dpointExtensionAutoConfigurationTests.java | 3 +- ...onfigureWebTestClientIntegrationTests.java | 3 +- .../autoconfigure/ExampleController1.java | 2 +- .../autoconfigure/ExampleController2.java | 2 +- .../autoconfigure/ExampleId.java | 2 +- .../autoconfigure/ExampleRealService.java | 3 +- .../ExampleWebTestClientApplication.java | 3 +- .../WebTestClientAutoConfigurationTests.java | 8 +-- ...tClientSpringBootTestIntegrationTests.java | 3 +- 45 files changed, 95 insertions(+), 123 deletions(-) rename documentation/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/{springbootapplication => application/customizetheenvironmentorapplicationcontext}/MyEnvironmentPostProcessorTests.java (87%) rename documentation/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/{ => builder}/MyDataSourceConfigurationTests.java (93%) rename documentation/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/{ => builder}/configurable/MyDataSourceConfigurationTests.java (92%) rename documentation/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/{ => builder}/simple/MyDataSourceConfigurationTests.java (93%) rename module/spring-boot-cache/src/test/java/org/springframework/boot/cache/autoconfigure/{actuate/endpoint => }/CachesEndpointAutoConfigurationTests.java (95%) rename {core/spring-boot-autoconfigure/src/testFixtures/java/org/springframework/boot/autoconfigure/cache/support => module/spring-boot-cache/src/test/java/org/springframework/boot/cache/autoconfigure}/MockCachingProvider.java (85%) rename module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/{ => actuate}/endpoint/FlywayEndpointTests.java (96%) rename module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/autoconfigure/{actuate/endpoint => }/FlywayEndpointAutoConfigurationTests.java (92%) rename module/spring-boot-hibernate/src/test/java/org/springframework/boot/{jpa/autoconfigure/hibernate => hibernate/autoconfigure}/mapping/NonAnnotatedEntity.java (94%) rename module/spring-boot-hibernate/src/test/java/org/springframework/boot/{jpa => hibernate}/autoconfigure/test/city/City.java (96%) rename module/spring-boot-hibernate/src/test/java/org/springframework/boot/{jpa => hibernate}/autoconfigure/test/city/CityListener.java (94%) rename module/spring-boot-hibernate/src/test/java/org/springframework/boot/{jpa => hibernate}/autoconfigure/test/country/Country.java (94%) rename module/spring-boot-integration/src/test/java/org/springframework/boot/integration/{ => actuate}/endpoint/IntegrationGraphEndpointTests.java (94%) rename module/spring-boot-integration/src/test/java/org/springframework/boot/integration/{ => actuate}/endpoint/IntegrationGraphEndpointWebIntegrationTests.java (94%) rename module/spring-boot-integration/src/test/java/org/springframework/boot/integration/autoconfigure/{endpoint => }/IntegrationGraphEndpointAutoConfigurationTests.java (91%) rename module/spring-boot-jooq-test/src/test/java/org/springframework/boot/{test/autoconfigure/jooq => jooq/test/autoconfigure}/ExampleComponent.java (93%) rename module/spring-boot-jooq-test/src/test/java/org/springframework/boot/{test/autoconfigure/jooq => jooq/test/autoconfigure}/ExampleJooqApplication.java (91%) rename module/spring-boot-jooq-test/src/test/java/org/springframework/boot/{test/autoconfigure/jooq => jooq/test/autoconfigure}/JooqTestIntegrationTests.java (96%) rename module/spring-boot-jooq-test/src/test/java/org/springframework/boot/{test/autoconfigure/jooq => jooq/test/autoconfigure}/JooqTestPropertiesIntegrationTests.java (93%) rename module/spring-boot-jooq-test/src/test/java/org/springframework/boot/{test/autoconfigure/jooq => jooq/test/autoconfigure}/JooqTestWithAutoConfigureTestDatabaseIntegrationTests.java (93%) rename module/spring-boot-liquibase/src/test/java/org/springframework/boot/liquibase/{ => actuate}/endpoint/LiquibaseEndpointTests.java (80%) rename module/spring-boot-liquibase/src/test/java/org/springframework/boot/liquibase/autoconfigure/{endpoint => }/LiquibaseEndpointAutoConfigurationTests.java (94%) rename module/spring-boot-mongodb/src/test/java/org/springframework/boot/{data => }/mongodb/autoconfigure/health/MongoHealthContributorAutoConfigurationTests.java (91%) rename module/spring-boot-mongodb/src/test/java/org/springframework/boot/{data => }/mongodb/autoconfigure/health/MongoReactiveHealthContributorAutoConfigurationTests.java (90%) rename module/spring-boot-pulsar/src/dockerTest/java/org/springframework/boot/{autoconfigure/pulsar => pulsar/autoconfigure}/PulsarAutoConfigurationIntegrationTests.java (96%) rename module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/{observation => }/RestClientObservationAutoConfigurationTests.java (96%) rename module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/{observation => }/RestClientObservationAutoConfigurationWithoutMetricsTests.java (92%) rename module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/{observation => }/RestTemplateObservationAutoConfigurationTests.java (95%) rename module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/{observation => }/RestTemplateObservationAutoConfigurationWithoutMetricsTests.java (92%) rename module/spring-boot-tomcat/src/test/java/org/springframework/boot/tomcat/autoconfigure/actuate/web/{ => server}/TomcatManagementServerPropertiesTests.java (91%) rename module/spring-boot-web-server/src/test/java/org/springframework/boot/{autoconfigure/web => web/server/autoconfigure}/ServerPropertiesTests.java (97%) rename module/spring-boot-webflux/src/test/java/org/springframework/boot/webflux/{observation => }/autoconfigure/WebFluxObservationAutoConfigurationTests.java (96%) rename module/spring-boot-webmvc/src/test/java/org/springframework/boot/webmvc/{actuate/autoconfigure/health => autoconfigure/actuate/endpoint/web}/WebMvcHealthEndpointExtensionAutoConfigurationTests.java (95%) rename module/spring-boot-webtestclient/src/test/java/org/springframework/boot/{webflux/test => webtestclient}/autoconfigure/AutoConfigureWebTestClientIntegrationTests.java (91%) rename module/spring-boot-webtestclient/src/test/java/org/springframework/boot/{webflux/test => webtestclient}/autoconfigure/ExampleController1.java (94%) rename module/spring-boot-webtestclient/src/test/java/org/springframework/boot/{webflux/test => webtestclient}/autoconfigure/ExampleController2.java (95%) rename module/spring-boot-webtestclient/src/test/java/org/springframework/boot/{webflux/test => webtestclient}/autoconfigure/ExampleId.java (93%) rename module/spring-boot-webtestclient/src/test/java/org/springframework/boot/{webflux/test => webtestclient}/autoconfigure/ExampleRealService.java (85%) rename module/spring-boot-webtestclient/src/test/java/org/springframework/boot/{webflux/test => webtestclient}/autoconfigure/ExampleWebTestClientApplication.java (86%) rename module/spring-boot-webtestclient/src/test/java/org/springframework/boot/{webflux/test => webtestclient}/autoconfigure/WebTestClientAutoConfigurationTests.java (94%) rename module/spring-boot-webtestclient/src/test/java/org/springframework/boot/{webflux/test => webtestclient}/autoconfigure/WebTestClientSpringBootTestIntegrationTests.java (93%) diff --git a/documentation/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/springbootapplication/MyEnvironmentPostProcessorTests.java b/documentation/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/application/customizetheenvironmentorapplicationcontext/MyEnvironmentPostProcessorTests.java similarity index 87% rename from documentation/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/springbootapplication/MyEnvironmentPostProcessorTests.java rename to documentation/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/application/customizetheenvironmentorapplicationcontext/MyEnvironmentPostProcessorTests.java index 41db220b2d4..65fc467aac0 100644 --- a/documentation/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/springbootapplication/MyEnvironmentPostProcessorTests.java +++ b/documentation/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/application/customizetheenvironmentorapplicationcontext/MyEnvironmentPostProcessorTests.java @@ -14,12 +14,11 @@ * limitations under the License. */ -package org.springframework.boot.docs.howto.springbootapplication; +package org.springframework.boot.docs.howto.application.customizetheenvironmentorapplicationcontext; import org.junit.jupiter.api.Test; import org.springframework.boot.SpringApplication; -import org.springframework.boot.docs.howto.application.customizetheenvironmentorapplicationcontext.MyEnvironmentPostProcessor; import org.springframework.core.env.StandardEnvironment; import static org.assertj.core.api.Assertions.assertThat; diff --git a/documentation/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/MyDataSourceConfigurationTests.java b/documentation/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/builder/MyDataSourceConfigurationTests.java similarity index 93% rename from documentation/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/MyDataSourceConfigurationTests.java rename to documentation/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/builder/MyDataSourceConfigurationTests.java index 88ad4463693..624ece34ae1 100644 --- a/documentation/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/MyDataSourceConfigurationTests.java +++ b/documentation/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/builder/MyDataSourceConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.howto.dataaccess.configurecustomdatasource; +package org.springframework.boot.docs.howto.dataaccess.configurecustomdatasource.builder; import java.sql.SQLException; @@ -24,7 +24,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.docs.howto.dataaccess.configurecustomdatasource.builder.MyDataSourceConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Import; diff --git a/documentation/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/configurable/MyDataSourceConfigurationTests.java b/documentation/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/builder/configurable/MyDataSourceConfigurationTests.java similarity index 92% rename from documentation/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/configurable/MyDataSourceConfigurationTests.java rename to documentation/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/builder/configurable/MyDataSourceConfigurationTests.java index de8814ad478..b6f01386be8 100644 --- a/documentation/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/configurable/MyDataSourceConfigurationTests.java +++ b/documentation/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/builder/configurable/MyDataSourceConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.howto.dataaccess.configurecustomdatasource.configurable; +package org.springframework.boot.docs.howto.dataaccess.configurecustomdatasource.builder.configurable; import java.sql.SQLException; @@ -25,6 +25,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.docs.howto.dataaccess.configurecustomdatasource.configurable.MyDataSourceConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Import; diff --git a/documentation/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/simple/MyDataSourceConfigurationTests.java b/documentation/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/builder/simple/MyDataSourceConfigurationTests.java similarity index 93% rename from documentation/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/simple/MyDataSourceConfigurationTests.java rename to documentation/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/builder/simple/MyDataSourceConfigurationTests.java index aee3134ee70..f80f803e5c8 100644 --- a/documentation/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/simple/MyDataSourceConfigurationTests.java +++ b/documentation/spring-boot-docs/src/test/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/builder/simple/MyDataSourceConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.docs.howto.dataaccess.configurecustomdatasource.simple; +package org.springframework.boot.docs.howto.dataaccess.configurecustomdatasource.builder.simple; import java.sql.SQLException; @@ -25,6 +25,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.docs.howto.dataaccess.configurecustomdatasource.simple.MyDataSourceConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Import; diff --git a/module/spring-boot-cache/src/test/java/org/springframework/boot/cache/autoconfigure/CacheAutoConfigurationTests.java b/module/spring-boot-cache/src/test/java/org/springframework/boot/cache/autoconfigure/CacheAutoConfigurationTests.java index 5b2ece8af25..2c3f9d1a187 100644 --- a/module/spring-boot-cache/src/test/java/org/springframework/boot/cache/autoconfigure/CacheAutoConfigurationTests.java +++ b/module/spring-boot-cache/src/test/java/org/springframework/boot/cache/autoconfigure/CacheAutoConfigurationTests.java @@ -47,8 +47,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.autoconfigure.cache.support.MockCachingProvider; -import org.springframework.boot.autoconfigure.cache.support.MockCachingProvider.MockCacheManager; +import org.springframework.boot.cache.autoconfigure.MockCachingProvider.MockCacheManager; import org.springframework.boot.hazelcast.autoconfigure.HazelcastAutoConfiguration; import org.springframework.boot.test.context.assertj.AssertableApplicationContext; import org.springframework.boot.testsupport.classpath.resources.WithResource; diff --git a/module/spring-boot-cache/src/test/java/org/springframework/boot/cache/autoconfigure/actuate/endpoint/CachesEndpointAutoConfigurationTests.java b/module/spring-boot-cache/src/test/java/org/springframework/boot/cache/autoconfigure/CachesEndpointAutoConfigurationTests.java similarity index 95% rename from module/spring-boot-cache/src/test/java/org/springframework/boot/cache/autoconfigure/actuate/endpoint/CachesEndpointAutoConfigurationTests.java rename to module/spring-boot-cache/src/test/java/org/springframework/boot/cache/autoconfigure/CachesEndpointAutoConfigurationTests.java index d619d9fbe50..eb225ee2edc 100644 --- a/module/spring-boot-cache/src/test/java/org/springframework/boot/cache/autoconfigure/actuate/endpoint/CachesEndpointAutoConfigurationTests.java +++ b/module/spring-boot-cache/src/test/java/org/springframework/boot/cache/autoconfigure/CachesEndpointAutoConfigurationTests.java @@ -14,14 +14,13 @@ * limitations under the License. */ -package org.springframework.boot.cache.autoconfigure.actuate.endpoint; +package org.springframework.boot.cache.autoconfigure; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.cache.actuate.endpoint.CachesEndpoint; import org.springframework.boot.cache.actuate.endpoint.CachesEndpointWebExtension; -import org.springframework.boot.cache.autoconfigure.CachesEndpointAutoConfiguration; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.cache.CacheManager; diff --git a/core/spring-boot-autoconfigure/src/testFixtures/java/org/springframework/boot/autoconfigure/cache/support/MockCachingProvider.java b/module/spring-boot-cache/src/test/java/org/springframework/boot/cache/autoconfigure/MockCachingProvider.java similarity index 85% rename from core/spring-boot-autoconfigure/src/testFixtures/java/org/springframework/boot/autoconfigure/cache/support/MockCachingProvider.java rename to module/spring-boot-cache/src/test/java/org/springframework/boot/cache/autoconfigure/MockCachingProvider.java index 520b081652a..c1d436a15bd 100644 --- a/core/spring-boot-autoconfigure/src/testFixtures/java/org/springframework/boot/autoconfigure/cache/support/MockCachingProvider.java +++ b/module/spring-boot-cache/src/test/java/org/springframework/boot/cache/autoconfigure/MockCachingProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.autoconfigure.cache.support; +package org.springframework.boot.cache.autoconfigure; import java.net.URI; import java.util.HashMap; @@ -27,6 +27,8 @@ import javax.cache.configuration.Configuration; import javax.cache.configuration.OptionalFeature; import javax.cache.spi.CachingProvider; +import org.jspecify.annotations.Nullable; + import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; @@ -39,7 +41,7 @@ import static org.mockito.Mockito.mock; public class MockCachingProvider implements CachingProvider { @Override - public CacheManager getCacheManager(URI uri, ClassLoader classLoader, Properties properties) { + public CacheManager getCacheManager(@Nullable URI uri, ClassLoader classLoader, Properties properties) { return new MockCacheManager(uri, classLoader, properties); } @@ -49,7 +51,7 @@ public class MockCachingProvider implements CachingProvider { } @Override - public URI getDefaultURI() { + public @Nullable URI getDefaultURI() { return null; } @@ -59,7 +61,7 @@ public class MockCachingProvider implements CachingProvider { } @Override - public CacheManager getCacheManager(URI uri, ClassLoader classLoader) { + public CacheManager getCacheManager(@Nullable URI uri, ClassLoader classLoader) { return getCacheManager(uri, classLoader, getDefaultProperties()); } @@ -91,7 +93,7 @@ public class MockCachingProvider implements CachingProvider { private final Map> caches = new HashMap<>(); - private final URI uri; + private final @Nullable URI uri; private final ClassLoader classLoader; @@ -99,7 +101,7 @@ public class MockCachingProvider implements CachingProvider { private boolean closed; - public MockCacheManager(URI uri, ClassLoader classLoader, Properties properties) { + public MockCacheManager(@Nullable URI uri, ClassLoader classLoader, Properties properties) { this.uri = uri; this.classLoader = classLoader; this.properties = properties; @@ -111,7 +113,7 @@ public class MockCachingProvider implements CachingProvider { } @Override - public URI getURI() { + public @Nullable URI getURI() { return this.uri; } @@ -137,13 +139,13 @@ public class MockCachingProvider implements CachingProvider { @Override @SuppressWarnings("unchecked") - public Cache getCache(String cacheName, Class keyType, Class valueType) { + public @Nullable Cache getCache(String cacheName, Class keyType, Class valueType) { return (Cache) this.caches.get(cacheName); } @Override @SuppressWarnings("unchecked") - public Cache getCache(String cacheName) { + public @Nullable Cache getCache(String cacheName) { return (Cache) this.caches.get(cacheName); } diff --git a/module/spring-boot-cache/src/test/resources/META-INF/services/javax.cache.spi.CachingProvider b/module/spring-boot-cache/src/test/resources/META-INF/services/javax.cache.spi.CachingProvider index a9ea8c43aa2..278637245d5 100644 --- a/module/spring-boot-cache/src/test/resources/META-INF/services/javax.cache.spi.CachingProvider +++ b/module/spring-boot-cache/src/test/resources/META-INF/services/javax.cache.spi.CachingProvider @@ -1,4 +1,4 @@ # # Test JSR 107 provider for testing purposes only. # -org.springframework.boot.autoconfigure.cache.support.MockCachingProvider \ No newline at end of file +org.springframework.boot.cache.autoconfigure.MockCachingProvider diff --git a/module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/endpoint/FlywayEndpointTests.java b/module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/actuate/endpoint/FlywayEndpointTests.java similarity index 96% rename from module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/endpoint/FlywayEndpointTests.java rename to module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/actuate/endpoint/FlywayEndpointTests.java index 32946d3c211..10a33686dbc 100644 --- a/module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/endpoint/FlywayEndpointTests.java +++ b/module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/actuate/endpoint/FlywayEndpointTests.java @@ -14,14 +14,13 @@ * limitations under the License. */ -package org.springframework.boot.flyway.endpoint; +package org.springframework.boot.flyway.actuate.endpoint; import java.util.Map; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.flyway.actuate.endpoint.FlywayEndpoint; import org.springframework.boot.flyway.actuate.endpoint.FlywayEndpoint.ContextFlywayBeansDescriptor; import org.springframework.boot.flyway.actuate.endpoint.FlywayEndpoint.FlywayDescriptor; import org.springframework.boot.flyway.autoconfigure.FlywayAutoConfiguration; diff --git a/module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/autoconfigure/actuate/endpoint/FlywayEndpointAutoConfigurationTests.java b/module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/autoconfigure/FlywayEndpointAutoConfigurationTests.java similarity index 92% rename from module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/autoconfigure/actuate/endpoint/FlywayEndpointAutoConfigurationTests.java rename to module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/autoconfigure/FlywayEndpointAutoConfigurationTests.java index 2ea0fc4d475..5d5a389becb 100644 --- a/module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/autoconfigure/actuate/endpoint/FlywayEndpointAutoConfigurationTests.java +++ b/module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/autoconfigure/FlywayEndpointAutoConfigurationTests.java @@ -14,14 +14,13 @@ * limitations under the License. */ -package org.springframework.boot.flyway.autoconfigure.actuate.endpoint; +package org.springframework.boot.flyway.autoconfigure; import org.flywaydb.core.Flyway; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.flyway.actuate.endpoint.FlywayEndpoint; -import org.springframework.boot.flyway.autoconfigure.FlywayEndpointAutoConfiguration; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import static org.assertj.core.api.Assertions.assertThat; diff --git a/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/CustomHibernateJpaAutoConfigurationTests.java b/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/CustomHibernateJpaAutoConfigurationTests.java index 4d7d9664f22..e848f8bf3df 100644 --- a/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/CustomHibernateJpaAutoConfigurationTests.java +++ b/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/CustomHibernateJpaAutoConfigurationTests.java @@ -31,9 +31,9 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.TestAutoConfigurationPackage; +import org.springframework.boot.hibernate.autoconfigure.test.city.City; import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration; import org.springframework.boot.jpa.autoconfigure.JpaProperties; -import org.springframework.boot.jpa.autoconfigure.test.city.City; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/HibernateJpaAutoConfigurationTests.java b/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/HibernateJpaAutoConfigurationTests.java index bce4c30cde6..a7080f38192 100644 --- a/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/HibernateJpaAutoConfigurationTests.java +++ b/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/HibernateJpaAutoConfigurationTests.java @@ -73,6 +73,9 @@ import org.springframework.boot.hibernate.SpringJtaPlatform; import org.springframework.boot.hibernate.autoconfigure.HibernateJpaAutoConfigurationTests.JpaUsingApplicationListenerConfiguration.EventCapturingApplicationListener; import org.springframework.boot.hibernate.autoconfigure.HibernateJpaConfiguration.Hibernate72RuntimeHints; import org.springframework.boot.hibernate.autoconfigure.HibernateJpaConfiguration.HibernateRuntimeHints; +import org.springframework.boot.hibernate.autoconfigure.mapping.NonAnnotatedEntity; +import org.springframework.boot.hibernate.autoconfigure.test.city.City; +import org.springframework.boot.hibernate.autoconfigure.test.country.Country; import org.springframework.boot.jdbc.DataSourceBuilder; import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration; import org.springframework.boot.jdbc.autoconfigure.DataSourceInitializationAutoConfiguration; @@ -82,9 +85,6 @@ import org.springframework.boot.jpa.EntityManagerFactoryBuilder; import org.springframework.boot.jpa.autoconfigure.EntityManagerFactoryBuilderCustomizer; import org.springframework.boot.jpa.autoconfigure.JpaBaseConfiguration; import org.springframework.boot.jpa.autoconfigure.JpaProperties; -import org.springframework.boot.jpa.autoconfigure.hibernate.mapping.NonAnnotatedEntity; -import org.springframework.boot.jpa.autoconfigure.test.city.City; -import org.springframework.boot.jpa.autoconfigure.test.country.Country; import org.springframework.boot.liquibase.autoconfigure.LiquibaseAutoConfiguration; import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization; import org.springframework.boot.test.context.assertj.AssertableApplicationContext; @@ -641,7 +641,7 @@ class HibernateJpaAutoConfigurationTests { xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence/orm https://www.oracle.com/webfolder/technetwork/jsc/xml/ns/persistence/orm_2_1.xsd" version="2.1"> - + diff --git a/module/spring-boot-hibernate/src/test/java/org/springframework/boot/jpa/autoconfigure/hibernate/mapping/NonAnnotatedEntity.java b/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/mapping/NonAnnotatedEntity.java similarity index 94% rename from module/spring-boot-hibernate/src/test/java/org/springframework/boot/jpa/autoconfigure/hibernate/mapping/NonAnnotatedEntity.java rename to module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/mapping/NonAnnotatedEntity.java index 8a22dc54288..8ab276b31bc 100644 --- a/module/spring-boot-hibernate/src/test/java/org/springframework/boot/jpa/autoconfigure/hibernate/mapping/NonAnnotatedEntity.java +++ b/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/mapping/NonAnnotatedEntity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.jpa.autoconfigure.hibernate.mapping; +package org.springframework.boot.hibernate.autoconfigure.mapping; /** * A non annotated entity that is handled by a custom "mapping-file". diff --git a/module/spring-boot-hibernate/src/test/java/org/springframework/boot/jpa/autoconfigure/test/city/City.java b/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/test/city/City.java similarity index 96% rename from module/spring-boot-hibernate/src/test/java/org/springframework/boot/jpa/autoconfigure/test/city/City.java rename to module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/test/city/City.java index f47ec38c3f6..ff8ae32e95b 100644 --- a/module/spring-boot-hibernate/src/test/java/org/springframework/boot/jpa/autoconfigure/test/city/City.java +++ b/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/test/city/City.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.jpa.autoconfigure.test.city; +package org.springframework.boot.hibernate.autoconfigure.test.city; import java.io.Serializable; diff --git a/module/spring-boot-hibernate/src/test/java/org/springframework/boot/jpa/autoconfigure/test/city/CityListener.java b/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/test/city/CityListener.java similarity index 94% rename from module/spring-boot-hibernate/src/test/java/org/springframework/boot/jpa/autoconfigure/test/city/CityListener.java rename to module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/test/city/CityListener.java index 6ae2f5d3c4f..06f4fe8eca1 100644 --- a/module/spring-boot-hibernate/src/test/java/org/springframework/boot/jpa/autoconfigure/test/city/CityListener.java +++ b/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/test/city/CityListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.jpa.autoconfigure.test.city; +package org.springframework.boot.hibernate.autoconfigure.test.city; import jakarta.persistence.PostLoad; diff --git a/module/spring-boot-hibernate/src/test/java/org/springframework/boot/jpa/autoconfigure/test/country/Country.java b/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/test/country/Country.java similarity index 94% rename from module/spring-boot-hibernate/src/test/java/org/springframework/boot/jpa/autoconfigure/test/country/Country.java rename to module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/test/country/Country.java index ba3e3f516f3..6c78085f642 100644 --- a/module/spring-boot-hibernate/src/test/java/org/springframework/boot/jpa/autoconfigure/test/country/Country.java +++ b/module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/test/country/Country.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.jpa.autoconfigure.test.country; +package org.springframework.boot.hibernate.autoconfigure.test.country; import java.io.Serializable; diff --git a/module/spring-boot-integration/src/test/java/org/springframework/boot/integration/endpoint/IntegrationGraphEndpointTests.java b/module/spring-boot-integration/src/test/java/org/springframework/boot/integration/actuate/endpoint/IntegrationGraphEndpointTests.java similarity index 94% rename from module/spring-boot-integration/src/test/java/org/springframework/boot/integration/endpoint/IntegrationGraphEndpointTests.java rename to module/spring-boot-integration/src/test/java/org/springframework/boot/integration/actuate/endpoint/IntegrationGraphEndpointTests.java index 7285b4e62a9..13491aa686b 100644 --- a/module/spring-boot-integration/src/test/java/org/springframework/boot/integration/endpoint/IntegrationGraphEndpointTests.java +++ b/module/spring-boot-integration/src/test/java/org/springframework/boot/integration/actuate/endpoint/IntegrationGraphEndpointTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.integration.endpoint; +package org.springframework.boot.integration.actuate.endpoint; import java.util.ArrayList; import java.util.Collection; @@ -23,7 +23,6 @@ import java.util.Map; import org.junit.jupiter.api.Test; -import org.springframework.boot.integration.actuate.endpoint.IntegrationGraphEndpoint; import org.springframework.boot.integration.actuate.endpoint.IntegrationGraphEndpoint.GraphDescriptor; import org.springframework.integration.graph.Graph; import org.springframework.integration.graph.IntegrationGraphServer; diff --git a/module/spring-boot-integration/src/test/java/org/springframework/boot/integration/endpoint/IntegrationGraphEndpointWebIntegrationTests.java b/module/spring-boot-integration/src/test/java/org/springframework/boot/integration/actuate/endpoint/IntegrationGraphEndpointWebIntegrationTests.java similarity index 94% rename from module/spring-boot-integration/src/test/java/org/springframework/boot/integration/endpoint/IntegrationGraphEndpointWebIntegrationTests.java rename to module/spring-boot-integration/src/test/java/org/springframework/boot/integration/actuate/endpoint/IntegrationGraphEndpointWebIntegrationTests.java index e319f74aad9..17bf7c7de31 100644 --- a/module/spring-boot-integration/src/test/java/org/springframework/boot/integration/endpoint/IntegrationGraphEndpointWebIntegrationTests.java +++ b/module/spring-boot-integration/src/test/java/org/springframework/boot/integration/actuate/endpoint/IntegrationGraphEndpointWebIntegrationTests.java @@ -14,10 +14,9 @@ * limitations under the License. */ -package org.springframework.boot.integration.endpoint; +package org.springframework.boot.integration.actuate.endpoint; import org.springframework.boot.actuate.endpoint.web.test.WebEndpointTest; -import org.springframework.boot.integration.actuate.endpoint.IntegrationGraphEndpoint; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.MediaType; diff --git a/module/spring-boot-integration/src/test/java/org/springframework/boot/integration/autoconfigure/endpoint/IntegrationGraphEndpointAutoConfigurationTests.java b/module/spring-boot-integration/src/test/java/org/springframework/boot/integration/autoconfigure/IntegrationGraphEndpointAutoConfigurationTests.java similarity index 91% rename from module/spring-boot-integration/src/test/java/org/springframework/boot/integration/autoconfigure/endpoint/IntegrationGraphEndpointAutoConfigurationTests.java rename to module/spring-boot-integration/src/test/java/org/springframework/boot/integration/autoconfigure/IntegrationGraphEndpointAutoConfigurationTests.java index 7153da3e698..77f299c8ec7 100644 --- a/module/spring-boot-integration/src/test/java/org/springframework/boot/integration/autoconfigure/endpoint/IntegrationGraphEndpointAutoConfigurationTests.java +++ b/module/spring-boot-integration/src/test/java/org/springframework/boot/integration/autoconfigure/IntegrationGraphEndpointAutoConfigurationTests.java @@ -14,15 +14,13 @@ * limitations under the License. */ -package org.springframework.boot.integration.autoconfigure.endpoint; +package org.springframework.boot.integration.autoconfigure; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration; import org.springframework.boot.integration.actuate.endpoint.IntegrationGraphEndpoint; -import org.springframework.boot.integration.autoconfigure.IntegrationAutoConfiguration; -import org.springframework.boot.integration.autoconfigure.IntegrationGraphEndpointAutoConfiguration; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.integration.graph.IntegrationGraphServer; diff --git a/module/spring-boot-jooq-test/src/test/java/org/springframework/boot/test/autoconfigure/jooq/ExampleComponent.java b/module/spring-boot-jooq-test/src/test/java/org/springframework/boot/jooq/test/autoconfigure/ExampleComponent.java similarity index 93% rename from module/spring-boot-jooq-test/src/test/java/org/springframework/boot/test/autoconfigure/jooq/ExampleComponent.java rename to module/spring-boot-jooq-test/src/test/java/org/springframework/boot/jooq/test/autoconfigure/ExampleComponent.java index a2a81d5bb6b..fe1fe51539f 100644 --- a/module/spring-boot-jooq-test/src/test/java/org/springframework/boot/test/autoconfigure/jooq/ExampleComponent.java +++ b/module/spring-boot-jooq-test/src/test/java/org/springframework/boot/jooq/test/autoconfigure/ExampleComponent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.test.autoconfigure.jooq; +package org.springframework.boot.jooq.test.autoconfigure; import org.springframework.stereotype.Component; diff --git a/module/spring-boot-jooq-test/src/test/java/org/springframework/boot/test/autoconfigure/jooq/ExampleJooqApplication.java b/module/spring-boot-jooq-test/src/test/java/org/springframework/boot/jooq/test/autoconfigure/ExampleJooqApplication.java similarity index 91% rename from module/spring-boot-jooq-test/src/test/java/org/springframework/boot/test/autoconfigure/jooq/ExampleJooqApplication.java rename to module/spring-boot-jooq-test/src/test/java/org/springframework/boot/jooq/test/autoconfigure/ExampleJooqApplication.java index a099b754005..ab7bcb173b5 100644 --- a/module/spring-boot-jooq-test/src/test/java/org/springframework/boot/test/autoconfigure/jooq/ExampleJooqApplication.java +++ b/module/spring-boot-jooq-test/src/test/java/org/springframework/boot/jooq/test/autoconfigure/ExampleJooqApplication.java @@ -14,12 +14,11 @@ * limitations under the License. */ -package org.springframework.boot.test.autoconfigure.jooq; +package org.springframework.boot.jooq.test.autoconfigure; import javax.sql.DataSource; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.jooq.test.autoconfigure.JooqTest; import org.springframework.context.annotation.Bean; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; diff --git a/module/spring-boot-jooq-test/src/test/java/org/springframework/boot/test/autoconfigure/jooq/JooqTestIntegrationTests.java b/module/spring-boot-jooq-test/src/test/java/org/springframework/boot/jooq/test/autoconfigure/JooqTestIntegrationTests.java similarity index 96% rename from module/spring-boot-jooq-test/src/test/java/org/springframework/boot/test/autoconfigure/jooq/JooqTestIntegrationTests.java rename to module/spring-boot-jooq-test/src/test/java/org/springframework/boot/jooq/test/autoconfigure/JooqTestIntegrationTests.java index a74a80995fe..0d7a9cf8909 100644 --- a/module/spring-boot-jooq-test/src/test/java/org/springframework/boot/test/autoconfigure/jooq/JooqTestIntegrationTests.java +++ b/module/spring-boot-jooq-test/src/test/java/org/springframework/boot/jooq/test/autoconfigure/JooqTestIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.test.autoconfigure.jooq; +package org.springframework.boot.jooq.test.autoconfigure; import javax.sql.DataSource; @@ -25,7 +25,6 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.flyway.autoconfigure.FlywayAutoConfiguration; -import org.springframework.boot.jooq.test.autoconfigure.JooqTest; import org.springframework.boot.liquibase.autoconfigure.LiquibaseAutoConfiguration; import org.springframework.boot.testcontainers.service.connection.ServiceConnectionAutoConfiguration; import org.springframework.context.ApplicationContext; diff --git a/module/spring-boot-jooq-test/src/test/java/org/springframework/boot/test/autoconfigure/jooq/JooqTestPropertiesIntegrationTests.java b/module/spring-boot-jooq-test/src/test/java/org/springframework/boot/jooq/test/autoconfigure/JooqTestPropertiesIntegrationTests.java similarity index 93% rename from module/spring-boot-jooq-test/src/test/java/org/springframework/boot/test/autoconfigure/jooq/JooqTestPropertiesIntegrationTests.java rename to module/spring-boot-jooq-test/src/test/java/org/springframework/boot/jooq/test/autoconfigure/JooqTestPropertiesIntegrationTests.java index a2cfe242121..d18a3f5b4b1 100644 --- a/module/spring-boot-jooq-test/src/test/java/org/springframework/boot/test/autoconfigure/jooq/JooqTestPropertiesIntegrationTests.java +++ b/module/spring-boot-jooq-test/src/test/java/org/springframework/boot/jooq/test/autoconfigure/JooqTestPropertiesIntegrationTests.java @@ -14,13 +14,12 @@ * limitations under the License. */ -package org.springframework.boot.test.autoconfigure.jooq; +package org.springframework.boot.jooq.test.autoconfigure; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.jooq.test.autoconfigure.JooqTest; import org.springframework.core.env.Environment; import static org.assertj.core.api.Assertions.assertThat; diff --git a/module/spring-boot-jooq-test/src/test/java/org/springframework/boot/test/autoconfigure/jooq/JooqTestWithAutoConfigureTestDatabaseIntegrationTests.java b/module/spring-boot-jooq-test/src/test/java/org/springframework/boot/jooq/test/autoconfigure/JooqTestWithAutoConfigureTestDatabaseIntegrationTests.java similarity index 93% rename from module/spring-boot-jooq-test/src/test/java/org/springframework/boot/test/autoconfigure/jooq/JooqTestWithAutoConfigureTestDatabaseIntegrationTests.java rename to module/spring-boot-jooq-test/src/test/java/org/springframework/boot/jooq/test/autoconfigure/JooqTestWithAutoConfigureTestDatabaseIntegrationTests.java index 5305fc9910b..527781ac507 100644 --- a/module/spring-boot-jooq-test/src/test/java/org/springframework/boot/test/autoconfigure/jooq/JooqTestWithAutoConfigureTestDatabaseIntegrationTests.java +++ b/module/spring-boot-jooq-test/src/test/java/org/springframework/boot/jooq/test/autoconfigure/JooqTestWithAutoConfigureTestDatabaseIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.test.autoconfigure.jooq; +package org.springframework.boot.jooq.test.autoconfigure; import javax.sql.DataSource; @@ -25,7 +25,6 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.jdbc.EmbeddedDatabaseConnection; import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; -import org.springframework.boot.jooq.test.autoconfigure.JooqTest; import org.springframework.test.context.TestPropertySource; import static org.assertj.core.api.Assertions.assertThat; diff --git a/module/spring-boot-liquibase/src/test/java/org/springframework/boot/liquibase/endpoint/LiquibaseEndpointTests.java b/module/spring-boot-liquibase/src/test/java/org/springframework/boot/liquibase/actuate/endpoint/LiquibaseEndpointTests.java similarity index 80% rename from module/spring-boot-liquibase/src/test/java/org/springframework/boot/liquibase/endpoint/LiquibaseEndpointTests.java rename to module/spring-boot-liquibase/src/test/java/org/springframework/boot/liquibase/actuate/endpoint/LiquibaseEndpointTests.java index 279e1f280ca..cba4d505264 100644 --- a/module/spring-boot-liquibase/src/test/java/org/springframework/boot/liquibase/endpoint/LiquibaseEndpointTests.java +++ b/module/spring-boot-liquibase/src/test/java/org/springframework/boot/liquibase/actuate/endpoint/LiquibaseEndpointTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.liquibase.endpoint; +package org.springframework.boot.liquibase.actuate.endpoint; import java.sql.Connection; import java.sql.SQLException; @@ -25,13 +25,13 @@ import java.util.UUID; import javax.sql.DataSource; import liquibase.integration.spring.SpringLiquibase; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.jdbc.EmbeddedDatabaseConnection; import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration; import org.springframework.boot.jdbc.init.DataSourceScriptDatabaseInitializer; -import org.springframework.boot.liquibase.actuate.endpoint.LiquibaseEndpoint; +import org.springframework.boot.liquibase.actuate.endpoint.LiquibaseEndpoint.ContextLiquibaseBeansDescriptor; import org.springframework.boot.liquibase.actuate.endpoint.LiquibaseEndpoint.LiquibaseBeanDescriptor; import org.springframework.boot.liquibase.autoconfigure.LiquibaseAutoConfiguration; import org.springframework.boot.sql.init.DatabaseInitializationSettings; @@ -43,6 +43,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; +import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; import static org.assertj.core.api.Assertions.assertThat; @@ -75,12 +76,15 @@ class LiquibaseEndpointTests { void liquibaseReportIsReturnedForContextHierarchy() { this.contextRunner.withUserConfiguration().run((parent) -> { this.contextRunner.withUserConfiguration(Config.class).withParent(parent).run((context) -> { - Map liquibaseBeans = context.getBean(LiquibaseEndpoint.class) + Map<@Nullable String, ContextLiquibaseBeansDescriptor> contexts = context + .getBean(LiquibaseEndpoint.class) .liquibaseBeans() - .getContexts() - .get(parent.getId()) - .getLiquibaseBeans(); - assertThat(liquibaseBeans.get("liquibase").getChangeSets()).hasSize(1); + .getContexts(); + ContextLiquibaseBeansDescriptor parentContext = contexts.get(parent.getId()); + assertThat(parentContext).isNotNull(); + Map liquibaseBeans = parentContext.getLiquibaseBeans(); + assertThat(liquibaseBeans).hasEntrySatisfying("liquibase", + (descriptor) -> assertThat(descriptor.getChangeSets()).hasSize(1)); }); }); } @@ -133,12 +137,14 @@ class LiquibaseEndpointTests { private ContextConsumer hasEndpointWithInitializedSchema() { return (context) -> { - Map liquibaseBeans = context.getBean(LiquibaseEndpoint.class) + ContextLiquibaseBeansDescriptor contextDescriptor = context.getBean(LiquibaseEndpoint.class) .liquibaseBeans() .getContexts() - .get(context.getId()) - .getLiquibaseBeans(); - assertThat(liquibaseBeans.get("liquibase").getChangeSets()).hasSize(1); + .get(context.getId()); + assertThat(contextDescriptor).isNotNull(); + Map liquibaseBeans = contextDescriptor.getLiquibaseBeans(); + assertThat(liquibaseBeans).hasEntrySatisfying("liquibase", + (descriptor) -> assertThat(descriptor.getChangeSets()).hasSize(1)); }; } @@ -162,17 +168,22 @@ class LiquibaseEndpointTests { void whenMultipleLiquibaseBeansArePresentChangeSetsAreCorrectlyReportedForEachBean() { this.contextRunner.withUserConfiguration(Config.class, MultipleDataSourceLiquibaseConfiguration.class) .run((context) -> { - Map liquibaseBeans = context.getBean(LiquibaseEndpoint.class) + ContextLiquibaseBeansDescriptor contextDescriptor = context.getBean(LiquibaseEndpoint.class) .liquibaseBeans() .getContexts() - .get(context.getId()) - .getLiquibaseBeans(); - assertThat(liquibaseBeans.get("liquibase").getChangeSets()).hasSize(1); - assertThat(liquibaseBeans.get("liquibase").getChangeSets().get(0).getChangeLog()) - .isEqualTo("db/changelog/db.changelog-master.yaml"); - assertThat(liquibaseBeans.get("liquibaseBackup").getChangeSets()).hasSize(1); - assertThat(liquibaseBeans.get("liquibaseBackup").getChangeSets().get(0).getChangeLog()) - .isEqualTo("db/changelog/db.changelog-master-backup.yaml"); + .get(context.getId()); + assertThat(contextDescriptor).isNotNull(); + Map liquibaseBeans = contextDescriptor.getLiquibaseBeans(); + assertThat(liquibaseBeans).hasEntrySatisfying("liquibase", (liquibase) -> { + assertThat(liquibase.getChangeSets()).hasSize(1); + assertThat(liquibase.getChangeSets().get(0).getChangeLog()) + .isEqualTo("db/changelog/db.changelog-master.yaml"); + }); + assertThat(liquibaseBeans).hasEntrySatisfying("liquibaseBackup", (liquibase) -> { + assertThat(liquibase.getChangeSets()).hasSize(1); + assertThat(liquibase.getChangeSets().get(0).getChangeLog()) + .isEqualTo("db/changelog/db.changelog-master-backup.yaml"); + }); }); } @@ -197,8 +208,7 @@ class LiquibaseEndpointTests { @Bean DataSource dataSource() { - DataSource dataSource = new EmbeddedDatabaseBuilder() - .setType(EmbeddedDatabaseConnection.get(getClass().getClassLoader()).getType()) + DataSource dataSource = new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.H2) .setName(UUID.randomUUID().toString()) .build(); DatabaseInitializationSettings settings = new DatabaseInitializationSettings(); @@ -235,9 +245,7 @@ class LiquibaseEndpointTests { } private DataSource createEmbeddedDatabase() { - return new EmbeddedDatabaseBuilder().generateUniqueName(true) - .setType(EmbeddedDatabaseConnection.H2.getType()) - .build(); + return new EmbeddedDatabaseBuilder().generateUniqueName(true).setType(EmbeddedDatabaseType.H2).build(); } private SpringLiquibase createSpringLiquibase(String changeLog, DataSource dataSource) { diff --git a/module/spring-boot-liquibase/src/test/java/org/springframework/boot/liquibase/autoconfigure/endpoint/LiquibaseEndpointAutoConfigurationTests.java b/module/spring-boot-liquibase/src/test/java/org/springframework/boot/liquibase/autoconfigure/LiquibaseEndpointAutoConfigurationTests.java similarity index 94% rename from module/spring-boot-liquibase/src/test/java/org/springframework/boot/liquibase/autoconfigure/endpoint/LiquibaseEndpointAutoConfigurationTests.java rename to module/spring-boot-liquibase/src/test/java/org/springframework/boot/liquibase/autoconfigure/LiquibaseEndpointAutoConfigurationTests.java index 50d150f00bf..122f826fe1a 100644 --- a/module/spring-boot-liquibase/src/test/java/org/springframework/boot/liquibase/autoconfigure/endpoint/LiquibaseEndpointAutoConfigurationTests.java +++ b/module/spring-boot-liquibase/src/test/java/org/springframework/boot/liquibase/autoconfigure/LiquibaseEndpointAutoConfigurationTests.java @@ -14,15 +14,13 @@ * limitations under the License. */ -package org.springframework.boot.liquibase.autoconfigure.endpoint; +package org.springframework.boot.liquibase.autoconfigure; import liquibase.integration.spring.SpringLiquibase; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.liquibase.actuate.endpoint.LiquibaseEndpoint; -import org.springframework.boot.liquibase.autoconfigure.DataSourceClosingSpringLiquibase; -import org.springframework.boot.liquibase.autoconfigure.LiquibaseEndpointAutoConfiguration; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/module/spring-boot-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/health/MongoHealthContributorAutoConfigurationTests.java b/module/spring-boot-mongodb/src/test/java/org/springframework/boot/mongodb/autoconfigure/health/MongoHealthContributorAutoConfigurationTests.java similarity index 91% rename from module/spring-boot-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/health/MongoHealthContributorAutoConfigurationTests.java rename to module/spring-boot-mongodb/src/test/java/org/springframework/boot/mongodb/autoconfigure/health/MongoHealthContributorAutoConfigurationTests.java index dd6517ef40b..b005846085f 100644 --- a/module/spring-boot-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/health/MongoHealthContributorAutoConfigurationTests.java +++ b/module/spring-boot-mongodb/src/test/java/org/springframework/boot/mongodb/autoconfigure/health/MongoHealthContributorAutoConfigurationTests.java @@ -14,14 +14,13 @@ * limitations under the License. */ -package org.springframework.boot.data.mongodb.autoconfigure.health; +package org.springframework.boot.mongodb.autoconfigure.health; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.health.autoconfigure.contributor.HealthContributorAutoConfiguration; import org.springframework.boot.mongodb.autoconfigure.MongoAutoConfiguration; -import org.springframework.boot.mongodb.autoconfigure.health.MongoHealthContributorAutoConfiguration; import org.springframework.boot.mongodb.health.MongoHealthIndicator; import org.springframework.boot.test.context.runner.ApplicationContextRunner; diff --git a/module/spring-boot-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/health/MongoReactiveHealthContributorAutoConfigurationTests.java b/module/spring-boot-mongodb/src/test/java/org/springframework/boot/mongodb/autoconfigure/health/MongoReactiveHealthContributorAutoConfigurationTests.java similarity index 90% rename from module/spring-boot-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/health/MongoReactiveHealthContributorAutoConfigurationTests.java rename to module/spring-boot-mongodb/src/test/java/org/springframework/boot/mongodb/autoconfigure/health/MongoReactiveHealthContributorAutoConfigurationTests.java index 364fe01a61c..22759fb4f9a 100644 --- a/module/spring-boot-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/health/MongoReactiveHealthContributorAutoConfigurationTests.java +++ b/module/spring-boot-mongodb/src/test/java/org/springframework/boot/mongodb/autoconfigure/health/MongoReactiveHealthContributorAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.data.mongodb.autoconfigure.health; +package org.springframework.boot.mongodb.autoconfigure.health; import org.junit.jupiter.api.Test; @@ -22,8 +22,6 @@ import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.health.autoconfigure.contributor.HealthContributorAutoConfiguration; import org.springframework.boot.mongodb.autoconfigure.MongoAutoConfiguration; import org.springframework.boot.mongodb.autoconfigure.MongoReactiveAutoConfiguration; -import org.springframework.boot.mongodb.autoconfigure.health.MongoHealthContributorAutoConfiguration; -import org.springframework.boot.mongodb.autoconfigure.health.MongoReactiveHealthContributorAutoConfiguration; import org.springframework.boot.mongodb.health.MongoHealthIndicator; import org.springframework.boot.mongodb.health.MongoReactiveHealthIndicator; import org.springframework.boot.test.context.runner.ApplicationContextRunner; diff --git a/module/spring-boot-pulsar/src/dockerTest/java/org/springframework/boot/autoconfigure/pulsar/PulsarAutoConfigurationIntegrationTests.java b/module/spring-boot-pulsar/src/dockerTest/java/org/springframework/boot/pulsar/autoconfigure/PulsarAutoConfigurationIntegrationTests.java similarity index 96% rename from module/spring-boot-pulsar/src/dockerTest/java/org/springframework/boot/autoconfigure/pulsar/PulsarAutoConfigurationIntegrationTests.java rename to module/spring-boot-pulsar/src/dockerTest/java/org/springframework/boot/pulsar/autoconfigure/PulsarAutoConfigurationIntegrationTests.java index 482c28d96a5..3948edce5c3 100644 --- a/module/spring-boot-pulsar/src/dockerTest/java/org/springframework/boot/autoconfigure/pulsar/PulsarAutoConfigurationIntegrationTests.java +++ b/module/spring-boot-pulsar/src/dockerTest/java/org/springframework/boot/pulsar/autoconfigure/PulsarAutoConfigurationIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.autoconfigure.pulsar; +package org.springframework.boot.pulsar.autoconfigure; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -26,7 +26,6 @@ import org.testcontainers.pulsar.PulsarContainer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; -import org.springframework.boot.pulsar.autoconfigure.PulsarAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.testsupport.container.TestImage; import org.springframework.context.annotation.Configuration; diff --git a/module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/observation/RestClientObservationAutoConfigurationTests.java b/module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/RestClientObservationAutoConfigurationTests.java similarity index 96% rename from module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/observation/RestClientObservationAutoConfigurationTests.java rename to module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/RestClientObservationAutoConfigurationTests.java index da51bef3a56..100b5e5c4a1 100644 --- a/module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/observation/RestClientObservationAutoConfigurationTests.java +++ b/module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/RestClientObservationAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.restclient.autoconfigure.observation; +package org.springframework.boot.restclient.autoconfigure; import io.micrometer.common.KeyValues; import io.micrometer.core.instrument.MeterRegistry; @@ -28,8 +28,6 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.micrometer.observation.autoconfigure.ObservationAutoConfiguration; -import org.springframework.boot.restclient.autoconfigure.RestClientAutoConfiguration; -import org.springframework.boot.restclient.autoconfigure.RestClientObservationAutoConfiguration; import org.springframework.boot.restclient.observation.ObservationRestClientCustomizer; import org.springframework.boot.test.context.assertj.AssertableApplicationContext; import org.springframework.boot.test.context.runner.ApplicationContextRunner; diff --git a/module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/observation/RestClientObservationAutoConfigurationWithoutMetricsTests.java b/module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/RestClientObservationAutoConfigurationWithoutMetricsTests.java similarity index 92% rename from module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/observation/RestClientObservationAutoConfigurationWithoutMetricsTests.java rename to module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/RestClientObservationAutoConfigurationWithoutMetricsTests.java index bb91671b583..4efdd93eda6 100644 --- a/module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/observation/RestClientObservationAutoConfigurationWithoutMetricsTests.java +++ b/module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/RestClientObservationAutoConfigurationWithoutMetricsTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.restclient.autoconfigure.observation; +package org.springframework.boot.restclient.autoconfigure; import io.micrometer.observation.ObservationRegistry; import io.micrometer.observation.tck.TestObservationRegistry; @@ -23,8 +23,6 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.micrometer.observation.autoconfigure.ObservationAutoConfiguration; -import org.springframework.boot.restclient.autoconfigure.RestClientAutoConfiguration; -import org.springframework.boot.restclient.autoconfigure.RestClientObservationAutoConfiguration; import org.springframework.boot.test.context.assertj.AssertableApplicationContext; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.boot.test.system.OutputCaptureExtension; diff --git a/module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/observation/RestTemplateObservationAutoConfigurationTests.java b/module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/RestTemplateObservationAutoConfigurationTests.java similarity index 95% rename from module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/observation/RestTemplateObservationAutoConfigurationTests.java rename to module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/RestTemplateObservationAutoConfigurationTests.java index d3d46ce59fd..4997d616399 100644 --- a/module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/observation/RestTemplateObservationAutoConfigurationTests.java +++ b/module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/RestTemplateObservationAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.restclient.autoconfigure.observation; +package org.springframework.boot.restclient.autoconfigure; import io.micrometer.common.KeyValues; import io.micrometer.core.instrument.MeterRegistry; @@ -29,8 +29,6 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.micrometer.observation.autoconfigure.ObservationAutoConfiguration; import org.springframework.boot.restclient.RestTemplateBuilder; -import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration; -import org.springframework.boot.restclient.autoconfigure.RestTemplateObservationAutoConfiguration; import org.springframework.boot.restclient.observation.ObservationRestTemplateCustomizer; import org.springframework.boot.test.context.assertj.AssertableApplicationContext; import org.springframework.boot.test.context.runner.ApplicationContextRunner; diff --git a/module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/observation/RestTemplateObservationAutoConfigurationWithoutMetricsTests.java b/module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/RestTemplateObservationAutoConfigurationWithoutMetricsTests.java similarity index 92% rename from module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/observation/RestTemplateObservationAutoConfigurationWithoutMetricsTests.java rename to module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/RestTemplateObservationAutoConfigurationWithoutMetricsTests.java index 51433e7464f..cf651483f04 100644 --- a/module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/observation/RestTemplateObservationAutoConfigurationWithoutMetricsTests.java +++ b/module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/RestTemplateObservationAutoConfigurationWithoutMetricsTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.restclient.autoconfigure.observation; +package org.springframework.boot.restclient.autoconfigure; import io.micrometer.observation.ObservationRegistry; import io.micrometer.observation.tck.TestObservationRegistry; @@ -24,8 +24,6 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.micrometer.observation.autoconfigure.ObservationAutoConfiguration; import org.springframework.boot.restclient.RestTemplateBuilder; -import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration; -import org.springframework.boot.restclient.autoconfigure.RestTemplateObservationAutoConfiguration; import org.springframework.boot.test.context.assertj.AssertableApplicationContext; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.boot.test.system.OutputCaptureExtension; diff --git a/module/spring-boot-tomcat/src/test/java/org/springframework/boot/tomcat/autoconfigure/actuate/web/TomcatManagementServerPropertiesTests.java b/module/spring-boot-tomcat/src/test/java/org/springframework/boot/tomcat/autoconfigure/actuate/web/server/TomcatManagementServerPropertiesTests.java similarity index 91% rename from module/spring-boot-tomcat/src/test/java/org/springframework/boot/tomcat/autoconfigure/actuate/web/TomcatManagementServerPropertiesTests.java rename to module/spring-boot-tomcat/src/test/java/org/springframework/boot/tomcat/autoconfigure/actuate/web/server/TomcatManagementServerPropertiesTests.java index 15272f76221..b49ff7d7295 100644 --- a/module/spring-boot-tomcat/src/test/java/org/springframework/boot/tomcat/autoconfigure/actuate/web/TomcatManagementServerPropertiesTests.java +++ b/module/spring-boot-tomcat/src/test/java/org/springframework/boot/tomcat/autoconfigure/actuate/web/server/TomcatManagementServerPropertiesTests.java @@ -14,12 +14,10 @@ * limitations under the License. */ -package org.springframework.boot.tomcat.autoconfigure.actuate.web; +package org.springframework.boot.tomcat.autoconfigure.actuate.web.server; import org.junit.jupiter.api.Test; -import org.springframework.boot.tomcat.autoconfigure.actuate.web.server.TomcatManagementServerProperties; - import static org.assertj.core.api.Assertions.assertThat; /** diff --git a/module/spring-boot-web-server/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java b/module/spring-boot-web-server/src/test/java/org/springframework/boot/web/server/autoconfigure/ServerPropertiesTests.java similarity index 97% rename from module/spring-boot-web-server/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java rename to module/spring-boot-web-server/src/test/java/org/springframework/boot/web/server/autoconfigure/ServerPropertiesTests.java index e640de7ad78..2e4f4eae506 100644 --- a/module/spring-boot-web-server/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java +++ b/module/spring-boot-web-server/src/test/java/org/springframework/boot/web/server/autoconfigure/ServerPropertiesTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.autoconfigure.web; +package org.springframework.boot.web.server.autoconfigure; import java.net.InetAddress; import java.util.Collections; @@ -29,7 +29,6 @@ import org.springframework.boot.context.properties.source.ConfigurationPropertyS import org.springframework.boot.context.properties.source.MapConfigurationPropertySource; import org.springframework.boot.web.server.MimeMappings; import org.springframework.boot.web.server.MimeMappings.Mapping; -import org.springframework.boot.web.server.autoconfigure.ServerProperties; import org.springframework.util.unit.DataSize; import static org.assertj.core.api.Assertions.assertThat; diff --git a/module/spring-boot-webflux/src/test/java/org/springframework/boot/webflux/observation/autoconfigure/WebFluxObservationAutoConfigurationTests.java b/module/spring-boot-webflux/src/test/java/org/springframework/boot/webflux/autoconfigure/WebFluxObservationAutoConfigurationTests.java similarity index 96% rename from module/spring-boot-webflux/src/test/java/org/springframework/boot/webflux/observation/autoconfigure/WebFluxObservationAutoConfigurationTests.java rename to module/spring-boot-webflux/src/test/java/org/springframework/boot/webflux/autoconfigure/WebFluxObservationAutoConfigurationTests.java index 2fe1e5aa1ec..b7caed9b2ae 100644 --- a/module/spring-boot-webflux/src/test/java/org/springframework/boot/webflux/observation/autoconfigure/WebFluxObservationAutoConfigurationTests.java +++ b/module/spring-boot-webflux/src/test/java/org/springframework/boot/webflux/autoconfigure/WebFluxObservationAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.webflux.observation.autoconfigure; +package org.springframework.boot.webflux.autoconfigure; import java.time.Duration; import java.time.temporal.ChronoUnit; @@ -31,8 +31,6 @@ import org.springframework.boot.test.context.assertj.AssertableReactiveWebApplic import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner; import org.springframework.boot.test.system.CapturedOutput; import org.springframework.boot.test.system.OutputCaptureExtension; -import org.springframework.boot.webflux.autoconfigure.WebFluxAutoConfiguration; -import org.springframework.boot.webflux.autoconfigure.WebFluxObservationAutoConfiguration; import org.springframework.http.server.reactive.observation.DefaultServerRequestObservationConvention; import org.springframework.http.server.reactive.observation.ServerRequestObservationConvention; import org.springframework.web.bind.annotation.GetMapping; diff --git a/module/spring-boot-webmvc/src/test/java/org/springframework/boot/webmvc/actuate/autoconfigure/health/WebMvcHealthEndpointExtensionAutoConfigurationTests.java b/module/spring-boot-webmvc/src/test/java/org/springframework/boot/webmvc/autoconfigure/actuate/endpoint/web/WebMvcHealthEndpointExtensionAutoConfigurationTests.java similarity index 95% rename from module/spring-boot-webmvc/src/test/java/org/springframework/boot/webmvc/actuate/autoconfigure/health/WebMvcHealthEndpointExtensionAutoConfigurationTests.java rename to module/spring-boot-webmvc/src/test/java/org/springframework/boot/webmvc/autoconfigure/actuate/endpoint/web/WebMvcHealthEndpointExtensionAutoConfigurationTests.java index 52b7f8654a8..4ae9e42603e 100644 --- a/module/spring-boot-webmvc/src/test/java/org/springframework/boot/webmvc/actuate/autoconfigure/health/WebMvcHealthEndpointExtensionAutoConfigurationTests.java +++ b/module/spring-boot-webmvc/src/test/java/org/springframework/boot/webmvc/autoconfigure/actuate/endpoint/web/WebMvcHealthEndpointExtensionAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.webmvc.actuate.autoconfigure.health; +package org.springframework.boot.webmvc.autoconfigure.actuate.endpoint.web; import org.junit.jupiter.api.Test; @@ -32,7 +32,6 @@ import org.springframework.boot.health.contributor.Health; import org.springframework.boot.health.contributor.HealthIndicator; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.boot.webmvc.actuate.endpoint.web.AdditionalHealthEndpointPathsWebMvcHandlerMapping; -import org.springframework.boot.webmvc.autoconfigure.actuate.endpoint.web.WebMvcHealthEndpointExtensionAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.DispatcherServlet; diff --git a/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webflux/test/autoconfigure/AutoConfigureWebTestClientIntegrationTests.java b/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webtestclient/autoconfigure/AutoConfigureWebTestClientIntegrationTests.java similarity index 91% rename from module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webflux/test/autoconfigure/AutoConfigureWebTestClientIntegrationTests.java rename to module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webtestclient/autoconfigure/AutoConfigureWebTestClientIntegrationTests.java index 39448b94e56..b3e10e6f79a 100644 --- a/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webflux/test/autoconfigure/AutoConfigureWebTestClientIntegrationTests.java +++ b/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webtestclient/autoconfigure/AutoConfigureWebTestClientIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.webflux.test.autoconfigure; +package org.springframework.boot.webtestclient.autoconfigure; import org.junit.jupiter.api.Test; @@ -22,7 +22,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.http.codec.autoconfigure.CodecsAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.webtestclient.autoconfigure.AutoConfigureWebTestClient; import org.springframework.context.ApplicationContext; import static org.assertj.core.api.Assertions.assertThat; diff --git a/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webflux/test/autoconfigure/ExampleController1.java b/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webtestclient/autoconfigure/ExampleController1.java similarity index 94% rename from module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webflux/test/autoconfigure/ExampleController1.java rename to module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webtestclient/autoconfigure/ExampleController1.java index 9eb6668cdb1..5b9433b5466 100644 --- a/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webflux/test/autoconfigure/ExampleController1.java +++ b/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webtestclient/autoconfigure/ExampleController1.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.webflux.test.autoconfigure; +package org.springframework.boot.webtestclient.autoconfigure; import reactor.core.publisher.Mono; diff --git a/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webflux/test/autoconfigure/ExampleController2.java b/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webtestclient/autoconfigure/ExampleController2.java similarity index 95% rename from module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webflux/test/autoconfigure/ExampleController2.java rename to module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webtestclient/autoconfigure/ExampleController2.java index 303613c0931..c456c9d4207 100644 --- a/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webflux/test/autoconfigure/ExampleController2.java +++ b/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webtestclient/autoconfigure/ExampleController2.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.webflux.test.autoconfigure; +package org.springframework.boot.webtestclient.autoconfigure; import reactor.core.publisher.Mono; diff --git a/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webflux/test/autoconfigure/ExampleId.java b/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webtestclient/autoconfigure/ExampleId.java similarity index 93% rename from module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webflux/test/autoconfigure/ExampleId.java rename to module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webtestclient/autoconfigure/ExampleId.java index b65fb527e8b..cb89f0c64e6 100644 --- a/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webflux/test/autoconfigure/ExampleId.java +++ b/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webtestclient/autoconfigure/ExampleId.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.webflux.test.autoconfigure; +package org.springframework.boot.webtestclient.autoconfigure; import java.util.UUID; diff --git a/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webflux/test/autoconfigure/ExampleRealService.java b/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webtestclient/autoconfigure/ExampleRealService.java similarity index 85% rename from module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webflux/test/autoconfigure/ExampleRealService.java rename to module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webtestclient/autoconfigure/ExampleRealService.java index 5b86e54770f..06be9409dd6 100644 --- a/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webflux/test/autoconfigure/ExampleRealService.java +++ b/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webtestclient/autoconfigure/ExampleRealService.java @@ -14,9 +14,8 @@ * limitations under the License. */ -package org.springframework.boot.webflux.test.autoconfigure; +package org.springframework.boot.webtestclient.autoconfigure; -import org.springframework.boot.webtestclient.autoconfigure.AutoConfigureWebTestClient; import org.springframework.stereotype.Service; /** diff --git a/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webflux/test/autoconfigure/ExampleWebTestClientApplication.java b/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webtestclient/autoconfigure/ExampleWebTestClientApplication.java similarity index 86% rename from module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webflux/test/autoconfigure/ExampleWebTestClientApplication.java rename to module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webtestclient/autoconfigure/ExampleWebTestClientApplication.java index 338f355e9d0..7391bf777a2 100644 --- a/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webflux/test/autoconfigure/ExampleWebTestClientApplication.java +++ b/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webtestclient/autoconfigure/ExampleWebTestClientApplication.java @@ -14,10 +14,9 @@ * limitations under the License. */ -package org.springframework.boot.webflux.test.autoconfigure; +package org.springframework.boot.webtestclient.autoconfigure; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.webtestclient.autoconfigure.AutoConfigureWebTestClient; /** * Example {@link SpringBootApplication @SpringBootApplication} used with diff --git a/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webflux/test/autoconfigure/WebTestClientAutoConfigurationTests.java b/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webtestclient/autoconfigure/WebTestClientAutoConfigurationTests.java similarity index 94% rename from module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webflux/test/autoconfigure/WebTestClientAutoConfigurationTests.java rename to module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webtestclient/autoconfigure/WebTestClientAutoConfigurationTests.java index d1e4bb6fcee..fa5df96355f 100644 --- a/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webflux/test/autoconfigure/WebTestClientAutoConfigurationTests.java +++ b/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webtestclient/autoconfigure/WebTestClientAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.webflux.test.autoconfigure; +package org.springframework.boot.webtestclient.autoconfigure; import java.time.Duration; @@ -28,8 +28,6 @@ import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.boot.test.http.server.LocalTestWebServer; import org.springframework.boot.test.http.server.LocalTestWebServer.Scheme; import org.springframework.boot.testsupport.classpath.resources.WithResource; -import org.springframework.boot.webtestclient.autoconfigure.WebTestClientAutoConfiguration; -import org.springframework.boot.webtestclient.autoconfigure.WebTestClientBuilderCustomizer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -101,7 +99,7 @@ class WebTestClientAutoConfigurationTests { @WithResource(name = "META-INF/spring.factories", content = """ org.springframework.boot.test.http.server.LocalTestWebServer$Provider=\ - org.springframework.boot.webflux.test.autoconfigure.WebTestClientAutoConfigurationTests$TestLocalTestWebServerProvider + org.springframework.boot.webtestclient.autoconfigure.WebTestClientAutoConfigurationTests$TestLocalTestWebServerProvider """) void shouldDefineWebTestClientBoundToWebServer() { this.contextRunner.run((context) -> { @@ -180,7 +178,7 @@ class WebTestClientAutoConfigurationTests { @WithResource(name = "META-INF/spring.factories", content = """ org.springframework.boot.test.http.server.LocalTestWebServer$Provider=\ - org.springframework.boot.webflux.test.autoconfigure.WebTestClientAutoConfigurationTests$TestLocalTestWebServerProvider + org.springframework.boot.webtestclient.autoconfigure.WebTestClientAutoConfigurationTests$TestLocalTestWebServerProvider """) void shouldWorkWithoutServletStack() { ClassLoader parentClassLoader = Thread.currentThread().getContextClassLoader(); diff --git a/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webflux/test/autoconfigure/WebTestClientSpringBootTestIntegrationTests.java b/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webtestclient/autoconfigure/WebTestClientSpringBootTestIntegrationTests.java similarity index 93% rename from module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webflux/test/autoconfigure/WebTestClientSpringBootTestIntegrationTests.java rename to module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webtestclient/autoconfigure/WebTestClientSpringBootTestIntegrationTests.java index 5cc31ebd3f5..324c4a26410 100644 --- a/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webflux/test/autoconfigure/WebTestClientSpringBootTestIntegrationTests.java +++ b/module/spring-boot-webtestclient/src/test/java/org/springframework/boot/webtestclient/autoconfigure/WebTestClientSpringBootTestIntegrationTests.java @@ -14,13 +14,12 @@ * limitations under the License. */ -package org.springframework.boot.webflux.test.autoconfigure; +package org.springframework.boot.webtestclient.autoconfigure; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.webtestclient.autoconfigure.AutoConfigureWebTestClient; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Import; import org.springframework.test.web.reactive.server.WebTestClient;