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

Preserve URLStreamHandler in toRelativeURL and convertClassLoaderURL

Browse Source 
Closes gh-33561
See gh-33199
This commit is contained in:
Juergen Hoeller
2024-09-25 12:45:34 +02:00
parent ca0448260f
commit daa109e2ec
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java
View File

@@ -412,6 +412,7 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
* @see #doFindAllClassPathResources
* @see #doFindPathMatchingFileResources
*/
@SuppressWarnings("deprecation") // on JDK 20 (deprecated URL constructor)
protected Resource convertClassLoaderURL(URL url) {
if (ResourceUtils.URL_PROTOCOL_FILE.equals(url.getProtocol())) {
try {
@@ -429,14 +430,10 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
if (!cleanedPath.equals(urlString)) {
// Prefer cleaned URL, aligned with UrlResource#createRelative(String)
try {
// Cannot test for URLStreamHandler directly: URL equality for same String
// in order to find out whether original URL uses default URLStreamHandler.
if (ResourceUtils.toURL(urlString).equals(url)) {
// Plain URL with default URLStreamHandler -> replace with cleaned path.
return new UrlResource(ResourceUtils.toURI(cleanedPath));
}
// Retain original URL instance, potentially including custom URLStreamHandler.
return new UrlResource(new URL(url, cleanedPath));
}
catch (URISyntaxException | MalformedURLException ex) {
catch (MalformedURLException ex) {
// Fallback to regular URL construction below...
}
}

8
spring-core/src/main/java/org/springframework/util/ResourceUtils.java
View File

@@ -405,14 +405,14 @@ public abstract class ResourceUtils {
* @see java.net.URI#toURL()
* @see #toURI(String)
*/
@SuppressWarnings("deprecation") // on JDK 20
@SuppressWarnings("deprecation") // on JDK 20 (deprecated URL constructor)
public static URL toURL(String location) throws MalformedURLException {
try {
// Prefer URI construction with toURL conversion (as of 6.1)
return toURI(StringUtils.cleanPath(location)).toURL();
}
catch (URISyntaxException | IllegalArgumentException ex) {
// Lenient fallback to deprecated (on JDK 20) URL constructor,
// Lenient fallback to deprecated URL constructor,
// e.g. for decoded location Strings with percent characters.
return new URL(location);
}
@@ -429,11 +429,13 @@ public abstract class ResourceUtils {
* @see #toURL(String)
* @see StringUtils#applyRelativePath
*/
@SuppressWarnings("deprecation") // on JDK 20 (deprecated URL constructor)
public static URL toRelativeURL(URL root, String relativePath) throws MalformedURLException {
// # can appear in filenames, java.net.URL should not treat it as a fragment
relativePath = StringUtils.replace(relativePath, "#", "%23");
return toURL(StringUtils.applyRelativePath(root.toString(), relativePath));
// Retain original URL instance, potentially including custom URLStreamHandler.
return new URL(root, StringUtils.cleanPath(StringUtils.applyRelativePath(root.toString(), relativePath)));
}
/**

7
spring-core/src/test/java/org/springframework/core/io/ResourceTests.java
View File

@@ -377,6 +377,13 @@ class ResourceTests {
assertThat(relative).isEqualTo(new UrlResource("file:dir/subdir"));
}
@Test
void unusualRelativeResourcesAreEqual() throws Exception {
Resource resource = new UrlResource("file:dir/");
Resource relative = resource.createRelative("http://spring.io");
assertThat(relative).isEqualTo(new UrlResource("file:dir/http://spring.io"));
}
@Test
void missingRemoteResourceDoesNotExist() throws Exception {
String baseUrl = startServer();