Merge branch '4.0.x'

module/spring-boot-security/src/test/java/org/springframework/boot/security/autoconfigure/web/servlet/SecurityFilterAutoConfigurationTests.java

@@ -16,7 +16,6 @@
 
 package org.springframework.boot.security.autoconfigure.web.servlet;
 
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
@@ -38,6 +37,7 @@ import org.springframework.context.annotation.Import;
 import org.springframework.mock.web.MockServletContext;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.within;
 
 /**
  * Tests for {@link SecurityFilterAutoConfiguration}.
@@ -65,7 +65,7 @@ class SecurityFilterAutoConfigurationTests {
 			int securityFilterOrder = context.getBean(DelegatingFilterProxyRegistrationBean.class).getOrder();
 			int requestContextFilterOrder = new OrderedRequestContextFilter().getOrder();
 			assertThat(securityFilterOrder).isGreaterThan(requestContextFilterOrder)
-				.isCloseTo(requestContextFilterOrder, Assertions.within(5));
+				.isCloseTo(requestContextFilterOrder, within(5));
 		}
 	}
 

module/spring-boot-servlet/src/test/java/org/springframework/boot/servlet/filter/OrderedFilterOrderingTests.java

@@ -19,12 +19,12 @@ 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;
+import static org.assertj.core.api.Assertions.within;
 
 /**
  * Tests for the ordering of various {@link OrderedFilter} implementations.
@@ -48,7 +48,7 @@ class OrderedFilterOrderingTests {
 	@Test
 	void requestContextOrderingIsCloseToRequestWrapperFilterMaxOrder() {
 		assertThat(new OrderedRequestContextFilter().getOrder())
-			.isCloseTo(OrderedFilter.REQUEST_WRAPPER_FILTER_MAX_ORDER, Assertions.within(105));
+			.isCloseTo(OrderedFilter.REQUEST_WRAPPER_FILTER_MAX_ORDER, within(105));
 	}
 
 }

module/spring-boot-session/src/test/java/org/springframework/boot/session/autoconfigure/SessionPropertiesTests.java

@@ -19,12 +19,12 @@ package org.springframework.boot.session.autoconfigure;
 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.assertj.core.api.Assertions.within;
 import static org.mockito.BDDMockito.then;
 import static org.mockito.Mockito.mock;
 
@@ -58,8 +58,7 @@ class SessionPropertiesTests {
 
 	@Test
 	void defaultFilterOrderIsCloseToHighestPrecedence() {
-		assertThat(this.properties.getServlet().getFilterOrder()).isCloseTo(Ordered.HIGHEST_PRECEDENCE,
+		assertThat(this.properties.getServlet().getFilterOrder()).isCloseTo(Ordered.HIGHEST_PRECEDENCE, within(50));
-				Assertions.within(50));
 	}
 
 }