Rationalize endpoint packages

Use consistent packages for endpoints and endpoint
auto-configuration.

Closes gh-47606

documentation/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/flyway/FlywayEndpointDocumentationTests.java

@@ -25,8 +25,8 @@ import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.actuate.docs.MockMvcEndpointDocumentationTests;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+import org.springframework.boot.flyway.actuate.endpoint.FlywayEndpoint;
 import org.springframework.boot.flyway.autoconfigure.FlywayAutoConfiguration;
-import org.springframework.boot.flyway.endpoint.FlywayEndpoint;
 import org.springframework.boot.jdbc.EmbeddedDatabaseConnection;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;

documentation/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/integration/IntegrationGraphEndpointDocumentationTests.java

@@ -19,7 +19,7 @@ package org.springframework.boot.actuate.docs.integration;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.actuate.docs.MockMvcEndpointDocumentationTests;
-import org.springframework.boot.integration.endpoint.IntegrationGraphEndpoint;
+import org.springframework.boot.integration.actuate.endpoint.IntegrationGraphEndpoint;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpStatus;

documentation/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/liquibase/LiquibaseEndpointDocumentationTests.java

@@ -23,8 +23,8 @@ import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.actuate.docs.MockMvcEndpointDocumentationTests;
 import org.springframework.boot.jdbc.autoconfigure.EmbeddedDataSourceConfiguration;
+import org.springframework.boot.liquibase.actuate.endpoint.LiquibaseEndpoint;
 import org.springframework.boot.liquibase.autoconfigure.LiquibaseAutoConfiguration;
-import org.springframework.boot.liquibase.endpoint.LiquibaseEndpoint;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

documentation/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/metrics/export/prometheus/PrometheusScrapeEndpointDocumentationTests.java

@@ -26,7 +26,7 @@ import io.prometheus.metrics.model.registry.PrometheusRegistry;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.actuate.docs.MockMvcEndpointDocumentationTests;
-import org.springframework.boot.micrometer.metrics.export.prometheus.endpoint.PrometheusScrapeEndpoint;
+import org.springframework.boot.micrometer.metrics.autoconfigure.export.prometheus.PrometheusScrapeEndpoint;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

documentation/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/quartz/QuartzEndpointDocumentationTests.java

@@ -55,8 +55,8 @@ import org.quartz.spi.OperableTrigger;
 import org.springframework.boot.actuate.docs.MockMvcEndpointDocumentationTests;
 import org.springframework.boot.actuate.endpoint.Show;
 import org.springframework.boot.json.JsonWriter;
-import org.springframework.boot.quartz.endpoint.QuartzEndpoint;
+import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint;
-import org.springframework.boot.quartz.endpoint.QuartzEndpointWebExtension;
+import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpointWebExtension;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;

documentation/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/session/SessionsEndpointDocumentationTests.java

@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.actuate.context.ShutdownEndpoint;
 import org.springframework.boot.actuate.docs.MockMvcEndpointDocumentationTests;
-import org.springframework.boot.session.endpoint.SessionsEndpoint;
+import org.springframework.boot.session.actuate.endpoint.SessionsEndpoint;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpStatus;

integration-test/spring-boot-actuator-integration-tests/src/test/java/org/springframework/boot/actuate/metrics/export/prometheus/PrometheusScrapeEndpointIntegrationTests.java

@@ -28,7 +28,7 @@ import io.prometheus.metrics.expositionformats.PrometheusTextFormatWriter;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
 
 import org.springframework.boot.actuate.endpoint.web.test.WebEndpointTest;
-import org.springframework.boot.micrometer.metrics.export.prometheus.endpoint.PrometheusScrapeEndpoint;
+import org.springframework.boot.micrometer.metrics.autoconfigure.export.prometheus.PrometheusScrapeEndpoint;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;

module/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/CachesEndpointAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cache.autoconfigure.endpoint;
+package org.springframework.boot.cache.autoconfigure;
 
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.SimpleAutowireCandidateResolver;
@@ -27,7 +27,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.cache.actuate.endpoint.CachesEndpoint;
 import org.springframework.boot.cache.actuate.endpoint.CachesEndpointWebExtension;
-import org.springframework.boot.cache.autoconfigure.CacheAutoConfiguration;
 import org.springframework.cache.CacheManager;
 import org.springframework.context.annotation.Bean;
 

