Move ManagementContextFactory and related code to web.server packages

Author: wilkinsona

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ChildManagementContextInitializer.java

@@ -29,7 +29,6 @@
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.support.RegisteredBean;
 import org.springframework.boot.LazyInitializationBeanFactoryPostProcessor;
-import org.springframework.boot.actuate.autoconfigure.web.ManagementContextFactory;
 import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
 import org.springframework.boot.context.event.ApplicationFailedEvent;
 import org.springframework.boot.web.server.context.ConfigurableWebServerApplicationContext;

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextAutoConfiguration.java

@@ -19,7 +19,6 @@
 import java.util.Map;
 
 import org.springframework.beans.factory.SmartInitializingSingleton;
-import org.springframework.boot.actuate.autoconfigure.web.ManagementContextFactory;
 import org.springframework.boot.actuate.autoconfigure.web.ManagementContextType;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/ManagementContextFactory.java renamed to spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextFactory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.web;
+package org.springframework.boot.actuate.autoconfigure.web.server;
 
 import java.lang.reflect.Modifier;
 
@@ -39,7 +39,7 @@
  *
  * @author Andy Wilkinson
  * @author Phillip Webb
- * @since 3.0.0
+ * @since 4.0.0
  */
 public final class ManagementContextFactory {
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/server/ChildManagementContextInitializerAotTests.java

@@ -28,7 +28,6 @@
 import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAutoConfiguration;
-import org.springframework.boot.actuate.autoconfigure.web.ManagementContextFactory;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
 import org.springframework.boot.test.system.CapturedOutput;

spring-boot-project/spring-boot-jersey/src/test/java/org/springframework/boot/jersey/autoconfigure/actuate/web/JerseyHealthEndpointAdditionalPathIntegrationTests.java

@@ -30,7 +30,7 @@
 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.autoconfigure.actuate.web.TomcatServletManagementContextAutoConfiguration;
+import org.springframework.boot.tomcat.autoconfigure.actuate.web.server.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;

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/actuate/web/JettyAccessLogCustomizer.java renamed to spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/actuate/web/server/JettyAccessLogCustomizer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jetty.autoconfigure.actuate.web;
+package org.springframework.boot.jetty.autoconfigure.actuate.web.server;
 
 import java.io.File;
 

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/actuate/web/JettyManagementServerProperties.java renamed to spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/actuate/web/server/JettyManagementServerProperties.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jetty.autoconfigure.actuate.web;
+package org.springframework.boot.jetty.autoconfigure.actuate.web.server;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/actuate/web/JettyReactiveManagementChildContextConfiguration.java renamed to spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/actuate/web/server/JettyReactiveManagementChildContextConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jetty.autoconfigure.actuate.web;
+package org.springframework.boot.jetty.autoconfigure.actuate.web.server;
 
 import org.eclipse.jetty.server.Server;
 

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/actuate/web/JettyReactiveManagementContextAutoConfiguration.java renamed to spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/actuate/web/server/JettyReactiveManagementContextAutoConfiguration.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jetty.autoconfigure.actuate.web;
+package org.springframework.boot.jetty.autoconfigure.actuate.web.server;
 
 import org.eclipse.jetty.server.Server;
 
 import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.actuate.autoconfigure.web.ManagementContextFactory;
 import org.springframework.boot.actuate.autoconfigure.web.server.ConditionalOnManagementPort;
+import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextFactory;
 import org.springframework.boot.actuate.autoconfigure.web.server.ManagementPortType;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/actuate/web/JettyServletManagementChildContextConfiguration.java renamed to spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/actuate/web/server/JettyServletManagementChildContextConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jetty.autoconfigure.actuate.web;
+package org.springframework.boot.jetty.autoconfigure.actuate.web.server;
 
 import org.eclipse.jetty.server.Server;
 

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/actuate/web/JettyServletManagementContextAutoConfiguration.java renamed to spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/actuate/web/server/JettyServletManagementContextAutoConfiguration.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jetty.autoconfigure.actuate.web;
+package org.springframework.boot.jetty.autoconfigure.actuate.web.server;
 
 import org.eclipse.jetty.server.Server;
 
 import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.actuate.autoconfigure.web.ManagementContextFactory;
 import org.springframework.boot.actuate.autoconfigure.web.server.ConditionalOnManagementPort;
+import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextFactory;
 import org.springframework.boot.actuate.autoconfigure.web.server.ManagementPortType;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/actuate/web/package-info.java renamed to spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/actuate/web/server/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Auto-configuration for Jetty actuator web concerns.
  */
-package org.springframework.boot.jetty.autoconfigure.actuate.web;
+package org.springframework.boot.jetty.autoconfigure.actuate.web.server;

spring-boot-project/spring-boot-jetty/src/main/resources/META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports

@@ -1,2 +1,2 @@
-org.springframework.boot.jetty.autoconfigure.actuate.web.JettyReactiveManagementChildContextConfiguration
-org.springframework.boot.jetty.autoconfigure.actuate.web.JettyServletManagementChildContextConfiguration
+org.springframework.boot.jetty.autoconfigure.actuate.web.server.JettyReactiveManagementChildContextConfiguration
+org.springframework.boot.jetty.autoconfigure.actuate.web.server.JettyServletManagementChildContextConfiguration

spring-boot-project/spring-boot-jetty/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,5 +1,5 @@
-org.springframework.boot.jetty.autoconfigure.actuate.web.JettyReactiveManagementContextAutoConfiguration
-org.springframework.boot.jetty.autoconfigure.actuate.web.JettyServletManagementContextAutoConfiguration
+org.springframework.boot.jetty.autoconfigure.actuate.web.server.JettyReactiveManagementContextAutoConfiguration
+org.springframework.boot.jetty.autoconfigure.actuate.web.server.JettyServletManagementContextAutoConfiguration
 org.springframework.boot.jetty.autoconfigure.metrics.JettyMetricsAutoConfiguration
 org.springframework.boot.jetty.autoconfigure.reactive.JettyReactiveWebServerAutoConfiguration
 org.springframework.boot.jetty.autoconfigure.servlet.JettyServletWebServerAutoConfiguration

spring-boot-project/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/autoconfigure/actuate/web/JettyManagementServerPropertiesTests.java renamed to spring-boot-project/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/autoconfigure/actuate/web/server/JettyManagementServerPropertiesTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jetty.autoconfigure.actuate.web;
+package org.springframework.boot.jetty.autoconfigure.actuate.web.server;
 
 import org.junit.jupiter.api.Test;
 

spring-boot-project/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/autoconfigure/actuate/web/NettyReactiveManagementChildContextConfiguration.java renamed to spring-boot-project/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/autoconfigure/actuate/web/server/NettyReactiveManagementChildContextConfiguration.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.reactor.netty.autoconfigure.actuate.web;
+package org.springframework.boot.reactor.netty.autoconfigure.actuate.web.server;
 
 import reactor.netty.http.server.HttpServer;
 
 import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration;
-import org.springframework.boot.actuate.autoconfigure.web.ManagementContextFactory;
 import org.springframework.boot.actuate.autoconfigure.web.ManagementContextType;
+import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextFactory;
 import org.springframework.boot.actuate.autoconfigure.web.server.ManagementServerProperties;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;

spring-boot-project/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/autoconfigure/actuate/web/NettyReactiveManagementContextAutoConfiguration.java renamed to spring-boot-project/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/autoconfigure/actuate/web/server/NettyReactiveManagementContextAutoConfiguration.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.reactor.netty.autoconfigure.actuate.web;
+package org.springframework.boot.reactor.netty.autoconfigure.actuate.web.server;
 
 import reactor.netty.http.server.HttpServer;
 
 import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.actuate.autoconfigure.web.ManagementContextFactory;
 import org.springframework.boot.actuate.autoconfigure.web.server.ConditionalOnManagementPort;
+import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextFactory;
 import org.springframework.boot.actuate.autoconfigure.web.server.ManagementPortType;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;

spring-boot-project/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/autoconfigure/actuate/web/package-info.java renamed to spring-boot-project/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/autoconfigure/actuate/web/server/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Auto-configuration for Reactor Netty actuator web concerns.
  */
-package org.springframework.boot.reactor.netty.autoconfigure.actuate.web;
+package org.springframework.boot.reactor.netty.autoconfigure.actuate.web.server;

spring-boot-project/spring-boot-reactor-netty/src/main/resources/META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports

@@ -1 +1 @@
-org.springframework.boot.reactor.netty.autoconfigure.actuate.web.NettyReactiveManagementChildContextConfiguration
+org.springframework.boot.reactor.netty.autoconfigure.actuate.web.server.NettyReactiveManagementChildContextConfiguration

spring-boot-project/spring-boot-reactor-netty/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,2 +1,2 @@
 org.springframework.boot.reactor.netty.autoconfigure.NettyReactiveWebServerAutoConfiguration
-org.springframework.boot.reactor.netty.autoconfigure.actuate.web.NettyReactiveManagementContextAutoConfiguration
+org.springframework.boot.reactor.netty.autoconfigure.actuate.web.server.NettyReactiveManagementContextAutoConfiguration

spring-boot-project/spring-boot-servlet/src/test/java/org/springframework/boot/servlet/autoconfigure/actuate/web/ServletManagementContextAutoConfigurationIntegrationTests.java

@@ -28,7 +28,7 @@
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
 import org.springframework.boot.test.system.CapturedOutput;
 import org.springframework.boot.test.system.OutputCaptureExtension;
-import org.springframework.boot.tomcat.autoconfigure.actuate.web.TomcatServletManagementContextAutoConfiguration;
+import org.springframework.boot.tomcat.autoconfigure.actuate.web.server.TomcatServletManagementContextAutoConfiguration;
 import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
 import org.springframework.boot.web.server.servlet.context.AnnotationConfigServletWebServerApplicationContext;
 import org.springframework.util.StringUtils;

spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/autoconfigure/actuate/web/TomcatAccessLogCustomizer.java renamed to spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/autoconfigure/actuate/web/server/TomcatAccessLogCustomizer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.tomcat.autoconfigure.actuate.web;
+package org.springframework.boot.tomcat.autoconfigure.actuate.web.server;
 
 import java.util.Collection;
 import java.util.function.Function;

spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/autoconfigure/actuate/web/TomcatManagementServerProperties.java renamed to spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/autoconfigure/actuate/web/server/TomcatManagementServerProperties.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.tomcat.autoconfigure.actuate.web;
+package org.springframework.boot.tomcat.autoconfigure.actuate.web.server;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/autoconfigure/actuate/web/TomcatReactiveManagementChildContextConfiguration.java renamed to spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/autoconfigure/actuate/web/server/TomcatReactiveManagementChildContextConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.tomcat.autoconfigure.actuate.web;
+package org.springframework.boot.tomcat.autoconfigure.actuate.web.server;
 
 import org.apache.catalina.startup.Tomcat;
 

spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/autoconfigure/actuate/web/TomcatReactiveManagementContextAutoConfiguration.java renamed to spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/autoconfigure/actuate/web/server/TomcatReactiveManagementContextAutoConfiguration.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.tomcat.autoconfigure.actuate.web;
+package org.springframework.boot.tomcat.autoconfigure.actuate.web.server;
 
 import org.apache.catalina.startup.Tomcat;
 
 import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.actuate.autoconfigure.web.ManagementContextFactory;
 import org.springframework.boot.actuate.autoconfigure.web.server.ConditionalOnManagementPort;
+import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextFactory;
 import org.springframework.boot.actuate.autoconfigure.web.server.ManagementPortType;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;

spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/autoconfigure/actuate/web/TomcatServletManagementChildContextConfiguration.java renamed to spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/autoconfigure/actuate/web/server/TomcatServletManagementChildContextConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.tomcat.autoconfigure.actuate.web;
+package org.springframework.boot.tomcat.autoconfigure.actuate.web.server;
 
 import org.apache.catalina.startup.Tomcat;
 

spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/autoconfigure/actuate/web/TomcatServletManagementContextAutoConfiguration.java renamed to spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/autoconfigure/actuate/web/server/TomcatServletManagementContextAutoConfiguration.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.tomcat.autoconfigure.actuate.web;
+package org.springframework.boot.tomcat.autoconfigure.actuate.web.server;
 
 import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.actuate.autoconfigure.web.ManagementContextFactory;
 import org.springframework.boot.actuate.autoconfigure.web.server.ConditionalOnManagementPort;
+import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextFactory;
 import org.springframework.boot.actuate.autoconfigure.web.server.ManagementPortType;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;

spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/autoconfigure/actuate/web/package-info.java renamed to spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/autoconfigure/actuate/web/server/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Auto-configuration for Tomcat actuator web concerns.
  */
-package org.springframework.boot.tomcat.autoconfigure.actuate.web;
+package org.springframework.boot.tomcat.autoconfigure.actuate.web.server;

spring-boot-project/spring-boot-tomcat/src/main/resources/META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports

@@ -1,2 +1,2 @@
-org.springframework.boot.tomcat.autoconfigure.actuate.web.TomcatReactiveManagementChildContextConfiguration
-org.springframework.boot.tomcat.autoconfigure.actuate.web.TomcatServletManagementChildContextConfiguration
+org.springframework.boot.tomcat.autoconfigure.actuate.web.server.TomcatReactiveManagementChildContextConfiguration
+org.springframework.boot.tomcat.autoconfigure.actuate.web.server.TomcatServletManagementChildContextConfiguration

spring-boot-project/spring-boot-tomcat/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,5 +1,5 @@
-org.springframework.boot.tomcat.autoconfigure.actuate.web.TomcatReactiveManagementContextAutoConfiguration
-org.springframework.boot.tomcat.autoconfigure.actuate.web.TomcatServletManagementContextAutoConfiguration
+org.springframework.boot.tomcat.autoconfigure.actuate.web.server.TomcatReactiveManagementContextAutoConfiguration
+org.springframework.boot.tomcat.autoconfigure.actuate.web.server.TomcatServletManagementContextAutoConfiguration
 org.springframework.boot.tomcat.autoconfigure.metrics.TomcatMetricsAutoConfiguration
 org.springframework.boot.tomcat.autoconfigure.reactive.TomcatReactiveWebServerAutoConfiguration
 org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration

spring-boot-project/spring-boot-tomcat/src/test/java/org/springframework/boot/tomcat/autoconfigure/actuate/web/TomcatManagementServerPropertiesTests.java

@@ -18,6 +18,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.tomcat.autoconfigure.actuate.web.server.TomcatManagementServerProperties;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**

spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/actuate/web/UndertowAccessLogCustomizer.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/actuate/web/server/UndertowAccessLogCustomizer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.undertow.autoconfigure.actuate.web;
+package org.springframework.boot.undertow.autoconfigure.actuate.web.server;
 
 import java.util.function.Function;
 

spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/actuate/web/UndertowManagementServerProperties.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/actuate/web/server/UndertowManagementServerProperties.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.undertow.autoconfigure.actuate.web;
+package org.springframework.boot.undertow.autoconfigure.actuate.web.server;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/actuate/web/UndertowReactiveManagementChildContextConfiguration.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/actuate/web/server/UndertowReactiveManagementChildContextConfiguration.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.undertow.autoconfigure.actuate.web;
+package org.springframework.boot.undertow.autoconfigure.actuate.web.server;
 
 import io.undertow.Undertow;
 
 import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration;
-import org.springframework.boot.actuate.autoconfigure.web.ManagementContextFactory;
 import org.springframework.boot.actuate.autoconfigure.web.ManagementContextType;
+import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;

spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/actuate/web/UndertowReactiveManagementContextAutoConfiguration.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/actuate/web/server/UndertowReactiveManagementContextAutoConfiguration.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.undertow.autoconfigure.actuate.web;
+package org.springframework.boot.undertow.autoconfigure.actuate.web.server;
 
 import io.undertow.Undertow;
 
 import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.actuate.autoconfigure.web.ManagementContextFactory;
 import org.springframework.boot.actuate.autoconfigure.web.server.ConditionalOnManagementPort;
+import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextFactory;
 import org.springframework.boot.actuate.autoconfigure.web.server.ManagementPortType;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;

spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/actuate/web/UndertowServletManagementChildContextConfiguration.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/actuate/web/server/UndertowServletManagementChildContextConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.undertow.autoconfigure.actuate.web;
+package org.springframework.boot.undertow.autoconfigure.actuate.web.server;
 
 import io.undertow.Undertow;
 

spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/actuate/web/UndertowServletManagementContextAutoConfiguration.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/actuate/web/server/UndertowServletManagementContextAutoConfiguration.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.undertow.autoconfigure.actuate.web;
+package org.springframework.boot.undertow.autoconfigure.actuate.web.server;
 
 import io.undertow.Undertow;
 
 import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.actuate.autoconfigure.web.ManagementContextFactory;
 import org.springframework.boot.actuate.autoconfigure.web.server.ConditionalOnManagementPort;
+import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextFactory;
 import org.springframework.boot.actuate.autoconfigure.web.server.ManagementPortType;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;

spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/actuate/web/package-info.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/actuate/web/server/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Actuator Undertow actuator web concerns.
  */
-package org.springframework.boot.undertow.autoconfigure.actuate.web;
+package org.springframework.boot.undertow.autoconfigure.actuate.web.server;

spring-boot-project/spring-boot-undertow/src/main/resources/META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports

@@ -1,2 +1,2 @@
-org.springframework.boot.undertow.autoconfigure.actuate.web.UndertowReactiveManagementChildContextConfiguration
-org.springframework.boot.undertow.autoconfigure.actuate.web.UndertowServletManagementChildContextConfiguration
+org.springframework.boot.undertow.autoconfigure.actuate.web.server.UndertowReactiveManagementChildContextConfiguration
+org.springframework.boot.undertow.autoconfigure.actuate.web.server.UndertowServletManagementChildContextConfiguration

spring-boot-project/spring-boot-undertow/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,4 +1,4 @@
-org.springframework.boot.undertow.autoconfigure.actuate.web.UndertowReactiveManagementContextAutoConfiguration
-org.springframework.boot.undertow.autoconfigure.actuate.web.UndertowServletManagementContextAutoConfiguration
+org.springframework.boot.undertow.autoconfigure.actuate.web.server.UndertowReactiveManagementContextAutoConfiguration
+org.springframework.boot.undertow.autoconfigure.actuate.web.server.UndertowServletManagementContextAutoConfiguration
 org.springframework.boot.undertow.autoconfigure.reactive.UndertowReactiveWebServerAutoConfiguration
 org.springframework.boot.undertow.autoconfigure.servlet.UndertowServletWebServerAutoConfiguration

spring-boot-project/spring-boot-undertow/src/test/java/org/springframework/boot/undertow/autoconfigure/actuate/web/UndertowManagementServerPropertiesTests.java

@@ -18,6 +18,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.undertow.autoconfigure.actuate.web.server.UndertowManagementServerProperties;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**