Fixed find commands.

Some of the REST services have been fixed to consistently return a
DataCollection which contains the total count, the requested subset
of results, and links to request other subsets of the results.

The TPSConnectorFindCLI has been split into separate find and show
commands.

Ticket #749

3 files changed, 14 insertions, 87 deletions

diff --git a/base/common/src/com/netscape/certsrv/user/UserCertCollection.java b/base/common/src/com/netscape/certsrv/user/UserCertCollection.java
index a395ed73c..3eb4ed406 100644
--- a/base/common/src/com/netscape/certsrv/user/UserCertCollection.java
+++ b/base/common/src/com/netscape/certsrv/user/UserCertCollection.java
@@ -18,43 +18,21 @@
 
 package com.netscape.certsrv.user;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.jboss.resteasy.plugins.providers.atom.Link;
+import com.netscape.certsrv.base.DataCollection;
 
 /**
  * @author Endi S. Dewata
  */
 @XmlRootElement(name="UserCerts")
-public class UserCertCollection {
-
-    List<UserCertData> certs = new ArrayList<UserCertData>();
-    Collection<Link> links = new ArrayList<Link>();
+public class UserCertCollection extends DataCollection<UserCertData> {
 
     @XmlElement(name="Cert")
-    public Collection<UserCertData> getCerts() {
-        return certs;
-    }
-
-    public void addCert(UserCertData cert) {
-        certs.add(cert);
-    }
-
-    @XmlElement(name="Link")
-    public Collection<Link> getLinks() {
-        return links;
-    }
-
-    public void setLink(Collection<Link> links) {
-        this.links = links;
-    }
-
-    public void addLink(Link link) {
-        links.add(link);
+    public Collection<UserCertData> getEntries() {
+        return super.getEntries();
     }
 }
diff --git a/base/common/src/com/netscape/certsrv/user/UserCollection.java b/base/common/src/com/netscape/certsrv/user/UserCollection.java
index d92ecc208..a24a79878 100644
--- a/base/common/src/com/netscape/certsrv/user/UserCollection.java
+++ b/base/common/src/com/netscape/certsrv/user/UserCollection.java
@@ -18,48 +18,22 @@
 
 package com.netscape.certsrv.user;
 
-import java.util.ArrayList;
 import java.util.Collection;
 
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.jboss.resteasy.plugins.providers.atom.Link;
+import com.netscape.certsrv.base.DataCollection;
 
 
 /**
  * @author Endi S. Dewata
  */
 @XmlRootElement(name="Users")
-public class UserCollection {
-
-    Collection<UserData> users = new ArrayList<UserData>();
-    Collection<Link> links = new ArrayList<Link>();
+public class UserCollection extends DataCollection<UserData> {
 
     @XmlElementRef
-    public Collection<UserData> getUsers() {
-        return users;
-    }
-
-    public void setUsers(Collection<UserData> users) {
-        this.users = users;
-    }
-
-    public void addUser(UserData userData) {
-        users.add(userData);
-    }
-
-    @XmlElement(name="Link")
-    public Collection<Link> getLinks() {
-        return links;
-    }
-
-    public void setLink(Collection<Link> links) {
-        this.links = links;
-    }
-
-    public void addLink(Link link) {
-        links.add(link);
+    public Collection<UserData> getEntries() {
+        return super.getEntries();
     }
 }
diff --git a/base/common/src/com/netscape/certsrv/user/UserMembershipCollection.java b/base/common/src/com/netscape/certsrv/user/UserMembershipCollection.java
index 069840d13..4c2ffa9b4 100644
--- a/base/common/src/com/netscape/certsrv/user/UserMembershipCollection.java
+++ b/base/common/src/com/netscape/certsrv/user/UserMembershipCollection.java
@@ -18,7 +18,6 @@
 
 package com.netscape.certsrv.user;
 
-import java.util.ArrayList;
 import java.util.Collection;
 
 import javax.xml.bind.JAXBContext;
@@ -26,41 +25,17 @@ import javax.xml.bind.Marshaller;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.jboss.resteasy.plugins.providers.atom.Link;
+import com.netscape.certsrv.base.DataCollection;
 
 /**
  * @author Endi S. Dewata
  */
 @XmlRootElement(name="UserMemberships")
-public class UserMembershipCollection {
-
-    Collection<UserMembershipData> memberships = new ArrayList<UserMembershipData>();
-    Collection<Link> links = new ArrayList<Link>();
+public class UserMembershipCollection extends DataCollection<UserMembershipData> {
 
     @XmlElement(name="Membership")
-    public Collection<UserMembershipData> getMemberships() {
-        return memberships;
-    }
-
-    public void setMemberships(Collection<UserMembershipData> members) {
-        this.memberships = members;
-    }
-
-    public void addMembership(UserMembershipData member) {
-        memberships.add(member);
-    }
-
-    @XmlElement(name="Link")
-    public Collection<Link> getLinks() {
-        return links;
-    }
-
-    public void setLink(Collection<Link> links) {
-        this.links = links;
-    }
-
-    public void addLink(Link link) {
-        links.add(link);
+    public Collection<UserMembershipData> getEntries() {
+        return super.getEntries();
     }
 
     public static void main(String args[]) throws Exception {
@@ -70,12 +45,12 @@ public class UserMembershipCollection {
         UserMembershipData membership1 = new UserMembershipData();
         membership1.setID("Group 1");
         membership1.setUserID("User 1");
-        response.addMembership(membership1);
+        response.addEntry(membership1);
 
         UserMembershipData membership2 = new UserMembershipData();
         membership2.setID("Group 2");
         membership2.setUserID("User 1");
-        response.addMembership(membership2);
+        response.addEntry(membership2);
 
         JAXBContext context = JAXBContext.newInstance(UserMembershipCollection.class);
         Marshaller marshaller = context.createMarshaller();