Merge branch '6.2.x'

Author: sbrannen

Diff for: spring-webflux/src/test/java/org/springframework/web/reactive/function/server/PathResourceLookupFunctionTests.java

@@ -31,6 +31,8 @@
 import org.springframework.web.testfixture.http.server.reactive.MockServerHttpRequest;
 import org.springframework.web.testfixture.server.MockServerWebExchange;
 
+import static org.assertj.core.api.Assertions.assertThatNoException;
+
 /**
  * @author Arjen Poutsma
  */
@@ -128,13 +130,13 @@ void composeResourceLookupFunction() {
 	@SuppressWarnings("removal")
 	void withPathResource() {
 		org.springframework.core.io.PathResource location = new org.springframework.core.io.PathResource("/static/");
-		PathResourceLookupFunction function = new PathResourceLookupFunction("/resources/**", location);
+		assertThatNoException().isThrownBy(() -> new PathResourceLookupFunction("/resources/**", location));
 	}
 
 	@Test
 	void withFileSystemResource() {
 		FileSystemResource location = new FileSystemResource("/static/");
-		PathResourceLookupFunction function = new PathResourceLookupFunction("/resources/**", location);
+		assertThatNoException().isThrownBy(() -> new PathResourceLookupFunction("/resources/**", location));
 	}
 
 }

Diff for: spring-webmvc/src/test/java/org/springframework/web/servlet/function/PathResourceLookupFunctionTests.java

@@ -29,6 +29,7 @@
 import org.springframework.web.servlet.handler.PathPatternsTestUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatNoException;
 
 /**
  * @author Arjen Poutsma
@@ -107,13 +108,13 @@ private ServerRequest initRequest(String httpMethod, String requestUri) {
 	@SuppressWarnings("removal")
 	void withPathResource() {
 		org.springframework.core.io.PathResource location = new org.springframework.core.io.PathResource("/static/");
-		PathResourceLookupFunction function = new PathResourceLookupFunction("/resources/**", location);
+		assertThatNoException().isThrownBy(() -> new PathResourceLookupFunction("/resources/**", location));
 	}
 
 	@Test
 	void withFileSystemResource() {
 		FileSystemResource location = new FileSystemResource("/static/");
-		PathResourceLookupFunction function = new PathResourceLookupFunction("/resources/**", location);
+		assertThatNoException().isThrownBy(() -> new PathResourceLookupFunction("/resources/**", location));
 	}
 
 }