diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/cms/profile')
9 files changed, 22 insertions, 23 deletions
diff --git a/pki/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java b/pki/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java index aa18acd3b..c03f90a4b 100644 --- a/pki/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java +++ b/pki/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java @@ -226,9 +226,9 @@ public class CAEnrollProfile extends EnrollProfile { request.setRequestStatus(RequestStatus.COMPLETE); // notifies updater plugins - Enumeration updaterIds = getProfileUpdaterIds(); + Enumeration<String> updaterIds = getProfileUpdaterIds(); while (updaterIds.hasMoreElements()) { - String updaterId = (String) updaterIds.nextElement(); + String updaterId = updaterIds.nextElement(); IProfileUpdater updater = getProfileUpdater(updaterId); updater.update(request, RequestStatus.COMPLETE); } diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java b/pki/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java index 9c8e04784..3c737e8a5 100644 --- a/pki/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java +++ b/pki/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java @@ -108,7 +108,7 @@ public class ExtendedKeyUsageExtConstraint extends EnrollConstraint { } // Build local cache of configured OIDs - Vector mCache = new Vector(); + Vector<String> mCache = new Vector<String>(); StringTokenizer st = new StringTokenizer(getConfig(CONFIG_OIDS), ","); while (st.hasMoreTokens()) { @@ -118,10 +118,10 @@ public class ExtendedKeyUsageExtConstraint extends EnrollConstraint { } // check OIDs - Enumeration e = ext.getOIDs(); + Enumeration<ObjectIdentifier> e = ext.getOIDs(); while (e.hasMoreElements()) { - ObjectIdentifier oid = (ObjectIdentifier) e.nextElement(); + ObjectIdentifier oid = e.nextElement(); if (!mCache.contains(oid.toString())) { throw new ERejectException( diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java b/pki/base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java index 0d81c583f..459e9f219 100644 --- a/pki/base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java +++ b/pki/base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java @@ -43,9 +43,9 @@ public class NoConstraint implements IPolicyConstraint { public static final String CONFIG_NAME = "name"; private IConfigStore mConfig = null; - private Vector mNames = new Vector(); + private Vector<String> mNames = new Vector<String>(); - public Enumeration getConfigNames() { + public Enumeration<String> getConfigNames() { return mNames.elements(); } diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java b/pki/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java index 1526686e9..f10130aa6 100644 --- a/pki/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java +++ b/pki/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java @@ -191,9 +191,9 @@ public class UniqueKeyConstraint extends EnrollConstraint { sjname_in_req = (X500Name) subName.get(CertificateSubjectName.DN_NAME); CMS.debug("UniqueKeyConstraint: cert request subject DN =" + sjname_in_req.toString()); - Enumeration e = list.getCertRecords(0, size - 1); + Enumeration<ICertRecord> e = list.getCertRecords(0, size - 1); while (e != null && e.hasMoreElements()) { - ICertRecord rec = (ICertRecord) e.nextElement(); + ICertRecord rec = e.nextElement(); X509CertImpl cert = rec.getCertificate(); String certDN = cert.getSubjectDN().toString(); diff --git a/pki/base/common/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java index c9ea70624..f23b7e24c 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java @@ -114,7 +114,7 @@ public class AuthInfoAccessExtDefault extends EnrollExtDefault { super.setConfig(name, value); } - public Enumeration getConfigNames() { + public Enumeration<String> getConfigNames() { refreshConfigAndValueNames(); return super.getConfigNames(); } @@ -236,10 +236,10 @@ public class AuthInfoAccessExtDefault extends EnrollExtDefault { for (int i = 0; i < size; i++) { NameValuePairs nvps = (NameValuePairs) v.elementAt(i); - Enumeration names = nvps.getNames(); + Enumeration<String> names = nvps.getNames(); while (names.hasMoreElements()) { - String name1 = (String) names.nextElement(); + String name1 = names.nextElement(); if (name1.equals(AD_METHOD)) { method = nvps.getValue(name1); diff --git a/pki/base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java index 15dec5412..f1d63a348 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java @@ -187,11 +187,10 @@ public class ExtendedKeyUsageExtDefault extends EnrollExtDefault { if (ext == null) { return ""; } - Enumeration e = ext.getOIDs(); + Enumeration<ObjectIdentifier> e = ext.getOIDs(); while (e.hasMoreElements()) { - ObjectIdentifier oid = (ObjectIdentifier) - e.nextElement(); + ObjectIdentifier oid = e.nextElement(); if (!sb.toString().equals("")) { sb.append(","); diff --git a/pki/base/common/src/com/netscape/cms/profile/def/NoDefault.java b/pki/base/common/src/com/netscape/cms/profile/def/NoDefault.java index 8197d3de4..a58b18008 100644 --- a/pki/base/common/src/com/netscape/cms/profile/def/NoDefault.java +++ b/pki/base/common/src/com/netscape/cms/profile/def/NoDefault.java @@ -41,10 +41,10 @@ public class NoDefault implements IPolicyDefault { public static final String PROP_NAME = "name"; protected Vector mValues = new Vector(); - protected Vector mNames = new Vector(); + protected Vector<String> mNames = new Vector<String>(); protected IConfigStore mConfig = null; - public Enumeration getConfigNames() { + public Enumeration<String> getConfigNames() { return mNames.elements(); } diff --git a/pki/base/common/src/com/netscape/cms/profile/input/EnrollInput.java b/pki/base/common/src/com/netscape/cms/profile/input/EnrollInput.java index db3945785..c4269ba7d 100644 --- a/pki/base/common/src/com/netscape/cms/profile/input/EnrollInput.java +++ b/pki/base/common/src/com/netscape/cms/profile/input/EnrollInput.java @@ -51,8 +51,8 @@ public abstract class EnrollInput implements IProfileInput { "LOGGING_SIGNED_AUDIT_PROOF_OF_POSSESSION_2"; protected IConfigStore mConfig = null; - protected Vector mValueNames = new Vector(); - protected Vector mConfigNames = new Vector(); + protected Vector<String> mValueNames = new Vector<String>(); + protected Vector<String> mConfigNames = new Vector<String>(); protected IProfile mProfile = null; protected ILogger mSignedAuditLogger = CMS.getSignedAuditLogger(); @@ -113,7 +113,7 @@ public abstract class EnrollInput implements IProfileInput { /** * Retrieves a list of names of the value parameter. */ - public Enumeration getValueNames() { + public Enumeration<String> getValueNames() { return mValueNames.elements(); } @@ -121,7 +121,7 @@ public abstract class EnrollInput implements IProfileInput { mConfigNames.addElement(name); } - public Enumeration getConfigNames() { + public Enumeration<String> getConfigNames() { return mConfigNames.elements(); } diff --git a/pki/base/common/src/com/netscape/cms/profile/input/GenericInput.java b/pki/base/common/src/com/netscape/cms/profile/input/GenericInput.java index 029e497f4..e8edfaa6d 100644 --- a/pki/base/common/src/com/netscape/cms/profile/input/GenericInput.java +++ b/pki/base/common/src/com/netscape/cms/profile/input/GenericInput.java @@ -94,8 +94,8 @@ public class GenericInput 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>(); int num = getNum(); for (int i = 0; i < num; i++) { String enable = getConfig(CONFIG_ENABLE + i); |