Merge branch '4.0.x'

Closes gh-48700

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;

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;
 

module/spring-boot-cache/src/test/java/org/springframework/boot/cache/autoconfigure/MockCachingProvider.java

@@ -0,0 +1,193 @@
+/*
+ * Copyright 2012-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.cache.autoconfigure;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.cache.Cache;
+import javax.cache.CacheManager;
+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;
+
+/**
+ * A mock {@link CachingProvider} that exposes a JSR-107 cache manager for testing
+ * purposes.
+ *
+ * @author Stephane Nicoll
+ */
+public class MockCachingProvider implements CachingProvider {
+
+	@Override
+	public CacheManager getCacheManager(@Nullable URI uri, ClassLoader classLoader, Properties properties) {
+		return new MockCacheManager(uri, classLoader, properties);
+	}
+
+	@Override
+	public ClassLoader getDefaultClassLoader() {
+		return mock(ClassLoader.class);
+	}
+
+	@Override
+	public @Nullable URI getDefaultURI() {
+		return null;
+	}
+
+	@Override
+	public Properties getDefaultProperties() {
+		return new Properties();
+	}
+
+	@Override
+	public CacheManager getCacheManager(@Nullable URI uri, ClassLoader classLoader) {
+		return getCacheManager(uri, classLoader, getDefaultProperties());
+	}
+
+	@Override
+	public CacheManager getCacheManager() {
+		return getCacheManager(getDefaultURI(), getDefaultClassLoader());
+	}
+
+	@Override
+	public void close() {
+	}
+
+	@Override
+	public void close(ClassLoader classLoader) {
+	}
+
+	@Override
+	public void close(URI uri, ClassLoader classLoader) {
+	}
+
+	@Override
+	public boolean isSupported(OptionalFeature optionalFeature) {
+		return false;
+	}
+
+	public static class MockCacheManager implements CacheManager {
+
+		private final Map<String, Configuration<?, ?>> configurations = new HashMap<>();
+
+		private final Map<String, Cache<?, ?>> caches = new HashMap<>();
+
+		private final @Nullable URI uri;
+
+		private final ClassLoader classLoader;
+
+		private final Properties properties;
+
+		private boolean closed;
+
+		public MockCacheManager(@Nullable URI uri, ClassLoader classLoader, Properties properties) {
+			this.uri = uri;
+			this.classLoader = classLoader;
+			this.properties = properties;
+		}
+
+		@Override
+		public CachingProvider getCachingProvider() {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public @Nullable URI getURI() {
+			return this.uri;
+		}
+
+		@Override
+		public ClassLoader getClassLoader() {
+			return this.classLoader;
+		}
+
+		@Override
+		public Properties getProperties() {
+			return this.properties;
+		}
+
+		@Override
+		@SuppressWarnings("unchecked")
+		public <K, V, C extends Configuration<K, V>> Cache<K, V> createCache(String cacheName, C configuration) {
+			this.configurations.put(cacheName, configuration);
+			Cache<K, V> cache = mock(Cache.class);
+			given(cache.getName()).willReturn(cacheName);
+			this.caches.put(cacheName, cache);
+			return cache;
+		}
+
+		@Override
+		@SuppressWarnings("unchecked")
+		public <K, V> @Nullable Cache<K, V> getCache(String cacheName, Class<K> keyType, Class<V> valueType) {
+			return (Cache<K, V>) this.caches.get(cacheName);
+		}
+
+		@Override
+		@SuppressWarnings("unchecked")
+		public <K, V> @Nullable Cache<K, V> getCache(String cacheName) {
+			return (Cache<K, V>) this.caches.get(cacheName);
+		}
+
+		@Override
+		public Iterable<String> getCacheNames() {
+			return this.caches.keySet();
+		}
+
+		@Override
+		public void destroyCache(String cacheName) {
+			this.caches.remove(cacheName);
+		}
+
+		@Override
+		public void enableManagement(String cacheName, boolean enabled) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public void enableStatistics(String cacheName, boolean enabled) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public void close() {
+			this.closed = true;
+		}
+
+		@Override
+		public boolean isClosed() {
+			return this.closed;
+		}
+
+		@Override
+		public <T> T unwrap(Class<T> type) {
+			throw new UnsupportedOperationException();
+		}
+
+		public Map<String, Configuration<?, ?>> getConfigurations() {
+			return this.configurations;
+		}
+
+	}
+
+}

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
+org.springframework.boot.cache.autoconfigure.MockCachingProvider

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;

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;

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;

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;
@@ -655,7 +655,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">
-						<entity class="org.springframework.boot.jpa.autoconfigure.hibernate.mapping.NonAnnotatedEntity">
+						<entity class="org.springframework.boot.hibernate.autoconfigure.mapping.NonAnnotatedEntity">
 							<table name="NON_ANNOTATED"/>
 							<attributes>
 								<id name="id">

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".

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;
 

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;
 

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;
 

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;

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;

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;
 

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;
 

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;

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;

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;

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;

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<String, LiquibaseBeanDescriptor> 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<String, LiquibaseBeanDescriptor> liquibaseBeans = parentContext.getLiquibaseBeans();
+				assertThat(liquibaseBeans).hasEntrySatisfying("liquibase",
+						(descriptor) -> assertThat(descriptor.getChangeSets()).hasSize(1));
 			});
 		});
 	}
@@ -133,12 +137,14 @@ class LiquibaseEndpointTests {
 
 	private ContextConsumer<AssertableApplicationContext> hasEndpointWithInitializedSchema() {
 		return (context) -> {
-			Map<String, LiquibaseBeanDescriptor> 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<String, LiquibaseBeanDescriptor> 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<String, LiquibaseBeanDescriptor> 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<String, LiquibaseBeanDescriptor> 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) {

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;

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;
 

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;

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;

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;

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;

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;

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;

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;
 
 /**

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;

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;

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;

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;

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;
 

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;
 

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;
 

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;
 
 /**

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

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();

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;