stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8145988: Use the raw methods of java.net.URI when possible

Browse Source 
Reviewed-by: shade, chegar
This commit is contained in:
Claes Redestad 2015-12-22 16:42:16 +01:00
parent 7e4d56677d
commit 22df7c453f
5 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jdk/src/java.base/share/classes/java/io/File.java
View File

@ -420,11 +420,11 @@ public class File
String scheme = uri.getScheme(); String scheme = uri.getScheme();
if ((scheme == null) || !scheme.equalsIgnoreCase("file")) if ((scheme == null) || !scheme.equalsIgnoreCase("file"))
throw new IllegalArgumentException("URI scheme is not \"file\""); throw new IllegalArgumentException("URI scheme is not \"file\"");
if (uri.getAuthority() != null) if (uri.getRawAuthority() != null)
throw new IllegalArgumentException("URI has an authority component"); throw new IllegalArgumentException("URI has an authority component");
if (uri.getFragment() != null) if (uri.getRawFragment() != null)
throw new IllegalArgumentException("URI has a fragment component"); throw new IllegalArgumentException("URI has a fragment component");
if (uri.getQuery() != null) if (uri.getRawQuery() != null)
throw new IllegalArgumentException("URI has a query component"); throw new IllegalArgumentException("URI has a query component");
String p = uri.getPath(); String p = uri.getPath();
if (p.equals("")) if (p.equals(""))

11
jdk/src/java.base/unix/classes/sun/nio/fs/UnixFileSystemProvider.java
View File

@ -69,15 +69,16 @@ public abstract class UnixFileSystemProvider
private void checkUri(URI uri) { private void checkUri(URI uri) {
if (!uri.getScheme().equalsIgnoreCase(getScheme())) if (!uri.getScheme().equalsIgnoreCase(getScheme()))
throw new IllegalArgumentException("URI does not match this provider"); throw new IllegalArgumentException("URI does not match this provider");
if (uri.getAuthority() != null) if (uri.getRawAuthority() != null)
throw new IllegalArgumentException("Authority component present"); throw new IllegalArgumentException("Authority component present");
if (uri.getPath() == null) String path = uri.getPath();
if (path == null)
throw new IllegalArgumentException("Path component is undefined"); throw new IllegalArgumentException("Path component is undefined");
if (!uri.getPath().equals("/")) if (!path.equals("/"))
throw new IllegalArgumentException("Path component should be '/'"); throw new IllegalArgumentException("Path component should be '/'");
if (uri.getQuery() != null) if (uri.getRawQuery() != null)
throw new IllegalArgumentException("Query component present"); throw new IllegalArgumentException("Query component present");
if (uri.getFragment() != null) if (uri.getRawFragment() != null)
throw new IllegalArgumentException("Fragment component present"); throw new IllegalArgumentException("Fragment component present");
} }

6
jdk/src/java.base/unix/classes/sun/nio/fs/UnixUriUtils.java
View File

@ -49,11 +49,11 @@ class UnixUriUtils {
String scheme = uri.getScheme(); String scheme = uri.getScheme();
if ((scheme == null) || !scheme.equalsIgnoreCase("file")) if ((scheme == null) || !scheme.equalsIgnoreCase("file"))
throw new IllegalArgumentException("URI scheme is not \"file\""); throw new IllegalArgumentException("URI scheme is not \"file\"");
if (uri.getAuthority() != null) if (uri.getRawAuthority() != null)
throw new IllegalArgumentException("URI has an authority component"); throw new IllegalArgumentException("URI has an authority component");
if (uri.getFragment() != null) if (uri.getRawFragment() != null)
throw new IllegalArgumentException("URI has a fragment component"); throw new IllegalArgumentException("URI has a fragment component");
if (uri.getQuery() != null) if (uri.getRawQuery() != null)
throw new IllegalArgumentException("URI has a query component"); throw new IllegalArgumentException("URI has a query component");
// compatibility with java.io.File // compatibility with java.io.File

11
jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileSystemProvider.java
View File

@ -61,15 +61,16 @@ public class WindowsFileSystemProvider
private void checkUri(URI uri) { private void checkUri(URI uri) {
if (!uri.getScheme().equalsIgnoreCase(getScheme())) if (!uri.getScheme().equalsIgnoreCase(getScheme()))
throw new IllegalArgumentException("URI does not match this provider"); throw new IllegalArgumentException("URI does not match this provider");
if (uri.getAuthority() != null) if (uri.getRawAuthority() != null)
throw new IllegalArgumentException("Authority component present"); throw new IllegalArgumentException("Authority component present");
if (uri.getPath() == null) String path = uri.getPath();
if (path == null)
throw new IllegalArgumentException("Path component is undefined"); throw new IllegalArgumentException("Path component is undefined");
if (!uri.getPath().equals("/")) if (!path.equals("/"))
throw new IllegalArgumentException("Path component should be '/'"); throw new IllegalArgumentException("Path component should be '/'");
if (uri.getQuery() != null) if (uri.getRawQuery() != null)
throw new IllegalArgumentException("Query component present"); throw new IllegalArgumentException("Query component present");
if (uri.getFragment() != null) if (uri.getRawFragment() != null)
throw new IllegalArgumentException("Fragment component present"); throw new IllegalArgumentException("Fragment component present");
} }

6
jdk/src/java.base/windows/classes/sun/nio/fs/WindowsUriSupport.java
View File

@ -123,16 +123,16 @@ class WindowsUriSupport {
String scheme = uri.getScheme(); String scheme = uri.getScheme();
if ((scheme == null) || !scheme.equalsIgnoreCase("file")) if ((scheme == null) || !scheme.equalsIgnoreCase("file"))
throw new IllegalArgumentException("URI scheme is not \"file\""); throw new IllegalArgumentException("URI scheme is not \"file\"");
if (uri.getFragment() != null) if (uri.getRawFragment() != null)
throw new IllegalArgumentException("URI has a fragment component"); throw new IllegalArgumentException("URI has a fragment component");
if (uri.getQuery() != null) if (uri.getRawQuery() != null)
throw new IllegalArgumentException("URI has a query component"); throw new IllegalArgumentException("URI has a query component");
String path = uri.getPath(); String path = uri.getPath();
if (path.equals("")) if (path.equals(""))
throw new IllegalArgumentException("URI path component is empty"); throw new IllegalArgumentException("URI path component is empty");
// UNC // UNC
String auth = uri.getAuthority(); String auth = uri.getRawAuthority();
if (auth != null && !auth.equals("")) { if (auth != null && !auth.equals("")) {
String host = uri.getHost(); String host = uri.getHost();
if (host == null) if (host == null)