Commit dd119810 authored by Brian Major's avatar Brian Major
Browse files

issue-10 - refactor GroupURI so constructor does URI reshaping

parent ad1249e8
...@@ -83,7 +83,6 @@ public class GroupURI ...@@ -83,7 +83,6 @@ public class GroupURI
private static Logger log = Logger.getLogger(GroupURI.class); private static Logger log = Logger.getLogger(GroupURI.class);
private URI uri; private URI uri;
private String name;
/** /**
* Attempts to create a URI using the specified uri. * Attempts to create a URI using the specified uri.
...@@ -99,8 +98,6 @@ public class GroupURI ...@@ -99,8 +98,6 @@ public class GroupURI
throw new IllegalArgumentException("Null URI"); throw new IllegalArgumentException("Null URI");
} }
this.uri = uri;
// Ensure the scheme is correct // Ensure the scheme is correct
if (uri.getScheme() == null) if (uri.getScheme() == null)
{ {
...@@ -117,13 +114,9 @@ public class GroupURI ...@@ -117,13 +114,9 @@ public class GroupURI
throw new IllegalArgumentException("Missing authority and/or path."); throw new IllegalArgumentException("Missing authority and/or path.");
} }
log.debug("URI: " + uri);
log.debug(" scheme: " + uri.getScheme());
log.debug(" authority: " + uri.getAuthority());
log.debug(" path: " + uri.getPath());
String fragment = uri.getFragment(); String fragment = uri.getFragment();
String query = uri.getQuery(); String query = uri.getQuery();
String name = null;
if (query == null) if (query == null)
{ {
if (fragment != null) if (fragment != null)
...@@ -144,6 +137,9 @@ public class GroupURI ...@@ -144,6 +137,9 @@ public class GroupURI
} }
name = query; name = query;
} }
this.uri = URI.create(
uri.getScheme() + "://" + uri.getAuthority() + uri.getPath() + "?" + name);
} }
/** /**
...@@ -200,7 +196,7 @@ public class GroupURI ...@@ -200,7 +196,7 @@ public class GroupURI
*/ */
public String getName() public String getName()
{ {
return name; return uri.getQuery();
} }
public String getServiceIDString() public String getServiceIDString()
...@@ -228,7 +224,7 @@ public class GroupURI ...@@ -228,7 +224,7 @@ public class GroupURI
@Override @Override
public String toString() public String toString()
{ {
return getServiceID() + "?" + name; return uri.toString();
} }
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment