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

Convert file: URL to FileSystemResource for backward compatibility

Browse Source 
See gh-29163
This commit is contained in:
Sam Brannen
2022-09-25 18:23:13 +02:00
parent 508be4e0fa
commit 0e22c3d89d
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,7 @@ import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.net.JarURLConnection;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
@@ -765,9 +766,9 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
files.forEach(file -> {
if (getPathMatcher().match(patternPath.toString(), file.toString())) {
try {
result.add(new UrlResource(file.toUri()));
result.add(convertToResource(file.toUri()));
}
catch (MalformedURLException ex) {
catch (Exception ex) {
// ignore
}
}
@@ -849,14 +850,12 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
}
@Nullable
private static Resource findResource(ModuleReader moduleReader, String name) {
private Resource findResource(ModuleReader moduleReader, String name) {
try {
return moduleReader.find(name)
// If it's a "file:" URI, use FileSystemResource to avoid duplicates
// for the same path discovered via class-path scanning.
.map(uri -> ResourceUtils.URL_PROTOCOL_FILE.equals(uri.getScheme()) ?
new FileSystemResource(uri.getPath()) :
UrlResource.from(uri))
.map(this::convertToResource)
.orElse(null);
}
catch (Exception ex) {
@@ -867,6 +866,12 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
}
}
private Resource convertToResource(URI uri) {
return ResourceUtils.URL_PROTOCOL_FILE.equals(uri.getScheme()) ?
new FileSystemResource(uri.getPath()) :
UrlResource.from(uri);
}
private static String stripLeadingSlash(String path) {
return (path.startsWith("/") ? path.substring(1) : path);
}