type safety for certserv.base

more type safety

7 files changed, 15 insertions, 19 deletions

diff --git a/pki/base/common/src/com/netscape/certsrv/base/IAttrSet.java b/pki/base/common/src/com/netscape/certsrv/base/IAttrSet.java
index 4e8b0205d..28e36da61 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/IAttrSet.java
+++ b/pki/base/common/src/com/netscape/certsrv/base/IAttrSet.java
@@ -68,5 +68,5 @@ public interface IAttrSet extends Serializable {
      *
      * @return an enumeration of the attribute names.
      */
-    public Enumeration getElements();
+    public Enumeration<?> getElements();
 }
diff --git a/pki/base/common/src/com/netscape/certsrv/base/ISecurityDomainSessionTable.java b/pki/base/common/src/com/netscape/certsrv/base/ISecurityDomainSessionTable.java
index 3902d4433..ced3886cb 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/ISecurityDomainSessionTable.java
+++ b/pki/base/common/src/com/netscape/certsrv/base/ISecurityDomainSessionTable.java
@@ -35,5 +35,5 @@ public interface ISecurityDomainSessionTable {
     public long getBeginTime(String sessionId);
     public int getSize();
     public long getTimeToLive();
-    public Enumeration getSessionIds();
+    public Enumeration<String> getSessionIds();
 }
diff --git a/pki/base/common/src/com/netscape/certsrv/base/ISourceConfigStore.java b/pki/base/common/src/com/netscape/certsrv/base/ISourceConfigStore.java
index fb8628ba2..03adb7009 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/ISourceConfigStore.java
+++ b/pki/base/common/src/com/netscape/certsrv/base/ISourceConfigStore.java
@@ -42,7 +42,7 @@ public interface ISourceConfigStore extends Serializable {
      * @param name The property name
      * @return property value
      */
-    public Object get(String name);
+    public String get(String name);
 
     /**
      * Retrieves a property.
@@ -51,7 +51,7 @@ public interface ISourceConfigStore extends Serializable {
      * @param name The property name
      * @param value The property value
      */
-    public void put(String name, Object value);
+    public String put(String name, String value);
 
     /**
      * Returns an enumeration of the config store's keys.
@@ -61,7 +61,7 @@ public interface ISourceConfigStore extends Serializable {
      * @see java.util.Hashtable#elements
      * @see java.util.Enumeration
      */
-    public Enumeration keys();
+    public Enumeration<String> keys();
 
     /**
      * Reads a config store from an input stream. 
diff --git a/pki/base/common/src/com/netscape/certsrv/base/MessageFormatter.java b/pki/base/common/src/com/netscape/certsrv/base/MessageFormatter.java
index 16324fb91..8e186fc48 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/MessageFormatter.java
+++ b/pki/base/common/src/com/netscape/certsrv/base/MessageFormatter.java
@@ -38,7 +38,7 @@ import java.util.ResourceBundle;
  */
 public class MessageFormatter {
 
-    private static final Class[] toStringSignature = { Locale.class };
+    private static final Class<?>[] toStringSignature = { Locale.class };
 
     /**
      * Retrieves the localized string.
diff --git a/pki/base/common/src/com/netscape/certsrv/base/MetaInfo.java b/pki/base/common/src/com/netscape/certsrv/base/MetaInfo.java
index 1922e74c6..65e401743 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/MetaInfo.java
+++ b/pki/base/common/src/com/netscape/certsrv/base/MetaInfo.java
@@ -39,7 +39,7 @@ public class MetaInfo implements IAttrSet {
     public static final String REQUEST_ID = "requestId";
     public static final String IN_LDAP_PUBLISH_DIR = "inLdapPublishDir";
 
-    private Hashtable content = new Hashtable();
+    private Hashtable<String, Object> content = new Hashtable<String, Object>();
 
     /**	
      * Constructs a meta information.
@@ -59,7 +59,7 @@ public class MetaInfo implements IAttrSet {
 
         sb.append("[\n");
         sb.append("  Meta information:\n");
-        Enumeration enum1 = content.keys();
+        Enumeration<String> enum1 = content.keys();
 
         while (enum1.hasMoreElements()) {
             String key = (String) enum1.nextElement();
@@ -111,7 +111,7 @@ public class MetaInfo implements IAttrSet {
      * 
      * @return an enumeration of the attribute names.
      */
-    public Enumeration getElements() {
+    public Enumeration<String> getElements() {
         return content.keys();
     }
 }
diff --git a/pki/base/common/src/com/netscape/certsrv/base/Nonces.java b/pki/base/common/src/com/netscape/certsrv/base/Nonces.java
index 470ba654c..fde209332 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/Nonces.java
+++ b/pki/base/common/src/com/netscape/certsrv/base/Nonces.java
@@ -28,25 +28,21 @@ import java.util.Vector;
  *
  * @version $Revision$, $Date$
  */
-public class Nonces implements IAuthInfo {
+public class Nonces  {
 
-    private Hashtable mNonces = new Hashtable();
-    private Vector mNonceList = new Vector();
+    private Hashtable<Long, X509Certificate> mNonces = new Hashtable<Long, X509Certificate>();
+    private Vector<Long> mNonceList = new Vector<Long>();
     private int mNonceLimit;
 
     /**
      * Constructs nonces.
      */
     public Nonces() {
-        mNonceLimit = 100;
-        Vector mNonceList = new Vector();
-        Hashtable mNonces = new Hashtable();
+        this(100);
     }
 
     public Nonces(int limit) {
         mNonceLimit = limit;
-        Vector mNonceList = new Vector();
-        Hashtable mNonces = new Hashtable();
     }
 
     public long addNonce(long nonce, X509Certificate cert) {
diff --git a/pki/base/common/src/com/netscape/certsrv/base/SessionContext.java b/pki/base/common/src/com/netscape/certsrv/base/SessionContext.java
index 29c390acd..151c24205 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/SessionContext.java
+++ b/pki/base/common/src/com/netscape/certsrv/base/SessionContext.java
@@ -32,7 +32,7 @@ import java.util.Hashtable;
  *
  * @version $Revision$, $Date$
  */
-public class SessionContext extends Hashtable implements IAuthInfo {
+public class SessionContext extends Hashtable<Object,Object> {
 
     /**
      *
@@ -84,7 +84,7 @@ public class SessionContext extends Hashtable implements IAuthInfo {
      */
     public static final String IPADDRESS = "ipAddress";
 
-    private static Hashtable mContexts = new Hashtable();
+    private static Hashtable<Thread, SessionContext> mContexts = new Hashtable<Thread, SessionContext>();
 
     /**
      * Constructs a session context.