diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/cms')
10 files changed, 75 insertions, 63 deletions
diff --git a/pki/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java b/pki/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java index 11605418..ce60bf8d 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java +++ b/pki/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java @@ -415,8 +415,8 @@ public class UidPwdPinDirAuthentication extends DirBasedAuthentication /** * Retrieves a list of names of the value parameter. */ - public Enumeration getValueNames() { - Vector v = new Vector(); + public Enumeration<String> getValueNames() { + Vector<String> v = new Vector<String>(); v.addElement(CRED_UID); v.addElement(CRED_PWD); diff --git a/pki/base/common/src/com/netscape/cms/notification/MailNotification.java b/pki/base/common/src/com/netscape/cms/notification/MailNotification.java index 1e409af8..af651584 100644 --- a/pki/base/common/src/com/netscape/cms/notification/MailNotification.java +++ b/pki/base/common/src/com/netscape/cms/notification/MailNotification.java @@ -170,7 +170,7 @@ public class MailNotification implements IMailNotification { * sets the recipients' email addresses * @param addresses a list of email addresses of the recipients */ - public void setTo(Vector addresses) { + public void setTo(Vector<String> addresses) { // concatenate addresses into comma separated mTo String } diff --git a/pki/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java index b5afc1c7..71cccdff 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java @@ -80,13 +80,13 @@ public abstract class EnrollDefault implements IPolicyDefault, ICertInfoPolicyDe public static final String GN_OID_NAME = "OIDName"; protected IConfigStore mConfig = null; - protected Vector mConfigNames = new Vector(); - protected Vector mValueNames = new Vector(); + protected Vector<String> mConfigNames = new Vector<String>(); + protected Vector<String> mValueNames = new Vector<String>(); public EnrollDefault() { } - public Enumeration getConfigNames() { + public Enumeration<String> getConfigNames() { return mConfigNames.elements(); } @@ -212,7 +212,7 @@ public abstract class EnrollDefault implements IPolicyDefault, ICertInfoPolicyDe mValueNames.addElement(name); } - public Enumeration getValueNames() { + public Enumeration<String> getValueNames() { return mValueNames.elements(); } @@ -291,7 +291,7 @@ public abstract class EnrollDefault implements IPolicyDefault, ICertInfoPolicyDe info.get(X509CertInfo.EXTENSIONS); if (exts == null) return; - Enumeration e = exts.getNames(); + Enumeration<?> e = exts.getNames(); while (e.hasMoreElements()) { String n = (String) e.nextElement(); @@ -323,7 +323,7 @@ public abstract class EnrollDefault implements IPolicyDefault, ICertInfoPolicyDe protected Extension getExtension(String name, CertificateExtensions exts) { if (exts == null) return null; - Enumeration e = exts.getElements(); + Enumeration<?> e = exts.getElements(); while (e.hasMoreElements()) { Extension ext = (Extension) e.nextElement(); @@ -515,7 +515,7 @@ public abstract class EnrollDefault implements IPolicyDefault, ICertInfoPolicyDe String realm = nameValue.substring(pos0 + 1, pos1).trim(); String name_type = nameValue.substring(pos1 + 1, pos2).trim(); String name_strings = nameValue.substring(pos2 + 1).trim(); - Vector strings = new Vector(); + Vector<String> strings = new Vector<String>(); StringTokenizer st = new StringTokenizer(name_strings, ","); while (st.hasMoreTokens()) { strings.addElement(st.nextToken()); @@ -637,7 +637,7 @@ public abstract class EnrollDefault implements IPolicyDefault, ICertInfoPolicyDe return true; } - protected String buildRecords(Vector recs) throws EPropertyException { + protected String buildRecords(Vector<?> recs) throws EPropertyException { StringBuffer sb = new StringBuffer(); for (int i = 0; i < recs.size(); i++) { @@ -646,7 +646,7 @@ public abstract class EnrollDefault implements IPolicyDefault, ICertInfoPolicyDe sb.append("Record #"); sb.append(i); sb.append("\r\n"); - Enumeration e = pairs.getNames(); + Enumeration<?> e = pairs.getNames(); while (e.hasMoreElements()) { String key = (String) e.nextElement(); @@ -663,10 +663,10 @@ public abstract class EnrollDefault implements IPolicyDefault, ICertInfoPolicyDe return sb.toString(); } - protected Vector parseRecords(String value) throws EPropertyException { + protected Vector<NameValuePairs> parseRecords(String value) throws EPropertyException { StringTokenizer st = new StringTokenizer(value, "\r\n"); int num = 0; - Vector v = new Vector(); + Vector<NameValuePairs> v = new Vector<NameValuePairs>(); NameValuePairs nvps = null; while (st.hasMoreTokens()) { diff --git a/pki/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java index f6ddd915..065b3044 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java @@ -163,7 +163,7 @@ public class NameConstraintsExtDefault extends EnrollExtDefault { } - public Enumeration getConfigNames() { + public Enumeration<String> getConfigNames() { refreshConfigAndValueNames(); return super.getConfigNames(); } diff --git a/pki/base/common/src/com/netscape/cms/profile/input/SubjectDNInput.java b/pki/base/common/src/com/netscape/cms/profile/input/SubjectDNInput.java index 8691b45c..4a8f6050 100644 --- a/pki/base/common/src/com/netscape/cms/profile/input/SubjectDNInput.java +++ b/pki/base/common/src/com/netscape/cms/profile/input/SubjectDNInput.java @@ -81,8 +81,8 @@ public class SubjectDNInput extends EnrollInput implements IProfileInput { /** * Returns selected value names based on the configuration. */ - public Enumeration getValueNames() { - Vector v = new Vector(); + public Enumeration<String> getValueNames() { + Vector<String> v = new Vector<String>(); v.addElement(VAL_SUBJECT); return v.elements(); } diff --git a/pki/base/common/src/com/netscape/cms/profile/output/EnrollOutput.java b/pki/base/common/src/com/netscape/cms/profile/output/EnrollOutput.java index 3013e881..5e3f077b 100644 --- a/pki/base/common/src/com/netscape/cms/profile/output/EnrollOutput.java +++ b/pki/base/common/src/com/netscape/cms/profile/output/EnrollOutput.java @@ -39,8 +39,8 @@ import com.netscape.certsrv.request.IRequest; */ public abstract class EnrollOutput implements IProfileOutput { private IConfigStore mConfig = null; - private Vector mValueNames = new Vector(); - protected Vector mConfigNames = new Vector(); + private Vector<String> mValueNames = new Vector<String>(); + protected Vector<String> mConfigNames = new Vector<String>(); /** * Initializes this default policy. @@ -98,7 +98,7 @@ public abstract class EnrollOutput implements IProfileOutput { /** * Retrieves a list of names of the value parameter. */ - public Enumeration getValueNames() { + public Enumeration<String> getValueNames() { return mValueNames.elements(); } @@ -115,7 +115,7 @@ public abstract class EnrollOutput implements IProfileOutput { request.setExtData(name, value); } - public Enumeration getConfigNames() { + public Enumeration<String> getConfigNames() { return mConfigNames.elements(); } diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java index 6f64d81a..9c83a30c 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java @@ -51,6 +51,7 @@ import com.netscape.certsrv.property.EPropertyException; import com.netscape.certsrv.property.IDescriptor; import com.netscape.certsrv.registry.IPluginInfo; import com.netscape.certsrv.registry.IPluginRegistry; +import com.netscape.cms.profile.common.ProfilePolicy; /** @@ -383,7 +384,7 @@ public class ProfileAdminServlet extends AdminServlet { HttpServletResponse resp) throws ServletException, IOException { - Enumeration impls = mRegistry.getIds("profile"); + Enumeration<String> impls = mRegistry.getIds("profile"); NameValuePairs nvp = new NameValuePairs(); while (impls.hasMoreElements()) { @@ -592,11 +593,12 @@ public class ProfileAdminServlet extends AdminServlet { } IProfileInput input = null; - Enumeration names = req.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> names = req.getParameterNames(); NameValuePairs nvps = new NameValuePairs(); while (names.hasMoreElements()) { - String name = (String) names.nextElement(); + String name = names.nextElement(); if (name.equals("OP_SCOPE")) continue; @@ -718,11 +720,12 @@ public class ProfileAdminServlet extends AdminServlet { } IProfileOutput output = null; - Enumeration names = req.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> names = req.getParameterNames(); NameValuePairs nvps = new NameValuePairs(); while (names.hasMoreElements()) { - String name = (String) names.nextElement(); + String name = names.nextElement(); if (name.equals("OP_SCOPE")) continue; @@ -819,10 +822,11 @@ public class ProfileAdminServlet extends AdminServlet { try { String profileId = ""; String policyId = ""; - Enumeration names = req.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> names = req.getParameterNames(); while (names.hasMoreElements()) { - String name = (String) names.nextElement(); + String name = names.nextElement(); if (name.equals("OP_SCOPE")) continue; @@ -939,10 +943,11 @@ public class ProfileAdminServlet extends AdminServlet { try { String profileId = ""; String inputId = ""; - Enumeration names = req.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> names = req.getParameterNames(); while (names.hasMoreElements()) { - String name = (String) names.nextElement(); + String name = names.nextElement(); if (name.equals("OP_SCOPE")) continue; @@ -1056,7 +1061,8 @@ public class ProfileAdminServlet extends AdminServlet { try { String profileId = ""; String outputId = ""; - Enumeration names = req.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> names = req.getParameterNames(); while (names.hasMoreElements()) { String name = (String) names.nextElement(); @@ -1205,7 +1211,8 @@ public class ProfileAdminServlet extends AdminServlet { IPolicyDefault def = policy.getDefault(); IConfigStore defConfig = def.getConfigStore(); - Enumeration names = req.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> names = req.getParameterNames(); while (names.hasMoreElements()) { String name = (String) names.nextElement(); @@ -1341,10 +1348,11 @@ public class ProfileAdminServlet extends AdminServlet { IPolicyConstraint con = policy.getConstraint(); IConfigStore conConfig = con.getConfigStore(); - Enumeration names = req.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> names = req.getParameterNames(); while (names.hasMoreElements()) { - String name = (String) names.nextElement(); + String name = names.nextElement(); if (name.equals("OP_SCOPE")) continue; @@ -1478,7 +1486,8 @@ public class ProfileAdminServlet extends AdminServlet { IPolicyDefault def = policy.getDefault(); IConfigStore defConfig = def.getConfigStore(); - Enumeration names = req.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> names = req.getParameterNames(); while (names.hasMoreElements()) { String name = (String) names.nextElement(); @@ -1606,7 +1615,8 @@ public class ProfileAdminServlet extends AdminServlet { IProfileInput input = profile.getProfileInput(inputId); IConfigStore inputConfig = input.getConfigStore(); - Enumeration names = req.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> names = req.getParameterNames(); while (names.hasMoreElements()) { String name = (String) names.nextElement(); @@ -1725,7 +1735,8 @@ public class ProfileAdminServlet extends AdminServlet { IProfileOutput output = profile.getProfileOutput(outputId); IConfigStore outputConfig = output.getConfigStore(); - Enumeration names = req.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> names = req.getParameterNames(); while (names.hasMoreElements()) { String name = (String) names.nextElement(); @@ -1849,7 +1860,8 @@ public class ProfileAdminServlet extends AdminServlet { IPolicyConstraint con = policy.getConstraint(); IConfigStore conConfig = con.getConfigStore(); - Enumeration names = req.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> names = req.getParameterNames(); CMS.debug("ProfileAdminServlet: modifyPolicyConstraintConfig policy " + policy + " con " + con); while (names.hasMoreElements()) { @@ -1959,10 +1971,10 @@ public class ProfileAdminServlet extends AdminServlet { rule = policy.getDefault(); NameValuePairs nvp = new NameValuePairs(); - Enumeration names = rule.getConfigNames(); + Enumeration<String> names = rule.getConfigNames(); while (names.hasMoreElements()) { - String name = (String) names.nextElement(); + String name = names.nextElement(); IDescriptor desc = rule.getConfigDescriptor(getLocale(req), name); if (desc == null) { @@ -2007,10 +2019,10 @@ public class ProfileAdminServlet extends AdminServlet { IPolicyConstraint rule = policy.getConstraint(); NameValuePairs nvp = new NameValuePairs(); - Enumeration names = rule.getConfigNames(); + Enumeration<String> names = rule.getConfigNames(); while (names.hasMoreElements()) { - String name = (String) names.nextElement(); + String name = names.nextElement(); IDescriptor desc = rule.getConfigDescriptor(getLocale(req), name); if (desc == null) { @@ -2040,7 +2052,7 @@ public class ProfileAdminServlet extends AdminServlet { } NameValuePairs nvp = new NameValuePairs(); - Enumeration setIds = profile.getProfilePolicySetIds(); + Enumeration<String> setIds = profile.getProfilePolicySetIds(); if (!setIds.hasMoreElements()) { // no set id; this is a brand new profile @@ -2049,7 +2061,7 @@ public class ProfileAdminServlet extends AdminServlet { } while (setIds.hasMoreElements()) { String setId = (String) setIds.nextElement(); - Enumeration policies = profile.getProfilePolicies(setId); + Enumeration<ProfilePolicy> policies = profile.getProfilePolicies(setId); while (policies.hasMoreElements()) { IProfilePolicy policy = (IProfilePolicy) policies.nextElement(); @@ -2082,7 +2094,7 @@ public class ProfileAdminServlet extends AdminServlet { } NameValuePairs nvp = new NameValuePairs(); - Enumeration outputs = profile.getProfileOutputIds(); + Enumeration<String> outputs = profile.getProfileOutputIds(); while (outputs.hasMoreElements()) { String outputId = (String) outputs.nextElement(); @@ -2109,7 +2121,7 @@ public class ProfileAdminServlet extends AdminServlet { } NameValuePairs nvp = new NameValuePairs(); - Enumeration inputs = profile.getProfileInputIds(); + Enumeration<String> inputs = profile.getProfileInputIds(); while (inputs.hasMoreElements()) { String inputId = (String) inputs.nextElement(); @@ -2143,10 +2155,10 @@ public class ProfileAdminServlet extends AdminServlet { NameValuePairs nvp = new NameValuePairs(); profileInput = profile.getProfileInput(inputId); - Enumeration names = profileInput.getConfigNames(); + Enumeration<String> names = profileInput.getConfigNames(); while (names.hasMoreElements()) { - String name = (String) names.nextElement(); + String name = names.nextElement(); IDescriptor desc = profileInput.getConfigDescriptor( getLocale(req), name); if (desc == null) { @@ -2184,10 +2196,10 @@ public class ProfileAdminServlet extends AdminServlet { NameValuePairs nvp = new NameValuePairs(); profileOutput = profile.getProfileOutput(outputId); - Enumeration names = profileOutput.getConfigNames(); + Enumeration<String> names = profileOutput.getConfigNames(); while (names.hasMoreElements()) { - String name = (String) names.nextElement(); + String name = names.nextElement(); IDescriptor desc = profileOutput.getConfigDescriptor( getLocale(req), name); if (desc == null) { @@ -2208,10 +2220,10 @@ public class ProfileAdminServlet extends AdminServlet { throws ServletException, IOException { NameValuePairs nvp = new NameValuePairs(); - Enumeration e = mProfileSub.getProfileIds(); + Enumeration<String> e = mProfileSub.getProfileIds(); while (e.hasMoreElements()) { - String profileId = (String) e.nextElement(); + String profileId = e.nextElement(); IProfile profile = null; try { diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java index be9eb456..7605eb2e 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java @@ -245,11 +245,11 @@ public class RegistryAdminServlet extends AdminServlet { throws ServletException, IOException { String scope = req.getParameter(Constants.OP_SCOPE); - Enumeration impls = mRegistry.getIds(scope); + Enumeration<String> impls = mRegistry.getIds(scope); NameValuePairs nvp = new NameValuePairs(); while (impls.hasMoreElements()) { - String id = (String) impls.nextElement(); + String id = impls.nextElement(); IPluginInfo info = mRegistry.getPluginInfo(scope, id); nvp.add(id, info.getClassName() + "," + @@ -276,7 +276,7 @@ public class RegistryAdminServlet extends AdminServlet { Class.forName(className).newInstance(); if (policyDefaultClass != null) { - Enumeration impls = mRegistry.getIds("constraintPolicy"); + Enumeration<String> impls = mRegistry.getIds("constraintPolicy"); while (impls.hasMoreElements()) { String constraintID = (String) impls.nextElement(); @@ -332,11 +332,11 @@ public class RegistryAdminServlet extends AdminServlet { } catch (Exception e) { } if (template != null) { - Enumeration names = template.getConfigNames(); + Enumeration<String> names = template.getConfigNames(); if (names != null) { while (names.hasMoreElements()) { - String name = (String) names.nextElement(); + String name = names.nextElement(); CMS.debug("RegistryAdminServlet: getProfileImpl descriptor " + name); IDescriptor desc = template.getConfigDescriptor(getLocale(req), name); diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java b/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java index 1c506275..60075b6d 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java @@ -1042,7 +1042,7 @@ public abstract class CMSServlet extends HttpServlet { */ protected void saveHttpParams( IArgBlock httpParams, IRequest req) { - Hashtable<String, Object> saveParams = new Hashtable<String, Object>(); + Hashtable<String, String> saveParams = new Hashtable<String, String>(); Enumeration<String> names = httpParams.elements(); @@ -1065,7 +1065,7 @@ public abstract class CMSServlet extends HttpServlet { // retrieves string values. // TODO - when we can use JDK5 features we should typecast // the params until they get here - saveParams.put(name, httpParams.get(name)); + saveParams.put(name, (String) httpParams.get(name)); } } req.setExtData(IRequest.HTTP_PARAMS, saveParams); @@ -1477,7 +1477,7 @@ public abstract class CMSServlet extends HttpServlet { // # 56230 - expose auth token parameters to the policy predicate if (token != null && req != null) { - Enumeration e = token.getElements(); + Enumeration<String> e = token.getElements(); while (e.hasMoreElements()) { String n = (String) e.nextElement(); String[] x1 = token.getInStringArray(n); @@ -2197,7 +2197,7 @@ public abstract class CMSServlet extends HttpServlet { return ILogger.SIGNED_AUDIT_EMPTY_VALUE; } - Enumeration groups = null; + Enumeration<IGroup> groups = null; try { groups = mUG.findGroups("*"); diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java index a159c0f2..33233275 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java @@ -703,12 +703,12 @@ public class ProfileProcessServlet extends ProfileServlet { IProfileOutput profileOutput = profile.getProfileOutput( outputId); - Enumeration outputNames = profileOutput.getValueNames(); + Enumeration<String> outputNames = profileOutput.getValueNames(); if (outputNames != null) { while (outputNames.hasMoreElements()) { ArgSet outputset = new ArgSet(); - String outputName = (String) + String outputName = outputNames.nextElement(); IDescriptor outputDesc = profileOutput.getValueDescriptor(locale, |