diff options
author | Adam Young <ayoung@redhat.com> | 2011-11-17 11:38:48 -0500 |
---|---|---|
committer | Adam Young <ayoung@redhat.com> | 2011-12-22 16:39:30 -0500 |
commit | ee93fc8f86eb62d52811ce2458e8ccd12bc1cd20 (patch) | |
tree | 172f48318589014614a9a5c1f03fd76485a42b2e /pki/base/common | |
parent | 90c761917754c18c18e9df643e8dd60368a3510f (diff) | |
download | pki-ee93fc8f86eb62d52811ce2458e8ccd12bc1cd20.tar.gz pki-ee93fc8f86eb62d52811ce2458e8ccd12bc1cd20.tar.xz pki-ee93fc8f86eb62d52811ce2458e8ccd12bc1cd20.zip |
type safety for certserv.authenticator
Diffstat (limited to 'pki/base/common')
6 files changed, 25 insertions, 28 deletions
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/AuthCredentials.java b/pki/base/common/src/com/netscape/certsrv/authentication/AuthCredentials.java index 222f9a613..de124a38c 100644 --- a/pki/base/common/src/com/netscape/certsrv/authentication/AuthCredentials.java +++ b/pki/base/common/src/com/netscape/certsrv/authentication/AuthCredentials.java @@ -30,18 +30,16 @@ import com.netscape.certsrv.base.IArgBlock; * @version $Revision$, $Date$ */ public class AuthCredentials implements IAuthCredentials { - /** - * - */ + private static final long serialVersionUID = 5862936214648594328L; - private Hashtable authCreds = null; + private Hashtable<String, Object> authCreds = null; private IArgBlock argblk = null; /** * Constructor */ public AuthCredentials() { - authCreds = new Hashtable(); + authCreds = new Hashtable<String, Object>(); } /** @@ -80,7 +78,7 @@ public class AuthCredentials implements IAuthCredentials { * fetch the elements sequentially. * @return an enumeration of the values in this credential set */ - public Enumeration getElements() { + public Enumeration<Object> getElements() { return (authCreds.elements()); } diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/AuthMgrPlugin.java b/pki/base/common/src/com/netscape/certsrv/authentication/AuthMgrPlugin.java index f060db5f2..bdb2fe002 100644 --- a/pki/base/common/src/com/netscape/certsrv/authentication/AuthMgrPlugin.java +++ b/pki/base/common/src/com/netscape/certsrv/authentication/AuthMgrPlugin.java @@ -29,7 +29,6 @@ package com.netscape.certsrv.authentication; public class AuthMgrPlugin { protected String mId = null; protected String mClassPath = null; - protected Class mClass = null; protected boolean mVisible = true; /** diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/AuthToken.java b/pki/base/common/src/com/netscape/certsrv/authentication/AuthToken.java index 7d2d5eb9d..eae282c02 100644 --- a/pki/base/common/src/com/netscape/certsrv/authentication/AuthToken.java +++ b/pki/base/common/src/com/netscape/certsrv/authentication/AuthToken.java @@ -48,7 +48,7 @@ import com.netscape.certsrv.usrgrp.Certificates; * @version $Revision$, $Date$ */ public class AuthToken implements IAuthToken { - protected Hashtable mAttrs = null; + protected Hashtable<String, Object> mAttrs = null; /* Subject name of the certificate in the authenticating entry */ public static final String TOKEN_CERT_SUBJECT = "tokenCertSubject"; @@ -101,7 +101,7 @@ public class AuthToken implements IAuthToken { * @param authMgr The authentication manager that created this Token. */ public AuthToken(IAuthManager authMgr) { - mAttrs = new Hashtable(); + mAttrs = new Hashtable<String, Object>(); if (authMgr != null) { set(TOKEN_AUTHMGR_INST_NAME, authMgr.getName()); set(TOKEN_AUTHMGR_IMPL_NAME, authMgr.getImplName()); @@ -133,7 +133,7 @@ public class AuthToken implements IAuthToken { * Enumerate all attribute names in the AuthToken. * @return Enumeration of all attribute names in this AuthToken. */ - public Enumeration getElements() { + public Enumeration<String> getElements() { return (mAttrs.keys()); } @@ -408,7 +408,7 @@ public class AuthToken implements IAuthToken { * Enumerate all attribute values in the AuthToken. * @return Enumeration of all attribute names in this AuthToken. */ - public Enumeration getVals() { + public Enumeration<Object> getVals() { return (mAttrs.elements()); } diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthSubsystem.java b/pki/base/common/src/com/netscape/certsrv/authentication/IAuthSubsystem.java index 29657e7a4..2de8ed266 100644 --- a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthSubsystem.java +++ b/pki/base/common/src/com/netscape/certsrv/authentication/IAuthSubsystem.java @@ -164,13 +164,13 @@ public interface IAuthSubsystem extends ISubsystem { * authentication subsystem. * @return a list of authentication managers */ - public Enumeration getAuthManagers(); + public Enumeration<IAuthManager> getAuthManagers(); /** * Gets an enumeration of authentication manager plugins. * @return a list of authentication plugins */ - public Enumeration getAuthManagerPlugins(); + public Enumeration<AuthMgrPlugin> getAuthManagerPlugins(); /** * Gets a single authentication manager plugin implementation @@ -201,13 +201,13 @@ public interface IAuthSubsystem extends ISubsystem { * Get a hashtable containing all authentication plugins. * @return all authentication plugins. */ - public Hashtable getPlugins(); + public Hashtable<String, AuthMgrPlugin> getPlugins(); /** * Get a hashtable containing all authentication instances. * @return all authentication instances. */ - public Hashtable getInstances(); + public Hashtable<?, ?> getInstances(); /** * Get an authentication manager interface for the given name. diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java b/pki/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java index a8462108e..942793633 100644 --- a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java +++ b/pki/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java @@ -61,7 +61,7 @@ public interface IAuthToken { * * @return an enumeration of the attribute names. */ - public Enumeration getElements(); + public Enumeration<String> getElements(); /************ * Helpers for non-string sets and gets. diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java b/pki/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java index d3793e344..252d69d6a 100644 --- a/pki/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java @@ -52,8 +52,8 @@ import com.netscape.cmscore.util.Debug; public class AuthSubsystem implements IAuthSubsystem { public static final String ID = "auths"; - public Hashtable mAuthMgrPlugins = new Hashtable(); - public Hashtable mAuthMgrInsts = new Hashtable(); + public Hashtable<String, AuthMgrPlugin> mAuthMgrPlugins = new Hashtable<String, AuthMgrPlugin>(); + public Hashtable<String, AuthManagerProxy> mAuthMgrInsts = new Hashtable<String, AuthManagerProxy>(); private String mId = "auths"; private IConfigStore mConfig = null; @@ -123,7 +123,7 @@ public class AuthSubsystem implements IAuthSubsystem { // get auth manager plugins. IConfigStore c = config.getSubStore(PROP_IMPL); - Enumeration mImpls = c.getSubStoreNames(); + Enumeration<String> mImpls = c.getSubStoreNames(); while (mImpls.hasMoreElements()) { String id = (String) mImpls.nextElement(); @@ -192,7 +192,7 @@ public class AuthSubsystem implements IAuthSubsystem { // get auth manager instances. c = config.getSubStore(PROP_INSTANCE); - Enumeration instances = c.getSubStoreNames(); + Enumeration<String> instances = c.getSubStoreNames(); while (instances.hasMoreElements()) { String insName = (String) instances.nextElement(); @@ -380,12 +380,12 @@ public class AuthSubsystem implements IAuthSubsystem { /** * Enumerate all authentication manager instances. */ - public Enumeration getAuthManagers() { - Vector inst = new Vector(); - Enumeration e = mAuthMgrInsts.keys(); + public Enumeration<IAuthManager> getAuthManagers() { + Vector<IAuthManager> inst = new Vector<IAuthManager>(); + Enumeration<String> e = mAuthMgrInsts.keys(); while (e.hasMoreElements()) { - IAuthManager p = get((String) e.nextElement()); + IAuthManager p = get( e.nextElement()); if (p != null) { inst.addElement(p); @@ -397,7 +397,7 @@ public class AuthSubsystem implements IAuthSubsystem { /** * Enumerate all registered authentication manager plugins. */ - public Enumeration getAuthManagerPlugins() { + public Enumeration<AuthMgrPlugin> getAuthManagerPlugins() { return (mAuthMgrPlugins.elements()); } @@ -459,7 +459,7 @@ public class AuthSubsystem implements IAuthSubsystem { * <P> */ public void shutdown() { - for (Enumeration e = mAuthMgrInsts.keys(); + for (Enumeration<String> e = mAuthMgrInsts.keys(); e.hasMoreElements();) { IAuthManager mgr = (IAuthManager) get((String) e.nextElement()); @@ -475,11 +475,11 @@ public class AuthSubsystem implements IAuthSubsystem { mAuthMgrInsts = null; } - public Hashtable getPlugins() { + public Hashtable<String, AuthMgrPlugin> getPlugins() { return mAuthMgrPlugins; } - public Hashtable getInstances() { + public Hashtable<String, AuthManagerProxy> getInstances() { return mAuthMgrInsts; } |