Typesafety for certsrv.kra

3 files changed, 9 insertions, 9 deletions

diff --git a/pki/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java b/pki/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java
index b268073e..7be3f165 100644
--- a/pki/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java
+++ b/pki/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java
@@ -164,7 +164,7 @@ public interface IKeyRecoveryAuthority extends ISubsystem {
      *
      * @return list of auto recovery identifiers
      */
-    public Enumeration getAutoRecoveryIDs();
+    public Enumeration<String> getAutoRecoveryIDs();
 
     /**
      * Returns the storage key unit that manages the
@@ -259,7 +259,7 @@ public interface IKeyRecoveryAuthority extends ISubsystem {
      * @param id request id
      * @return volatile requests
      */
-    public Hashtable createVolatileRequest(RequestId id);
+    public Hashtable<String, Object> createVolatileRequest(RequestId id);
 
     /**
      * Retrieves the request object.
@@ -267,7 +267,7 @@ public interface IKeyRecoveryAuthority extends ISubsystem {
      * @param id request id
      * @return volatile requests
      */
-    public Hashtable getVolatileRequest(RequestId id);
+    public Hashtable<String, Object> getVolatileRequest(RequestId id);
 
     /**
      * Destroys the request object.
@@ -276,7 +276,7 @@ public interface IKeyRecoveryAuthority extends ISubsystem {
      */
     public void destroyVolatileRequest(RequestId id);
 
-    public Vector getAppAgents(
+    public Vector<Credential> getAppAgents(
         String recoveryID) throws EBaseException;
 
     /**
diff --git a/pki/base/common/src/com/netscape/certsrv/kra/IKeyService.java b/pki/base/common/src/com/netscape/certsrv/kra/IKeyService.java
index 5785aeb0..5ed17453 100644
--- a/pki/base/common/src/com/netscape/certsrv/kra/IKeyService.java
+++ b/pki/base/common/src/com/netscape/certsrv/kra/IKeyService.java
@@ -133,7 +133,7 @@ public interface IKeyService {
      * @return recovery parameters
      * @exception EBaseException failed to create
      */
-    public Hashtable createRecoveryParams(String recoveryID) 
+    public Hashtable<String, Object> createRecoveryParams(String recoveryID)
         throws EBaseException;
 
     /**
@@ -152,7 +152,7 @@ public interface IKeyService {
      * @return recovery parameters
      * @exception EBaseException failed to retrieve
      */
-    public Hashtable getRecoveryParams(String recoveryID) 
+    public Hashtable<String, Object> getRecoveryParams(String recoveryID)
         throws EBaseException;
 
     /**
diff --git a/pki/base/common/src/com/netscape/certsrv/kra/ProofOfArchival.java b/pki/base/common/src/com/netscape/certsrv/kra/ProofOfArchival.java
index a2742809..ca575396 100644
--- a/pki/base/common/src/com/netscape/certsrv/kra/ProofOfArchival.java
+++ b/pki/base/common/src/com/netscape/certsrv/kra/ProofOfArchival.java
@@ -94,7 +94,7 @@ public class ProofOfArchival implements IDBObj, IProofOfArchival, Serializable {
     protected String mIssuer = null;
     protected Date mDateOfArchival = null;
 
-    protected static Vector mNames = new Vector();
+    protected static Vector<String> mNames = new Vector<String>();
     static {
         mNames.addElement(ATTR_VERSION);
         mNames.addElement(ATTR_SERIALNO);
@@ -195,7 +195,7 @@ public class ProofOfArchival implements IDBObj, IProofOfArchival, Serializable {
      *
      * @return a list of names
      */
-    public Enumeration getElements() {
+    public Enumeration<String> getElements() {
         return mNames.elements();
     }
 
@@ -204,7 +204,7 @@ public class ProofOfArchival implements IDBObj, IProofOfArchival, Serializable {
      * 
      * @return a list of serializable attribute names
      */
-    public Enumeration getSerializableAttrNames() {
+    public Enumeration<String> getSerializableAttrNames() {
         return mNames.elements();
     }