module/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/endpoint/package-info.java

@@ -1,23 +0,0 @@
-/*
- * Copyright 2012-present the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Auto-configuration for the cache abstraction endpoints.
- */
-@NullMarked
-package org.springframework.boot.cache.autoconfigure.endpoint;
-
-import org.jspecify.annotations.NullMarked;

module/spring-boot-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,3 +1,3 @@
 org.springframework.boot.cache.autoconfigure.CacheAutoConfiguration
-org.springframework.boot.cache.autoconfigure.endpoint.CachesEndpointAutoConfiguration
+org.springframework.boot.cache.autoconfigure.CachesEndpointAutoConfiguration
 org.springframework.boot.cache.autoconfigure.metrics.CacheMetricsAutoConfiguration

module/spring-boot-cache/src/test/java/org/springframework/boot/cache/autoconfigure/actuate/endpoint/CachesEndpointAutoConfigurationTests.java

@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.cache.autoconfigure.endpoint;
+package org.springframework.boot.cache.autoconfigure.actuate.endpoint;
 
 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-flyway/src/main/java/org/springframework/boot/flyway/actuate/endpoint/FlywayEndpoint.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.flyway.endpoint;
+package org.springframework.boot.flyway.actuate.endpoint;
 
 import java.time.Instant;
 import java.util.Date;

module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/actuate/endpoint/package-info.java

@@ -18,6 +18,6 @@
  * Actuator endpoint for Flyway.
  */
 @NullMarked
-package org.springframework.boot.flyway.endpoint;
+package org.springframework.boot.flyway.actuate.endpoint;
 
 import org.jspecify.annotations.NullMarked;

module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/autoconfigure/FlywayEndpointAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.flyway.autoconfigure.endpoint;
+package org.springframework.boot.flyway.autoconfigure;
 
 import org.flywaydb.core.Flyway;
 
@@ -24,8 +24,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.flyway.autoconfigure.FlywayAutoConfiguration;
+import org.springframework.boot.flyway.actuate.endpoint.FlywayEndpoint;
-import org.springframework.boot.flyway.endpoint.FlywayEndpoint;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 

module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/autoconfigure/endpoint/package-info.java

@@ -1,23 +0,0 @@
-/*
- * Copyright 2012-present the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Auto-configuration for Flyway endpoint.
- */
-@NullMarked
-package org.springframework.boot.flyway.autoconfigure.endpoint;
-
-import org.jspecify.annotations.NullMarked;

module/spring-boot-flyway/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,2 +1,2 @@
 org.springframework.boot.flyway.autoconfigure.FlywayAutoConfiguration
-org.springframework.boot.flyway.autoconfigure.endpoint.FlywayEndpointAutoConfiguration
+org.springframework.boot.flyway.autoconfigure.FlywayEndpointAutoConfiguration

module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/autoconfigure/actuate/endpoint/FlywayEndpointAutoConfigurationTests.java

@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.flyway.autoconfigure.endpoint;
+package org.springframework.boot.flyway.autoconfigure.actuate.endpoint;
 
 import org.flywaydb.core.Flyway;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.flyway.endpoint.FlywayEndpoint;
+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-flyway/src/test/java/org/springframework/boot/flyway/endpoint/FlywayEndpointTests.java

@@ -21,10 +21,11 @@ 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;
 import org.springframework.boot.flyway.autoconfigure.FlywayMigrationStrategy;
-import org.springframework.boot.flyway.endpoint.FlywayEndpoint.ContextFlywayBeansDescriptor;
-import org.springframework.boot.flyway.endpoint.FlywayEndpoint.FlywayDescriptor;
 import org.springframework.boot.jdbc.autoconfigure.EmbeddedDataSourceConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.testsupport.classpath.resources.WithResource;

module/spring-boot-integration/src/main/java/org/springframework/boot/integration/actuate/endpoint/IntegrationGraphEndpoint.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.Collection;
 import java.util.Map;

module/spring-boot-integration/src/main/java/org/springframework/boot/integration/actuate/endpoint/package-info.java

@@ -18,6 +18,6 @@
  * Actuator endpoint for Spring Integration.
  */
 @NullMarked
-package org.springframework.boot.integration.endpoint;
+package org.springframework.boot.integration.actuate.endpoint;
 
 import org.jspecify.annotations.NullMarked;

