Merge branch '3.4.x'

Author: mhalbritter

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java

@@ -1140,6 +1140,28 @@ public void setTrustedProxies(String trustedProxies) {
 
 		}
 
+		/**
+		 * When to use APR.
+		 */
+		public enum UseApr {
+
+			/**
+			 * Always use APR and fail if it's not available.
+			 */
+			ALWAYS,
+
+			/**
+			 * Use APR if it is available.
+			 */
+			WHEN_AVAILABLE,
+
+			/**
+			 * Never user APR.
+			 */
+			NEVER
+
+		}
+
 	}
 
 	/**
@@ -1945,26 +1967,4 @@ public enum ForwardHeadersStrategy {
 
 	}
 
-	/**
-	 * When to use APR.
-	 */
-	public enum UseApr {
-
-		/**
-		 * Always use APR and fail if it's not available.
-		 */
-		ALWAYS,
-
-		/**
-		 * Use APR if it is available.
-		 */
-		WHEN_AVAILABLE,
-
-		/**
-		 * Never user APR.
-		 */
-		NEVER
-
-	}
-
 }

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/TomcatReactiveWebServerFactoryCustomizer.java

@@ -20,7 +20,7 @@
 
 import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.boot.autoconfigure.web.ServerProperties.Tomcat;
-import org.springframework.boot.autoconfigure.web.ServerProperties.UseApr;
+import org.springframework.boot.autoconfigure.web.ServerProperties.Tomcat.UseApr;
 import org.springframework.boot.web.embedded.tomcat.TomcatReactiveWebServerFactory;
 import org.springframework.boot.web.server.WebServerFactoryCustomizer;
 import org.springframework.util.Assert;

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/TomcatServletWebServerFactoryCustomizer.java

@@ -19,7 +19,7 @@
 import org.apache.catalina.core.AprLifecycleListener;
 
 import org.springframework.boot.autoconfigure.web.ServerProperties;
-import org.springframework.boot.autoconfigure.web.ServerProperties.UseApr;
+import org.springframework.boot.autoconfigure.web.ServerProperties.Tomcat.UseApr;
 import org.springframework.boot.web.embedded.tomcat.ConfigurableTomcatWebServerFactory;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
 import org.springframework.boot.web.server.WebServerFactoryCustomizer;

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java

@@ -38,7 +38,7 @@
 import reactor.netty.http.HttpDecoderSpec;
 
 import org.springframework.boot.autoconfigure.web.ServerProperties.Tomcat.Accesslog;
-import org.springframework.boot.autoconfigure.web.ServerProperties.UseApr;
+import org.springframework.boot.autoconfigure.web.ServerProperties.Tomcat.UseApr;
 import org.springframework.boot.context.properties.bind.Bindable;
 import org.springframework.boot.context.properties.bind.Binder;
 import org.springframework.boot.context.properties.source.ConfigurationPropertySource;