Restructure autoconfigure packages

Restructure modules packages so that all auto-configuration is
organized under single top-level autoconfigure package.
This commit is contained in:
Phillip Webb
2025-06-11 16:29:17 -07:00
parent e60af6a8c7
commit 3de1e27b64
499 changed files with 1133 additions and 1464 deletions

View File

@@ -1,20 +0,0 @@
/*
* Copyright 2012-2025 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 actuator health concerns.
*/
package org.springframework.boot.jersey.actuate.autoconfigure.health;

View File

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

View File

@@ -15,6 +15,6 @@
*/
/**
* Auto-configuration for exposing actuator web endpoints using Jersey.
* Auto-configuration for Jersey actuator web endpoint support.
*/
package org.springframework.boot.jersey.actuate.autoconfigure.endpoint.web;
package org.springframework.boot.jersey.autoconfigure.actuate.endpoint.web;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.jersey.actuate.autoconfigure.web;
package org.springframework.boot.jersey.autoconfigure.actuate.web;
import org.glassfish.jersey.server.ResourceConfig;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.jersey.actuate.autoconfigure.endpoint.web;
package org.springframework.boot.jersey.autoconfigure.actuate.web;
import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties;
import org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.jersey.actuate.autoconfigure.web;
package org.springframework.boot.jersey.autoconfigure.actuate.web;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.servlet.ServletContainer;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.jersey.actuate.autoconfigure.web;
package org.springframework.boot.jersey.autoconfigure.actuate.web;
import org.glassfish.jersey.server.ResourceConfig;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.jersey.actuate.autoconfigure.endpoint.web;
package org.springframework.boot.jersey.autoconfigure.actuate.web;
import java.util.ArrayList;
import java.util.Collection;
@@ -54,7 +54,6 @@ 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.jersey.actuate.autoconfigure.web.ManagementContextResourceConfigCustomizer;
import org.springframework.boot.jersey.actuate.endpoint.web.JerseyEndpointResourceFactory;
import org.springframework.boot.jersey.actuate.endpoint.web.JerseyHealthEndpointAdditionalPathResourceFactory;
import org.springframework.boot.jersey.autoconfigure.ResourceConfigCustomizer;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.jersey.actuate.autoconfigure.web;
package org.springframework.boot.jersey.autoconfigure.actuate.web;
import org.glassfish.jersey.server.ResourceConfig;

View File

@@ -15,6 +15,6 @@
*/
/**
* Configuration for a Jersey-based management context.
* Auto-configuration for Jersey actuator web concerns.
*/
package org.springframework.boot.jersey.actuate.autoconfigure.web;
package org.springframework.boot.jersey.autoconfigure.actuate.web;

View File

@@ -15,6 +15,6 @@
*/
/**
* Auto-configuration for Jersey actuator metrics.
* Auto-configuration for Jersey metrics.
*/
package org.springframework.boot.jersey.autoconfigure.metrics;

View File

@@ -1,5 +1,4 @@
org.springframework.boot.jersey.actuate.autoconfigure.endpoint.web.JerseyEndpointManagementContextConfiguration
org.springframework.boot.jersey.actuate.autoconfigure.endpoint.web.JerseyWebEndpointManagementContextConfiguration
org.springframework.boot.jersey.actuate.autoconfigure.web.JerseySameManagementContextConfiguration
org.springframework.boot.jersey.actuate.autoconfigure.web.JerseyChildManagementContextConfiguration
org.springframework.boot.jersey.autoconfigure.actuate.web.JerseyChildManagementContextConfiguration
org.springframework.boot.jersey.autoconfigure.actuate.web.JerseyEndpointManagementContextConfiguration
org.springframework.boot.jersey.autoconfigure.actuate.web.JerseySameManagementContextConfiguration
org.springframework.boot.jersey.autoconfigure.actuate.web.JerseyWebEndpointManagementContextConfiguration

View File

