infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-08 23:20:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

8159745: Remove java.net.Parts

Browse Source 
Reviewed-by: alanb, chegar
This commit is contained in:
Claes Redestad 2016-06-17 16:18:37 +02:00
parent 4f7d655557
commit ccc3cbf458
1 changed files with 8 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
jdk/src/java.base/share/classes/java/net/URL.java
View File

@ -428,16 +428,18 @@ public final class URL implements java.io.Serializable {
authority = (port == -1) ? host : host + ":" + port;
}
Parts parts = new Parts(file);
path = parts.getPath();
query = parts.getQuery();
if (query != null) {
int index = file.indexOf('#');
this.ref = index < 0 ? null : file.substring(index + 1);
file = index < 0 ? file : file.substring(0, index);
int q = file.lastIndexOf('?');
if (q != -1) {
this.query = file.substring(q + 1);
this.path = file.substring(0, q);
this.file = path + "?" + query;
} else {
this.path = file;
this.file = path;
}
ref = parts.getRef();
// Note: we don't do validation of the URL here. Too risky to change
// right now, but worth considering for future reference. -br
@ -1617,35 +1619,6 @@ public final class URL implements java.io.Serializable {
}
}
class Parts {
String path, query, ref;
Parts(String file) {
int ind = file.indexOf('#');
ref = ind < 0 ? null: file.substring(ind + 1);
file = ind < 0 ? file: file.substring(0, ind);
int q = file.lastIndexOf('?');
if (q != -1) {
query = file.substring(q+1);
path = file.substring(0, q);
} else {
path = file;
}
}
String getPath() {
return path;
}
String getQuery() {
return query;
}
String getRef() {
return ref;
}
}
final class UrlDeserializedState {
private final String protocol;
private final String host;