Rename KeyDataInfos and KeyrequestInfos

5 files changed, 12 insertions, 12 deletions

diff --git a/base/common/src/com/netscape/certsrv/key/KeyClient.java b/base/common/src/com/netscape/certsrv/key/KeyClient.java
index 272f8ca04..81519509e 100644
--- a/base/common/src/com/netscape/certsrv/key/KeyClient.java
+++ b/base/common/src/com/netscape/certsrv/key/KeyClient.java
@@ -41,7 +41,7 @@ public class KeyClient extends Client {
         keyRequestClient = createProxy(KeyRequestResource.class);
     }
 
-    public KeyDataInfos findKeys(String clientID, String status, Integer maxSize, Integer maxTime,
+    public KeyDataInfoCollection findKeys(String clientID, String status, Integer maxSize, Integer maxTime,
             Integer start, Integer size) {
         return keyClient.listKeys(clientID, status, maxSize, maxTime, start, size);
     }
@@ -50,7 +50,7 @@ public class KeyClient extends Client {
         return keyClient.retrieveKey(data);
     }
 
-    public KeyRequestInfos findKeyRequests(
+    public KeyRequestInfoCollection findKeyRequests(
             String requestState,
             String requestType,
             String clientID,
diff --git a/base/common/src/com/netscape/certsrv/key/KeyDataInfos.java b/base/common/src/com/netscape/certsrv/key/KeyDataInfoCollection.java
index 8f02348a5..4e67e2a44 100644
--- a/base/common/src/com/netscape/certsrv/key/KeyDataInfos.java
+++ b/base/common/src/com/netscape/certsrv/key/KeyDataInfoCollection.java
@@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 import com.netscape.certsrv.base.DataCollection;
 
 @XmlRootElement(name = "KeyDataInfos")
-public class KeyDataInfos extends DataCollection<KeyDataInfo> {
+public class KeyDataInfoCollection extends DataCollection<KeyDataInfo> {
 
     @XmlElementRef
     public Collection<KeyDataInfo> getEntries() {
diff --git a/base/common/src/com/netscape/certsrv/key/KeyRequestInfos.java b/base/common/src/com/netscape/certsrv/key/KeyRequestInfoCollection.java
index 403dc7d41..5f4d2ab87 100644
--- a/base/common/src/com/netscape/certsrv/key/KeyRequestInfos.java
+++ b/base/common/src/com/netscape/certsrv/key/KeyRequestInfoCollection.java
@@ -34,7 +34,7 @@ import com.netscape.certsrv.base.DataCollection;
 import com.netscape.certsrv.request.RequestStatus;
 
 @XmlRootElement(name = "KeyRequestInfos")
-public class KeyRequestInfos extends DataCollection<KeyRequestInfo> {
+public class KeyRequestInfoCollection extends DataCollection<KeyRequestInfo> {
 
     @XmlElementRef
     public Collection<KeyRequestInfo> getEntries() {
@@ -63,7 +63,7 @@ public class KeyRequestInfos extends DataCollection<KeyRequestInfo> {
     public String toString() {
         try {
             StringWriter sw = new StringWriter();
-            Marshaller marshaller = JAXBContext.newInstance(KeyRequestInfos.class).createMarshaller();
+            Marshaller marshaller = JAXBContext.newInstance(KeyRequestInfoCollection.class).createMarshaller();
             marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
             marshaller.marshal(this, sw);
             return sw.toString();
@@ -73,10 +73,10 @@ public class KeyRequestInfos extends DataCollection<KeyRequestInfo> {
         }
     }
 
-    public static KeyRequestInfos valueOf(String string) throws Exception {
+    public static KeyRequestInfoCollection valueOf(String string) throws Exception {
         try {
-            Unmarshaller unmarshaller = JAXBContext.newInstance(KeyRequestInfos.class).createUnmarshaller();
-            return (KeyRequestInfos)unmarshaller.unmarshal(new StringReader(string));
+            Unmarshaller unmarshaller = JAXBContext.newInstance(KeyRequestInfoCollection.class).createUnmarshaller();
+            return (KeyRequestInfoCollection)unmarshaller.unmarshal(new StringReader(string));
         } catch (Exception e) {
             return null;
         }
@@ -84,7 +84,7 @@ public class KeyRequestInfos extends DataCollection<KeyRequestInfo> {
 
     public static void main(String args[]) throws Exception {
 
-        KeyRequestInfos before = new KeyRequestInfos();
+        KeyRequestInfoCollection before = new KeyRequestInfoCollection();
 
         KeyRequestInfo request = new KeyRequestInfo();
         request.setRequestType("securityDataEnrollment");
@@ -94,7 +94,7 @@ public class KeyRequestInfos extends DataCollection<KeyRequestInfo> {
         String string = before.toString();
         System.out.println(string);
 
-        KeyRequestInfos after = KeyRequestInfos.valueOf(string);
+        KeyRequestInfoCollection after = KeyRequestInfoCollection.valueOf(string);
         System.out.println(after);
 
         System.out.println(before.equals(after));
diff --git a/base/common/src/com/netscape/certsrv/key/KeyRequestResource.java b/base/common/src/com/netscape/certsrv/key/KeyRequestResource.java
index 17e8a67e5..3f2536100 100644
--- a/base/common/src/com/netscape/certsrv/key/KeyRequestResource.java
+++ b/base/common/src/com/netscape/certsrv/key/KeyRequestResource.java
@@ -37,7 +37,7 @@ public interface KeyRequestResource {
      */
     @GET
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public KeyRequestInfos listRequests(@QueryParam("requestState") String requestState,
+    public KeyRequestInfoCollection listRequests(@QueryParam("requestState") String requestState,
                                             @QueryParam("requestType") String requestType,
                                             @QueryParam("clientID") String clientID,
                                             @QueryParam("start") RequestId start,
diff --git a/base/common/src/com/netscape/certsrv/key/KeyResource.java b/base/common/src/com/netscape/certsrv/key/KeyResource.java
index c420e0d45..68efb7770 100644
--- a/base/common/src/com/netscape/certsrv/key/KeyResource.java
+++ b/base/common/src/com/netscape/certsrv/key/KeyResource.java
@@ -20,7 +20,7 @@ public interface KeyResource {
 
     @GET
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public KeyDataInfos listKeys(@QueryParam("clientID") String clientID,
+    public KeyDataInfoCollection listKeys(@QueryParam("clientID") String clientID,
                                  @QueryParam("status") String status,
                                  @QueryParam("maxResults") Integer maxResults,
                                  @QueryParam("maxTime") Integer maxTime,