Merge branch '6.2.x'

jhoeller · jhoeller · commit 2fbd54078bbb · 2025-03-04T18:46:39.000+01:00
# Conflicts:
#	spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceHandlerUtils.java
#	spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHandlerUtils.java
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGenerator.java b/spring-beans/src/main/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGenerator.java
@@ -440,6 +440,7 @@ private void registerProxyIfNecessary(RuntimeHints runtimeHints, DependencyDescr
 		}
 	}
 
+
 	record ConstructorDescriptor(String beanName, Constructor<?> constructor, Class<?> publicType) {
 
 		Class<?> actualType() {
diff --git a/spring-core/src/main/java/org/springframework/util/StringUtils.java b/spring-core/src/main/java/org/springframework/util/StringUtils.java
@@ -784,9 +784,9 @@ else if (TOP_PATH.equals(element)) {
 			pathElements.addFirst(CURRENT_PATH);
 		}
 
-		final String joined = collectionToDelimitedString(pathElements, FOLDER_SEPARATOR);
-		// avoid string concatenation with empty prefix
-		return prefix.isEmpty() ? joined : prefix + joined;
+		String joined = collectionToDelimitedString(pathElements, FOLDER_SEPARATOR);
+		// Avoid String concatenation with empty prefix
+		return (prefix.isEmpty() ? joined : prefix + joined);
 	}
 
 	/**
diff --git a/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java b/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java
@@ -461,7 +461,7 @@ List<T> get() {
 		}
 	}
 
-	public interface InterfaceWithDefaultMethod<T extends InheritsDefaultMethod.AbstractType> {
+	public interface InterfaceWithDefaultMethod<T extends InterfaceWithDefaultMethod.AbstractType> {
 
 		default String get(T input) {
 			throw new UnsupportedOperationException();
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceHandlerUtils.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceHandlerUtils.java
@@ -25,6 +25,7 @@
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.UrlResource;
 import org.springframework.core.log.LogFormatUtils;
@@ -60,12 +61,15 @@ public static void assertResourceLocation(@Nullable Resource location) {
 			if (location instanceof org.springframework.core.io.PathResource) {
 				return;
 			}
-			else if (location instanceof UrlResource) {
-				path = location.getURL().toExternalForm();
+			else if (location instanceof FileSystemResource fileSystemResource) {
+				path = fileSystemResource.getPath();
 			}
 			else if (location instanceof ClassPathResource classPathResource) {
 				path = classPathResource.getPath();
 			}
+			else if (location instanceof UrlResource) {
+				path = location.getURL().toExternalForm();
+			}
 			else {
 				path = location.getURL().getPath();
 			}
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/PathResourceLookupFunctionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/PathResourceLookupFunctionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -26,6 +26,7 @@
 import reactor.test.StepVerifier;
 
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 import org.springframework.web.testfixture.http.server.reactive.MockServerHttpRequest;
 import org.springframework.web.testfixture.server.MockServerWebExchange;
@@ -39,8 +40,7 @@ class PathResourceLookupFunctionTests {
 	void normal() throws Exception {
 		ClassPathResource location = new ClassPathResource("org/springframework/web/reactive/function/server/");
 
-		PathResourceLookupFunction
-				function = new PathResourceLookupFunction("/resources/**", location);
+		PathResourceLookupFunction function = new PathResourceLookupFunction("/resources/**", location);
 		MockServerHttpRequest mockRequest = MockServerHttpRequest.get("https://localhost/resources/response.txt").build();
 		ServerRequest request = new DefaultServerRequest(MockServerWebExchange.from(mockRequest), Collections.emptyList());
 		Mono<Resource> result = function.apply(request);
@@ -124,4 +124,17 @@ void composeResourceLookupFunction() {
 				.verify();
 	}
 
+	@Test
+	@SuppressWarnings("removal")
+	void withPathResource() {
+		org.springframework.core.io.PathResource location = new org.springframework.core.io.PathResource("/static/");
+		PathResourceLookupFunction function = new PathResourceLookupFunction("/resources/**", location);
+	}
+
+	@Test
+	void withFileSystemResource() {
+		FileSystemResource location = new FileSystemResource("/static/");
+		PathResourceLookupFunction function = new PathResourceLookupFunction("/resources/**", location);
+	}
+
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHandlerUtils.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHandlerUtils.java
@@ -25,6 +25,7 @@
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.UrlResource;
 import org.springframework.core.log.LogFormatUtils;
@@ -61,12 +62,15 @@ public static void assertResourceLocation(@Nullable Resource location) {
 			if (location instanceof org.springframework.core.io.PathResource) {
 				return;
 			}
-			else if (location instanceof UrlResource) {
-				path = location.getURL().toExternalForm();
+			else if (location instanceof FileSystemResource fileSystemResource) {
+				path = fileSystemResource.getPath();
 			}
 			else if (location instanceof ClassPathResource classPathResource) {
 				path = classPathResource.getPath();
 			}
+			else if (location instanceof UrlResource) {
+				path = location.getURL().toExternalForm();
+			}
 			else {
 				path = location.getURL().getPath();
 			}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/PathResourceLookupFunctionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/PathResourceLookupFunctionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -24,6 +24,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 import org.springframework.web.servlet.handler.PathPatternsTestUtils;
 
@@ -102,4 +103,17 @@ private ServerRequest initRequest(String httpMethod, String requestUri) {
 				Collections.emptyList());
 	}
 
+	@Test
+	@SuppressWarnings("removal")
+	void withPathResource() {
+		org.springframework.core.io.PathResource location = new org.springframework.core.io.PathResource("/static/");
+		PathResourceLookupFunction function = new PathResourceLookupFunction("/resources/**", location);
+	}
+
+	@Test
+	void withFileSystemResource() {
+		FileSystemResource location = new FileSystemResource("/static/");
+		PathResourceLookupFunction function = new PathResourceLookupFunction("/resources/**", location);
+	}
+
 }
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/ResourceHandlerFunctionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/ResourceHandlerFunctionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -56,6 +56,7 @@ class ResourceHandlerFunctionTests {
 
 	private ResourceHttpMessageConverter messageConverter;
 
+
 	@BeforeEach
 	void createContext() {
 		this.messageConverter = new ResourceHttpMessageConverter();

Original file line number	Diff line number	Diff line change
`@@ -440,6 +440,7 @@ private void registerProxyIfNecessary(RuntimeHints runtimeHints, DependencyDescr`
`440`	`440`	`}`
`441`	`441`	`}`
`442`	`442`
	`443`	`+`
`443`	`444`	`record ConstructorDescriptor(String beanName, Constructor<?> constructor, Class<?> publicType) {`
`444`	`445`
`445`	`446`	`Class<?> actualType() {`
Original file line number	Diff line number	Diff line change
`@@ -784,9 +784,9 @@ else if (TOP_PATH.equals(element)) {`
`784`	`784`	`pathElements.addFirst(CURRENT_PATH);`
`785`	`785`	`}`
`786`	`786`
`787`		`- final String joined = collectionToDelimitedString(pathElements, FOLDER_SEPARATOR);`
`788`		`- // avoid string concatenation with empty prefix`
`789`		`- return prefix.isEmpty() ? joined : prefix + joined;`
	`787`	`+ String joined = collectionToDelimitedString(pathElements, FOLDER_SEPARATOR);`
	`788`	`+ // Avoid String concatenation with empty prefix`
	`789`	`+ return (prefix.isEmpty() ? joined : prefix + joined);`
`790`	`790`	`}`
`791`	`791`
`792`	`792`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -461,7 +461,7 @@ List<T> get() {`
`461`	`461`	`}`
`462`	`462`	`}`
`463`	`463`
`464`		`- public interface InterfaceWithDefaultMethod<T extends InheritsDefaultMethod.AbstractType> {`
	`464`	`+ public interface InterfaceWithDefaultMethod<T extends InterfaceWithDefaultMethod.AbstractType> {`
`465`	`465`
`466`	`466`	`default String get(T input) {`
`467`	`467`	`throw new UnsupportedOperationException();`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`import org.jspecify.annotations.Nullable;`
`26`	`26`
`27`	`27`	`import org.springframework.core.io.ClassPathResource;`
	`28`	`+import org.springframework.core.io.FileSystemResource;`
`28`	`29`	`import org.springframework.core.io.Resource;`
`29`	`30`	`import org.springframework.core.io.UrlResource;`
`30`	`31`	`import org.springframework.core.log.LogFormatUtils;`
`@@ -60,12 +61,15 @@ public static void assertResourceLocation(@Nullable Resource location) {`
`60`	`61`	`if (location instanceof org.springframework.core.io.PathResource) {`
`61`	`62`	`return;`
`62`	`63`	`}`
`63`		`- else if (location instanceof UrlResource) {`
`64`		`- path = location.getURL().toExternalForm();`
	`64`	`+ else if (location instanceof FileSystemResource fileSystemResource) {`
	`65`	`+ path = fileSystemResource.getPath();`
`65`	`66`	`}`
`66`	`67`	`else if (location instanceof ClassPathResource classPathResource) {`
`67`	`68`	`path = classPathResource.getPath();`
`68`	`69`	`}`
	`70`	`+ else if (location instanceof UrlResource) {`
	`71`	`+ path = location.getURL().toExternalForm();`
	`72`	`+ }`
`69`	`73`	`else {`
`70`	`74`	`path = location.getURL().getPath();`
`71`	`75`	`}`