From 24b660d14871cda1c23cdac60b5cdf49a24e128f Mon Sep 17 00:00:00 2001
From: Brian Major <major.brian@gmail.com>
Date: Tue, 22 Nov 2016 15:41:34 -0800
Subject: [PATCH] issue-10 - GroupURI object cleanup
---
.../main/java/ca/nrc/cadc/ac/GroupURI.java | 26 +++----------------
.../java/ca/nrc/cadc/ac/GroupURITest.java | 2 --
2 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/cadc-access-control/src/main/java/ca/nrc/cadc/ac/GroupURI.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/GroupURI.java
index 507dc99c..68a87acd 100644
--- a/cadc-access-control/src/main/java/ca/nrc/cadc/ac/GroupURI.java
+++ b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/GroupURI.java
@@ -160,11 +160,8 @@ public class GroupURI
return true;
if (other instanceof GroupURI)
{
-
- GroupURI oID = (GroupURI) other;
- String otherURI = getServiceIDString() + "?" + oID.getName();
- String thisURI = getServiceIDString() + "?" + this.getName();
- return thisURI.equals(otherURI);
+ GroupURI otherURI = (GroupURI) other;
+ return uri.equals(otherURI.getURI());
}
return false;
}
@@ -179,16 +176,6 @@ public class GroupURI
return uri;
}
- /**
- * Returns the decoded authority component of the URI.
- *
- * @return authority of the URI, or null if the authority is undefined.
- */
- public String getAuthority()
- {
- return uri.getAuthority();
- }
-
/**
* Returns the decoded fragment component of the URI.
*
@@ -199,17 +186,12 @@ public class GroupURI
return uri.getQuery();
}
- public String getServiceIDString()
+ public URI getServiceID()
{
- return uri.getScheme() +
+ String serviceIDString = uri.getScheme() +
"://" +
uri.getAuthority() +
uri.getPath();
- }
-
- public URI getServiceID()
- {
- String serviceIDString = getServiceIDString();
try
{
return new URI(serviceIDString);
diff --git a/cadc-access-control/src/test/java/ca/nrc/cadc/ac/GroupURITest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/GroupURITest.java
index 16b658bb..db202c74 100644
--- a/cadc-access-control/src/test/java/ca/nrc/cadc/ac/GroupURITest.java
+++ b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/GroupURITest.java
@@ -58,7 +58,6 @@ public class GroupURITest
{
GroupURI g = new GroupURI("ivo://my.authority/gms?name");
Assert.assertEquals("ivo", g.getURI().getScheme());
- Assert.assertEquals("my.authority", g.getAuthority());
Assert.assertEquals("/gms", g.getURI().getPath());
Assert.assertEquals("name", g.getName());
Assert.assertEquals("ivo://my.authority/gms", g.getServiceID().toString());
@@ -77,7 +76,6 @@ public class GroupURITest
{
GroupURI g = new GroupURI("ivo://my.authority/gms#name");
Assert.assertEquals("ivo", g.getURI().getScheme());
- Assert.assertEquals("my.authority", g.getAuthority());
Assert.assertEquals("/gms", g.getURI().getPath());
Assert.assertEquals("name", g.getName());
Assert.assertEquals("ivo://my.authority/gms", g.getServiceID().toString());
--
GitLab