diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/cms/servlet/admin')
7 files changed, 120 insertions, 102 deletions
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java index 72838eb55..fe176b641 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java @@ -206,9 +206,10 @@ public class AdminServlet extends HttpServlet { public void outputHttpParameters(HttpServletRequest httpReq) { CMS.debug("AdminServlet:service() uri = " + httpReq.getRequestURI()); - Enumeration paramNames = httpReq.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> paramNames = httpReq.getParameterNames(); while (paramNames.hasMoreElements()) { - String pn = (String) paramNames.nextElement(); + String pn = paramNames.nextElement(); // added this facility so that password can be hidden, // all sensitive parameters should be prefixed with // __ (double underscores); however, in the event that @@ -793,11 +794,11 @@ public class AdminServlet extends HttpServlet { StringBuffer buf = new StringBuffer(); if (params != null) { - Enumeration e = params.getNames(); + Enumeration<String> e = params.getNames(); if (e.hasMoreElements()) { while (e.hasMoreElements()) { - String name = (String) e.nextElement(); + String name = e.nextElement(); String value = java.net.URLEncoder.encode((String) params.getValue(name)); @@ -857,10 +858,11 @@ public class AdminServlet extends HttpServlet { HttpServletResponse resp) throws ServletException, IOException, EBaseException { NameValuePairs params = new NameValuePairs(); - Enumeration e = req.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> e = req.getParameterNames(); while (e.hasMoreElements()) { - String name = (String) e.nextElement(); + String name = e.nextElement(); //if (name.equals(Constants.PT_OP)) // continue; @@ -888,10 +890,11 @@ public class AdminServlet extends HttpServlet { HttpServletResponse resp) throws ServletException, IOException, EBaseException { NameValuePairs params = new NameValuePairs(); - Enumeration e = req.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> e = req.getParameterNames(); while (e.hasMoreElements()) { - String name = (String) e.nextElement(); + String name = e.nextElement(); //if (name.equals(Constants.PT_OP)) // continue; @@ -916,11 +919,11 @@ public class AdminServlet extends HttpServlet { IConfigStore config, HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException, EBaseException { - Enumeration e = config.getPropertyNames(); + Enumeration<String> e = config.getPropertyNames(); NameValuePairs params = new NameValuePairs(); while (e.hasMoreElements()) { - String s = (String) e.nextElement(); + String s = e.nextElement(); params.add(s, config.getString(s)); } @@ -1132,10 +1135,11 @@ public class AdminServlet extends HttpServlet { } // identify any remaining request parameters - Enumeration e = req.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> e = req.getParameterNames(); while (e.hasMoreElements()) { - String name = (String) e.nextElement(); + String name = e.nextElement(); // skip previously extracted parameters if (name.equals(Constants.OP_SCOPE)) { @@ -1231,7 +1235,7 @@ public class AdminServlet extends HttpServlet { return ILogger.SIGNED_AUDIT_EMPTY_VALUE; } - Enumeration groups = null; + Enumeration<IGroup> groups = null; try { groups = mUG.findGroups("*"); @@ -1242,7 +1246,7 @@ public class AdminServlet extends HttpServlet { StringBuffer membersString = new StringBuffer(); while (groups.hasMoreElements()) { - IGroup group = (IGroup) groups.nextElement(); + IGroup group = groups.nextElement(); if (group.isMember(SubjectID) == true) { if (membersString.length() != 0) { diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java b/pki/base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java index d0bbfa824..9d4c4f00e 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java @@ -35,14 +35,14 @@ public class AuthCredentials implements IAuthCredentials { * */ private static final long serialVersionUID = -6938644716486895814L; - private Hashtable authCreds = null; + private Hashtable<String, Object> authCreds = null; // Inserted by bskim private IArgBlock argblk = null; // Insert end public AuthCredentials() { - authCreds = new Hashtable(); + authCreds = new Hashtable<String, Object>(); } /** @@ -68,7 +68,7 @@ public class AuthCredentials implements IAuthCredentials { * @return the named authentication credential */ public Object get(String name) { - return ((Object) authCreds.get(name)); + return authCreds.get(name); } /** @@ -90,8 +90,8 @@ public class AuthCredentials implements IAuthCredentials { * @return an enumeration of the values in this credential set * @see java.util.Enumeration */ - public Enumeration getElements() { - return (authCreds.elements()); + public Enumeration<Object> getElements() { + return authCreds.elements(); } // Inserted by bskim diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java index fa3933ed6..2c6ba3dbc 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java @@ -230,10 +230,11 @@ public class CAAdminServlet extends AdminServlet { IOException, EBaseException { NameValuePairs params = new NameValuePairs(); - Enumeration e = req.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> e = req.getParameterNames(); while (e.hasMoreElements()) { - String name = (String) e.nextElement(); + String name = e.nextElement(); if (name.equals(Constants.OP_TYPE)) continue; @@ -290,10 +291,11 @@ public class CAAdminServlet extends AdminServlet { IConfigStore riq = nc.getSubStore(ICertificateAuthority.PROP_REQ_IN_Q_SUBSTORE); - Enumeration e = req.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> e = req.getParameterNames(); while (e.hasMoreElements()) { - String name = (String) e.nextElement(); + String name = e.nextElement(); if (name.equals(Constants.OP_TYPE)) continue; @@ -324,10 +326,11 @@ public class CAAdminServlet extends AdminServlet { IConfigStore riq = nc.getSubStore(ICertificateAuthority.PROP_REQ_IN_Q_SUBSTORE); //set rest of the parameters - Enumeration e = req.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> e = req.getParameterNames(); while (e.hasMoreElements()) { - String name = (String) e.nextElement(); + String name = e.nextElement(); if (name.equals(Constants.OP_TYPE)) continue; @@ -379,10 +382,11 @@ public class CAAdminServlet extends AdminServlet { IOException, EBaseException { //set rest of the parameters - Enumeration e = req.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> e = req.getParameterNames(); while (e.hasMoreElements()) { - String name = (String) e.nextElement(); + String name = e.nextElement(); if (name.equals(Constants.OP_TYPE)) continue; @@ -456,10 +460,10 @@ public class CAAdminServlet extends AdminServlet { throws ServletException, IOException, EBaseException { NameValuePairs params = new NameValuePairs(); - Enumeration ips = mCA.getCRLIssuingPoints(); + Enumeration<ICRLIssuingPoint> ips = mCA.getCRLIssuingPoints(); while (ips.hasMoreElements()) { - ICRLIssuingPoint ip = (ICRLIssuingPoint) ips.nextElement(); + ICRLIssuingPoint ip = ips.nextElement(); if (ip != null) { String ipId = ip.getId(); @@ -486,11 +490,12 @@ public class CAAdminServlet extends AdminServlet { if (ip != null) { - Enumeration e = req.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> e = req.getParameterNames(); String value = ""; while (e.hasMoreElements()) { - String name = (String) e.nextElement(); + String name = e.nextElement(); if (name.equals(Constants.PR_ENABLED)) { if (ip.isCRLIssuingPointEnabled()) { @@ -586,10 +591,10 @@ public class CAAdminServlet extends AdminServlet { IConfigStore crlSubStore = mCA.getConfigStore().getSubStore(ICertificateAuthority.PROP_CRL_SUBSTORE); - Enumeration crlNames = crlSubStore.getSubStoreNames(); + Enumeration<String> crlNames = crlSubStore.getSubStoreNames(); while (crlNames.hasMoreElements()) { - String name = (String) crlNames.nextElement(); + String name = crlNames.nextElement(); if (ipId.equals(name)) { // store a message in the signed audit log file @@ -743,10 +748,10 @@ public class CAAdminServlet extends AdminServlet { IConfigStore crlSubStore = mCA.getConfigStore().getSubStore(ICertificateAuthority.PROP_CRL_SUBSTORE); boolean done = false; - Enumeration crlNames = crlSubStore.getSubStoreNames(); + Enumeration<String> crlNames = crlSubStore.getSubStoreNames(); while (crlNames.hasMoreElements()) { - String name = (String) crlNames.nextElement(); + String name = crlNames.nextElement(); if (ipId.equals(name)) { ICRLIssuingPoint ip = mCA.getCRLIssuingPoint(ipId); @@ -862,10 +867,10 @@ public class CAAdminServlet extends AdminServlet { IConfigStore crlSubStore = mCA.getConfigStore().getSubStore(ICertificateAuthority.PROP_CRL_SUBSTORE); boolean done = false; - Enumeration crlNames = crlSubStore.getSubStoreNames(); + Enumeration<String> crlNames = crlSubStore.getSubStoreNames(); while (crlNames.hasMoreElements()) { - String name = (String) crlNames.nextElement(); + String name = crlNames.nextElement(); if (id.equals(name)) { mCA.deleteCRLIssuingPoint(crlSubStore, id); @@ -944,10 +949,11 @@ public class CAAdminServlet extends AdminServlet { NameValuePairs params = new NameValuePairs(); String ipId = null; - Enumeration e = req.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> e = req.getParameterNames(); while (e.hasMoreElements()) { - String name = (String) e.nextElement(); + String name = e.nextElement(); if (name.equals(Constants.OP_TYPE)) continue; @@ -1019,10 +1025,11 @@ public class CAAdminServlet extends AdminServlet { if (id != null) { IConfigStore crlExtSubStore = crlExtsSubStore.getSubStore(id); - Enumeration e = req.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> e = req.getParameterNames(); while (e.hasMoreElements()) { - String name = (String) e.nextElement(); + String name = e.nextElement(); if (name.equals(Constants.OP_TYPE)) continue; @@ -1110,16 +1117,16 @@ public class CAAdminServlet extends AdminServlet { IConfigStore crlExtsSubStore = crlSubStore.getSubStore(ICertificateAuthority.PROP_CRLEXT_SUBSTORE); if (crlExtsSubStore != null) { - Enumeration enumExts = crlExtsSubStore.getSubStoreNames(); + Enumeration<String> enumExts = crlExtsSubStore.getSubStoreNames(); while (enumExts.hasMoreElements()) { - String extName = (String) enumExts.nextElement(); + String extName = enumExts.nextElement(); boolean crlExtEnabled = false; IConfigStore crlExtSubStore = crlExtsSubStore.getSubStore(extName); - Enumeration properties = crlExtSubStore.getPropertyNames(); + Enumeration<String> properties = crlExtSubStore.getPropertyNames(); while (properties.hasMoreElements()) { - String name = (String) properties.nextElement(); + String name = properties.nextElement(); if (name.equals(Constants.PR_ENABLE)) { crlExtEnabled = crlExtSubStore.getBoolean(name, false); @@ -1158,9 +1165,9 @@ public class CAAdminServlet extends AdminServlet { String ipId = null; String name = null; - Enumeration ips = mCA.getCRLIssuingPoints(); + Enumeration<ICRLIssuingPoint> ips = mCA.getCRLIssuingPoints(); if (ips.hasMoreElements()) { - ICRLIssuingPoint ip = (ICRLIssuingPoint) ips.nextElement(); + ICRLIssuingPoint ip = ips.nextElement(); if (ip != null) { ipId = ip.getId(); } @@ -1229,10 +1236,11 @@ public class CAAdminServlet extends AdminServlet { IConfigStore crlSubStore = crlsSubStore.getSubStore(id); //set reset of the parameters - Enumeration e = req.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> e = req.getParameterNames(); while (e.hasMoreElements()) { - String name = (String) e.nextElement(); + String name = e.nextElement(); if (name.equals(Constants.OP_TYPE)) continue; @@ -1319,10 +1327,11 @@ public class CAAdminServlet extends AdminServlet { mCA.getConfigStore().getSubStore(ICertificateAuthority.PROP_CRL_SUBSTORE); IConfigStore crlSubStore = crlsSubStore.getSubStore(id); - Enumeration e = req.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> e = req.getParameterNames(); while (e.hasMoreElements()) { - String name = (String) e.nextElement(); + String name = e.nextElement(); if (name.equals(Constants.OP_TYPE)) continue; @@ -1352,12 +1361,13 @@ public class CAAdminServlet extends AdminServlet { caConnectorConfig = connectorConfig.getSubStore("CLA"); } - Enumeration enum1 = req.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> enum1 = req.getParameterNames(); NameValuePairs params = new NameValuePairs(); if (caConnectorConfig != null) { while (enum1.hasMoreElements()) { - String name = (String) enum1.nextElement(); + String name = enum1.nextElement(); if (name.equals(Constants.RS_ID)) continue; @@ -1388,11 +1398,12 @@ public class CAAdminServlet extends AdminServlet { caConnectorConfig = connectorConfig.getSubStore("CLA"); } - Enumeration enum1 = req.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> enum1 = req.getParameterNames(); if (caConnectorConfig != null) { while (enum1.hasMoreElements()) { - String name = (String) enum1.nextElement(); + String name = enum1.nextElement(); if (name.equals(Constants.OP_TYPE)) continue; @@ -1423,10 +1434,11 @@ public class CAAdminServlet extends AdminServlet { } private boolean isKRAConnector(HttpServletRequest req) { - Enumeration enum1 = req.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> enum1 = req.getParameterNames(); while (enum1.hasMoreElements()) { - String key = (String) enum1.nextElement(); + String key = enum1.nextElement(); if (key.equals("RS_ID")) { String val = req.getParameter(key); @@ -1441,10 +1453,11 @@ public class CAAdminServlet extends AdminServlet { } private boolean isCLAConnector(HttpServletRequest req) { - Enumeration enum1 = req.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> enum1 = req.getParameterNames(); while (enum1.hasMoreElements()) { - String key = (String) enum1.nextElement(); + String key = enum1.nextElement(); if (key.equals("RS_ID")) { String val = req.getParameter(key); @@ -1532,12 +1545,12 @@ public class CAAdminServlet extends AdminServlet { IConfigStore caConfig = mCA.getConfigStore(); - Enumeration enum1 = req.getParameterNames(); + Enumeration<String> enum1 = req.getParameterNames(); boolean restart = false; //mCA.setMaxSerial(""); while (enum1.hasMoreElements()) { - String key = (String) enum1.nextElement(); + String key = enum1.nextElement(); String value = req.getParameter(key); if (key.equals(Constants.PR_EE_ENABLED)) { diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java index 7ebb64af1..b93e6eb0b 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java @@ -520,12 +520,11 @@ public class JobsAdminServlet extends AdminServlet { IOException, EBaseException { NameValuePairs params = new NameValuePairs(); - Enumeration e = mJobsSched.getPlugins().keys(); + Enumeration<String> e = mJobsSched.getPlugins().keys(); while (e.hasMoreElements()) { - String name = (String) e.nextElement(); - JobPlugin value = (JobPlugin) - mJobsSched.getPlugins().get(name); + String name = e.nextElement(); + JobPlugin value = mJobsSched.getPlugins().get(name); params.add(name, value.getClassPath()); // params.add(name, value.getClassPath()+EDIT); @@ -540,10 +539,9 @@ public class JobsAdminServlet extends AdminServlet { NameValuePairs params = new NameValuePairs(); - for (Enumeration e = mJobsSched.getInstances().keys(); e.hasMoreElements();) { - String name = (String) e.nextElement(); - IJob value = (IJob) - mJobsSched.getInstances().get((Object) name); + for (Enumeration<String> e = mJobsSched.getInstances().keys(); e.hasMoreElements();) { + String name = e.nextElement(); + IJob value = mJobsSched.getInstances().get((Object) name); // params.add(name, value.getImplName()); params.add(name, value.getImplName() + VISIBLE + @@ -581,8 +579,8 @@ public class JobsAdminServlet extends AdminServlet { // first check if any instances from this job plugin // DON'T remove job plugin if any instance - for (Enumeration e = mJobsSched.getInstances().elements(); e.hasMoreElements();) { - IJob jobs = (IJob) e.nextElement(); + for (Enumeration<IJob> e = mJobsSched.getInstances().elements(); e.hasMoreElements();) { + IJob jobs = e.nextElement(); if ((jobs.getImplName()).equals(id)) { sendResponse(ERROR, @@ -1001,10 +999,10 @@ public class JobsAdminServlet 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(); + String key = keys.nextElement(); String value = saveParams.getValue(key); if (!value.equals("")) diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java index 1dd346667..0d3648c98 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java @@ -188,14 +188,15 @@ public class KRAAdminServlet extends AdminServlet { private void setGeneralConfig(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException, EBaseException { - Enumeration enum1 = req.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> enum1 = req.getParameterNames(); boolean restart = false; String auditMessage = null; String auditSubjectID = auditSubjectID(); while (enum1.hasMoreElements()) { - String key = (String) enum1.nextElement(); + String key = enum1.nextElement(); String value = req.getParameter(key); if (key.equals(Constants.PR_NO_OF_REQUIRED_RECOVERY_AGENTS)) { diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java index 338a58239..317a50d68 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java @@ -344,10 +344,11 @@ public class OCSPAdminServlet extends AdminServlet { IOCSPStore store = mOCSP.getOCSPStore(id); - Enumeration e = req.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> e = req.getParameterNames(); while (e.hasMoreElements()) { - String name = (String) e.nextElement(); + String name = e.nextElement(); if (name.equals(Constants.OP_TYPE)) continue; @@ -422,10 +423,10 @@ public class OCSPAdminServlet extends AdminServlet { IConfigStore config = mOCSP.getConfigStore(); String defStore = config.getString(IOCSPAuthority.PROP_DEF_STORE_ID); IConfigStore SubStore = config.getSubStore(IOCSPAuthority.PROP_STORE); - Enumeration enumStores = SubStore.getSubStoreNames(); + Enumeration<String> enumStores = SubStore.getSubStoreNames(); while (enumStores.hasMoreElements()) { - String storeName = (String) enumStores.nextElement(); + String storeName = enumStores.nextElement(); boolean storeEnabled = false; if (storeName.equals(defStore)) { @@ -488,7 +489,8 @@ public class OCSPAdminServlet extends AdminServlet { // ensure that any low-level exceptions are reported // to the signed audit log and stored as failures try { - Enumeration enum1 = req.getParameterNames(); + @SuppressWarnings("unchecked") + Enumeration<String> enum1 = req.getParameterNames(); boolean restart = false; while (enum1.hasMoreElements()) { diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java index f34a82770..4dbde7e06 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java @@ -428,8 +428,8 @@ public class PolicyAdminServlet extends AdminServlet { public void listPolicyImpls(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - Enumeration policyImplNames = mProcessor.getPolicyImplsInfo(); - Enumeration policyImpls = mProcessor.getPolicyImpls(); + Enumeration<String> policyImplNames = mProcessor.getPolicyImplsInfo(); + Enumeration<IPolicyRule> policyImpls = mProcessor.getPolicyImpls(); if (policyImplNames == null || policyImpls == null) { @@ -442,9 +442,8 @@ public class PolicyAdminServlet extends AdminServlet { while (policyImplNames.hasMoreElements() && policyImpls.hasMoreElements()) { - String id = (String) policyImplNames.nextElement(); - IPolicyRule impl = (IPolicyRule) - policyImpls.nextElement(); + String id = policyImplNames.nextElement(); + IPolicyRule impl = policyImpls.nextElement(); String className = impl.getClass().getName(); String desc = impl.getDescription(); @@ -457,7 +456,7 @@ public class PolicyAdminServlet extends AdminServlet { public void listPolicyInstances(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - Enumeration instancesInfo = mProcessor.getPolicyInstancesInfo(); + Enumeration<String> instancesInfo = mProcessor.getPolicyInstancesInfo(); if (instancesInfo == null) { sendResponse(ERROR, INVALID_POLICY_INSTANCE_CONFIG, null, resp); @@ -469,7 +468,7 @@ public class PolicyAdminServlet extends AdminServlet { String instName, rest; while (instancesInfo.hasMoreElements()) { - String info = (String) instancesInfo.nextElement(); + String info = instancesInfo.nextElement(); int i = info.indexOf(";"); nvp.add(info.substring(0, i), info.substring(i + 1)); @@ -583,7 +582,7 @@ public class PolicyAdminServlet extends AdminServlet { return; } - Vector v = mProcessor.getPolicyImplConfig(id); + Vector<String> v = mProcessor.getPolicyImplConfig(id); if (v == null) { sendResponse(ERROR, INVALID_POLICY_IMPL_ID, null, resp); @@ -591,8 +590,8 @@ public class PolicyAdminServlet extends AdminServlet { } NameValuePairs nvp = new NameValuePairs(); - for (Enumeration e = v.elements(); e.hasMoreElements();) { - String nv = (String) e.nextElement(); + for (Enumeration<String> e = v.elements(); e.hasMoreElements();) { + String nv = e.nextElement(); int index = nv.indexOf("="); nvp.add(nv.substring(0, index), nv.substring(index + 1)); @@ -812,7 +811,7 @@ public class PolicyAdminServlet extends AdminServlet { return; } - Vector v = mProcessor.getPolicyInstanceConfig(id); + Vector<String> v = mProcessor.getPolicyInstanceConfig(id); if (v == null) { sendResponse(ERROR, INVALID_POLICY_INST_ID, null, resp); @@ -820,8 +819,8 @@ public class PolicyAdminServlet extends AdminServlet { } NameValuePairs nvp = new NameValuePairs(); - for (Enumeration e = v.elements(); e.hasMoreElements();) { - String nv = (String) e.nextElement(); + for (Enumeration<String> e = v.elements(); e.hasMoreElements();) { + String nv = e.nextElement(); int index = nv.indexOf("="); String name = nv.substring(0, index); String value = nv.substring(index + 1); @@ -907,7 +906,7 @@ public class PolicyAdminServlet extends AdminServlet { // We need to fetch parameters: enable, predicate and implname // always, and any additional parameters as required by the // implementation. - Hashtable ht = new Hashtable(); + Hashtable<String, String> ht = new Hashtable<String, String>(); String val = req.getParameter(IPolicyRule.PROP_ENABLE).trim(); if (val == null) @@ -919,7 +918,7 @@ public class PolicyAdminServlet extends AdminServlet { ht.put(IPolicyRule.PROP_PREDICATE, val); ht.put(IPolicyRule.PROP_IMPLNAME, implName); - Vector v = mProcessor.getPolicyImplConfig(implName); + Vector<String> v = mProcessor.getPolicyImplConfig(implName); if (v == null) { // Invalid impl id @@ -936,8 +935,8 @@ public class PolicyAdminServlet extends AdminServlet { sendResponse(ERROR, INVALID_POLICY_IMPL_ID, null, resp); return; } - for (Enumeration e = v.elements(); e.hasMoreElements();) { - String nv = (String) e.nextElement(); + for (Enumeration<String> e = v.elements(); e.hasMoreElements();) { + String nv = e.nextElement(); int index = nv.indexOf("="); String key = nv.substring(0, index); @@ -1155,7 +1154,7 @@ public class PolicyAdminServlet extends AdminServlet { // We need to fetch parameters: enable, predicate and implname // always, and any additional parameters as required by the // implementation. - Hashtable ht = new Hashtable(); + Hashtable<String, String> ht = new Hashtable<String, String>(); String val = req.getParameter(IPolicyRule.PROP_ENABLE).trim(); if (val == null) @@ -1166,7 +1165,7 @@ public class PolicyAdminServlet extends AdminServlet { if (val != null) ht.put(IPolicyRule.PROP_PREDICATE, val); ht.put(IPolicyRule.PROP_IMPLNAME, implName); - Vector v = mProcessor.getPolicyImplConfig(implName); + Vector<String> v = mProcessor.getPolicyImplConfig(implName); if (v == null) { // Invalid impl id @@ -1184,9 +1183,10 @@ public class PolicyAdminServlet extends AdminServlet { return; } // XXX - for (Enumeration n = req.getParameterNames(); n.hasMoreElements();) { - String p = (String) n.nextElement(); - String l = (String) req.getParameter(p); + for (@SuppressWarnings("unchecked") + Enumeration<String> n = req.getParameterNames(); n.hasMoreElements();) { + String p = n.nextElement(); + String l = req.getParameter(p); if (l != null) ht.put(p, l); |