root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Equivalent code without java.net.URL constructor in comment blocks 

See gh-29486
See gh-29481
This commit is contained in:
Juergen Hoeller 2022-11-15 00:33:48 +01:00
parent 7d2543ed82
commit 9235e3996f
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spring-core/src/main/java/org/springframework/core/io/UrlResource.java
View File

@ -97,6 +97,21 @@ public class UrlResource extends AbstractFileResolvingResource {
*/ */
public UrlResource(String path) throws MalformedURLException { public UrlResource(String path) throws MalformedURLException {
Assert.notNull(path, "Path must not be null"); Assert.notNull(path, "Path must not be null");
// Equivalent without java.net.URL constructor - for building on JDK 20+
/*
try {
this.uri = ResourceUtils.toURI(StringUtils.cleanPath(path));
this.url = this.uri.toURL();
this.cleanedUrl = StringUtils.cleanPath(path);
}
catch (URISyntaxException | IllegalArgumentException ex) {
MalformedURLException exToThrow = new MalformedURLException(ex.getMessage());
exToThrow.initCause(ex);
throw exToThrow;
}
*/
this.uri = null; this.uri = null;
this.url = ResourceUtils.toURL(path); this.url = ResourceUtils.toURL(path);
this.cleanedUrl = StringUtils.cleanPath(path); this.cleanedUrl = StringUtils.cleanPath(path);

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

@ -390,13 +390,12 @@ public abstract class ResourceUtils {
* @since 6.0 * @since 6.0
*/ */
public static URL toURL(String location) throws MalformedURLException { public static URL toURL(String location) throws MalformedURLException {
// Not fully equivalent - but to be moved in the given direction // Equivalent without java.net.URL constructor - for building on JDK 20+
// since JDK 20 deprecates all direct java.net.URL constructors.
/* /*
try { try {
return toURI(location).toURL(); return toURI(StringUtils.cleanPath(location)).toURL();
} }
catch (URISyntaxException ex) { catch (URISyntaxException | IllegalArgumentException ex) {
MalformedURLException exToThrow = new MalformedURLException(ex.getMessage()); MalformedURLException exToThrow = new MalformedURLException(ex.getMessage());
exToThrow.initCause(ex); exToThrow.initCause(ex);
throw exToThrow; throw exToThrow;
@ -419,8 +418,7 @@ public abstract class ResourceUtils {
// # can appear in filenames, java.net.URL should not treat it as a fragment // # can appear in filenames, java.net.URL should not treat it as a fragment
relativePath = StringUtils.replace(relativePath, "#", "%23"); relativePath = StringUtils.replace(relativePath, "#", "%23");
// Not fully equivalent - but to be moved in the given direction // Equivalent without java.net.URL constructor - for building on JDK 20+
// since JDK 20 deprecates all direct java.net.URL constructors.
/* /*
return toURL(StringUtils.applyRelativePath(root.toString(), relativePath)); return toURL(StringUtils.applyRelativePath(root.toString(), relativePath));
*/ */