diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/cms/servlet/key')
8 files changed, 11 insertions, 19 deletions
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java b/pki/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java index 15e73179e..59b01f26a 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java @@ -28,7 +28,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.dbs.keydb.IKeyRecord; @@ -112,7 +111,7 @@ public class ConfirmRecoverBySerial extends CMSServlet { HttpServletRequest req = cmsReq.getHttpReq(); HttpServletResponse resp = cmsReq.getHttpResp(); - IAuthToken authToken = authenticate(cmsReq); + authenticate(cmsReq); CMSTemplate form = null; Locale[] locale = new Locale[1]; diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java b/pki/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java index bc23e635b..81ced5290 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java @@ -217,7 +217,7 @@ public class ExamineRecovery extends CMSServlet { req.getRequestURI()); header.addStringValue("keySplitting", CMS.getConfigStore().getString("kra.keySplitting")); - Hashtable params = mService.getRecoveryParams( + Hashtable<String, Object> params = mService.getRecoveryParams( recoveryID); if (params == null) { diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/GetPk12.java b/pki/base/common/src/com/netscape/cms/servlet/key/GetPk12.java index f27e966d0..96fe7c85d 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/GetPk12.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/GetPk12.java @@ -154,7 +154,6 @@ public class GetPk12 extends CMSServlet { IArgBlock header = CMS.createArgBlock(); IArgBlock fixed = CMS.createArgBlock(); CMSTemplateParams argSet = new CMSTemplateParams(header, fixed); - int seq = -1; // get status and populate argSet try { @@ -162,7 +161,7 @@ public class GetPk12 extends CMSServlet { header.addStringValue("recoveryID", recoveryID); - Hashtable params = mService.getRecoveryParams(recoveryID); + Hashtable<String, Object> params = mService.getRecoveryParams(recoveryID); if (params == null) { log(ILogger.LL_FAILURE, diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java b/pki/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java index a7b256e83..9989fafad 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java @@ -244,7 +244,7 @@ public class GrantRecovery extends CMSServlet { header.addStringValue(OUT_SERVICE_URL, req.getRequestURI()); - Hashtable h = mService.getRecoveryParams(recoveryID); + Hashtable<String, Object> h = mService.getRecoveryParams(recoveryID); if (h == null) { header.addStringValue(OUT_ERROR, diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java b/pki/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java index d6bc57fcf..aeee624c0 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java @@ -17,7 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.key; -import java.math.BigInteger; import java.util.Date; import com.netscape.certsrv.apps.CMS; diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java b/pki/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java index 6bb013b1c..28ff30803 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java @@ -175,12 +175,9 @@ public class RecoverBySerial extends CMSServlet { fixed.set(PORT, Integer.valueOf(port)); fixed.set(SCHEME, scheme); - int seq = -1; - SessionContext ctx = null; try { - String localAgents = req.getParameter("localAgents"); String initAsyncRecovery = req.getParameter("initAsyncRecovery"); // this information is needed within the server for @@ -367,7 +364,7 @@ public class RecoverBySerial extends CMSServlet { header.addStringValue(OUT_ERROR, "No recovery ID specified"); return null; } - Hashtable params = mService.createRecoveryParams(recoveryID); + Hashtable<String, Object> params = mService.createRecoveryParams(recoveryID); params.put("keyID", req.getParameter(IN_SERIALNO)); @@ -383,7 +380,7 @@ public class RecoverBySerial extends CMSServlet { waitThread.start(); return null; } else { - Vector v = new Vector(); + Vector<Credential> v = new Vector<Credential>(); for (int i = 0; i < mService.getNoOfRequiredAgents(); i++) { String uid = req.getParameter(IN_UID + i); @@ -424,7 +421,7 @@ public class RecoverBySerial extends CMSServlet { header.addStringValue(OUT_ERROR, "No recovery ID specified"); return null; } - Hashtable params = mService.createRecoveryParams(recoveryID); + Hashtable<String, Object> params = mService.createRecoveryParams(recoveryID); params.put("keyID", req.getParameter(IN_SERIALNO)); diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/SrchKey.java b/pki/base/common/src/com/netscape/cms/servlet/key/SrchKey.java index b6693ee6b..bff14e9f2 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/SrchKey.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/SrchKey.java @@ -263,7 +263,7 @@ public class SrchKey extends CMSServlet { timeLimit = mTimeLimits; } CMS.debug("Start searching ... timelimit=" + timeLimit); - Enumeration e = mKeyDB.searchKeys(filter, + Enumeration<IKeyRecord> e = mKeyDB.searchKeys(filter, maxResults, timeLimit); int count = 0; @@ -272,8 +272,7 @@ public class SrchKey extends CMSServlet { null); } else { while (e.hasMoreElements()) { - IKeyRecord rec = (IKeyRecord) - e.nextElement(); + IKeyRecord rec = e.nextElement(); // rec is null when we specify maxResults // DS will return an err=4, which triggers // a LDAPException.SIZE_LIMIT_ExCEEDED diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java b/pki/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java index 828ef0e6c..95c777701 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java @@ -284,7 +284,7 @@ public class SrchKeyForRecovery extends CMSServlet { timeLimit = mTimeLimits; } CMS.debug("Start searching ... timelimit=" + timeLimit); - Enumeration e = mKeyDB.searchKeys(filter, maxResults, timeLimit); + Enumeration<IKeyRecord> e = mKeyDB.searchKeys(filter, maxResults, timeLimit); int count = 0; if (e == null) { @@ -292,8 +292,7 @@ public class SrchKeyForRecovery extends CMSServlet { null); } else { while (e.hasMoreElements()) { - IKeyRecord rec = (IKeyRecord) - e.nextElement(); + IKeyRecord rec = e.nextElement(); // rec is null when we specify maxResults // DS will return an err=4, which triggers // a LDAPException.SIZE_LIMIT_ExCEEDED |