Fixup Undertow autoconfigure package ordering

Author: philwebb

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

@@ -26,8 +26,8 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.undertow.autoconfigure.reactive.UndertowReactiveWebServerAutoConfiguration;
 import org.springframework.boot.undertow.reactive.UndertowReactiveWebServerFactory;
-import org.springframework.boot.undertow.reactive.autoconfigure.UndertowReactiveWebServerAutoConfiguration;
 import org.springframework.boot.web.server.reactive.ReactiveWebServerFactory;
 import org.springframework.context.annotation.Bean;
 

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

@@ -26,7 +26,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
-import org.springframework.boot.undertow.reactive.autoconfigure.UndertowReactiveWebServerAutoConfiguration;
+import org.springframework.boot.undertow.autoconfigure.reactive.UndertowReactiveWebServerAutoConfiguration;
 import org.springframework.boot.web.server.reactive.ReactiveWebServerFactory;
 import org.springframework.context.annotation.Bean;
 

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

@@ -26,7 +26,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
-import org.springframework.boot.undertow.servlet.autoconfigure.UndertowServletWebServerAutoConfiguration;
+import org.springframework.boot.undertow.autoconfigure.servlet.UndertowServletWebServerAutoConfiguration;
 import org.springframework.boot.web.server.servlet.ServletWebServerFactory;
 import org.springframework.context.annotation.Bean;
 

…wReactiveWebServerAutoConfiguration.java …wReactiveWebServerAutoConfiguration.javaspring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/reactive/autoconfigure/UndertowReactiveWebServerAutoConfiguration.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/reactive/UndertowReactiveWebServerAutoConfiguration.java spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/reactive/autoconfigure/UndertowReactiveWebServerAutoConfiguration.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/reactive/UndertowReactiveWebServerAutoConfiguration.java

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

…reactive/autoconfigure/package-info.java …autoconfigure/reactive/package-info.javaspring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/reactive/autoconfigure/package-info.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/reactive/package-info.java spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/reactive/autoconfigure/package-info.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/reactive/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Classes related to the auto-configuration of a reactive web server using Undertow.
  */
-package org.springframework.boot.undertow.reactive.autoconfigure;
+package org.springframework.boot.undertow.autoconfigure.reactive;

…owServletWebServerAutoConfiguration.java …owServletWebServerAutoConfiguration.javaspring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/servlet/autoconfigure/UndertowServletWebServerAutoConfiguration.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/servlet/UndertowServletWebServerAutoConfiguration.java spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/servlet/autoconfigure/UndertowServletWebServerAutoConfiguration.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/servlet/UndertowServletWebServerAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.undertow.servlet.autoconfigure;
+package org.springframework.boot.undertow.autoconfigure.servlet;
 
 import io.undertow.Undertow;
 import io.undertow.websockets.jsr.Bootstrap;

…owServletWebServerFactoryCustomizer.java …owServletWebServerFactoryCustomizer.javaspring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/servlet/autoconfigure/UndertowServletWebServerFactoryCustomizer.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/servlet/UndertowServletWebServerFactoryCustomizer.java spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/servlet/autoconfigure/UndertowServletWebServerFactoryCustomizer.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/servlet/UndertowServletWebServerFactoryCustomizer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.undertow.servlet.autoconfigure;
+package org.springframework.boot.undertow.autoconfigure.servlet;
 
 import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.boot.undertow.autoconfigure.UndertowServerProperties;

…owServletWebServerFactoryCustomizer.java …owServletWebServerFactoryCustomizer.javaspring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/servlet/autoconfigure/WebSocketUndertowServletWebServerFactoryCustomizer.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/servlet/WebSocketUndertowServletWebServerFactoryCustomizer.java spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/servlet/autoconfigure/WebSocketUndertowServletWebServerFactoryCustomizer.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/servlet/WebSocketUndertowServletWebServerFactoryCustomizer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.undertow.servlet.autoconfigure;
+package org.springframework.boot.undertow.autoconfigure.servlet;
 
 import io.undertow.servlet.api.DeploymentInfo;
 import io.undertow.websockets.jsr.WebSocketDeploymentInfo;

…/servlet/autoconfigure/package-info.java …/autoconfigure/servlet/package-info.javaspring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/servlet/autoconfigure/package-info.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/servlet/package-info.java spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/servlet/autoconfigure/package-info.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/autoconfigure/servlet/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Classes related to the auto-configuration of a servlet web server using Undertow.
  */
-package org.springframework.boot.undertow.servlet.autoconfigure;
+package org.springframework.boot.undertow.autoconfigure.servlet;

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

@@ -1,2 +1,2 @@
-org.springframework.boot.undertow.reactive.autoconfigure.UndertowReactiveWebServerAutoConfiguration
-org.springframework.boot.undertow.servlet.autoconfigure.UndertowServletWebServerAutoConfiguration
+org.springframework.boot.undertow.autoconfigure.reactive.UndertowReactiveWebServerAutoConfiguration
+org.springframework.boot.undertow.autoconfigure.servlet.UndertowServletWebServerAutoConfiguration