module/spring-boot-integration/src/main/java/org/springframework/boot/integration/autoconfigure/IntegrationGraphEndpointAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.integration.autoconfigure.endpoint;
+package org.springframework.boot.integration.autoconfigure;
 
 import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -22,8 +22,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.integration.autoconfigure.IntegrationAutoConfiguration;
+import org.springframework.boot.integration.actuate.endpoint.IntegrationGraphEndpoint;
-import org.springframework.boot.integration.endpoint.IntegrationGraphEndpoint;
 import org.springframework.context.annotation.Bean;
 import org.springframework.integration.config.IntegrationConfigurationBeanFactoryPostProcessor;
 import org.springframework.integration.graph.IntegrationGraphServer;

module/spring-boot-integration/src/main/java/org/springframework/boot/integration/autoconfigure/endpoint/package-info.java

@@ -1,23 +0,0 @@
-/*
- * Copyright 2012-present the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Auto-configuration for Spring Integration endpoint.
- */
-@NullMarked
-package org.springframework.boot.integration.autoconfigure.endpoint;
-
-import org.jspecify.annotations.NullMarked;

module/spring-boot-integration/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,3 +1,3 @@
 org.springframework.boot.integration.autoconfigure.IntegrationAutoConfiguration
-org.springframework.boot.integration.autoconfigure.endpoint.IntegrationGraphEndpointAutoConfiguration
+org.springframework.boot.integration.autoconfigure.IntegrationGraphEndpointAutoConfiguration
 org.springframework.boot.integration.autoconfigure.metrics.IntegrationMetricsAutoConfiguration

module/spring-boot-integration/src/test/java/org/springframework/boot/integration/autoconfigure/endpoint/IntegrationGraphEndpointAutoConfigurationTests.java

@@ -20,8 +20,9 @@ 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.endpoint.IntegrationGraphEndpoint;
+import org.springframework.boot.integration.autoconfigure.IntegrationGraphEndpointAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.integration.graph.IntegrationGraphServer;
 

module/spring-boot-integration/src/test/java/org/springframework/boot/integration/autoconfigure/metrics/IntegrationMetricsAutoConfigurationTests.java

@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.integration.autoconfigure.IntegrationAutoConfiguration;
-import org.springframework.boot.integration.autoconfigure.endpoint.IntegrationGraphEndpointAutoConfiguration;
+import org.springframework.boot.integration.autoconfigure.IntegrationGraphEndpointAutoConfiguration;
 import org.springframework.boot.micrometer.metrics.autoconfigure.MetricsAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 

module/spring-boot-integration/src/test/java/org/springframework/boot/integration/endpoint/IntegrationGraphEndpointTests.java

@@ -23,7 +23,8 @@ import java.util.Map;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.integration.endpoint.IntegrationGraphEndpoint.GraphDescriptor;
+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;
 import org.springframework.integration.graph.IntegrationNode;

module/spring-boot-integration/src/test/java/org/springframework/boot/integration/endpoint/IntegrationGraphEndpointWebIntegrationTests.java

@@ -17,6 +17,7 @@
 package org.springframework.boot.integration.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-liquibase/src/main/java/org/springframework/boot/liquibase/actuate/endpoint/LiquibaseEndpoint.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.liquibase.endpoint;
+package org.springframework.boot.liquibase.actuate.endpoint;
 
 import java.time.Instant;
 import java.util.HashMap;

module/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/actuate/endpoint/package-info.java

@@ -18,6 +18,6 @@
  * Actuator endpoint for Liquibase.
  */
 @NullMarked
-package org.springframework.boot.liquibase.endpoint;
+package org.springframework.boot.liquibase.actuate.endpoint;
 
 import org.jspecify.annotations.NullMarked;

module/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/autoconfigure/LiquibaseEndpointAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.liquibase.autoconfigure.endpoint;
+package org.springframework.boot.liquibase.autoconfigure;
 
 import liquibase.integration.spring.SpringLiquibase;
 
@@ -26,9 +26,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.liquibase.autoconfigure.DataSourceClosingSpringLiquibase;
+import org.springframework.boot.liquibase.actuate.endpoint.LiquibaseEndpoint;
-import org.springframework.boot.liquibase.autoconfigure.LiquibaseAutoConfiguration;
-import org.springframework.boot.liquibase.endpoint.LiquibaseEndpoint;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 

