Split URI regex strings differently

The strings used to construct the regex to parse
URIs are split differently. This makes it easier
to introduce meaningful String constants later on.

Change-Id: I9355fd42e57e0983204465c5d6fe5b6b93655074
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
This commit is contained in:
Christian Halstrick 2010-10-06 12:15:30 +02:00 committed by Chris Aniszczyk
parent 47e9e165b8
commit 0a2b4c1455
1 changed files with 16 additions and 9 deletions

View File

@ -63,16 +63,23 @@
public class URIish implements Serializable {
private static final long serialVersionUID = 1L;
private static final Pattern FULL_URI = Pattern
.compile("^(?:([a-z][a-z0-9+-]+)://" // optional http://
+ "(?:([^/]+?)(?::([^/]+?))?@)?" // optional user:password@
+ "(?:([^/]+?))?(?::(\\d+))?)?" // optional example.com:1337
+ "((?:[A-Za-z]:)?" // optional drive-letter:
+ "(?:\\.\\.)?" // optionally a relative path
+"/.+)$"); // /anything
private static final Pattern FULL_URI = Pattern.compile("^" //
+ "(?:" //
+ "([a-z][a-z0-9+-]+)://" // optional http://
+ "(?:([^/]+?)(?::([^/]+?))?@)?" // optional user:password@
+ "(?:([^/]+?))?(?::(\\d+))?" // optional example.com:1337
+ ")?" //
+ "(" + "(?:[A-Za-z]:)?" // optional drive-letter:
+ "(?:\\.\\.)?" // optionally a relative path
+ "/.+" //
+ ")$"); // /anything
private static final Pattern SCP_URI = Pattern
.compile("^(?:([^@]+?)@)?([^:]+?):(.+)$");
private static final Pattern SCP_URI = Pattern.compile("^" //
+ "(?:([^@]+?)@)?" //
+ "([^:]+?)" //
+ ":" //
+ "(.+)" //
+ "$"); //
private String scheme;