Remove spring-boot-autoconfigure-all

Issue: 46071

Author: wilkinsona

settings.gradle

@@ -65,7 +65,6 @@ include "spring-boot-project:spring-boot-actuator-integration-tests"
 include "spring-boot-project:spring-boot-amqp"
 include "spring-boot-project:spring-boot-artemis"
 include "spring-boot-project:spring-boot-autoconfigure"
-include "spring-boot-project:spring-boot-autoconfigure-all"
 include "spring-boot-project:spring-boot-batch"
 include "spring-boot-project:spring-boot-cache"
 include "spring-boot-project:spring-boot-cassandra"

spring-boot-project/spring-boot-autoconfigure-all/build.gradle

@@ -40,11 +40,11 @@ artifacts {
 
 dependencies {
 	api(project(":spring-boot-project:spring-boot"))
-	api(project(":spring-boot-project:spring-boot-autoconfigure-all"))
+	api(project(":spring-boot-project:spring-boot-autoconfigure"))
 
 	intTestDependencies(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))
 
-	intTestImplementation(project(":spring-boot-project:spring-boot-autoconfigure-all"))
+	intTestImplementation(project(":spring-boot-project:spring-boot-autoconfigure"))
 	intTestImplementation(project(":spring-boot-project:spring-boot-restclient"))
 	intTestImplementation(project(":spring-boot-project:spring-boot-test"))
 	intTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))

spring-boot-project/spring-boot-autoconfigure-all/src/test/java/org/springframework/boot/autoconfigure/web/servlet/FilterOrderingIntegrationTests.java

