type safety for certserv.base

more type safety

7 files changed, 72 insertions, 68 deletions

diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java b/pki/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java
index 2a98f12f..3aeadabe 100644
--- a/pki/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java
+++ b/pki/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java
@@ -78,7 +78,8 @@ public class AgentPolicy extends APolicyRule
             IConfigStore substore = config.getSubStore("params");
 
             try {
-                Class c = Class.forName(className);
+                @SuppressWarnings("unchecked")
+				Class<APolicyRule> c = (Class<APolicyRule>) Class.forName(className);
 
                 Object o = c.newInstance();
 
@@ -146,7 +147,7 @@ public class AgentPolicy extends APolicyRule
      *
      * @return nvPairs A Vector of name/value pairs.
      */
-    public Vector getInstanceParams() {
+    public Vector<String> getInstanceParams() {
         return null;
     }
 
@@ -155,7 +156,7 @@ public class AgentPolicy extends APolicyRule
      *
      * @return nvPairs A Vector of name/value pairs.
      */
-    public Vector getDefaultParams() {
+    public Vector<String> getDefaultParams() {
         return null;
     }
 
diff --git a/pki/base/common/src/com/netscape/cms/profile/common/BasicProfile.java b/pki/base/common/src/com/netscape/cms/profile/common/BasicProfile.java
index acaf9772..68c706f5 100644
--- a/pki/base/common/src/com/netscape/cms/profile/common/BasicProfile.java
+++ b/pki/base/common/src/com/netscape/cms/profile/common/BasicProfile.java
@@ -83,19 +83,19 @@ public abstract class BasicProfile implements IProfile {
     protected IConfigStore mConfig = null;
     protected IPluginRegistry mRegistry = null;
 
-    protected Vector mInputNames = new Vector();
-    protected Hashtable mInputs = new Hashtable();
-    protected Vector mInputIds = new Vector();
-    protected Hashtable mOutputs = new Hashtable();
-    protected Vector mOutputIds = new Vector();
-    protected Hashtable mUpdaters = new Hashtable();
-    protected Vector mUpdaterIds = new Vector();
+    protected Vector<String> mInputNames = new Vector<String>();
+    protected Hashtable<String, IProfileInput> mInputs = new Hashtable<String, IProfileInput>();
+    protected Vector<String> mInputIds = new Vector<String>();
+    protected Hashtable<String, IProfileOutput> mOutputs = new Hashtable<String, IProfileOutput>();
+    protected Vector<String> mOutputIds = new Vector<String>();
+    protected Hashtable<String, IProfileUpdater> mUpdaters = new Hashtable<String, IProfileUpdater>();
+    protected Vector<String> mUpdaterIds = new Vector<String>();
     protected IProfileAuthenticator mAuthenticator = null;
     protected String mAuthInstanceId = null;
     protected String mId = null;
     protected String mAuthzAcl = "";
 
-    protected Hashtable mPolicySet = new Hashtable();
+    protected Hashtable<String, Vector<ProfilePolicy>> mPolicySet = new Hashtable<String, Vector<ProfilePolicy>>();
 
     protected ILogger mSignedAuditLogger = CMS.getSignedAuditLogger();
 
@@ -343,11 +343,11 @@ public abstract class BasicProfile implements IProfile {
         return mConfig;
     }
 
-    public Enumeration getInputNames() {
+    public Enumeration<String> getInputNames() {
         return mInputNames.elements();
     }
 
-    public Enumeration getProfileUpdaterIds() {
+    public Enumeration<String> getProfileUpdaterIds() {
         return mUpdaterIds.elements(); // ordered list
     }
 
@@ -355,7 +355,7 @@ public abstract class BasicProfile implements IProfile {
         return (IProfileUpdater) mUpdaters.get(name);
     }
 
-    public Enumeration getProfileOutputIds() {
+    public Enumeration<String> getProfileOutputIds() {
         return mOutputIds.elements(); // ordered list
     }
 
@@ -363,7 +363,7 @@ public abstract class BasicProfile implements IProfile {
         return (IProfileOutput) mOutputs.get(name);
     }
 
-    public Enumeration getProfileInputIds() {
+    public Enumeration<String> getProfileInputIds() {
         return mInputIds.elements(); // ordered list
     }
 
@@ -388,13 +388,13 @@ public abstract class BasicProfile implements IProfile {
         String value) throws EProfileException {
     }
 
-    public Enumeration getProfilePolicySetIds() {
+    public Enumeration<String> getProfilePolicySetIds() {
         return mPolicySet.keys();
     }
 
     public void deleteProfilePolicy(String setId, String policyId) 
         throws EProfileException {
-        Vector policies = (Vector) mPolicySet.get(setId);
+        Vector<ProfilePolicy> policies = mPolicySet.get(setId);
 
         if (policies == null) {
             return;
@@ -621,7 +621,7 @@ public abstract class BasicProfile implements IProfile {
                 outputInfo.getName(Locale.getDefault()));
             outputStore.putString(prefix + "class_id", outputId);
 
-            Enumeration enum1 = nvps.getNames();
+            Enumeration<String> enum1 = nvps.getNames();
 
             while (enum1.hasMoreElements()) {
                 String name = (String) enum1.nextElement();
@@ -724,7 +724,7 @@ public abstract class BasicProfile implements IProfile {
                 inputInfo.getName(Locale.getDefault()));
             inputStore.putString(prefix + "class_id", inputId);
             
-            Enumeration enum1 = nvps.getNames();
+            Enumeration<String> enum1 = nvps.getNames();
 
             while (enum1.hasMoreElements()) {
                 String name = (String) enum1.nextElement();
@@ -772,16 +772,16 @@ public abstract class BasicProfile implements IProfile {
         // String constraintClassId : if of the constraint plugin ex: basicConstraintsExtConstraintImpl
         // boolean createConfig : true : being called from the console. false: being called from server startup code
 
-        Vector policies = (Vector) mPolicySet.get(setId);
+        Vector<ProfilePolicy> policies =  mPolicySet.get(setId);
 
         IConfigStore policyStore = mConfig.getSubStore("policyset." + setId);
         if (policies == null) {
-            policies = new Vector();
+            policies = new Vector<ProfilePolicy>();
             mPolicySet.put(setId, policies);
             if (createConfig) {	
                 // re-create policyset.list
                 StringBuffer setlist =new StringBuffer();
-                Enumeration keys = mPolicySet.keys();
+                Enumeration<String> keys = mPolicySet.keys();
 
                 while (keys.hasMoreElements()) {
                     String k = (String) keys.nextElement();
@@ -990,7 +990,7 @@ public abstract class BasicProfile implements IProfile {
     }
 
     public IProfilePolicy getProfilePolicy(String setId, String id) {
-        Vector policies = (Vector) mPolicySet.get(setId);
+        Vector<ProfilePolicy> policies =  mPolicySet.get(setId);
 
         if (policies == null)
             return null;
@@ -1057,7 +1057,7 @@ public abstract class BasicProfile implements IProfile {
 
     public void populateInput(IProfileContext ctx, IRequest request)
         throws EProfileException {
-        Enumeration ids = getProfileInputIds();
+        Enumeration<String> ids = getProfileInputIds();
 
         while (ids.hasMoreElements()) {
             String id = (String) ids.nextElement();
@@ -1067,8 +1067,8 @@ public abstract class BasicProfile implements IProfile {
         }
     }
 
-    public Vector getPolicies(String setId) {
-        Vector policies = (Vector) mPolicySet.get(setId);
+    public Vector<ProfilePolicy> getPolicies(String setId) {
+        Vector<ProfilePolicy> policies =  mPolicySet.get(setId);
 
         return policies;
     }
@@ -1080,7 +1080,7 @@ public abstract class BasicProfile implements IProfile {
     public void populate(IRequest request)
         throws EProfileException {
         String setId = getPolicySetId(request);
-        Vector policies = getPolicies(setId);
+        Vector<ProfilePolicy> policies = getPolicies(setId);
         CMS.debug("BasicProfile: populate() policy setid ="+ setId);
 
         for (int i = 0; i < policies.size(); i++) {
@@ -1099,7 +1099,7 @@ public abstract class BasicProfile implements IProfile {
         throws ERejectException {
         String setId = getPolicySetId(request);
         CMS.debug("BasicProfile: validate start on setId="+ setId);
-        Vector policies = getPolicies(setId);
+        Vector<ProfilePolicy> policies = getPolicies(setId);
 
         for (int i = 0; i < policies.size(); i++) {
             ProfilePolicy policy = (ProfilePolicy)
@@ -1112,21 +1112,21 @@ public abstract class BasicProfile implements IProfile {
         CMS.debug("BasicProfile: validate end");
     }
 
-    public Enumeration getProfilePolicies(String setId) {
-        Vector policies = (Vector) mPolicySet.get(setId);
+    public Enumeration<ProfilePolicy> getProfilePolicies(String setId) {
+        Vector<ProfilePolicy> policies = mPolicySet.get(setId);
 
         if (policies == null)
             return null;
         return policies.elements();
     }
 
-    public Enumeration getProfilePolicyIds(String setId) {
-        Vector policies = (Vector) mPolicySet.get(setId);
+    public Enumeration<String> getProfilePolicyIds(String setId) {
+        Vector<ProfilePolicy> policies = mPolicySet.get(setId);
 
         if (policies == null)
             return null;
 
-        Vector v = new Vector();
+        Vector<String> v = new Vector<String>();
 
         for (int i = 0; i < policies.size(); i++) {
             ProfilePolicy policy = (ProfilePolicy)
diff --git a/pki/base/common/src/com/netscape/cms/profile/common/EnrollProfile.java b/pki/base/common/src/com/netscape/cms/profile/common/EnrollProfile.java
index 95c360f8..8bc6f190 100644
--- a/pki/base/common/src/com/netscape/cms/profile/common/EnrollProfile.java
+++ b/pki/base/common/src/com/netscape/cms/profile/common/EnrollProfile.java
@@ -28,7 +28,6 @@ import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;
 import java.util.Date;
 import java.util.Enumeration;
-import java.util.Hashtable;
 import java.util.Locale;
 import java.util.StringTokenizer;
 
@@ -281,7 +280,7 @@ public abstract class EnrollProfile extends BasicProfile
         int seq_no = seq.intValue(); // start from 0
 
         int count = 0;
-        Enumeration setIds = getProfilePolicySetIds();
+        Enumeration<String> setIds = getProfilePolicySetIds();
 
         while (setIds.hasMoreElements()) {
             String setId = (String) setIds.nextElement();
@@ -369,7 +368,6 @@ public abstract class EnrollProfile extends BasicProfile
         }
         CMS.debug("EnrollProfile: Start parseCMC(): " + certreq);
 
-        Hashtable t1 = new Hashtable();
         TaggedRequest msgs[] = null;
 
         String creq = normalizeCertReq(certreq);
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java
index c4fa440d..4737e2f7 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java
@@ -254,7 +254,7 @@ public class ACLAdminServlet extends AdminServlet {
 
         NameValuePairs params = new NameValuePairs();
 
-        Enumeration res = mAuthzMgr.getACLs();
+        Enumeration<ACL> res = mAuthzMgr.getACLs();
 
         while (res.hasMoreElements()) {
             ACL acl = (ACL) res.nextElement();
@@ -291,16 +291,16 @@ public class ACLAdminServlet extends AdminServlet {
         IACL acl = mAuthzMgr.getACL(resourceId);
 
         if (acl != null) {
-            Enumeration en = acl.rights();
+            Enumeration<String> rightsEnum = acl.rights();
 
             StringBuffer rights = new StringBuffer();
 
-            if (en.hasMoreElements()) {
-                while (en.hasMoreElements()) {
+			if (rightsEnum.hasMoreElements()) {
+                while (rightsEnum.hasMoreElements()) {
                     if (rights.length() != 0) {
                         rights.append(",");
                     }
-                    String right = (String) en.nextElement();
+                    String right = rightsEnum.nextElement();
 
                     rights.append(right);
                 }
@@ -308,15 +308,16 @@ public class ACLAdminServlet extends AdminServlet {
 
             params.add(Constants.PR_ACL_OPS, rights.toString());
 
-            en = acl.entries();
+            Enumeration<ACLEntry> aclEntryEnum;
+            aclEntryEnum = acl.entries();
             String acis = "";
 
-            if (en.hasMoreElements()) {
-                while (en.hasMoreElements()) {
+            if (aclEntryEnum.hasMoreElements()) {
+                while (aclEntryEnum.hasMoreElements()) {
                     if (acis != "") {
                         acis += ";";
                     }
-                    ACLEntry aclEntry = (ACLEntry) en.nextElement();
+                    ACLEntry aclEntry = (ACLEntry) aclEntryEnum.nextElement();
                     String aci = aclEntry.getACLEntryString();
 
                     acis += aci;
@@ -466,10 +467,10 @@ public class ACLAdminServlet extends AdminServlet {
         HttpServletResponse resp) throws ServletException, IOException,
             EBaseException {
         NameValuePairs params = new NameValuePairs();
-        Enumeration res = mAuthzMgr.aclEvaluatorElements();
+        Enumeration<IAccessEvaluator> res = mAuthzMgr.aclEvaluatorElements();
 
         while (res.hasMoreElements()) {
-            IAccessEvaluator evaluator = (IAccessEvaluator) res.nextElement();
+            IAccessEvaluator evaluator =  res.nextElement();
 
             // params.add(evaluator.getType(), evaluator.getDescription());
             params.add(evaluator.getType(), evaluator.getClass().getName());
@@ -482,10 +483,10 @@ public class ACLAdminServlet extends AdminServlet {
         HttpServletResponse resp) throws ServletException, IOException,
             EBaseException {
         NameValuePairs params = new NameValuePairs();
-        Enumeration res = mAuthzMgr.aclEvaluatorElements();
+        Enumeration<IAccessEvaluator> res = mAuthzMgr.aclEvaluatorElements();
 
         while (res.hasMoreElements()) {
-            IAccessEvaluator evaluator = (IAccessEvaluator) res.nextElement();
+            IAccessEvaluator evaluator =  res.nextElement();
             String[] operators = evaluator.getSupportedOperators();
             StringBuffer str = new StringBuffer();
 
@@ -564,7 +565,7 @@ public class ACLAdminServlet extends AdminServlet {
                 destStore.getSubStore(ScopeDef.SC_ACL_IMPLS);
 
             // Does the class exist?
-            Class newImpl = null;
+            Class<?> newImpl = null;
 
             try {
                 newImpl = Class.forName(classPath);
@@ -787,7 +788,7 @@ public class ACLAdminServlet extends AdminServlet {
             }
 
             // does the evaluator exist?
-            Hashtable mEvaluators = mAuthzMgr.getAccessEvaluators();
+            Hashtable<String, IAccessEvaluator> mEvaluators = mAuthzMgr.getAccessEvaluators();
 
             if (mEvaluators.containsKey(id) == false) {
                 log(ILogger.LL_FAILURE, "evaluator attempted to be removed not found");
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java
index ff9b9911..4a7329c9 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java
@@ -369,7 +369,8 @@ public class AuthAdminServlet extends AdminServlet {
      * @exception IOException an input/output error has occurred
      * @exception EBaseException an error has occurred
      */
-    private synchronized void addAuthMgrPlugin(HttpServletRequest req, 
+    
+	private synchronized void addAuthMgrPlugin(HttpServletRequest req, 
         HttpServletResponse resp, String scope)
         throws ServletException, IOException, EBaseException {
 
@@ -454,10 +455,13 @@ public class AuthAdminServlet extends AdminServlet {
                 destStore.getSubStore(scope);
 
             // Does the class exist?
-            Class newImpl = null;
+            
+            Class<IAuthManager> newImpl = null;
 
             try {
-                newImpl = Class.forName(classPath);
+                @SuppressWarnings("unchecked")
+                Class<IAuthManager> tmpImpl = (Class<IAuthManager>) Class.forName(classPath);
+                newImpl = tmpImpl;
             } catch (ClassNotFoundException e) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
@@ -901,7 +905,7 @@ public class AuthAdminServlet extends AdminServlet {
             IOException, EBaseException {
 
         NameValuePairs params = new NameValuePairs();
-        Enumeration e = mAuths.getPlugins().keys();
+        Enumeration<String> e = mAuths.getPlugins().keys();
 
         while (e.hasMoreElements()) {
             String name = (String) e.nextElement();
@@ -922,7 +926,7 @@ public class AuthAdminServlet extends AdminServlet {
 
         NameValuePairs params = new NameValuePairs();
 
-        for (Enumeration e = mAuths.getInstances().keys();
+        for (Enumeration<?> e = mAuths.getInstances().keys();
             e.hasMoreElements();) {
             String name = (String) e.nextElement();
             AuthManagerProxy proxy = (AuthManagerProxy) mAuths.getInstances().get(name);
@@ -1018,7 +1022,7 @@ public class AuthAdminServlet extends AdminServlet {
 
             // first check if any instances from this auth manager
             // DON'T remove auth manager if any instance
-            for (Enumeration e = mAuths.getInstances().keys();
+            for (Enumeration<?> e = mAuths.getInstances().keys();
                 e.hasMoreElements();) {
                 IAuthManager authMgr = (IAuthManager) mAuths.get((String) e.nextElement());
 
@@ -1689,7 +1693,7 @@ public class AuthAdminServlet extends AdminServlet {
         store.removeSubStore(id);
         IConfigStore rstore = store.makeSubStore(id);
 
-        Enumeration keys = saveParams.getNames();
+        Enumeration<String> keys = saveParams.getNames();
 
         while (keys.hasMoreElements()) {
             String key = (String) keys.nextElement();
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/LDAPSecurityDomainSessionTable.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/LDAPSecurityDomainSessionTable.java
index da2a3ccb..a421302b 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/LDAPSecurityDomainSessionTable.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/LDAPSecurityDomainSessionTable.java
@@ -169,10 +169,10 @@ public class LDAPSecurityDomainSessionTable
     }
 
 
-    public Enumeration getSessionIds() {
+    public Enumeration<String> getSessionIds() {
         IConfigStore cs = CMS.getConfigStore();
         LDAPConnection conn = null;
-        Vector ret = new Vector();
+        Vector<String> ret = new Vector<String>();
 
         try {
             String basedn = cs.getString("internaldb.basedn");
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainSessionTable.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainSessionTable.java
index 3d3530f2..75cc0fb6 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainSessionTable.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainSessionTable.java
@@ -30,17 +30,17 @@ import com.netscape.certsrv.base.ISecurityDomainSessionTable;
 public class SecurityDomainSessionTable 
   implements ISecurityDomainSessionTable {
 
-    private Hashtable m_sessions;
+    private Hashtable<String, Vector<Comparable<?>>> m_sessions;
     private long m_timeToLive;
 
     public SecurityDomainSessionTable(long timeToLive) {
-        m_sessions = new Hashtable();
+        m_sessions = new Hashtable<String, Vector<Comparable<?>>>();
         m_timeToLive = timeToLive;
     }
 
     public int addEntry(String sessionId, String ip, 
       String uid, String group) {
-        Vector v = new Vector();
+        Vector<Comparable<?>> v = new Vector<Comparable<?>>();
         v.addElement(ip);
         v.addElement(uid);
         v.addElement(group);
@@ -60,33 +60,33 @@ public class SecurityDomainSessionTable
         return m_sessions.containsKey(sessionId);
     }
 
-    public Enumeration getSessionIds() {
+    public Enumeration<String> getSessionIds() {
         return m_sessions.keys();
     }
 
     public String getIP(String sessionId) {
-        Vector v = (Vector)m_sessions.get(sessionId);
+        Vector<Comparable<?>> v = m_sessions.get(sessionId);
         if (v != null)
             return (String)v.elementAt(0);
         return null;
     }
 
     public String getUID(String sessionId) {
-        Vector v = (Vector)m_sessions.get(sessionId);
+        Vector<Comparable<?>> v = m_sessions.get(sessionId);
         if (v != null)
             return (String)v.elementAt(1);
         return null;
     }
 
     public String getGroup(String sessionId) {
-        Vector v = (Vector)m_sessions.get(sessionId);
+        Vector<Comparable<?>> v = m_sessions.get(sessionId);
         if (v != null)
             return (String)v.elementAt(2);
         return null;
     }
 
     public long getBeginTime(String sessionId) {
-        Vector v = (Vector)m_sessions.get(sessionId);
+        Vector<Comparable<?>> v = m_sessions.get(sessionId);
         if (v != null) { 
             Long n = (Long)v.elementAt(3);
             if (n != null)