module/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/autoconfigure/endpoint/package-info.java

@@ -1,23 +0,0 @@
-/*
- * Copyright 2012-present the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Auto-configuration for Liquibase endpoint.
- */
-@NullMarked
-package org.springframework.boot.liquibase.autoconfigure.endpoint;
-
-import org.jspecify.annotations.NullMarked;

module/spring-boot-liquibase/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,2 +1,2 @@
 org.springframework.boot.liquibase.autoconfigure.LiquibaseAutoConfiguration
-org.springframework.boot.liquibase.autoconfigure.endpoint.LiquibaseEndpointAutoConfiguration
+org.springframework.boot.liquibase.autoconfigure.LiquibaseEndpointAutoConfiguration

module/spring-boot-liquibase/src/test/java/org/springframework/boot/liquibase/autoconfigure/endpoint/LiquibaseEndpointAutoConfigurationTests.java

@@ -20,8 +20,9 @@ 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.endpoint.LiquibaseEndpoint;
+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-liquibase/src/test/java/org/springframework/boot/liquibase/endpoint/LiquibaseEndpointTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.liquibase.actuate.endpoint;
+package org.springframework.boot.liquibase.endpoint;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -31,9 +31,9 @@ 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.LiquibaseBeanDescriptor;
 import org.springframework.boot.liquibase.autoconfigure.LiquibaseAutoConfiguration;
-import org.springframework.boot.liquibase.endpoint.LiquibaseEndpoint;
-import org.springframework.boot.liquibase.endpoint.LiquibaseEndpoint.LiquibaseBeanDescriptor;
 import org.springframework.boot.sql.init.DatabaseInitializationSettings;
 import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;

module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/autoconfigure/export/prometheus/PrometheusMetricsExportAutoConfiguration.java

@@ -41,7 +41,6 @@ import org.springframework.boot.micrometer.metrics.autoconfigure.MetricsAutoConf
 import org.springframework.boot.micrometer.metrics.autoconfigure.export.ConditionalOnEnabledMetricsExport;
 import org.springframework.boot.micrometer.metrics.autoconfigure.export.simple.SimpleMetricsExportAutoConfiguration;
 import org.springframework.boot.micrometer.metrics.export.prometheus.PrometheusPushGatewayManager;
-import org.springframework.boot.micrometer.metrics.export.prometheus.endpoint.PrometheusScrapeEndpoint;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;

module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/autoconfigure/export/prometheus/PrometheusOutputFormat.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.micrometer.metrics.export.prometheus.endpoint;
+package org.springframework.boot.micrometer.metrics.autoconfigure.export.prometheus;
 
 import java.io.IOException;
 import java.io.OutputStream;

module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/autoconfigure/export/prometheus/PrometheusScrapeEndpoint.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.micrometer.metrics.export.prometheus.endpoint;
+package org.springframework.boot.micrometer.metrics.autoconfigure.export.prometheus;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

module/spring-boot-micrometer-metrics/src/test/java/org/springframework/boot/micrometer/metrics/autoconfigure/export/prometheus/PrometheusMetricsExportAutoConfigurationTests.java

@@ -36,7 +36,6 @@ import org.springframework.boot.actuate.autoconfigure.web.server.ManagementConte
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.context.properties.source.MutuallyExclusiveConfigurationPropertiesException;
 import org.springframework.boot.micrometer.metrics.export.prometheus.PrometheusPushGatewayManager;
-import org.springframework.boot.micrometer.metrics.export.prometheus.endpoint.PrometheusScrapeEndpoint;
 import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.test.system.CapturedOutput;

module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/actuate/endpoint/QuartzEndpoint.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.quartz.endpoint;
+package org.springframework.boot.quartz.actuate.endpoint;
 
 import java.time.Duration;
 import java.time.Instant;

module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/actuate/endpoint/QuartzEndpointWebExtension.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.quartz.endpoint;
+package org.springframework.boot.quartz.actuate.endpoint;
 
 import java.util.Set;
 
@@ -31,11 +31,11 @@ import org.springframework.boot.actuate.endpoint.annotation.Selector;
 import org.springframework.boot.actuate.endpoint.annotation.WriteOperation;
 import org.springframework.boot.actuate.endpoint.web.WebEndpointResponse;
 import org.springframework.boot.actuate.endpoint.web.annotation.EndpointWebExtension;
