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

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