@@ -1,3 +1,3 @@
org.springframework.boot.jersey.actuate.autoconfigure.health.HealthEndpointJerseyExtensionAutoConfiguration
org.springframework.boot.jersey.autoconfigure.JerseyAutoConfiguration
org.springframework.boot.jersey.autoconfigure.actuate.endpoint.web.HealthEndpointJerseyExtensionAutoConfiguration
org.springframework.boot.jersey.autoconfigure.metrics.JerseyServerMetricsAutoConfiguration

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.jersey.actuate.autoconfigure.health;
package org.springframework.boot.jersey.autoconfigure.actuate.endpoint.web;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Mono;
@@ -31,7 +31,7 @@ import org.springframework.boot.actuate.health.HealthEndpointWebExtension;
import org.springframework.boot.actuate.health.HealthIndicator;
import org.springframework.boot.actuate.health.ReactiveHealthIndicator;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.jersey.actuate.autoconfigure.health.HealthEndpointJerseyExtensionAutoConfiguration.JerseyAdditionalHealthEndpointPathsResourcesRegistrar;
import org.springframework.boot.jersey.autoconfigure.actuate.endpoint.web.HealthEndpointJerseyExtensionAutoConfiguration.JerseyAdditionalHealthEndpointPathsResourcesRegistrar;
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.jersey.actuate.autoconfigure;
package org.springframework.boot.jersey.autoconfigure.actuate.endpoint.web;
import java.io.IOException;
import java.time.Duration;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.jersey.actuate.autoconfigure;
package org.springframework.boot.jersey.autoconfigure.actuate.endpoint.web;
import java.io.IOException;
import java.nio.charset.StandardCharsets;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.jersey.actuate.autoconfigure.web;
package org.springframework.boot.jersey.autoconfigure.actuate.web;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.servlet.ServletContainer;

View File

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

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.jersey.actuate.autoconfigure;
package org.springframework.boot.jersey.autoconfigure.actuate.web;
import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration;
import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAutoConfiguration;
@@ -24,12 +24,12 @@ import org.springframework.boot.actuate.autoconfigure.system.DiskSpaceHealthCont
import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
import org.springframework.boot.jersey.actuate.autoconfigure.health.HealthEndpointJerseyExtensionAutoConfiguration;
import org.springframework.boot.jersey.autoconfigure.JerseyAutoConfiguration;
import org.springframework.boot.servlet.actuate.autoconfigure.ServletManagementContextAutoConfiguration;
import org.springframework.boot.jersey.autoconfigure.actuate.endpoint.web.HealthEndpointJerseyExtensionAutoConfiguration;
import org.springframework.boot.servlet.autoconfigure.actuate.web.ServletManagementContextAutoConfiguration;
import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
import org.springframework.boot.tomcat.actuate.autoconfigure.web.TomcatServletManagementContextAutoConfiguration;
import org.springframework.boot.tomcat.autoconfigure.actuate.web.TomcatServletManagementContextAutoConfiguration;
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
import org.springframework.boot.web.server.context.ServerPortInfoApplicationContextInitializer;
import org.springframework.boot.web.server.servlet.context.AnnotationConfigServletWebServerApplicationContext;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.jersey.actuate.autoconfigure.web;
package org.springframework.boot.jersey.autoconfigure.actuate.web;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.servlet.ServletContainer;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.jersey.actuate.autoconfigure.endpoint.web;
package org.springframework.boot.jersey.autoconfigure.actuate.web;
import java.util.Set;
@@ -25,7 +25,6 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration;
import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.jersey.actuate.autoconfigure.web.JerseySameManagementContextConfiguration;
import org.springframework.boot.jersey.autoconfigure.JerseyAutoConfiguration;
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.jersey.actuate.autoconfigure.endpoint.web;
package org.springframework.boot.jersey.autoconfigure.actuate.web;
import java.util.Collections;
@@ -26,8 +26,7 @@ import org.springframework.boot.actuate.endpoint.Access;
import org.springframework.boot.actuate.endpoint.EndpointAccessResolver;
import org.springframework.boot.actuate.endpoint.web.WebEndpointsSupplier;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.jersey.actuate.autoconfigure.endpoint.web.JerseyWebEndpointManagementContextConfiguration.JerseyWebEndpointsResourcesRegistrar;
import org.springframework.boot.jersey.actuate.autoconfigure.web.JerseySameManagementContextConfiguration;
import org.springframework.boot.jersey.autoconfigure.actuate.web.JerseyWebEndpointManagementContextConfiguration.JerseyWebEndpointsResourcesRegistrar;
import org.springframework.boot.test.context.FilteredClassLoader;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;