-import org.springframework.boot.quartz.endpoint.QuartzEndpoint.QuartzGroupsDescriptor;
+import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint.QuartzGroupsDescriptor;
-import org.springframework.boot.quartz.endpoint.QuartzEndpoint.QuartzJobDetailsDescriptor;
+import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint.QuartzJobDetailsDescriptor;
-import org.springframework.boot.quartz.endpoint.QuartzEndpoint.QuartzJobGroupSummaryDescriptor;
+import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint.QuartzJobGroupSummaryDescriptor;
-import org.springframework.boot.quartz.endpoint.QuartzEndpoint.QuartzTriggerGroupSummaryDescriptor;
+import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint.QuartzTriggerGroupSummaryDescriptor;
-import org.springframework.boot.quartz.endpoint.QuartzEndpointWebExtension.QuartzEndpointWebExtensionRuntimeHints;
+import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpointWebExtension.QuartzEndpointWebExtensionRuntimeHints;
 import org.springframework.context.annotation.ImportRuntimeHints;
 
 /**

module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/actuate/endpoint/package-info.java

@@ -18,6 +18,6 @@
  * Actuator endpoint for Quartz Scheduler.
  */
 @NullMarked
-package org.springframework.boot.quartz.endpoint;
+package org.springframework.boot.quartz.actuate.endpoint;
 
 import org.jspecify.annotations.NullMarked;

module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/autoconfigure/QuartzEndpointAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.quartz.autoconfigure.endpoint;
+package org.springframework.boot.quartz.autoconfigure;
 
 import org.quartz.Scheduler;
 
@@ -28,9 +28,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.quartz.autoconfigure.QuartzAutoConfiguration;
+import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint;
-import org.springframework.boot.quartz.endpoint.QuartzEndpoint;
+import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpointWebExtension;
-import org.springframework.boot.quartz.endpoint.QuartzEndpointWebExtension;
 import org.springframework.context.annotation.Bean;
 
 /**

module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/autoconfigure/QuartzEndpointProperties.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.quartz.autoconfigure.endpoint;
+package org.springframework.boot.quartz.autoconfigure;
 
 import java.util.HashSet;
 import java.util.Set;
 
 import org.springframework.boot.actuate.endpoint.Show;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.quartz.endpoint.QuartzEndpoint;
+import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint;
 
 /**
  * Configuration properties for {@link QuartzEndpoint}.

module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/autoconfigure/endpoint/package-info.java

@@ -1,23 +0,0 @@
-/*
- * Copyright 2012-present the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Auto-configuration for Quartz Scheduler endpoint.
- */
-@NullMarked
-package org.springframework.boot.quartz.autoconfigure.endpoint;
-
-import org.jspecify.annotations.NullMarked;

module/spring-boot-quartz/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,2 +1,2 @@
 org.springframework.boot.quartz.autoconfigure.QuartzAutoConfiguration
-org.springframework.boot.quartz.autoconfigure.endpoint.QuartzEndpointAutoConfiguration
+org.springframework.boot.quartz.autoconfigure.QuartzEndpointAutoConfiguration

module/spring-boot-quartz/src/test/java/org/springframework/boot/quartz/actuate/endpoint/QuartzEndpointTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.quartz.endpoint;
+package org.springframework.boot.quartz.actuate.endpoint;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -62,12 +62,12 @@ import org.quartz.TriggerKey;
 import org.quartz.impl.matchers.GroupMatcher;
 import org.quartz.spi.OperableTrigger;
 
-import org.springframework.boot.quartz.endpoint.QuartzEndpoint.QuartzDescriptor;
+import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint.QuartzDescriptor;
-import org.springframework.boot.quartz.endpoint.QuartzEndpoint.QuartzJobDetailsDescriptor;
+import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint.QuartzJobDetailsDescriptor;
-import org.springframework.boot.quartz.endpoint.QuartzEndpoint.QuartzJobGroupSummaryDescriptor;
+import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint.QuartzJobGroupSummaryDescriptor;
-import org.springframework.boot.quartz.endpoint.QuartzEndpoint.QuartzJobSummaryDescriptor;
+import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint.QuartzJobSummaryDescriptor;
-import org.springframework.boot.quartz.endpoint.QuartzEndpoint.QuartzJobTriggerDescriptor;
+import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint.QuartzJobTriggerDescriptor;
-import org.springframework.boot.quartz.endpoint.QuartzEndpoint.QuartzTriggerGroupSummaryDescriptor;
+import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint.QuartzTriggerGroupSummaryDescriptor;
 import org.springframework.scheduling.quartz.DelegatingJob;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;

