platform/shared/rubyJVM/src/com/rho/net/URI.java in rhodes-1.2.2 vs platform/shared/rubyJVM/src/com/rho/net/URI.java in rhodes-1.4.0
- old
+ new
@@ -1,50 +1,12 @@
-/*
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
package com.rho.net;
-/** URI class. This class is the Xerces URI class.
- *
- */
public class URI {
- /** MalformedURIExceptions are thrown in the process of building a URI
- * or setting fields on a URI when an operation would result in an
- * invalid URI specification.
- *
- */
public static class MalformedURIException extends RuntimeException {
- /**
- * Constructs a <code>MalformedURIException</code> with no specified
- * detail message.
- */
-// public MalformedURIException() {
-// super();
-// }
-
- /**
- * Constructs a <code>MalformedURIException</code> with the
- * specified detail message.
- *
- * @param p_msg the detail message.
- */
public MalformedURIException(String p_msg) {
super(p_msg);
}
public String getMessage() {
@@ -53,14 +15,10 @@
}
private static final byte [] fgLookupTable = new byte[128];
- /**
- * Character Classes
- */
-
/** reserved characters ;/?:@&=+$,[] */
//RFC 2732 added '[' and ']' as reserved characters
private static final int RESERVED_CHARACTERS = 0x01;
/** URI punctuation mark characters: -_.!~*'() - these, combined with
@@ -220,214 +178,19 @@
*/
// public URI(URI p_other) {
// initialize(p_other);
// }
- /**
- * Construct a new URI from a URI specification string. If the
- * specification follows the "generic URI" syntax, (two slashes
- * following the first colon), the specification will be parsed
- * accordingly - setting the scheme, userinfo, host,port, path, query
- * string and fragment fields as necessary. If the specification does
- * not follow the "generic URI" syntax, the specification is parsed
- * into a scheme and scheme-specific part (stored as the path) only.
- *
- * @param p_uriSpec the URI specification string (cannot be null or
- * empty)
- *
- * @exception MalformedURIException if p_uriSpec violates any syntax
- * rules
- */
public URI(String p_uriSpec) throws MalformedURIException {
this((URI)null, p_uriSpec);
}
- /**
- * Construct a new URI from a URI specification string. If the
- * specification follows the "generic URI" syntax, (two slashes
- * following the first colon), the specification will be parsed
- * accordingly - setting the scheme, userinfo, host,port, path, query
- * string and fragment fields as necessary. If the specification does
- * not follow the "generic URI" syntax, the specification is parsed
- * into a scheme and scheme-specific part (stored as the path) only.
- * Construct a relative URI if boolean is assigned to "true"
- * and p_uriSpec is not valid absolute URI, instead of throwing an exception.
- *
- * @param p_uriSpec the URI specification string (cannot be null or
- * empty)
- * @param allowNonAbsoluteURI true to permit non-absolute URIs,
- * false otherwise.
- *
- * @exception MalformedURIException if p_uriSpec violates any syntax
- * rules
- */
-// public URI(String p_uriSpec, boolean allowNonAbsoluteURI) throws MalformedURIException {
-// this((URI)null, p_uriSpec, allowNonAbsoluteURI);
-// }
-
- /**
- * Construct a new URI from a base URI and a URI specification string.
- * The URI specification string may be a relative URI.
- *
- * @param p_base the base URI (cannot be null if p_uriSpec is null or
- * empty)
- * @param p_uriSpec the URI specification string (cannot be null or
- * empty if p_base is null)
- *
- * @exception MalformedURIException if p_uriSpec violates any syntax
- * rules
- */
public URI(URI p_base, String p_uriSpec) throws MalformedURIException {
initialize(p_base, p_uriSpec!=null?p_uriSpec.trim():null);
mHashCode=-1;
}
-
- /**
- * Construct a new URI from a base URI and a URI specification string.
- * The URI specification string may be a relative URI.
- * Construct a relative URI if boolean is assigned to "true"
- * and p_uriSpec is not valid absolute URI and p_base is null
- * instead of throwing an exception.
- *
- * @param p_base the base URI (cannot be null if p_uriSpec is null or
- * empty)
- * @param p_uriSpec the URI specification string (cannot be null or
- * empty if p_base is null)
- * @param allowNonAbsoluteURI true to permit non-absolute URIs,
- * false otherwise.
- *
- * @exception MalformedURIException if p_uriSpec violates any syntax
- * rules
- */
-// public URI(URI p_base, String p_uriSpec, boolean allowNonAbsoluteURI) throws MalformedURIException {
-// initialize(p_base, p_uriSpec, allowNonAbsoluteURI);
-// }
- /**
- * Construct a new URI that does not follow the generic URI syntax.
- * Only the scheme and scheme-specific part (stored as the path) are
- * initialized.
- *
- * @param p_scheme the URI scheme (cannot be null or empty)
- * @param p_schemeSpecificPart the scheme-specific part (cannot be
- * null or empty)
- *
- * @exception MalformedURIException if p_scheme violates any
- * syntax rules
- */
-// public URI(String p_scheme, String p_schemeSpecificPart)
-// throws MalformedURIException {
-// if (p_scheme == null || p_scheme.trim().length() == 0) {
-// throw new MalformedURIException(
-// "Cannot construct URI with null/empty scheme!");
-// }
-// if (p_schemeSpecificPart == null ||
-// p_schemeSpecificPart.trim().length() == 0) {
-// throw new MalformedURIException(
-// "Cannot construct URI with null/empty scheme-specific part!");
-// }
-// setScheme(p_scheme);
-// setPath(p_schemeSpecificPart);
-// }
-
- /**
- * Construct a new URI that follows the generic URI syntax from its
- * component parts. Each component is validated for syntax and some
- * basic semantic checks are performed as well. See the individual
- * setter methods for specifics.
- *
- * @param p_scheme the URI scheme (cannot be null or empty)
- * @param p_host the hostname, IPv4 address or IPv6 reference for the URI
- * @param p_path the URI path - if the path contains '?' or '#',
- * then the query string and/or fragment will be
- * set from the path; however, if the query and
- * fragment are specified both in the path and as
- * separate parameters, an exception is thrown
- * @param p_queryString the URI query string (cannot be specified
- * if path is null)
- * @param p_fragment the URI fragment (cannot be specified if path
- * is null)
- *
- * @exception MalformedURIException if any of the parameters violates
- * syntax rules or semantic rules
- */
-// public URI(String p_scheme, String p_host, String p_path,
-// String p_queryString, String p_fragment)
-// throws MalformedURIException {
-// this(p_scheme, null, p_host, -1, p_path, p_queryString, p_fragment);
-// }
-
- /**
- * Construct a new URI that follows the generic URI syntax from its
- * component parts. Each component is validated for syntax and some
- * basic semantic checks are performed as well. See the individual
- * setter methods for specifics.
- *
- * @param p_scheme the URI scheme (cannot be null or empty)
- * @param p_userinfo the URI userinfo (cannot be specified if host
- * is null)
- * @param p_host the hostname, IPv4 address or IPv6 reference for the URI
- * @param p_port the URI port (may be -1 for "unspecified"; cannot
- * be specified if host is null)
- * @param p_path the URI path - if the path contains '?' or '#',
- * then the query string and/or fragment will be
- * set from the path; however, if the query and
- * fragment are specified both in the path and as
- * separate parameters, an exception is thrown
- * @param p_queryString the URI query string (cannot be specified
- * if path is null)
- * @param p_fragment the URI fragment (cannot be specified if path
- * is null)
- *
- * @exception MalformedURIException if any of the parameters violates
- * syntax rules or semantic rules
- */
-// public URI(String p_scheme, String p_userinfo,
-// String p_host, int p_port, String p_path,
-// String p_queryString, String p_fragment)
-// throws MalformedURIException {
-// if (p_scheme == null || p_scheme.trim().length() == 0) {
-// throw new MalformedURIException("Scheme is required!");
-// }
-//
-// if (p_host == null) {
-// if (p_userinfo != null) {
-// throw new MalformedURIException(
-// "Userinfo may not be specified if host is not specified!");
-// }
-// if (p_port != -1) {
-// throw new MalformedURIException(
-// "Port may not be specified if host is not specified!");
-// }
-// }
-//
-// if (p_path != null) {
-// if (p_path.indexOf('?') != -1 && p_queryString != null) {
-// throw new MalformedURIException(
-// "Query string cannot be specified in path and query string!");
-// }
-//
-// if (p_path.indexOf('#') != -1 && p_fragment != null) {
-// throw new MalformedURIException(
-// "Fragment cannot be specified in both the path and fragment!");
-// }
-// }
-//
-// setScheme(p_scheme);
-// setHost(p_host);
-// setPort(p_port);
-// setUserinfo(p_userinfo);
-// setPath(p_path);
-// setQueryString(p_queryString);
-// setFragment(p_fragment);
-// }
-
- /**
- * Initialize all fields of this URI from another URI.
- *
- * @param p_other the URI to copy (cannot be null)
- */
private void initialize(URI p_other) {
m_scheme = p_other.getScheme();
m_userinfo = p_other.getUserinfo();
m_host = p_other.getHost();
m_port = p_other.getPort();
@@ -469,147 +232,10 @@
if (mHashCode==-1)
mHashCode = calcHashCode();
return mHashCode;
}
- /**
- * Initializes this URI from a base URI and a URI specification string.
- * See RFC 2396 Section 4 and Appendix B for specifications on parsing
- * the URI and Section 5 for specifications on resolving relative URIs
- * and relative paths.
- *
- * @param p_base the base URI (may be null if p_uriSpec is an absolute
- * URI)
- * @param p_uriSpec the URI spec string which may be an absolute or
- * relative URI (can only be null/empty if p_base
- * is not null)
- * @param allowNonAbsoluteURI true to permit non-absolute URIs,
- * in case of relative URI, false otherwise.
- *
- * @exception MalformedURIException if p_base is null and p_uriSpec
- * is not an absolute URI or if
- * p_uriSpec violates syntax rules
- */
-// private void initialize(URI p_base, String p_uriSpec, boolean allowNonAbsoluteURI)
-// throws MalformedURIException {
-//
-// String uriSpec = p_uriSpec;
-// int uriSpecLen = (uriSpec != null) ? uriSpec.length() : 0;
-//
-// if (p_base == null && uriSpecLen == 0) {
-// if (allowNonAbsoluteURI) {
-// m_path = "";
-// return;
-// }
-// throw new MalformedURIException("Cannot initialize URI with empty parameters.");
-// }
-//
-// // just make a copy of the base if spec is empty
-// if (uriSpecLen == 0) {
-// initialize(p_base);
-// return;
-// }
-//
-// int index = 0;
-//
-// // Check for scheme, which must be before '/', '?' or '#'.
-// int colonIdx = uriSpec.indexOf(':');
-// if (colonIdx != -1) {
-// final int searchFrom = colonIdx - 1;
-// // search backwards starting from character before ':'.
-// int slashIdx = uriSpec.lastIndexOf('/', searchFrom);
-// int queryIdx = uriSpec.lastIndexOf('?', searchFrom);
-// int fragmentIdx = uriSpec.lastIndexOf('#', searchFrom);
-//
-// if (colonIdx == 0 || slashIdx != -1 ||
-// queryIdx != -1 || fragmentIdx != -1) {
-// // A standalone base is a valid URI according to spec
-// if (colonIdx == 0 || (p_base == null && fragmentIdx != 0 && !allowNonAbsoluteURI)) {
-// throw new MalformedURIException("No scheme found in URI.");
-// }
-// }
-// else {
-// initializeScheme(uriSpec);
-// index = m_scheme.length()+1;
-//
-// // Neither 'scheme:' or 'scheme:#fragment' are valid URIs.
-// if (colonIdx == uriSpecLen - 1 || uriSpec.charAt(colonIdx+1) == '#') {
-// throw new MalformedURIException("Scheme specific part cannot be empty.");
-// }
-// }
-// }
-// else if (p_base == null && uriSpec.indexOf('#') != 0 && !allowNonAbsoluteURI) {
-// throw new MalformedURIException("No scheme found in URI.");
-// }
-//
-// // Two slashes means we may have authority, but definitely means we're either
-// // matching net_path or abs_path. These two productions are ambiguous in that
-// // every net_path (except those containing an IPv6Reference) is an abs_path.
-// // RFC 2396 resolves this ambiguity by applying a greedy left most matching rule.
-// // Try matching net_path first, and if that fails we don't have authority so
-// // then attempt to match abs_path.
-// //
-// // net_path = "//" authority [ abs_path ]
-// // abs_path = "/" path_segments
-// if (((index+1) < uriSpecLen) &&
-// (uriSpec.charAt(index) == '/' && uriSpec.charAt(index+1) == '/')) {
-// index += 2;
-// int startPos = index;
-//
-// // Authority will be everything up to path, query or fragment
-// char testChar = '\0';
-// while (index < uriSpecLen) {
-// testChar = uriSpec.charAt(index);
-// if (testChar == '/' || testChar == '?' || testChar == '#') {
-// break;
-// }
-// index++;
-// }
-//
-// // Attempt to parse authority. If the section is an empty string
-// // this is a valid server based authority, so set the host to this
-// // value.
-// if (index > startPos) {
-// // If we didn't find authority we need to back up. Attempt to
-// // match against abs_path next.
-// if (!initializeAuthority(uriSpec.substring(startPos, index))) {
-// index = startPos - 2;
-// }
-// }
-// else {
-// m_host = "";
-// }
-// }
-//
-// initializePath(uriSpec, index);
-//
-// // Resolve relative URI to base URI - see RFC 2396 Section 5.2
-// // In some cases, it might make more sense to throw an exception
-// // (when scheme is specified is the string spec and the base URI
-// // is also specified, for example), but we're just following the
-// // RFC specifications
-// if (p_base != null) {
-// absolutize(p_base);
-// }
-// }
-
- /**
- * Initializes this URI from a base URI and a URI specification string.
- * See RFC 2396 Section 4 and Appendix B for specifications on parsing
- * the URI and Section 5 for specifications on resolving relative URIs
- * and relative paths.
- *
- * @param p_base the base URI (may be null if p_uriSpec is an absolute
- * URI)
- * @param p_uriSpec the URI spec string which may be an absolute or
- * relative URI (can only be null/empty if p_base
- * is not null)
- *
- * @exception MalformedURIException if p_base is null and p_uriSpec
- * is not an absolute URI or if
- * p_uriSpec violates syntax rules
- */
private void initialize(URI p_base, String p_uriSpec)
throws MalformedURIException {
String uriSpec = p_uriSpec;
int uriSpecLen = (uriSpec != null) ? uriSpec.length() : 0;
@@ -707,15 +333,10 @@
if (p_base != null) {
absolutize(p_base);
}
}
- /**
- * Absolutize URI with given base URI.
- *
- * @param p_base base URI for absolutization
- */
private void absolutize(URI p_base) {
// check to see if this is the current doc - RFC 2396 5.2 #2
// note that this is slightly different from the RFC spec in that
// we don't include the check for query string being null
@@ -832,18 +453,10 @@
}
}
m_path = path;
}
- /**
- * Initialize the scheme for this URI from a URI string spec.
- *
- * @param p_uriSpec the URI specification (cannot be null)
- *
- * @exception MalformedURIException if URI does not have a conformant
- * scheme
- */
private void initializeScheme(String p_uriSpec)
throws MalformedURIException {
int uriSpecLen = p_uriSpec.length();
int index = 0;
String scheme = null;
@@ -865,19 +478,10 @@
else {
setScheme(scheme);
}
}
- /**
- * Initialize the authority (either server or registry based)
- * for this URI from a URI string spec.
- *
- * @param p_uriSpec the URI specification (cannot be null)
- *
- * @return true if the given string matched server or registry
- * based authority
- */
private boolean initializeAuthority(String p_uriSpec) {
int index = 0;
int start = 0;
int end = p_uriSpec.length();
@@ -969,21 +573,10 @@
// return true;
// }
return false;
}
- /**
- * Determines whether the components host, port, and user info
- * are valid as a server authority.
- *
- * @param host the host component of authority
- * @param port the port number component of authority
- * @param userinfo the user info component of authority
- *
- * @return true if the given host, port, and userinfo compose
- * a valid server authority
- */
private boolean isValidServerBasedAuthority(String host, int port, String userinfo) {
// Check if the host is well formed.
if (!isWellFormedAddress(host)) {
return false;
@@ -1021,52 +614,10 @@
// }
// }
return true;
}
- /**
- * Determines whether the given string is a registry based authority.
- *
- * @param authority the authority component of a URI
- *
- * @return true if the given string is a registry based authority
- */
-// private boolean isValidRegistryBasedAuthority(String authority) {
-// int index = 0;
-// int end = authority.length();
-// char testChar;
-//
-// while (index < end) {
-// testChar = authority.charAt(index);
-//
-// // check for valid escape sequence
-// if (testChar == '%') {
-// if (index+2 >= end ||
-// !isHex(authority.charAt(index+1)) ||
-// !isHex(authority.charAt(index+2))) {
-// return false;
-// }
-// index += 2;
-// }
-// // can check against path characters because the set
-// // is the same except for '/' which we've already excluded.
-// else if (!isPathCharacter(testChar)) {
-// return false;
-// }
-// ++index;
-// }
-// return true;
-// }
-
- /**
- * Initialize the path for this URI from a URI string spec.
- *
- * @param p_uriSpec the URI specification (cannot be null)
- * @param p_nStartIndex the index to begin scanning from
- *
- * @exception MalformedURIException if p_uriSpec violates syntax rules
- */
private void initializePath(String p_uriSpec, int p_nStartIndex)
throws MalformedURIException {
if (p_uriSpec == null) {
throw new MalformedURIException("Url: " + p_uriSpec +
"; Cannot initialize path from null string!");
@@ -1197,25 +748,14 @@
}
m_fragment = p_uriSpec.substring(start, index);
}
}
- /**
- * Get the scheme for this URI.
- *
- * @return the scheme for this URI
- */
public String getScheme() {
return m_scheme;
}
- /**
- * Get the scheme-specific part for this URI (everything following the
- * scheme and the first colon). See RFC 2396 Section 5.2 for spec.
- *
- * @return the scheme-specific part for this URI
- */
public String getSchemeSpecificPart() {
StringBuffer schemespec = new StringBuffer();
if (m_host != null || m_regAuthority != null) {
schemespec.append("//");
@@ -1256,158 +796,85 @@
}
return schemespec.toString();
}
- /**
- * Get the userinfo for this URI.
- *
- * @return the userinfo for this URI (null if not specified).
- */
+ public String getPathSpecificPart() {
+ StringBuffer schemespec = new StringBuffer();
+
+ if (m_scheme != null) {
+ schemespec.append(m_scheme);
+ schemespec.append(':');
+ }
+
+ if (m_host != null || m_regAuthority != null) {
+ schemespec.append("//");
+
+ // Server based authority.
+ if (m_host != null) {
+
+ if (m_userinfo != null) {
+ schemespec.append(m_userinfo);
+ schemespec.append('@');
+ }
+
+ schemespec.append(m_host);
+
+ if (m_port != -1) {
+ schemespec.append(':');
+ schemespec.append(m_port);
+ }
+ }
+ // Registry based authority.
+ else {
+ schemespec.append(m_regAuthority);
+ }
+ }
+
+ if (m_path != null) {
+ schemespec.append((m_path));
+ }
+
+ return schemespec.toString();
+ }
+
public String getUserinfo() {
return m_userinfo;
}
- /**
- * Get the host for this URI.
- *
- * @return the host for this URI (null if not specified).
- */
public String getHost() {
return m_host;
}
public void setHost(String strHost) {
m_host = strHost;
}
- /**
- * Get the port for this URI.
- *
- * @return the port for this URI (-1 if not specified).
- */
public int getPort() {
return m_port;
}
- /**
- * Get the registry based authority for this URI.
- *
- * @return the registry based authority (null if not specified).
- */
public String getRegBasedAuthority() {
return m_regAuthority;
}
- /**
- * Get the authority for this URI.
- *
- * @return the authority
- */
-// public String getAuthority() {
-// StringBuffer authority = new StringBuffer();
-// if (m_host != null || m_regAuthority != null) {
-// authority.append("//");
-//
-// // Server based authority.
-// if (m_host != null) {
-//
-// if (m_userinfo != null) {
-// authority.append(m_userinfo);
-// authority.append('@');
-// }
-//
-// authority.append(m_host);
-//
-// if (m_port != -1) {
-// authority.append(':');
-// authority.append(m_port);
-// }
-// }
-// // Registry based authority.
-// else {
-// authority.append(m_regAuthority);
-// }
-// }
-// return authority.toString();
-// }
-
- /**
- * Get the path for this URI (optionally with the query string and
- * fragment).
- *
- * @param p_includeQueryString if true (and query string is not null),
- * then a "?" followed by the query string
- * will be appended
- * @param p_includeFragment if true (and fragment is not null),
- * then a "#" followed by the fragment
- * will be appended
- *
- * @return the path for this URI possibly including the query string
- * and fragment
- */
-// public String getPath(boolean p_includeQueryString,
-// boolean p_includeFragment) {
-// StringBuffer pathString = new StringBuffer(m_path);
-//
-// if (p_includeQueryString && m_queryString != null) {
-// pathString.append('?');
-// pathString.append(m_queryString);
-// }
-//
-// if (p_includeFragment && m_fragment != null) {
-// pathString.append('#');
-// pathString.append(m_fragment);
-// }
-// return pathString.toString();
-// }
-
- /**
- * Get the path for this URI. Note that the value returned is the path
- * only and does not include the query string or fragment.
- *
- * @return the path for this URI.
- */
public String getPath() {
return m_path;
}
public void setPath(String path) {
m_path = path;
}
- /**
- * Get the query string for this URI.
- *
- * @return the query string for this URI. Null is returned if there
- * was no "?" in the URI spec, empty string if there was a
- * "?" but no query string following it.
- */
public String getQueryString() {
return m_queryString;
}
- /**
- * Get the fragment for this URI.
- *
- * @return the fragment for this URI. Null is returned if there
- * was no "#" in the URI spec, empty string if there was a
- * "#" but no fragment following it.
- */
public String getFragment() {
return m_fragment;
}
- /**
- * Set the scheme for this URI. The scheme is converted to lowercase
- * before it is set.
- *
- * @param p_scheme the scheme for this URI (cannot be null)
- *
- * @exception MalformedURIException if p_scheme is not a conformant
- * scheme name
- */
public void setScheme(String p_scheme) throws MalformedURIException {
if (p_scheme == null) {
throw new MalformedURIException("Url: " + p_scheme +
"; Cannot set scheme from null string!");
}
@@ -1416,225 +883,10 @@
}
m_scheme = p_scheme.toLowerCase();
mHashCode=-1;
}
- /**
- * Set the userinfo for this URI. If a non-null value is passed in and
- * the host value is null, then an exception is thrown.
- *
- * @param p_userinfo the userinfo for this URI
- *
- * @exception MalformedURIException if p_userinfo contains invalid
- * characters
- */
-// public void setUserinfo(String p_userinfo) throws MalformedURIException {
-// if (p_userinfo == null) {
-// m_userinfo = null;
-// return;
-// }
-// else {
-// if (m_host == null) {
-// throw new MalformedURIException(
-// "Userinfo cannot be set when host is null!");
-// }
-//
-// // userinfo can contain alphanumerics, mark characters, escaped
-// // and ';',':','&','=','+','$',','
-// int index = 0;
-// int end = p_userinfo.length();
-// char testChar = '\0';
-// while (index < end) {
-// testChar = p_userinfo.charAt(index);
-// if (testChar == '%') {
-// if (index+2 >= end ||
-// !isHex(p_userinfo.charAt(index+1)) ||
-// !isHex(p_userinfo.charAt(index+2))) {
-// throw new MalformedURIException(
-// "Userinfo contains invalid escape sequence!");
-// }
-// }
-// else if (!isUserinfoCharacter(testChar)) {
-// throw new MalformedURIException(
-// "Userinfo contains invalid character:"+testChar);
-// }
-// index++;
-// }
-// }
-// m_userinfo = p_userinfo;
-// }
-
- /**
- * <p>Set the host for this URI. If null is passed in, the userinfo
- * field is also set to null and the port is set to -1.</p>
- *
- * <p>Note: This method overwrites registry based authority if it
- * previously existed in this URI.</p>
- *
- * @param p_host the host for this URI
- *
- * @exception MalformedURIException if p_host is not a valid IP
- * address or DNS hostname.
- */
-// public void setHost(String p_host) throws MalformedURIException {
-// if (p_host == null || p_host.length() == 0) {
-// if (p_host != null) {
-// m_regAuthority = null;
-// }
-// m_host = p_host;
-// m_userinfo = null;
-// m_port = -1;
-// return;
-// }
-// else if (!isWellFormedAddress(p_host)) {
-// throw new MalformedURIException("Host is not a well formed address!");
-// }
-// m_host = p_host;
-// m_regAuthority = null;
-// }
-
- /**
- * Set the port for this URI. -1 is used to indicate that the port is
- * not specified, otherwise valid port numbers are between 0 and 65535.
- * If a valid port number is passed in and the host field is null,
- * an exception is thrown.
- *
- * @param p_port the port number for this URI
- *
- * @exception MalformedURIException if p_port is not -1 and not a
- * valid port number
- */
-// public void setPort(int p_port) throws MalformedURIException {
-// if (p_port >= 0 && p_port <= 65535) {
-// if (m_host == null) {
-// throw new MalformedURIException(
-// "Port cannot be set when host is null!");
-// }
-// }
-// else if (p_port != -1) {
-// throw new MalformedURIException("Invalid port number!");
-// }
-// m_port = p_port;
-// }
-
- /**
- * <p>Sets the registry based authority for this URI.</p>
- *
- * <p>Note: This method overwrites server based authority
- * if it previously existed in this URI.</p>
- *
- * @param authority the registry based authority for this URI
- *
- * @exception MalformedURIException it authority is not a
- * well formed registry based authority
- */
-// public void setRegBasedAuthority(String authority)
-// throws MalformedURIException {
-//
-// if (authority == null) {
-// m_regAuthority = null;
-// return;
-// }
-// // reg_name = 1*( unreserved | escaped | "$" | "," |
-// // ";" | ":" | "@" | "&" | "=" | "+" )
-// else if (authority.length() < 1 ||
-// !isValidRegistryBasedAuthority(authority) ||
-// authority.indexOf('/') != -1) {
-// throw new MalformedURIException("Registry based authority is not well formed.");
-// }
-// m_regAuthority = authority;
-// m_host = null;
-// m_userinfo = null;
-// m_port = -1;
-// }
-
- /**
- * Set the path for this URI. If the supplied path is null, then the
- * query string and fragment are set to null as well. If the supplied
- * path includes a query string and/or fragment, these fields will be
- * parsed and set as well. Note that, for URIs following the "generic
- * URI" syntax, the path specified should start with a slash.
- * For URIs that do not follow the generic URI syntax, this method
- * sets the scheme-specific part.
- *
- * @param p_path the path for this URI (may be null)
- *
- * @exception MalformedURIException if p_path contains invalid
- * characters
- */
-// public void setPath(String p_path) throws MalformedURIException {
-// if (p_path == null) {
-// m_path = null;
-// m_queryString = null;
-// m_fragment = null;
-// }
-// else {
-// initializePath(p_path, 0);
-// }
-// }
-
- /**
- * Append to the end of the path of this URI. If the current path does
- * not end in a slash and the path to be appended does not begin with
- * a slash, a slash will be appended to the current path before the
- * new segment is added. Also, if the current path ends in a slash
- * and the new segment begins with a slash, the extra slash will be
- * removed before the new segment is appended.
- *
- * @param p_addToPath the new segment to be added to the current path
- *
- * @exception MalformedURIException if p_addToPath contains syntax
- * errors
- */
-// public void appendPath(String p_addToPath)
-// throws MalformedURIException {
-// if (p_addToPath == null || p_addToPath.trim().length() == 0) {
-// return;
-// }
-//
-// if (!isURIString(p_addToPath)) {
-// throw new MalformedURIException(
-// "Path contains invalid character!");
-// }
-//
-// if (m_path == null || m_path.trim().length() == 0) {
-// if (p_addToPath.startsWith("/")) {
-// m_path = p_addToPath;
-// }
-// else {
-// m_path = "/" + p_addToPath;
-// }
-// }
-// else if (m_path.endsWith("/")) {
-// if (p_addToPath.startsWith("/")) {
-// m_path = m_path.concat(p_addToPath.substring(1));
-// }
-// else {
-// m_path = m_path.concat(p_addToPath);
-// }
-// }
-// else {
-// if (p_addToPath.startsWith("/")) {
-// m_path = m_path.concat(p_addToPath);
-// }
-// else {
-// m_path = m_path.concat("/" + p_addToPath);
-// }
-// }
-// }
-
- /**
- * Set the query string for this URI. A non-null value is valid only
- * if this is an URI conforming to the generic URI syntax and
- * the path value is not null.
- *
- * @param p_queryString the query string for this URI
- *
- * @exception MalformedURIException if p_queryString is not null and this
- * URI does not conform to the generic
- * URI syntax or if the path is null
- */
public void setQueryString(String p_queryString) throws MalformedURIException {
if (p_queryString == null) {
m_queryString = null;
}
else if (!isGenericURI()) {
@@ -1653,50 +905,10 @@
m_queryString = p_queryString;
}
mHashCode=-1;
}
- /**
- * Set the fragment for this URI. A non-null value is valid only
- * if this is a URI conforming to the generic URI syntax and
- * the path value is not null.
- *
- * @param p_fragment the fragment for this URI
- *
- * @exception MalformedURIException if p_fragment is not null and this
- * URI does not conform to the generic
- * URI syntax or if the path is null
- */
-// public void setFragment(String p_fragment) throws MalformedURIException {
-// if (p_fragment == null) {
-// m_fragment = null;
-// }
-// else if (!isGenericURI()) {
-// throw new MalformedURIException(
-// "Fragment can only be set for a generic URI!");
-// }
-// else if (getPath() == null) {
-// throw new MalformedURIException(
-// "Fragment cannot be set when path is null!");
-// }
-// else if (!isURIString(p_fragment)) {
-// throw new MalformedURIException(
-// "Fragment contains invalid character!");
-// }
-// else {
-// m_fragment = p_fragment;
-// }
-// }
-
- /**
- * Determines if the passed-in Object is equivalent to this URI.
- *
- * @param p_test the Object to test for equality.
- *
- * @return true if p_test is a URI with all values equal to this
- * URI, false otherwise
- */
public boolean equals(Object p_test) {
if (p_test instanceof URI) {
URI testURI = (URI) p_test;
if ( ((m_scheme == testURI.m_scheme) ||
(m_scheme != null && m_scheme.equals(testURI.m_scheme))) &&
@@ -1737,15 +949,10 @@
// }
}
return false;
}
- /**
- * Get the URI as a string specification. See RFC 2396 Section 5.2.
- *
- * @return the URI string specification
- */
public String toString() {
StringBuffer uriSpecString = new StringBuffer();
if (m_scheme != null) {
uriSpecString.append(m_scheme);
@@ -1753,41 +960,16 @@
}
uriSpecString.append(getSchemeSpecificPart());
return uriSpecString.toString();
}
- /**
- * Get the indicator as to whether this URI uses the "generic URI"
- * syntax.
- *
- * @return true if this URI uses the "generic URI" syntax, false
- * otherwise
- */
private boolean isGenericURI() {
// presence of the host (whether valid or empty) means
// double-slashes which means generic uri
return (m_host != null);
}
- /**
- * Returns whether this URI represents an absolute URI.
- *
- * @return true if this URI represents an absolute URI, false
- * otherwise
- */
-// public boolean isAbsoluteURI() {
-// // presence of the scheme means absolute uri
-// return (m_scheme != null);
-// }
-
- /**
- * Determine whether a scheme conforms to the rules for a scheme name.
- * A scheme is conformant if it starts with an alphanumeric, and
- * contains only alphanumerics, '+','-' and '.'.
- *
- * @return true if the scheme is conformant, false otherwise
- */
public static boolean isConformantSchemeName(String p_scheme) {
if (p_scheme == null || p_scheme.trim().length() == 0) {
return false;
}
@@ -1805,22 +987,10 @@
}
return true;
}
- /**
- * Determine whether a string is syntactically capable of representing
- * a valid IPv4 address, IPv6 reference or the domain name of a network host.
- * A valid IPv4 address consists of four decimal digit groups separated by a
- * '.'. Each group must consist of one to three DIGITS. See RFC 2732 Section 3,
- * and RFC 2373 Section 2.2, for the definition of IPv6 references. A hostname
- * consists of domain labels (each of which must begin and end with an alphanumeric
- * but may contain '-') separated & by a '.'. See RFC 2396 Section 3.2.2.
- *
- * @return true if the string is a syntactically valid IPv4 address,
- * IPv6 reference or hostname
- */
public static boolean isWellFormedAddress(String address) {
if (address == null) {
return false;
}
@@ -1890,21 +1060,10 @@
}
}
return true;
}
- /**
- * <p>Determines whether a string is an IPv4 address as defined by
- * RFC 2373, and under the further constraint that it must be a 32-bit
- * address. Though not expressed in the grammar, in order to satisfy
- * the 32-bit address constraint, each segment of the address cannot
- * be greater than 255 (8 bits of information).</p>
- *
- * <p><code>IPv4address = 1*3DIGIT "." 1*3DIGIT "." 1*3DIGIT "." 1*3DIGIT</code></p>
- *
- * @return true if the string is a syntactically valid IPv4 address
- */
public static boolean isWellFormedIPv4Address(String address) {
int addrLength = address.length();
char testChar;
int numDots = 0;
@@ -1953,222 +1112,37 @@
}
}
return (numDots == 3);
}
- /**
- * <p>Determines whether a string is an IPv6 reference as defined
- * by RFC 2732, where IPv6address is defined in RFC 2373. The
- * IPv6 address is parsed according to Section 2.2 of RFC 2373,
- * with the additional constraint that the address be composed of
- * 128 bits of information.</p>
- *
- * <p><code>IPv6reference = "[" IPv6address "]"</code></p>
- *
- * <p>Note: The BNF expressed in RFC 2373 Appendix B does not
- * accurately describe section 2.2, and was in fact removed from
- * RFC 3513, the successor of RFC 2373.</p>
- *
- * @return true if the string is a syntactically valid IPv6 reference
- */
-// public static boolean isWellFormedIPv6Reference(String address) {
-//
-// int addrLength = address.length();
-// int index = 1;
-// int end = addrLength-1;
-//
-// // Check if string is a potential match for IPv6reference.
-// if (!(addrLength > 2 && address.charAt(0) == '['
-// && address.charAt(end) == ']')) {
-// return false;
-// }
-//
-// // Counter for the number of 16-bit sections read in the address.
-// int [] counter = new int[1];
-//
-// // Scan hex sequence before possible '::' or IPv4 address.
-// index = scanHexSequence(address, index, end, counter);
-// if (index == -1) {
-// return false;
-// }
-// // Address must contain 128-bits of information.
-// else if (index == end) {
-// return (counter[0] == 8);
-// }
-//
-// if (index+1 < end && address.charAt(index) == ':') {
-// if (address.charAt(index+1) == ':') {
-// // '::' represents at least one 16-bit group of zeros.
-// if (++counter[0] > 8) {
-// return false;
-// }
-// index += 2;
-// // Trailing zeros will fill out the rest of the address.
-// if (index == end) {
-// return true;
-// }
-// }
-// // If the second character wasn't ':', in order to be valid,
-// // the remainder of the string must match IPv4Address,
-// // and we must have read exactly 6 16-bit groups.
-// else {
-// return (counter[0] == 6) &&
-// isWellFormedIPv4Address(address.substring(index+1, end));
-// }
-// }
-// else {
-// return false;
-// }
-//
-// // 3. Scan hex sequence after '::'.
-// int prevCount = counter[0];
-// index = scanHexSequence(address, index, end, counter);
-//
-// // We've either reached the end of the string, the address ends in
-// // an IPv4 address, or it is invalid. scanHexSequence has already
-// // made sure that we have the right number of bits.
-// return (index == end) ||
-// (index != -1 && isWellFormedIPv4Address(
-// address.substring((counter[0] > prevCount) ? index+1 : index, end)));
-// }
-
- /**
- * Helper method for isWellFormedIPv6Reference which scans the
- * hex sequences of an IPv6 address. It returns the index of the
- * next character to scan in the address, or -1 if the string
- * cannot match a valid IPv6 address.
- *
- * @param address the string to be scanned
- * @param index the beginning index (inclusive)
- * @param end the ending index (exclusive)
- * @param counter a counter for the number of 16-bit sections read
- * in the address
- *
- * @return the index of the next character to scan, or -1 if the
- * string cannot match a valid IPv6 address
- */
-// private static int scanHexSequence (String address, int index, int end, int [] counter) {
-//
-// char testChar;
-// int numDigits = 0;
-// int start = index;
-//
-// // Trying to match the following productions:
-// // hexseq = hex4 *( ":" hex4)
-// // hex4 = 1*4HEXDIG
-// for (; index < end; ++index) {
-// testChar = address.charAt(index);
-// if (testChar == ':') {
-// // IPv6 addresses are 128-bit, so there can be at most eight sections.
-// if (numDigits > 0 && ++counter[0] > 8) {
-// return -1;
-// }
-// // This could be '::'.
-// if (numDigits == 0 || ((index+1 < end) && address.charAt(index+1) == ':')) {
-// return index;
-// }
-// numDigits = 0;
-// }
-// // This might be invalid or an IPv4address. If it's potentially an IPv4address,
-// // backup to just after the last valid character that matches hexseq.
-// else if (!isHex(testChar)) {
-// if (testChar == '.' && numDigits < 4 && numDigits > 0 && counter[0] <= 6) {
-// int back = index - numDigits - 1;
-// return (back >= start) ? back : (back+1);
-// }
-// return -1;
-// }
-// // There can be at most 4 hex DIGITS per group.
-// else if (++numDigits > 4) {
-// return -1;
-// }
-// }
-// return (numDigits > 0 && ++counter[0] <= 8) ? end : -1;
-// }
-
-
- /**
- * Determine whether a char is a digit.
- *
- * @return true if the char is betweeen '0' and '9', false otherwise
- */
private static boolean isDigit(char p_char) {
return p_char >= '0' && p_char <= '9';
}
- /**
- * Determine whether a character is a hexadecimal character.
- *
- * @return true if the char is betweeen '0' and '9', 'a' and 'f'
- * or 'A' and 'F', false otherwise
- */
private static boolean isHex(char p_char) {
return (p_char <= 'f' && (fgLookupTable[p_char] & ASCII_HEX_CHARACTERS) != 0);
}
- /**
- * Determine whether a char is an alphabetic character: a-z or A-Z
- *
- * @return true if the char is alphabetic, false otherwise
- */
private static boolean isAlpha(char p_char) {
return ((p_char >= 'a' && p_char <= 'z') || (p_char >= 'A' && p_char <= 'Z' ));
}
- /**
- * Determine whether a char is an alphanumeric: 0-9, a-z or A-Z
- *
- * @return true if the char is alphanumeric, false otherwise
- */
private static boolean isAlphanum(char p_char) {
return (p_char <= 'z' && (fgLookupTable[p_char] & MASK_ALPHA_NUMERIC) != 0);
}
- /**
- * Determine whether a char is a URI character (reserved or
- * unreserved, not including '%' for escaped octets).
- *
- * @return true if the char is a URI character, false otherwise
- */
private static boolean isURICharacter (char p_char) {
return (p_char <= '~' && (fgLookupTable[p_char] & MASK_URI_CHARACTER) != 0);
}
- /**
- * Determine whether a char is a scheme character.
- *
- * @return true if the char is a scheme character, false otherwise
- */
private static boolean isSchemeCharacter (char p_char) {
return (p_char <= 'z' && (fgLookupTable[p_char] & MASK_SCHEME_CHARACTER) != 0);
}
- /**
- * Determine whether a char is a userinfo character.
- *
- * @return true if the char is a userinfo character, false otherwise
- */
-// private static boolean isUserinfoCharacter (char p_char) {
-// return (p_char <= 'z' && (fgLookupTable[p_char] & MASK_USERINFO_CHARACTER) != 0);
-// }
-
- /**
- * Determine whether a char is a path character.
- *
- * @return true if the char is a path character, false otherwise
- */
private static boolean isPathCharacter (char p_char) {
return (p_char <= '~' && (fgLookupTable[p_char] & MASK_PATH_CHARACTER) != 0);
}
-
- /**
- * Determine whether a given string contains only URI characters (also
- * called "uric" in RFC 2396). uric consist of all reserved
- * characters, unreserved characters and escaped characters.
- *
- * @return true if the string is comprised of uric, false otherwise
- */
private static boolean isURIString(String p_uric) {
if (p_uric == null) {
return false;
}
int end = p_uric.length();