Fixup Jetty autoconfigure package ordering

Author: philwebb

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/jetty/JettyReactiveManagementContextAutoConfiguration.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.jetty.reactive.autoconfigure.JettyReactiveWebServerAutoConfiguration;
+import org.springframework.boot.jetty.autoconfigure.reactive.JettyReactiveWebServerAutoConfiguration;
 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/jetty/JettyServletManagementContextAutoConfiguration.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.jetty.servlet.autoconfigure.JettyServletWebServerAutoConfiguration;
+import org.springframework.boot.jetty.autoconfigure.servlet.JettyServletWebServerAutoConfiguration;
 import org.springframework.boot.web.server.servlet.ServletWebServerFactory;
 import org.springframework.context.annotation.Bean;
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfigurationTests.java

@@ -27,10 +27,10 @@
 import org.springframework.boot.actuate.metrics.web.jetty.JettySslHandshakeMetricsBinder;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.context.event.ApplicationStartedEvent;
+import org.springframework.boot.jetty.autoconfigure.reactive.JettyReactiveWebServerAutoConfiguration;
+import org.springframework.boot.jetty.autoconfigure.servlet.JettyServletWebServerAutoConfiguration;
 import org.springframework.boot.jetty.reactive.JettyReactiveWebServerFactory;
-import org.springframework.boot.jetty.reactive.autoconfigure.JettyReactiveWebServerAutoConfiguration;
 import org.springframework.boot.jetty.servlet.JettyServletWebServerFactory;
-import org.springframework.boot.jetty.servlet.autoconfigure.JettyServletWebServerAutoConfiguration;
 import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
 import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/JettyWebServerConfiguration.java

@@ -20,8 +20,8 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnThreading;
 import org.springframework.boot.autoconfigure.thread.Threading;
 import org.springframework.boot.autoconfigure.web.ServerProperties;
-import org.springframework.boot.jetty.reactive.autoconfigure.JettyReactiveWebServerAutoConfiguration;
-import org.springframework.boot.jetty.servlet.autoconfigure.JettyServletWebServerAutoConfiguration;
+import org.springframework.boot.jetty.autoconfigure.reactive.JettyReactiveWebServerAutoConfiguration;
+import org.springframework.boot.jetty.autoconfigure.servlet.JettyServletWebServerAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/reactive/autoconfigure/JettyReactiveWebServerAutoConfiguration.java renamed to spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/reactive/JettyReactiveWebServerAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jetty.reactive.autoconfigure;
+package org.springframework.boot.jetty.autoconfigure.reactive;
 
 import org.eclipse.jetty.ee10.servlet.ServletHolder;
 import org.eclipse.jetty.ee10.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/reactive/autoconfigure/WebSocketJettyReactiveWebServerFactoryCustomizer.java renamed to spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/reactive/WebSocketJettyReactiveWebServerFactoryCustomizer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jetty.reactive.autoconfigure;
+package org.springframework.boot.jetty.autoconfigure.reactive;
 
 import jakarta.servlet.ServletContext;
 import org.eclipse.jetty.ee10.servlet.ServletContextHandler;

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

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

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/servlet/autoconfigure/JettyServletWebServerAutoConfiguration.java renamed to spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/servlet/JettyServletWebServerAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jetty.servlet.autoconfigure;
+package org.springframework.boot.jetty.autoconfigure.servlet;
 
 import java.util.EnumSet;
 

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/servlet/autoconfigure/WebSocketJettyServletWebServerFactoryCustomizer.java renamed to spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/servlet/WebSocketJettyServletWebServerFactoryCustomizer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jetty.servlet.autoconfigure;
+package org.springframework.boot.jetty.autoconfigure.servlet;
 
 import org.eclipse.jetty.ee10.webapp.AbstractConfiguration;
 import org.eclipse.jetty.ee10.webapp.WebAppContext;

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

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

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

@@ -1,2 +1,2 @@
-org.springframework.boot.jetty.reactive.autoconfigure.JettyReactiveWebServerAutoConfiguration
-org.springframework.boot.jetty.servlet.autoconfigure.JettyServletWebServerAutoConfiguration
+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/reactive/autoconfigure/JettyReactiveWebServerAutoConfigurationTests.java renamed to spring-boot-project/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/autoconfigure/reactive/JettyReactiveWebServerAutoConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jetty.reactive.autoconfigure;
+package org.springframework.boot.jetty.autoconfigure.reactive;
 
 import jakarta.websocket.server.ServerContainer;
 import org.eclipse.jetty.ee10.servlet.ServletContextHandler;

spring-boot-project/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/servlet/autoconfigure/JettyServletWebServerAutoConfigurationTests.java renamed to spring-boot-project/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/autoconfigure/servlet/JettyServletWebServerAutoConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jetty.servlet.autoconfigure;
+package org.springframework.boot.jetty.autoconfigure.servlet;
 
 import java.util.Map;
 

spring-boot-project/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/servlet/autoconfigure/JettyServletWebServerServletContextListenerTests.java renamed to spring-boot-project/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/autoconfigure/servlet/JettyServletWebServerServletContextListenerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jetty.servlet.autoconfigure;
+package org.springframework.boot.jetty.autoconfigure.servlet;
 
 import jakarta.servlet.ServletContextListener;