Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.2.x'

Browse Source 
# 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
This commit is contained in:
Juergen Hoeller
2025-03-04 18:46:39 +01:00
parent ca7ebd60ed 403362fe3c
commit 2fbd54078b
8 changed files with 50 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-beans/src/main/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGenerator.java
View File

@@ -440,6 +440,7 @@ public class InstanceSupplierCodeGenerator {
}
}
record ConstructorDescriptor(String beanName, Constructor<?> constructor, Class<?> publicType) {
Class<?> actualType() {

6
spring-core/src/main/java/org/springframework/util/StringUtils.java
View File

@@ -784,9 +784,9 @@ public abstract class StringUtils {
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);
}
/**

2
spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java
View File

@@ -461,7 +461,7 @@ class GenericTypeResolverTests {
}
}
public interface InterfaceWithDefaultMethod<T extends InheritsDefaultMethod.AbstractType> {
public interface InterfaceWithDefaultMethod<T extends InterfaceWithDefaultMethod.AbstractType> {
default String get(T input) {
throw new UnsupportedOperationException();

8
spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceHandlerUtils.java
View File

@@ -25,6 +25,7 @@ import org.apache.commons.logging.LogFactory;
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 abstract class ResourceHandlerUtils {
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();
}

19
spring-webflux/src/test/java/org/springframework/web/reactive/function/server/PathResourceLookupFunctionTests.java
View File

@@ -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.core.publisher.Mono;
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 @@ class PathResourceLookupFunctionTests {
.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);
}
}

8
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHandlerUtils.java
View File

@@ -25,6 +25,7 @@ import org.apache.commons.logging.LogFactory;
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 abstract class ResourceHandlerUtils {
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();
}

16
spring-webmvc/src/test/java/org/springframework/web/servlet/function/PathResourceLookupFunctionTests.java
View File

@@ -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 java.util.function.Function;
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 @@ class PathResourceLookupFunctionTests {
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);
}
}

3
spring-webmvc/src/test/java/org/springframework/web/servlet/function/ResourceHandlerFunctionTests.java
View File

@@ -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();