module/spring-boot-quartz/src/test/java/org/springframework/boot/quartz/actuate/endpoint/QuartzEndpointWebExtensionTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.quartz.endpoint;
+package org.springframework.boot.quartz.actuate.endpoint;
 
 import java.security.Principal;
 import java.util.Collections;
@@ -28,11 +28,11 @@ import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
 import org.springframework.boot.actuate.endpoint.SecurityContext;
 import org.springframework.boot.actuate.endpoint.Show;
-import org.springframework.boot.quartz.endpoint.QuartzEndpoint.QuartzGroupsDescriptor;
+import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint.QuartzGroupsDescriptor;
-import org.springframework.boot.quartz.endpoint.QuartzEndpoint.QuartzJobDetailsDescriptor;
+import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint.QuartzJobDetailsDescriptor;
-import org.springframework.boot.quartz.endpoint.QuartzEndpoint.QuartzJobGroupSummaryDescriptor;
+import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint.QuartzJobGroupSummaryDescriptor;
-import org.springframework.boot.quartz.endpoint.QuartzEndpoint.QuartzTriggerGroupSummaryDescriptor;
+import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint.QuartzTriggerGroupSummaryDescriptor;
-import org.springframework.boot.quartz.endpoint.QuartzEndpointWebExtension.QuartzEndpointWebExtensionRuntimeHints;
+import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpointWebExtension.QuartzEndpointWebExtensionRuntimeHints;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;

module/spring-boot-quartz/src/test/java/org/springframework/boot/quartz/actuate/endpoint/QuartzEndpointWebIntegrationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.quartz.endpoint;
+package org.springframework.boot.quartz.actuate.endpoint;
 
 import java.util.ArrayList;
 import java.util.Collections;

module/spring-boot-quartz/src/test/java/org/springframework/boot/quartz/autoconfigure/QuartzEndpointAutoConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.quartz.autoconfigure.endpoint;
+package org.springframework.boot.quartz.autoconfigure;
 
 import java.util.Collections;
 import java.util.Set;
@@ -24,8 +24,8 @@ import org.quartz.Scheduler;
 
 import org.springframework.boot.actuate.endpoint.Show;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.quartz.endpoint.QuartzEndpoint;
+import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint;
-import org.springframework.boot.quartz.endpoint.QuartzEndpointWebExtension;
+import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpointWebExtension;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

module/spring-boot-session/src/main/java/org/springframework/boot/session/actuate/endpoint/ReactiveSessionsEndpoint.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.session.endpoint;
+package org.springframework.boot.session.actuate.endpoint;
 
 import org.jspecify.annotations.Nullable;
 import reactor.core.publisher.Mono;
@@ -23,7 +23,7 @@ import org.springframework.boot.actuate.endpoint.annotation.DeleteOperation;
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
 import org.springframework.boot.actuate.endpoint.annotation.Selector;
-import org.springframework.boot.session.endpoint.SessionsDescriptor.SessionDescriptor;
+import org.springframework.boot.session.actuate.endpoint.SessionsDescriptor.SessionDescriptor;
 import org.springframework.session.ReactiveFindByIndexNameSessionRepository;
 import org.springframework.session.ReactiveSessionRepository;
 import org.springframework.session.Session;

module/spring-boot-session/src/main/java/org/springframework/boot/session/actuate/endpoint/SessionsDescriptor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.session.endpoint;
+package org.springframework.boot.session.actuate.endpoint;
 
 import java.time.Instant;
 import java.util.List;

module/spring-boot-session/src/main/java/org/springframework/boot/session/actuate/endpoint/SessionsEndpoint.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.session.endpoint;
+package org.springframework.boot.session.actuate.endpoint;
 
 import java.util.Map;
 
@@ -24,7 +24,7 @@ import org.springframework.boot.actuate.endpoint.annotation.DeleteOperation;
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
 import org.springframework.boot.actuate.endpoint.annotation.Selector;
