diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/cms/authentication')
4 files changed, 14 insertions, 13 deletions
diff --git a/pki/base/common/src/com/netscape/cms/authentication/CMCAuth.java b/pki/base/common/src/com/netscape/cms/authentication/CMCAuth.java index 905efc42a..06d4eaa0f 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/CMCAuth.java +++ b/pki/base/common/src/com/netscape/cms/authentication/CMCAuth.java @@ -150,13 +150,13 @@ public class CMCAuth implements IAuthManager, IExtendedPluginInfo, //////////////////////////////////// /* Vector of extendedPluginInfo strings */ - protected static Vector mExtendedPluginInfo = null; + protected static Vector<String> mExtendedPluginInfo = null; //public static final String AGENT_AUTHMGR_ID = "agentAuthMgr"; //public static final String AGENT_PLUGIN_ID = "agentAuthPlugin"; /* actual help messages */ static { - mExtendedPluginInfo = new Vector(); + mExtendedPluginInfo = new Vector<String>(); mExtendedPluginInfo .add(IExtendedPluginInfo.HELP_TEXT + diff --git a/pki/base/common/src/com/netscape/cms/authentication/DNPattern.java b/pki/base/common/src/com/netscape/cms/authentication/DNPattern.java index 653a950aa..480b5b909 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/DNPattern.java +++ b/pki/base/common/src/com/netscape/cms/authentication/DNPattern.java @@ -153,7 +153,7 @@ public class DNPattern { private void parse(PushbackReader in) throws EAuthException { - Vector rdnPatterns = new Vector(); + Vector<RDNPattern> rdnPatterns = new Vector<RDNPattern>(); RDNPattern rdnPattern = null; int lastChar = -1; @@ -170,7 +170,7 @@ public class DNPattern { mRDNPatterns = new RDNPattern[rdnPatterns.size()]; rdnPatterns.copyInto(mRDNPatterns); - Vector ldapAttrs = new Vector(); + Vector<String> ldapAttrs = new Vector<String>(); for (int i = 0; i < mRDNPatterns.length; i++) { String[] rdnAttrs = mRDNPatterns[i].getLdapAttrs(); diff --git a/pki/base/common/src/com/netscape/cms/authentication/PortalEnroll.java b/pki/base/common/src/com/netscape/cms/authentication/PortalEnroll.java index fe2c352ec..38a3e6fcf 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/PortalEnroll.java +++ b/pki/base/common/src/com/netscape/cms/authentication/PortalEnroll.java @@ -83,14 +83,14 @@ public class PortalEnroll extends DirBasedAuthentication { // contains all nested superiors' required attrs in the form of a // vector of "required" attributes in Enumeration - Vector mRequiredAttrs = null; + Vector<Enumeration<String>> mRequiredAttrs = null; // contains all nested superiors' optional attrs in the form of a // vector of "optional" attributes in Enumeration - Vector mOptionalAttrs = null; + Vector<Enumeration<String>> mOptionalAttrs = null; // contains all the objclasses, including superiors and itself - Vector mObjClasses = null; + Vector<String> mObjClasses = null; /* Holds configuration parameters accepted by this implementation. * This list is passed to the configuration console so configuration @@ -324,15 +324,15 @@ public class PortalEnroll extends DirBasedAuthentication { String dn = "uid=" + uid + "," + mBaseDN; /* Specify the attributes of the entry */ - Vector objectclass_values = null; + Vector<String> objectclass_values = null; LDAPAttributeSet attrs = new LDAPAttributeSet(); LDAPAttribute attr = new LDAPAttribute("objectclass"); // initialized to new - mRequiredAttrs = new Vector(); - mOptionalAttrs = new Vector(); - mObjClasses = new Vector(); + mRequiredAttrs = new Vector<Enumeration<String>>(); + mOptionalAttrs = new Vector<Enumeration<String>>(); + mObjClasses = new Vector<String>(); LDAPSchema dirSchema = null; @@ -431,6 +431,7 @@ public class PortalEnroll extends DirBasedAuthentication { * should build up * mRequiredAttrs, mOptionalAttrs, and mObjClasses when returned */ + @SuppressWarnings("unchecked") public void initLdapAttrs(LDAPSchema dirSchema, String oclass) { CMS.debug("PortalEnroll: in initLdapAttrsAttrs"); mObjClasses.addElement(oclass); diff --git a/pki/base/common/src/com/netscape/cms/authentication/RDNPattern.java b/pki/base/common/src/com/netscape/cms/authentication/RDNPattern.java index 02a8f1438..722aefbc3 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/RDNPattern.java +++ b/pki/base/common/src/com/netscape/cms/authentication/RDNPattern.java @@ -158,7 +158,7 @@ class RDNPattern { private void parse(PushbackReader in) throws EAuthException { //System.out.println("_________ begin rdn _________"); - Vector avaPatterns = new Vector(); + Vector<AVAPattern> avaPatterns = new Vector<AVAPattern>(); AVAPattern avaPattern = null; int lastChar; @@ -188,7 +188,7 @@ class RDNPattern { mAVAPatterns = new AVAPattern[avaPatterns.size()]; avaPatterns.copyInto(mAVAPatterns); - Vector ldapAttrs = new Vector(); + Vector<String> ldapAttrs = new Vector<String>(); for (int i = 0; i < mAVAPatterns.length; i++) { String avaAttr = mAVAPatterns[i].getLdapAttr(); |