@@ -57,7 +57,6 @@ dependencies {
 	optional(project(":spring-boot-project:spring-boot-activemq"))
 	optional(project(":spring-boot-project:spring-boot-amqp"))
 	optional(project(":spring-boot-project:spring-boot-artemis"))
-	optional(project(":spring-boot-project:spring-boot-autoconfigure-all"))
 	optional(project(":spring-boot-project:spring-boot-actuator-autoconfigure-all"))
 	optional(project(":spring-boot-project:spring-boot-cassandra"))
 	optional(project(":spring-boot-project:spring-boot-data-redis"))

spring-boot-project/spring-boot-autoconfigure-all/src/test/resources/logback-test.xml

@@ -249,7 +249,6 @@ dependencies {
 	implementation(project(path: ":spring-boot-project:spring-boot-actuator-autoconfigure"))
 	implementation(project(path: ":spring-boot-project:spring-boot-actuator-autoconfigure-all"))
 	implementation(project(path: ":spring-boot-project:spring-boot-amqp"))
-	implementation(project(path: ":spring-boot-project:spring-boot-autoconfigure-all"))
 	implementation(project(path: ":spring-boot-project:spring-boot-cache"))
 	implementation(project(path: ":spring-boot-project:spring-boot-data-cassandra"))
 	implementation(project(path: ":spring-boot-project:spring-boot-data-elasticsearch"))

spring-boot-project/spring-boot-devtools/build.gradle

@@ -16,6 +16,7 @@
 
 package org.springframework.boot.security.autoconfigure.servlet;
 
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
@@ -26,13 +27,17 @@
 import org.springframework.boot.security.autoconfigure.servlet.SecurityFilterAutoConfigurationEarlyInitializationTests.DeserializerBean;
 import org.springframework.boot.security.autoconfigure.servlet.SecurityFilterAutoConfigurationEarlyInitializationTests.ExampleController;
 import org.springframework.boot.security.autoconfigure.servlet.SecurityFilterAutoConfigurationEarlyInitializationTests.JacksonModuleBean;
+import org.springframework.boot.servlet.filter.OrderedRequestContextFilter;
 import org.springframework.boot.web.context.servlet.AnnotationConfigServletWebApplicationContext;
+import org.springframework.boot.web.servlet.DelegatingFilterProxyRegistrationBean;
 import org.springframework.boot.webmvc.autoconfigure.DispatcherServletAutoConfiguration;
 import org.springframework.boot.webmvc.autoconfigure.WebMvcAutoConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.mock.web.MockServletContext;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * Tests for {@link SecurityFilterAutoConfiguration}.
  *
@@ -49,6 +54,20 @@ void filterAutoConfigurationWorksWithoutSecurityAutoConfiguration() {
 		}
 	}
 
+	@Test
+	void filterIsOrderedShortlyAfterRequestContextFilter() {
+		try (AnnotationConfigServletWebApplicationContext context = new AnnotationConfigServletWebApplicationContext()) {
+			context.setServletContext(new MockServletContext());
+			context.register(SecurityAutoConfiguration.class);
+			context.register(Config.class);
+			context.refresh();
+			int securityFilterOrder = context.getBean(DelegatingFilterProxyRegistrationBean.class).getOrder();
+			int requestContextFilterOrder = new OrderedRequestContextFilter().getOrder();
+			assertThat(securityFilterOrder).isGreaterThan(requestContextFilterOrder)
+				.isCloseTo(requestContextFilterOrder, Assertions.within(5));
+		}
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	@Import({ DeserializerBean.class, JacksonModuleBean.class, ExampleController.class, ConverterBean.class })
 	@ImportAutoConfiguration({ WebMvcAutoConfiguration.class, JacksonAutoConfiguration.class,

spring-boot-project/spring-boot-docker-compose-all/build.gradle

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2012-present 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.
+ */
+
+package org.springframework.boot.servlet.filter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.core.annotation.AnnotationAwareOrderComparator;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for the ordering of various {@link OrderedFilter} implementations.
+ *
+ * @author Andy Wilkinson
+ */
+class OrderedFilterOrderingTests {
+
+	@Test
+	void ordering() {
+		OrderedCharacterEncodingFilter characterEncoding = new OrderedCharacterEncodingFilter();
+		OrderedFormContentFilter formContent = new OrderedFormContentFilter();
+		OrderedHiddenHttpMethodFilter hiddenHttpMethod = new OrderedHiddenHttpMethodFilter();
+		OrderedRequestContextFilter requestContext = new OrderedRequestContextFilter();
+		List<OrderedFilter> filters = new ArrayList<>(
+				List.of(characterEncoding, formContent, hiddenHttpMethod, requestContext));
+		AnnotationAwareOrderComparator.sort(filters);
+		assertThat(filters).containsExactly(characterEncoding, hiddenHttpMethod, formContent, requestContext);
+	}
+
+	@Test
+	void requestContextOrderingIsCloseToRequestWrapperFilterMaxOrder() {
+		assertThat(new OrderedRequestContextFilter().getOrder())
+			.isCloseTo(OrderedFilter.REQUEST_WRAPPER_FILTER_MAX_ORDER, Assertions.within(105));
+	}
+
+}

spring-boot-project/spring-boot-docs/build.gradle

@@ -19,8 +19,11 @@
 import java.time.Duration;
 import java.util.function.Supplier;
 
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.core.Ordered;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.then;
 import static org.mockito.Mockito.mock;
@@ -32,22 +35,28 @@
  */
 class SessionPropertiesTests {
 
+	private final SessionProperties properties = new SessionProperties();
+
 	@Test
 	@SuppressWarnings("unchecked")
 	void determineTimeoutWithTimeoutIgnoreFallback() {
-		SessionProperties properties = new SessionProperties();
-		properties.setTimeout(Duration.ofMinutes(1));
+		this.properties.setTimeout(Duration.ofMinutes(1));
 		Supplier<Duration> fallback = mock(Supplier.class);
-		assertThat(properties.determineTimeout(fallback)).isEqualTo(Duration.ofMinutes(1));
+		assertThat(this.properties.determineTimeout(fallback)).isEqualTo(Duration.ofMinutes(1));
 		then(fallback).shouldHaveNoInteractions();
 	}
 
 	@Test
 	void determineTimeoutWithNoTimeoutUseFallback() {
-		SessionProperties properties = new SessionProperties();
-		properties.setTimeout(null);
+		this.properties.setTimeout(null);
 		Duration fallback = Duration.ofMinutes(2);
-		assertThat(properties.determineTimeout(() -> fallback)).isSameAs(fallback);
+		assertThat(this.properties.determineTimeout(() -> fallback)).isSameAs(fallback);
+	}
+
+	@Test
+	void defaultFilterOrderIsCloseToHighestPrecedence() {
+		assertThat(this.properties.getServlet().getFilterOrder()).isCloseTo(Ordered.HIGHEST_PRECEDENCE,
+				Assertions.within(50));
 	}
 
 }