-import org.springframework.boot.session.endpoint.SessionsDescriptor.SessionDescriptor;
+import org.springframework.boot.session.actuate.endpoint.SessionsDescriptor.SessionDescriptor;
 import org.springframework.session.FindByIndexNameSessionRepository;
 import org.springframework.session.Session;
 import org.springframework.session.SessionRepository;

module/spring-boot-session/src/main/java/org/springframework/boot/session/actuate/endpoint/package-info.java

@@ -18,6 +18,6 @@
  * Actuator endpoint for Spring Session.
  */
 @NullMarked
-package org.springframework.boot.session.endpoint;
+package org.springframework.boot.session.actuate.endpoint;
 
 import org.jspecify.annotations.NullMarked;

module/spring-boot-session/src/main/java/org/springframework/boot/session/autoconfigure/SessionsEndpointAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.session.autoconfigure.endpoint;
+package org.springframework.boot.session.autoconfigure;
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint;
@@ -25,9 +25,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
-import org.springframework.boot.session.autoconfigure.SessionAutoConfiguration;
+import org.springframework.boot.session.actuate.endpoint.ReactiveSessionsEndpoint;
-import org.springframework.boot.session.endpoint.ReactiveSessionsEndpoint;
+import org.springframework.boot.session.actuate.endpoint.SessionsEndpoint;
-import org.springframework.boot.session.endpoint.SessionsEndpoint;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.session.FindByIndexNameSessionRepository;

module/spring-boot-session/src/main/java/org/springframework/boot/session/autoconfigure/endpoint/package-info.java

@@ -1,23 +0,0 @@
-/*
- * Copyright 2012-present the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Auto-configuration for Spring Session endpoint.
- */
-@NullMarked
-package org.springframework.boot.session.autoconfigure.endpoint;
-
-import org.jspecify.annotations.NullMarked;

module/spring-boot-session/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,2 +1,2 @@
 org.springframework.boot.session.autoconfigure.SessionAutoConfiguration
-org.springframework.boot.session.autoconfigure.endpoint.SessionsEndpointAutoConfiguration
+org.springframework.boot.session.autoconfigure.SessionsEndpointAutoConfiguration

module/spring-boot-session/src/test/java/org/springframework/boot/session/actuate/endpoint/ReactiveSessionsEndpointTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.session.endpoint;
+package org.springframework.boot.session.actuate.endpoint;
 
 import java.time.Duration;
 import java.util.Collections;
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-import org.springframework.boot.session.endpoint.SessionsDescriptor.SessionDescriptor;
+import org.springframework.boot.session.actuate.endpoint.SessionsDescriptor.SessionDescriptor;
 import org.springframework.session.MapSession;
 import org.springframework.session.ReactiveFindByIndexNameSessionRepository;
 import org.springframework.session.ReactiveSessionRepository;

module/spring-boot-session/src/test/java/org/springframework/boot/session/actuate/endpoint/ReactiveSessionsEndpointWebIntegrationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.session.endpoint;
+package org.springframework.boot.session.actuate.endpoint;
 
 import java.util.Collections;
 

module/spring-boot-session/src/test/java/org/springframework/boot/session/actuate/endpoint/SessionsEndpointTests.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.session.endpoint;
+package org.springframework.boot.session.actuate.endpoint;
 
 import java.util.Collections;
 import java.util.List;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.session.endpoint.SessionsDescriptor.SessionDescriptor;
+import org.springframework.boot.session.actuate.endpoint.SessionsDescriptor.SessionDescriptor;
 import org.springframework.session.FindByIndexNameSessionRepository;
 import org.springframework.session.MapSession;
 import org.springframework.session.Session;

module/spring-boot-session/src/test/java/org/springframework/boot/session/actuate/endpoint/SessionsEndpointWebIntegrationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.session.endpoint;
+package org.springframework.boot.session.actuate.endpoint;
 
 import java.util.Collections;
 

module/spring-boot-session/src/test/java/org/springframework/boot/session/autoconfigure/SessionsEndpointAutoConfigurationTests.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.session.autoconfigure.endpoint;
+package org.springframework.boot.session.autoconfigure;
 
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.session.endpoint.ReactiveSessionsEndpoint;
+import org.springframework.boot.session.actuate.endpoint.ReactiveSessionsEndpoint;
-import org.springframework.boot.session.endpoint.SessionsEndpoint;
+import org.springframework.boot.session.actuate.endpoint.SessionsEndpoint;
 import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
 import org.springframework.context.annotation.Bean;