From ddf26080d606caa441c7dd4480e7df2c6c1ff311 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 13 Oct 2025 18:12:22 -0700 Subject: [PATCH] Rationalize endpoint packages Use consistent packages for endpoints and endpoint auto-configuration. Closes gh-47606 --- .../FlywayEndpointDocumentationTests.java | 2 +- ...rationGraphEndpointDocumentationTests.java | 2 +- .../LiquibaseEndpointDocumentationTests.java | 2 +- ...theusScrapeEndpointDocumentationTests.java | 2 +- .../QuartzEndpointDocumentationTests.java | 4 ++-- .../SessionsEndpointDocumentationTests.java | 2 +- ...metheusScrapeEndpointIntegrationTests.java | 2 +- .../CachesEndpointAutoConfiguration.java | 3 +-- .../autoconfigure/endpoint/package-info.java | 23 ------------------- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../CachesEndpointAutoConfigurationTests.java | 3 ++- .../endpoint/FlywayEndpoint.java | 2 +- .../{ => actuate}/endpoint/package-info.java | 2 +- .../FlywayEndpointAutoConfiguration.java | 5 ++-- .../autoconfigure/endpoint/package-info.java | 23 ------------------- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../FlywayEndpointAutoConfigurationTests.java | 5 ++-- .../flyway/endpoint/FlywayEndpointTests.java | 5 ++-- .../endpoint/IntegrationGraphEndpoint.java | 2 +- .../{ => actuate}/endpoint/package-info.java | 2 +- ...grationGraphEndpointAutoConfiguration.java | 5 ++-- .../autoconfigure/endpoint/package-info.java | 23 ------------------- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- ...onGraphEndpointAutoConfigurationTests.java | 3 ++- ...egrationMetricsAutoConfigurationTests.java | 2 +- .../IntegrationGraphEndpointTests.java | 3 ++- ...ationGraphEndpointWebIntegrationTests.java | 1 + .../endpoint/LiquibaseEndpoint.java | 2 +- .../{ => actuate}/endpoint/package-info.java | 2 +- .../LiquibaseEndpointAutoConfiguration.java | 6 ++--- .../autoconfigure/endpoint/package-info.java | 23 ------------------- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- ...quibaseEndpointAutoConfigurationTests.java | 3 ++- .../endpoint/LiquibaseEndpointTests.java | 6 ++--- ...metheusMetricsExportAutoConfiguration.java | 1 - .../prometheus}/PrometheusOutputFormat.java | 2 +- .../prometheus}/PrometheusScrapeEndpoint.java | 2 +- ...usMetricsExportAutoConfigurationTests.java | 1 - .../endpoint/QuartzEndpoint.java | 2 +- .../endpoint/QuartzEndpointWebExtension.java | 12 +++++----- .../{ => actuate}/endpoint/package-info.java | 2 +- .../QuartzEndpointAutoConfiguration.java | 7 +++--- .../QuartzEndpointProperties.java | 4 ++-- .../autoconfigure/endpoint/package-info.java | 23 ------------------- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../endpoint/QuartzEndpointTests.java | 14 +++++------ .../QuartzEndpointWebExtensionTests.java | 12 +++++----- .../QuartzEndpointWebIntegrationTests.java | 2 +- .../QuartzEndpointAutoConfigurationTests.java | 6 ++--- .../endpoint/ReactiveSessionsEndpoint.java | 4 ++-- .../endpoint/SessionsDescriptor.java | 2 +- .../endpoint/SessionsEndpoint.java | 4 ++-- .../{ => actuate}/endpoint/package-info.java | 2 +- .../SessionsEndpointAutoConfiguration.java | 7 +++--- .../autoconfigure/endpoint/package-info.java | 23 ------------------- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../ReactiveSessionsEndpointTests.java | 4 ++-- ...veSessionsEndpointWebIntegrationTests.java | 2 +- .../endpoint/SessionsEndpointTests.java | 4 ++-- .../SessionsEndpointWebIntegrationTests.java | 2 +- ...essionsEndpointAutoConfigurationTests.java | 6 ++--- 61 files changed, 96 insertions(+), 236 deletions(-) rename module/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/{endpoint => }/CachesEndpointAutoConfiguration.java (94%) delete mode 100644 module/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/endpoint/package-info.java rename module/spring-boot-cache/src/test/java/org/springframework/boot/cache/autoconfigure/{ => actuate}/endpoint/CachesEndpointAutoConfigurationTests.java (95%) rename module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/{ => actuate}/endpoint/FlywayEndpoint.java (99%) rename module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/{ => actuate}/endpoint/package-info.java (92%) rename module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/autoconfigure/{endpoint => }/FlywayEndpointAutoConfiguration.java (89%) delete mode 100644 module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/autoconfigure/endpoint/package-info.java rename module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/autoconfigure/{ => actuate}/endpoint/FlywayEndpointAutoConfigurationTests.java (89%) rename module/spring-boot-integration/src/main/java/org/springframework/boot/integration/{ => actuate}/endpoint/IntegrationGraphEndpoint.java (97%) rename module/spring-boot-integration/src/main/java/org/springframework/boot/integration/{ => actuate}/endpoint/package-info.java (92%) rename module/spring-boot-integration/src/main/java/org/springframework/boot/integration/autoconfigure/{endpoint => }/IntegrationGraphEndpointAutoConfiguration.java (90%) delete mode 100644 module/spring-boot-integration/src/main/java/org/springframework/boot/integration/autoconfigure/endpoint/package-info.java rename module/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/{ => actuate}/endpoint/LiquibaseEndpoint.java (99%) rename module/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/{ => actuate}/endpoint/package-info.java (92%) rename module/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/autoconfigure/{endpoint => }/LiquibaseEndpointAutoConfiguration.java (89%) delete mode 100644 module/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/autoconfigure/endpoint/package-info.java rename module/spring-boot-liquibase/src/test/java/org/springframework/boot/liquibase/{actuate => }/endpoint/LiquibaseEndpointTests.java (97%) rename module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/{export/prometheus/endpoint => autoconfigure/export/prometheus}/PrometheusOutputFormat.java (97%) rename module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/{export/prometheus/endpoint => autoconfigure/export/prometheus}/PrometheusScrapeEndpoint.java (97%) rename module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/{ => actuate}/endpoint/QuartzEndpoint.java (99%) rename module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/{ => actuate}/endpoint/QuartzEndpointWebExtension.java (89%) rename module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/{ => actuate}/endpoint/package-info.java (92%) rename module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/autoconfigure/{endpoint => }/QuartzEndpointAutoConfiguration.java (90%) rename module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/autoconfigure/{endpoint => }/QuartzEndpointProperties.java (92%) delete mode 100644 module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/autoconfigure/endpoint/package-info.java rename module/spring-boot-quartz/src/test/java/org/springframework/boot/quartz/{ => actuate}/endpoint/QuartzEndpointTests.java (98%) rename module/spring-boot-quartz/src/test/java/org/springframework/boot/quartz/{ => actuate}/endpoint/QuartzEndpointWebExtensionTests.java (88%) rename module/spring-boot-quartz/src/test/java/org/springframework/boot/quartz/{ => actuate}/endpoint/QuartzEndpointWebIntegrationTests.java (99%) rename module/spring-boot-quartz/src/test/java/org/springframework/boot/quartz/autoconfigure/{endpoint => }/QuartzEndpointAutoConfigurationTests.java (95%) rename module/spring-boot-session/src/main/java/org/springframework/boot/session/{ => actuate}/endpoint/ReactiveSessionsEndpoint.java (94%) rename module/spring-boot-session/src/main/java/org/springframework/boot/session/{ => actuate}/endpoint/SessionsDescriptor.java (97%) rename module/spring-boot-session/src/main/java/org/springframework/boot/session/{ => actuate}/endpoint/SessionsEndpoint.java (94%) rename module/spring-boot-session/src/main/java/org/springframework/boot/session/{ => actuate}/endpoint/package-info.java (92%) rename module/spring-boot-session/src/main/java/org/springframework/boot/session/autoconfigure/{endpoint => }/SessionsEndpointAutoConfiguration.java (92%) delete mode 100644 module/spring-boot-session/src/main/java/org/springframework/boot/session/autoconfigure/endpoint/package-info.java rename module/spring-boot-session/src/test/java/org/springframework/boot/session/{ => actuate}/endpoint/ReactiveSessionsEndpointTests.java (96%) rename module/spring-boot-session/src/test/java/org/springframework/boot/session/{ => actuate}/endpoint/ReactiveSessionsEndpointWebIntegrationTests.java (98%) rename module/spring-boot-session/src/test/java/org/springframework/boot/session/{ => actuate}/endpoint/SessionsEndpointTests.java (96%) rename module/spring-boot-session/src/test/java/org/springframework/boot/session/{ => actuate}/endpoint/SessionsEndpointWebIntegrationTests.java (98%) rename module/spring-boot-session/src/test/java/org/springframework/boot/session/autoconfigure/{endpoint => }/SessionsEndpointAutoConfigurationTests.java (96%) diff --git a/documentation/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/flyway/FlywayEndpointDocumentationTests.java b/documentation/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/flyway/FlywayEndpointDocumentationTests.java index 8d68fe05088..62533eb8dc9 100644 --- a/documentation/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/flyway/FlywayEndpointDocumentationTests.java +++ b/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; diff --git a/documentation/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/integration/IntegrationGraphEndpointDocumentationTests.java b/documentation/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/integration/IntegrationGraphEndpointDocumentationTests.java index 1f52ee8463a..502cae25bfc 100644 --- a/documentation/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/integration/IntegrationGraphEndpointDocumentationTests.java +++ b/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; diff --git a/documentation/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/liquibase/LiquibaseEndpointDocumentationTests.java b/documentation/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/liquibase/LiquibaseEndpointDocumentationTests.java index e4414dc672a..6a3809d297f 100644 --- a/documentation/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/liquibase/LiquibaseEndpointDocumentationTests.java +++ b/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; diff --git a/documentation/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/metrics/export/prometheus/PrometheusScrapeEndpointDocumentationTests.java b/documentation/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/metrics/export/prometheus/PrometheusScrapeEndpointDocumentationTests.java index 0a0efbd8fe9..e1389474301 100644 --- a/documentation/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/metrics/export/prometheus/PrometheusScrapeEndpointDocumentationTests.java +++ b/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; diff --git a/documentation/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/quartz/QuartzEndpointDocumentationTests.java b/documentation/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/quartz/QuartzEndpointDocumentationTests.java index 2ce8eb0ef4a..ae01b8db90a 100644 --- a/documentation/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/quartz/QuartzEndpointDocumentationTests.java +++ b/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.endpoint.QuartzEndpointWebExtension; +import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint; +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; diff --git a/documentation/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/session/SessionsEndpointDocumentationTests.java b/documentation/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/session/SessionsEndpointDocumentationTests.java index 7eacf46cb4f..04af323959f 100644 --- a/documentation/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/session/SessionsEndpointDocumentationTests.java +++ b/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; diff --git a/integration-test/spring-boot-actuator-integration-tests/src/test/java/org/springframework/boot/actuate/metrics/export/prometheus/PrometheusScrapeEndpointIntegrationTests.java b/integration-test/spring-boot-actuator-integration-tests/src/test/java/org/springframework/boot/actuate/metrics/export/prometheus/PrometheusScrapeEndpointIntegrationTests.java index d9ee1c032d6..5dbe54da362 100644 --- a/integration-test/spring-boot-actuator-integration-tests/src/test/java/org/springframework/boot/actuate/metrics/export/prometheus/PrometheusScrapeEndpointIntegrationTests.java +++ b/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; diff --git a/module/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/endpoint/CachesEndpointAutoConfiguration.java b/module/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/CachesEndpointAutoConfiguration.java similarity index 94% rename from module/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/endpoint/CachesEndpointAutoConfiguration.java rename to module/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/CachesEndpointAutoConfiguration.java index 87babcd6242..584c5c42ded 100644 --- a/module/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/endpoint/CachesEndpointAutoConfiguration.java +++ b/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; diff --git a/module/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/endpoint/package-info.java b/module/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/endpoint/package-info.java deleted file mode 100644 index e260f738584..00000000000 --- a/module/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/endpoint/package-info.java +++ /dev/null @@ -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; diff --git a/module/spring-boot-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/module/spring-boot-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 5818459d0b0..17aba5ee555 100644 --- a/module/spring-boot-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/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 diff --git a/module/spring-boot-cache/src/test/java/org/springframework/boot/cache/autoconfigure/endpoint/CachesEndpointAutoConfigurationTests.java b/module/spring-boot-cache/src/test/java/org/springframework/boot/cache/autoconfigure/actuate/endpoint/CachesEndpointAutoConfigurationTests.java similarity index 95% rename from module/spring-boot-cache/src/test/java/org/springframework/boot/cache/autoconfigure/endpoint/CachesEndpointAutoConfigurationTests.java rename to module/spring-boot-cache/src/test/java/org/springframework/boot/cache/autoconfigure/actuate/endpoint/CachesEndpointAutoConfigurationTests.java index 72916d71cff..d619d9fbe50 100644 --- a/module/spring-boot-cache/src/test/java/org/springframework/boot/cache/autoconfigure/endpoint/CachesEndpointAutoConfigurationTests.java +++ b/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; diff --git a/module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/endpoint/FlywayEndpoint.java b/module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/actuate/endpoint/FlywayEndpoint.java similarity index 99% rename from module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/endpoint/FlywayEndpoint.java rename to module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/actuate/endpoint/FlywayEndpoint.java index 6ff9bdee425..a83fd5574e0 100644 --- a/module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/endpoint/FlywayEndpoint.java +++ b/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; diff --git a/module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/endpoint/package-info.java b/module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/actuate/endpoint/package-info.java similarity index 92% rename from module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/endpoint/package-info.java rename to module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/actuate/endpoint/package-info.java index a538788d928..251919a4da0 100644 --- a/module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/endpoint/package-info.java +++ b/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; diff --git a/module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/autoconfigure/endpoint/FlywayEndpointAutoConfiguration.java b/module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/autoconfigure/FlywayEndpointAutoConfiguration.java similarity index 89% rename from module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/autoconfigure/endpoint/FlywayEndpointAutoConfiguration.java rename to module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/autoconfigure/FlywayEndpointAutoConfiguration.java index 7ba35587eb4..32a8378ea46 100644 --- a/module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/autoconfigure/endpoint/FlywayEndpointAutoConfiguration.java +++ b/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.endpoint.FlywayEndpoint; +import org.springframework.boot.flyway.actuate.endpoint.FlywayEndpoint; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/autoconfigure/endpoint/package-info.java b/module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/autoconfigure/endpoint/package-info.java deleted file mode 100644 index b67b9a5e5a6..00000000000 --- a/module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/autoconfigure/endpoint/package-info.java +++ /dev/null @@ -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; diff --git a/module/spring-boot-flyway/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/module/spring-boot-flyway/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 940699ac900..28a70db4ea7 100644 --- a/module/spring-boot-flyway/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/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 diff --git a/module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/autoconfigure/endpoint/FlywayEndpointAutoConfigurationTests.java b/module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/autoconfigure/actuate/endpoint/FlywayEndpointAutoConfigurationTests.java similarity index 89% rename from module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/autoconfigure/endpoint/FlywayEndpointAutoConfigurationTests.java rename to module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/autoconfigure/actuate/endpoint/FlywayEndpointAutoConfigurationTests.java index 020fde5c2e0..2ea0fc4d475 100644 --- a/module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/autoconfigure/endpoint/FlywayEndpointAutoConfigurationTests.java +++ b/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; 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/endpoint/FlywayEndpointTests.java index 5d10705ef7b..32946d3c211 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/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; diff --git a/module/spring-boot-integration/src/main/java/org/springframework/boot/integration/endpoint/IntegrationGraphEndpoint.java b/module/spring-boot-integration/src/main/java/org/springframework/boot/integration/actuate/endpoint/IntegrationGraphEndpoint.java similarity index 97% rename from module/spring-boot-integration/src/main/java/org/springframework/boot/integration/endpoint/IntegrationGraphEndpoint.java rename to module/spring-boot-integration/src/main/java/org/springframework/boot/integration/actuate/endpoint/IntegrationGraphEndpoint.java index 448841df97d..11f32a2054e 100644 --- a/module/spring-boot-integration/src/main/java/org/springframework/boot/integration/endpoint/IntegrationGraphEndpoint.java +++ b/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; diff --git a/module/spring-boot-integration/src/main/java/org/springframework/boot/integration/endpoint/package-info.java b/module/spring-boot-integration/src/main/java/org/springframework/boot/integration/actuate/endpoint/package-info.java similarity index 92% rename from module/spring-boot-integration/src/main/java/org/springframework/boot/integration/endpoint/package-info.java rename to module/spring-boot-integration/src/main/java/org/springframework/boot/integration/actuate/endpoint/package-info.java index 0dbe014c2b2..c7414357ff2 100644 --- a/module/spring-boot-integration/src/main/java/org/springframework/boot/integration/endpoint/package-info.java +++ b/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; diff --git a/module/spring-boot-integration/src/main/java/org/springframework/boot/integration/autoconfigure/endpoint/IntegrationGraphEndpointAutoConfiguration.java b/module/spring-boot-integration/src/main/java/org/springframework/boot/integration/autoconfigure/IntegrationGraphEndpointAutoConfiguration.java similarity index 90% rename from module/spring-boot-integration/src/main/java/org/springframework/boot/integration/autoconfigure/endpoint/IntegrationGraphEndpointAutoConfiguration.java rename to module/spring-boot-integration/src/main/java/org/springframework/boot/integration/autoconfigure/IntegrationGraphEndpointAutoConfiguration.java index 931e0bb727f..464845320b7 100644 --- a/module/spring-boot-integration/src/main/java/org/springframework/boot/integration/autoconfigure/endpoint/IntegrationGraphEndpointAutoConfiguration.java +++ b/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.endpoint.IntegrationGraphEndpoint; +import org.springframework.boot.integration.actuate.endpoint.IntegrationGraphEndpoint; import org.springframework.context.annotation.Bean; import org.springframework.integration.config.IntegrationConfigurationBeanFactoryPostProcessor; import org.springframework.integration.graph.IntegrationGraphServer; diff --git a/module/spring-boot-integration/src/main/java/org/springframework/boot/integration/autoconfigure/endpoint/package-info.java b/module/spring-boot-integration/src/main/java/org/springframework/boot/integration/autoconfigure/endpoint/package-info.java deleted file mode 100644 index c093abdb94f..00000000000 --- a/module/spring-boot-integration/src/main/java/org/springframework/boot/integration/autoconfigure/endpoint/package-info.java +++ /dev/null @@ -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; diff --git a/module/spring-boot-integration/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/module/spring-boot-integration/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index f67355c6e43..1495f60a5dd 100644 --- a/module/spring-boot-integration/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/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 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/endpoint/IntegrationGraphEndpointAutoConfigurationTests.java index aebf7d5b510..7153da3e698 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/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; diff --git a/module/spring-boot-integration/src/test/java/org/springframework/boot/integration/autoconfigure/metrics/IntegrationMetricsAutoConfigurationTests.java b/module/spring-boot-integration/src/test/java/org/springframework/boot/integration/autoconfigure/metrics/IntegrationMetricsAutoConfigurationTests.java index 355d59d61a2..a3a5256ec81 100644 --- a/module/spring-boot-integration/src/test/java/org/springframework/boot/integration/autoconfigure/metrics/IntegrationMetricsAutoConfigurationTests.java +++ b/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; 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/endpoint/IntegrationGraphEndpointTests.java index 87ee239735e..7285b4e62a9 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/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; 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/endpoint/IntegrationGraphEndpointWebIntegrationTests.java index dfc2a62d783..e319f74aad9 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/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; diff --git a/module/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/endpoint/LiquibaseEndpoint.java b/module/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/actuate/endpoint/LiquibaseEndpoint.java similarity index 99% rename from module/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/endpoint/LiquibaseEndpoint.java rename to module/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/actuate/endpoint/LiquibaseEndpoint.java index d44a73fc313..46b11c98c8e 100644 --- a/module/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/endpoint/LiquibaseEndpoint.java +++ b/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; diff --git a/module/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/endpoint/package-info.java b/module/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/actuate/endpoint/package-info.java similarity index 92% rename from module/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/endpoint/package-info.java rename to module/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/actuate/endpoint/package-info.java index 5d9e03bd954..6b6ef063675 100644 --- a/module/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/endpoint/package-info.java +++ b/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; diff --git a/module/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/autoconfigure/endpoint/LiquibaseEndpointAutoConfiguration.java b/module/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/autoconfigure/LiquibaseEndpointAutoConfiguration.java similarity index 89% rename from module/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/autoconfigure/endpoint/LiquibaseEndpointAutoConfiguration.java rename to module/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/autoconfigure/LiquibaseEndpointAutoConfiguration.java index 3e6fc35db86..b46e1d872cc 100644 --- a/module/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/autoconfigure/endpoint/LiquibaseEndpointAutoConfiguration.java +++ b/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.autoconfigure.LiquibaseAutoConfiguration; -import org.springframework.boot.liquibase.endpoint.LiquibaseEndpoint; +import org.springframework.boot.liquibase.actuate.endpoint.LiquibaseEndpoint; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/module/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/autoconfigure/endpoint/package-info.java b/module/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/autoconfigure/endpoint/package-info.java deleted file mode 100644 index 31161af0676..00000000000 --- a/module/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/autoconfigure/endpoint/package-info.java +++ /dev/null @@ -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; diff --git a/module/spring-boot-liquibase/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/module/spring-boot-liquibase/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index bb4b46df140..2418d6ff145 100644 --- a/module/spring-boot-liquibase/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/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 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/endpoint/LiquibaseEndpointAutoConfigurationTests.java index 4205d627d77..50d150f00bf 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/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; diff --git a/module/spring-boot-liquibase/src/test/java/org/springframework/boot/liquibase/actuate/endpoint/LiquibaseEndpointTests.java b/module/spring-boot-liquibase/src/test/java/org/springframework/boot/liquibase/endpoint/LiquibaseEndpointTests.java similarity index 97% rename from module/spring-boot-liquibase/src/test/java/org/springframework/boot/liquibase/actuate/endpoint/LiquibaseEndpointTests.java rename to module/spring-boot-liquibase/src/test/java/org/springframework/boot/liquibase/endpoint/LiquibaseEndpointTests.java index 17da0a520d6..279e1f280ca 100644 --- a/module/spring-boot-liquibase/src/test/java/org/springframework/boot/liquibase/actuate/endpoint/LiquibaseEndpointTests.java +++ b/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; diff --git a/module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/autoconfigure/export/prometheus/PrometheusMetricsExportAutoConfiguration.java b/module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/autoconfigure/export/prometheus/PrometheusMetricsExportAutoConfiguration.java index 0780a47e1bc..7811b02a01a 100644 --- a/module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/autoconfigure/export/prometheus/PrometheusMetricsExportAutoConfiguration.java +++ b/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; diff --git a/module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/export/prometheus/endpoint/PrometheusOutputFormat.java b/module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/autoconfigure/export/prometheus/PrometheusOutputFormat.java similarity index 97% rename from module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/export/prometheus/endpoint/PrometheusOutputFormat.java rename to module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/autoconfigure/export/prometheus/PrometheusOutputFormat.java index 24b9ce52faf..e63f8ad6f40 100644 --- a/module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/export/prometheus/endpoint/PrometheusOutputFormat.java +++ b/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; diff --git a/module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/export/prometheus/endpoint/PrometheusScrapeEndpoint.java b/module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/autoconfigure/export/prometheus/PrometheusScrapeEndpoint.java similarity index 97% rename from module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/export/prometheus/endpoint/PrometheusScrapeEndpoint.java rename to module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/autoconfigure/export/prometheus/PrometheusScrapeEndpoint.java index 67a88844943..dbd3489ed54 100644 --- a/module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/export/prometheus/endpoint/PrometheusScrapeEndpoint.java +++ b/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; diff --git a/module/spring-boot-micrometer-metrics/src/test/java/org/springframework/boot/micrometer/metrics/autoconfigure/export/prometheus/PrometheusMetricsExportAutoConfigurationTests.java b/module/spring-boot-micrometer-metrics/src/test/java/org/springframework/boot/micrometer/metrics/autoconfigure/export/prometheus/PrometheusMetricsExportAutoConfigurationTests.java index 52bda056ef8..7838e3f4a9a 100644 --- a/module/spring-boot-micrometer-metrics/src/test/java/org/springframework/boot/micrometer/metrics/autoconfigure/export/prometheus/PrometheusMetricsExportAutoConfigurationTests.java +++ b/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; diff --git a/module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/endpoint/QuartzEndpoint.java b/module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/actuate/endpoint/QuartzEndpoint.java similarity index 99% rename from module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/endpoint/QuartzEndpoint.java rename to module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/actuate/endpoint/QuartzEndpoint.java index 427970fddcf..9a236fa2dc9 100644 --- a/module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/endpoint/QuartzEndpoint.java +++ b/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; diff --git a/module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/endpoint/QuartzEndpointWebExtension.java b/module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/actuate/endpoint/QuartzEndpointWebExtension.java similarity index 89% rename from module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/endpoint/QuartzEndpointWebExtension.java rename to module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/actuate/endpoint/QuartzEndpointWebExtension.java index 1fc2e33e7c9..19129fc05cf 100644 --- a/module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/endpoint/QuartzEndpointWebExtension.java +++ b/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.endpoint.QuartzEndpoint.QuartzJobDetailsDescriptor; -import org.springframework.boot.quartz.endpoint.QuartzEndpoint.QuartzJobGroupSummaryDescriptor; -import org.springframework.boot.quartz.endpoint.QuartzEndpoint.QuartzTriggerGroupSummaryDescriptor; -import org.springframework.boot.quartz.endpoint.QuartzEndpointWebExtension.QuartzEndpointWebExtensionRuntimeHints; +import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint.QuartzGroupsDescriptor; +import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint.QuartzJobDetailsDescriptor; +import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint.QuartzJobGroupSummaryDescriptor; +import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint.QuartzTriggerGroupSummaryDescriptor; +import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpointWebExtension.QuartzEndpointWebExtensionRuntimeHints; import org.springframework.context.annotation.ImportRuntimeHints; /** diff --git a/module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/endpoint/package-info.java b/module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/actuate/endpoint/package-info.java similarity index 92% rename from module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/endpoint/package-info.java rename to module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/actuate/endpoint/package-info.java index 6fdc3288291..88491bc4942 100644 --- a/module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/endpoint/package-info.java +++ b/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; diff --git a/module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/autoconfigure/endpoint/QuartzEndpointAutoConfiguration.java b/module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/autoconfigure/QuartzEndpointAutoConfiguration.java similarity index 90% rename from module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/autoconfigure/endpoint/QuartzEndpointAutoConfiguration.java rename to module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/autoconfigure/QuartzEndpointAutoConfiguration.java index 304104d5f51..10b17342123 100644 --- a/module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/autoconfigure/endpoint/QuartzEndpointAutoConfiguration.java +++ b/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.endpoint.QuartzEndpoint; -import org.springframework.boot.quartz.endpoint.QuartzEndpointWebExtension; +import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint; +import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpointWebExtension; import org.springframework.context.annotation.Bean; /** diff --git a/module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/autoconfigure/endpoint/QuartzEndpointProperties.java b/module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/autoconfigure/QuartzEndpointProperties.java similarity index 92% rename from module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/autoconfigure/endpoint/QuartzEndpointProperties.java rename to module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/autoconfigure/QuartzEndpointProperties.java index 02347d01441..176dd4b6e60 100644 --- a/module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/autoconfigure/endpoint/QuartzEndpointProperties.java +++ b/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}. diff --git a/module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/autoconfigure/endpoint/package-info.java b/module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/autoconfigure/endpoint/package-info.java deleted file mode 100644 index 98c403abe0a..00000000000 --- a/module/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/autoconfigure/endpoint/package-info.java +++ /dev/null @@ -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; diff --git a/module/spring-boot-quartz/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/module/spring-boot-quartz/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index e438fb1b841..ba57a2d5172 100644 --- a/module/spring-boot-quartz/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/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 diff --git a/module/spring-boot-quartz/src/test/java/org/springframework/boot/quartz/endpoint/QuartzEndpointTests.java b/module/spring-boot-quartz/src/test/java/org/springframework/boot/quartz/actuate/endpoint/QuartzEndpointTests.java similarity index 98% rename from module/spring-boot-quartz/src/test/java/org/springframework/boot/quartz/endpoint/QuartzEndpointTests.java rename to module/spring-boot-quartz/src/test/java/org/springframework/boot/quartz/actuate/endpoint/QuartzEndpointTests.java index fe948cb1ce4..c30f5abcaff 100644 --- a/module/spring-boot-quartz/src/test/java/org/springframework/boot/quartz/endpoint/QuartzEndpointTests.java +++ b/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.endpoint.QuartzEndpoint.QuartzJobDetailsDescriptor; -import org.springframework.boot.quartz.endpoint.QuartzEndpoint.QuartzJobGroupSummaryDescriptor; -import org.springframework.boot.quartz.endpoint.QuartzEndpoint.QuartzJobSummaryDescriptor; -import org.springframework.boot.quartz.endpoint.QuartzEndpoint.QuartzJobTriggerDescriptor; -import org.springframework.boot.quartz.endpoint.QuartzEndpoint.QuartzTriggerGroupSummaryDescriptor; +import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint.QuartzDescriptor; +import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint.QuartzJobDetailsDescriptor; +import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint.QuartzJobGroupSummaryDescriptor; +import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint.QuartzJobSummaryDescriptor; +import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint.QuartzJobTriggerDescriptor; +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; diff --git a/module/spring-boot-quartz/src/test/java/org/springframework/boot/quartz/endpoint/QuartzEndpointWebExtensionTests.java b/module/spring-boot-quartz/src/test/java/org/springframework/boot/quartz/actuate/endpoint/QuartzEndpointWebExtensionTests.java similarity index 88% rename from module/spring-boot-quartz/src/test/java/org/springframework/boot/quartz/endpoint/QuartzEndpointWebExtensionTests.java rename to module/spring-boot-quartz/src/test/java/org/springframework/boot/quartz/actuate/endpoint/QuartzEndpointWebExtensionTests.java index ee38b116049..095f0b537db 100644 --- a/module/spring-boot-quartz/src/test/java/org/springframework/boot/quartz/endpoint/QuartzEndpointWebExtensionTests.java +++ b/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.endpoint.QuartzEndpoint.QuartzJobDetailsDescriptor; -import org.springframework.boot.quartz.endpoint.QuartzEndpoint.QuartzJobGroupSummaryDescriptor; -import org.springframework.boot.quartz.endpoint.QuartzEndpoint.QuartzTriggerGroupSummaryDescriptor; -import org.springframework.boot.quartz.endpoint.QuartzEndpointWebExtension.QuartzEndpointWebExtensionRuntimeHints; +import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint.QuartzGroupsDescriptor; +import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint.QuartzJobDetailsDescriptor; +import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint.QuartzJobGroupSummaryDescriptor; +import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint.QuartzTriggerGroupSummaryDescriptor; +import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpointWebExtension.QuartzEndpointWebExtensionRuntimeHints; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; diff --git a/module/spring-boot-quartz/src/test/java/org/springframework/boot/quartz/endpoint/QuartzEndpointWebIntegrationTests.java b/module/spring-boot-quartz/src/test/java/org/springframework/boot/quartz/actuate/endpoint/QuartzEndpointWebIntegrationTests.java similarity index 99% rename from module/spring-boot-quartz/src/test/java/org/springframework/boot/quartz/endpoint/QuartzEndpointWebIntegrationTests.java rename to module/spring-boot-quartz/src/test/java/org/springframework/boot/quartz/actuate/endpoint/QuartzEndpointWebIntegrationTests.java index c7b2adb044e..ede099982bb 100644 --- a/module/spring-boot-quartz/src/test/java/org/springframework/boot/quartz/endpoint/QuartzEndpointWebIntegrationTests.java +++ b/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; diff --git a/module/spring-boot-quartz/src/test/java/org/springframework/boot/quartz/autoconfigure/endpoint/QuartzEndpointAutoConfigurationTests.java b/module/spring-boot-quartz/src/test/java/org/springframework/boot/quartz/autoconfigure/QuartzEndpointAutoConfigurationTests.java similarity index 95% rename from module/spring-boot-quartz/src/test/java/org/springframework/boot/quartz/autoconfigure/endpoint/QuartzEndpointAutoConfigurationTests.java rename to module/spring-boot-quartz/src/test/java/org/springframework/boot/quartz/autoconfigure/QuartzEndpointAutoConfigurationTests.java index 3aecea8714f..df34aec4141 100644 --- a/module/spring-boot-quartz/src/test/java/org/springframework/boot/quartz/autoconfigure/endpoint/QuartzEndpointAutoConfigurationTests.java +++ b/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.endpoint.QuartzEndpointWebExtension; +import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint; +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; diff --git a/module/spring-boot-session/src/main/java/org/springframework/boot/session/endpoint/ReactiveSessionsEndpoint.java b/module/spring-boot-session/src/main/java/org/springframework/boot/session/actuate/endpoint/ReactiveSessionsEndpoint.java similarity index 94% rename from module/spring-boot-session/src/main/java/org/springframework/boot/session/endpoint/ReactiveSessionsEndpoint.java rename to module/spring-boot-session/src/main/java/org/springframework/boot/session/actuate/endpoint/ReactiveSessionsEndpoint.java index 5bfd56b6bfe..1ed8e14063e 100644 --- a/module/spring-boot-session/src/main/java/org/springframework/boot/session/endpoint/ReactiveSessionsEndpoint.java +++ b/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; diff --git a/module/spring-boot-session/src/main/java/org/springframework/boot/session/endpoint/SessionsDescriptor.java b/module/spring-boot-session/src/main/java/org/springframework/boot/session/actuate/endpoint/SessionsDescriptor.java similarity index 97% rename from module/spring-boot-session/src/main/java/org/springframework/boot/session/endpoint/SessionsDescriptor.java rename to module/spring-boot-session/src/main/java/org/springframework/boot/session/actuate/endpoint/SessionsDescriptor.java index 0a6eaafd518..fddadd81663 100644 --- a/module/spring-boot-session/src/main/java/org/springframework/boot/session/endpoint/SessionsDescriptor.java +++ b/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; diff --git a/module/spring-boot-session/src/main/java/org/springframework/boot/session/endpoint/SessionsEndpoint.java b/module/spring-boot-session/src/main/java/org/springframework/boot/session/actuate/endpoint/SessionsEndpoint.java similarity index 94% rename from module/spring-boot-session/src/main/java/org/springframework/boot/session/endpoint/SessionsEndpoint.java rename to module/spring-boot-session/src/main/java/org/springframework/boot/session/actuate/endpoint/SessionsEndpoint.java index 03e89012216..e26f5869095 100644 --- a/module/spring-boot-session/src/main/java/org/springframework/boot/session/endpoint/SessionsEndpoint.java +++ b/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; diff --git a/module/spring-boot-session/src/main/java/org/springframework/boot/session/endpoint/package-info.java b/module/spring-boot-session/src/main/java/org/springframework/boot/session/actuate/endpoint/package-info.java similarity index 92% rename from module/spring-boot-session/src/main/java/org/springframework/boot/session/endpoint/package-info.java rename to module/spring-boot-session/src/main/java/org/springframework/boot/session/actuate/endpoint/package-info.java index 2a856136021..a65cad5646b 100644 --- a/module/spring-boot-session/src/main/java/org/springframework/boot/session/endpoint/package-info.java +++ b/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; diff --git a/module/spring-boot-session/src/main/java/org/springframework/boot/session/autoconfigure/endpoint/SessionsEndpointAutoConfiguration.java b/module/spring-boot-session/src/main/java/org/springframework/boot/session/autoconfigure/SessionsEndpointAutoConfiguration.java similarity index 92% rename from module/spring-boot-session/src/main/java/org/springframework/boot/session/autoconfigure/endpoint/SessionsEndpointAutoConfiguration.java rename to module/spring-boot-session/src/main/java/org/springframework/boot/session/autoconfigure/SessionsEndpointAutoConfiguration.java index b8d4fc1ecb5..3940ff9b278 100644 --- a/module/spring-boot-session/src/main/java/org/springframework/boot/session/autoconfigure/endpoint/SessionsEndpointAutoConfiguration.java +++ b/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.endpoint.ReactiveSessionsEndpoint; -import org.springframework.boot.session.endpoint.SessionsEndpoint; +import org.springframework.boot.session.actuate.endpoint.ReactiveSessionsEndpoint; +import org.springframework.boot.session.actuate.endpoint.SessionsEndpoint; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.session.FindByIndexNameSessionRepository; diff --git a/module/spring-boot-session/src/main/java/org/springframework/boot/session/autoconfigure/endpoint/package-info.java b/module/spring-boot-session/src/main/java/org/springframework/boot/session/autoconfigure/endpoint/package-info.java deleted file mode 100644 index ae9e855d2a3..00000000000 --- a/module/spring-boot-session/src/main/java/org/springframework/boot/session/autoconfigure/endpoint/package-info.java +++ /dev/null @@ -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; diff --git a/module/spring-boot-session/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/module/spring-boot-session/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index a07a84eafb5..c4af3af7955 100644 --- a/module/spring-boot-session/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/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 diff --git a/module/spring-boot-session/src/test/java/org/springframework/boot/session/endpoint/ReactiveSessionsEndpointTests.java b/module/spring-boot-session/src/test/java/org/springframework/boot/session/actuate/endpoint/ReactiveSessionsEndpointTests.java similarity index 96% rename from module/spring-boot-session/src/test/java/org/springframework/boot/session/endpoint/ReactiveSessionsEndpointTests.java rename to module/spring-boot-session/src/test/java/org/springframework/boot/session/actuate/endpoint/ReactiveSessionsEndpointTests.java index d8d3609e5fe..775a7959767 100644 --- a/module/spring-boot-session/src/test/java/org/springframework/boot/session/endpoint/ReactiveSessionsEndpointTests.java +++ b/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; diff --git a/module/spring-boot-session/src/test/java/org/springframework/boot/session/endpoint/ReactiveSessionsEndpointWebIntegrationTests.java b/module/spring-boot-session/src/test/java/org/springframework/boot/session/actuate/endpoint/ReactiveSessionsEndpointWebIntegrationTests.java similarity index 98% rename from module/spring-boot-session/src/test/java/org/springframework/boot/session/endpoint/ReactiveSessionsEndpointWebIntegrationTests.java rename to module/spring-boot-session/src/test/java/org/springframework/boot/session/actuate/endpoint/ReactiveSessionsEndpointWebIntegrationTests.java index c0d2596a912..847cbc19d86 100644 --- a/module/spring-boot-session/src/test/java/org/springframework/boot/session/endpoint/ReactiveSessionsEndpointWebIntegrationTests.java +++ b/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; diff --git a/module/spring-boot-session/src/test/java/org/springframework/boot/session/endpoint/SessionsEndpointTests.java b/module/spring-boot-session/src/test/java/org/springframework/boot/session/actuate/endpoint/SessionsEndpointTests.java similarity index 96% rename from module/spring-boot-session/src/test/java/org/springframework/boot/session/endpoint/SessionsEndpointTests.java rename to module/spring-boot-session/src/test/java/org/springframework/boot/session/actuate/endpoint/SessionsEndpointTests.java index 9d3a23eb3c5..52fa95838bc 100644 --- a/module/spring-boot-session/src/test/java/org/springframework/boot/session/endpoint/SessionsEndpointTests.java +++ b/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; diff --git a/module/spring-boot-session/src/test/java/org/springframework/boot/session/endpoint/SessionsEndpointWebIntegrationTests.java b/module/spring-boot-session/src/test/java/org/springframework/boot/session/actuate/endpoint/SessionsEndpointWebIntegrationTests.java similarity index 98% rename from module/spring-boot-session/src/test/java/org/springframework/boot/session/endpoint/SessionsEndpointWebIntegrationTests.java rename to module/spring-boot-session/src/test/java/org/springframework/boot/session/actuate/endpoint/SessionsEndpointWebIntegrationTests.java index e7da6404a7d..cf6957065f3 100644 --- a/module/spring-boot-session/src/test/java/org/springframework/boot/session/endpoint/SessionsEndpointWebIntegrationTests.java +++ b/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; diff --git a/module/spring-boot-session/src/test/java/org/springframework/boot/session/autoconfigure/endpoint/SessionsEndpointAutoConfigurationTests.java b/module/spring-boot-session/src/test/java/org/springframework/boot/session/autoconfigure/SessionsEndpointAutoConfigurationTests.java similarity index 96% rename from module/spring-boot-session/src/test/java/org/springframework/boot/session/autoconfigure/endpoint/SessionsEndpointAutoConfigurationTests.java rename to module/spring-boot-session/src/test/java/org/springframework/boot/session/autoconfigure/SessionsEndpointAutoConfigurationTests.java index a587c7633f2..3aebb1429d0 100644 --- a/module/spring-boot-session/src/test/java/org/springframework/boot/session/autoconfigure/endpoint/SessionsEndpointAutoConfigurationTests.java +++ b/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.endpoint.SessionsEndpoint; +import org.springframework.boot.session.actuate.endpoint.ReactiveSessionsEndpoint; +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;