From 3f24e55923fc986af4c6a08b2b8d45704a905627 Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Thu, 5 Apr 2012 15:08:18 -0500 Subject: Removed unnecessary type casts. Unnecessary type casts have been removed using Eclipse Quick Fix. Ticket #134 --- .../cms/servlet/cert/CMCRevReqServlet.java | 11 ++++---- .../servlet/cert/ChallengeRevocationServlet1.java | 11 ++++---- .../cms/servlet/cert/DisableEnrollResult.java | 2 +- .../netscape/cms/servlet/cert/DisplayBySerial.java | 8 +++--- .../com/netscape/cms/servlet/cert/DisplayCRL.java | 2 +- .../com/netscape/cms/servlet/cert/DoRevoke.java | 17 ++++++------ .../com/netscape/cms/servlet/cert/DoRevokeTPS.java | 15 +++++------ .../com/netscape/cms/servlet/cert/DoUnrevoke.java | 2 +- .../netscape/cms/servlet/cert/DoUnrevokeTPS.java | 2 +- .../cms/servlet/cert/EnableEnrollResult.java | 2 +- .../netscape/cms/servlet/cert/EnrollServlet.java | 16 +++++------ .../com/netscape/cms/servlet/cert/GetBySerial.java | 4 +-- .../com/netscape/cms/servlet/cert/GetCAChain.java | 4 +-- .../src/com/netscape/cms/servlet/cert/GetCRL.java | 2 +- .../cms/servlet/cert/GetCertFromRequest.java | 2 +- .../cms/servlet/cert/HashEnrollServlet.java | 25 +++++++++-------- .../servlet/cert/ImportCertsTemplateFiller.java | 3 +-- .../com/netscape/cms/servlet/cert/ListCerts.java | 12 ++++----- .../src/com/netscape/cms/servlet/cert/Monitor.java | 4 +-- .../netscape/cms/servlet/cert/RenewalServlet.java | 3 +-- .../cms/servlet/cert/RevocationServlet.java | 2 +- .../cert/RevocationSuccessTemplateFiller.java | 3 +-- .../com/netscape/cms/servlet/cert/SrchCerts.java | 4 +-- .../com/netscape/cms/servlet/cert/UpdateDir.java | 8 +++--- .../cms/servlet/cert/scep/CRSEnrollment.java | 31 +++++++++++----------- 25 files changed, 90 insertions(+), 105 deletions(-) (limited to 'base/common/src/com/netscape/cms/servlet/cert') diff --git a/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java b/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java index fc9a97be2..ad818d89b 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java @@ -404,7 +404,7 @@ public class CMCRevReqServlet extends CMSServlet { } if (mAuthority instanceof ICertificateAuthority) { - ICertRecordList list = (ICertRecordList) mCertDB.findCertRecordsInList( + ICertRecordList list = mCertDB.findCertRecordsInList( revokeAll, null, totalRecordCount); Enumeration e = list.getCertRecords(0, totalRecordCount - 1); @@ -471,7 +471,7 @@ public class CMCRevReqServlet extends CMSServlet { for (int j = 0; j < serialNumbers.size(); j++) { if (certs[i].getSerialNumber().toString().equals( - (String) serialNumbers.elementAt(j))) { + serialNumbers.elementAt(j))) { addToList = true; break; } @@ -523,8 +523,8 @@ public class CMCRevReqServlet extends CMSServlet { RevokedCertImpl[] revCertImpls = new RevokedCertImpl[count]; for (int i = 0; i < count; i++) { - oldCerts[i] = (X509CertImpl) oldCertsV.elementAt(i); - revCertImpls[i] = (RevokedCertImpl) revCertImplsV.elementAt(i); + oldCerts[i] = oldCertsV.elementAt(i); + revCertImpls[i] = revCertImplsV.elementAt(i); } IRequest revReq = @@ -658,8 +658,7 @@ public class CMCRevReqServlet extends CMSServlet { ((ICertificateAuthority) mAuthority).getCRLIssuingPoints(); while (otherCRLs.hasMoreElements()) { - ICRLIssuingPoint crl = (ICRLIssuingPoint) - otherCRLs.nextElement(); + ICRLIssuingPoint crl = otherCRLs.nextElement(); String crlId = crl.getId(); if (crlId.equals(ICertificateAuthority.PROP_MASTER_CRL)) diff --git a/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java b/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java index 94c8f1207..e820bb87a 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java +++ b/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java @@ -332,7 +332,7 @@ public class ChallengeRevocationServlet1 extends CMSServlet { } if (mAuthority instanceof ICertificateAuthority) { - ICertRecordList list = (ICertRecordList) mCertDB.findCertRecordsInList( + ICertRecordList list = mCertDB.findCertRecordsInList( revokeAll, null, totalRecordCount); Enumeration e = list.getCertRecords(0, totalRecordCount - 1); @@ -399,7 +399,7 @@ public class ChallengeRevocationServlet1 extends CMSServlet { for (int j = 0; j < serialNumbers.size(); j++) { if (certs[i].getSerialNumber().toString().equals( - (String) serialNumbers.elementAt(j))) { + serialNumbers.elementAt(j))) { addToList = true; break; } @@ -451,8 +451,8 @@ public class ChallengeRevocationServlet1 extends CMSServlet { RevokedCertImpl[] revCertImpls = new RevokedCertImpl[count]; for (int i = 0; i < count; i++) { - oldCerts[i] = (X509CertImpl) oldCertsV.elementAt(i); - revCertImpls[i] = (RevokedCertImpl) revCertImplsV.elementAt(i); + oldCerts[i] = oldCertsV.elementAt(i); + revCertImpls[i] = revCertImplsV.elementAt(i); } IRequest revReq = @@ -566,8 +566,7 @@ public class ChallengeRevocationServlet1 extends CMSServlet { ((ICertificateAuthority) mAuthority).getCRLIssuingPoints(); while (otherCRLs.hasMoreElements()) { - ICRLIssuingPoint crl = (ICRLIssuingPoint) - otherCRLs.nextElement(); + ICRLIssuingPoint crl = otherCRLs.nextElement(); String crlId = crl.getId(); if (crlId.equals(ICertificateAuthority.PROP_MASTER_CRL)) diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java b/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java index 46863c098..8794143fa 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java @@ -104,7 +104,7 @@ public class DisableEnrollResult extends CMSServlet { X509Certificate sslClientCert = null; sslClientCert = getSSLClientCertificate(httpReq); - String dn = (String) sslClientCert.getSubjectDN().toString(); + String dn = sslClientCert.getSubjectDN().toString(); // Construct an ArgBlock IArgBlock args = cmsReq.getHttpParams(); diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java b/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java index 105fc66a1..1e1ee44f1 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java @@ -251,7 +251,7 @@ public class DisplayBySerial extends CMSServlet { Locale locale) throws EBaseException { try { - ICertRecord rec = (ICertRecord) mCertDB.readCertificateRecord(seq); + ICertRecord rec = mCertDB.readCertificateRecord(seq); if (rec == null) { CMS.debug("DisplayBySerial: failed to read record"); throw new ECMSGWException( @@ -277,7 +277,7 @@ public class DisplayBySerial extends CMSServlet { if (extensions != null) { for (int i = 0; i < extensions.size(); i++) { - Extension ext = (Extension) extensions.elementAt(i); + Extension ext = extensions.elementAt(i); if (ext instanceof NSCertTypeExtension) { NSCertTypeExtension type = (NSCertTypeExtension) ext; @@ -336,7 +336,7 @@ public class DisplayBySerial extends CMSServlet { int reason = 0; while (enumx.hasMoreElements()) { - Extension ext = (Extension) enumx.nextElement(); + Extension ext = enumx.nextElement(); if (ext instanceof CRLReasonExtension) { reason = ((CRLReasonExtension) ext).getReason().toInt(); @@ -454,7 +454,7 @@ public class DisplayBySerial extends CMSServlet { ICertRecord rec = null; try { - rec = (ICertRecord) mCertDB.readCertificateRecord(seq); + rec = mCertDB.readCertificateRecord(seq); X509CertImpl x509cert = rec.getCertificate(); if (x509cert != null) { diff --git a/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java b/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java index 61a606cae..af91b1cb3 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java @@ -245,7 +245,7 @@ public class DisplayCRL extends CMSServlet { try { crlRecord = - (ICRLIssuingPointRecord) mCA.getCRLRepository().readCRLIssuingPointRecord(crlIssuingPointId); + mCA.getCRLRepository().readCRLIssuingPointRecord(crlIssuingPointId); } catch (EBaseException e) { header.addStringValue("error", e.toString(locale)); return; diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java b/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java index afd958abf..8e5df2c14 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java @@ -227,7 +227,7 @@ public class DoRevoke extends CMSServlet { certChain[0] = cert2; IUser user = null; try { - user = (IUser) mUL.locateUser(new Certificates(certChain)); + user = mUL.locateUser(new Certificates(certChain)); } catch (Exception e) { CMS.debug("DoRevoke: Failed to map certificate '" + cert2.getSubjectDN().getName() + "' to user."); @@ -565,7 +565,7 @@ public class DoRevoke extends CMSServlet { for (int j = 0; j < serialNumbers.size(); j++) { //xxxxx serial number in decimal? - if (certs[i].getSerialNumber().toString().equals((String) serialNumbers.elementAt(j)) && + if (certs[i].getSerialNumber().toString().equals(serialNumbers.elementAt(j)) && eeSubjectDN != null && eeSubjectDN.equals(certs[i].getSubjectDN().toString())) { addToList = true; break; @@ -658,8 +658,8 @@ public class DoRevoke extends CMSServlet { RevokedCertImpl[] revCertImpls = new RevokedCertImpl[count]; for (int i = 0; i < count; i++) { - oldCerts[i] = (X509CertImpl) oldCertsV.elementAt(i); - revCertImpls[i] = (RevokedCertImpl) revCertImplsV.elementAt(i); + oldCerts[i] = oldCertsV.elementAt(i); + revCertImpls[i] = revCertImplsV.elementAt(i); } IRequest revReq = @@ -722,7 +722,7 @@ public class DoRevoke extends CMSServlet { //cmsReq.setErrorDescription(err); for (int j = 0; j < count; j++) { if (oldCerts[j] instanceof X509CertImpl) { - X509CertImpl cert = (X509CertImpl) oldCerts[j]; + X509CertImpl cert = oldCerts[j]; if (oldCerts[j] != null) { mLogger.log(ILogger.EV_AUDIT, @@ -776,7 +776,7 @@ public class DoRevoke extends CMSServlet { for (int j = 0; j < count; j++) { if (oldCerts[j] != null) { if (oldCerts[j] instanceof X509CertImpl) { - X509CertImpl cert = (X509CertImpl) oldCerts[j]; + X509CertImpl cert = oldCerts[j]; mLogger.log(ILogger.EV_AUDIT, ILogger.S_OTHER, AuditFormat.LEVEL, @@ -837,8 +837,7 @@ public class DoRevoke extends CMSServlet { ((ICertificateAuthority) mAuthority).getCRLIssuingPoints(); while (otherCRLs.hasMoreElements()) { - ICRLIssuingPoint crl = (ICRLIssuingPoint) - otherCRLs.nextElement(); + ICRLIssuingPoint crl = otherCRLs.nextElement(); String crlId = crl.getId(); if (crlId.equals(ICertificateAuthority.PROP_MASTER_CRL)) @@ -944,7 +943,7 @@ public class DoRevoke extends CMSServlet { for (int j = 0; j < count; j++) { if (oldCerts[j] != null) { if (oldCerts[j] instanceof X509CertImpl) { - X509CertImpl cert = (X509CertImpl) oldCerts[j]; + X509CertImpl cert = oldCerts[j]; mLogger.log(ILogger.EV_AUDIT, ILogger.S_OTHER, AuditFormat.LEVEL, diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java b/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java index 83cefa6f6..f16ce2526 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java @@ -380,7 +380,7 @@ public class DoRevokeTPS extends CMSServlet { boolean alreadyRevokedCertFound = false; boolean badCertsRequested = false; while (e != null && e.hasMoreElements()) { - ICertRecord rec = (ICertRecord) e.nextElement(); + ICertRecord rec = e.nextElement(); if (rec == null) { badCertsRequested = true; @@ -460,8 +460,8 @@ public class DoRevokeTPS extends CMSServlet { RevokedCertImpl[] revCertImpls = new RevokedCertImpl[count]; for (int i = 0; i < count; i++) { - oldCerts[i] = (X509CertImpl) oldCertsV.elementAt(i); - revCertImpls[i] = (RevokedCertImpl) revCertImplsV.elementAt(i); + oldCerts[i] = oldCertsV.elementAt(i); + revCertImpls[i] = revCertImplsV.elementAt(i); } IRequest revReq = @@ -525,7 +525,7 @@ public class DoRevokeTPS extends CMSServlet { //cmsReq.setErrorDescription(err); for (int j = 0; j < count; j++) { if (oldCerts[j] instanceof X509CertImpl) { - X509CertImpl cert = (X509CertImpl) oldCerts[j]; + X509CertImpl cert = oldCerts[j]; if (oldCerts[j] != null) { mLogger.log(ILogger.EV_AUDIT, @@ -579,7 +579,7 @@ public class DoRevokeTPS extends CMSServlet { for (int j = 0; j < count; j++) { if (oldCerts[j] != null) { if (oldCerts[j] instanceof X509CertImpl) { - X509CertImpl cert = (X509CertImpl) oldCerts[j]; + X509CertImpl cert = oldCerts[j]; mLogger.log(ILogger.EV_AUDIT, ILogger.S_OTHER, AuditFormat.LEVEL, @@ -634,8 +634,7 @@ public class DoRevokeTPS extends CMSServlet { ((ICertificateAuthority) mAuthority).getCRLIssuingPoints(); while (otherCRLs.hasMoreElements()) { - ICRLIssuingPoint crl = (ICRLIssuingPoint) - otherCRLs.nextElement(); + ICRLIssuingPoint crl = otherCRLs.nextElement(); String crlId = crl.getId(); if (crlId.equals(ICertificateAuthority.PROP_MASTER_CRL)) @@ -725,7 +724,7 @@ public class DoRevokeTPS extends CMSServlet { for (int j = 0; j < count; j++) { if (oldCerts[j] != null) { if (oldCerts[j] instanceof X509CertImpl) { - X509CertImpl cert = (X509CertImpl) oldCerts[j]; + X509CertImpl cert = oldCerts[j]; mLogger.log(ILogger.EV_AUDIT, ILogger.S_OTHER, AuditFormat.LEVEL, diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java index cd9a0196b..6f1346c68 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java @@ -602,7 +602,7 @@ public class DoUnrevoke extends CMSServlet { BigInteger[] biNumbers = new BigInteger[biList.size()]; for (int i = 0; i < biList.size(); i++) { - biNumbers[i] = (BigInteger) biList.elementAt(i); + biNumbers[i] = biList.elementAt(i); } return biNumbers; diff --git a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java index e56eece2c..de5f075ba 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java +++ b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java @@ -549,7 +549,7 @@ public class DoUnrevokeTPS extends CMSServlet { BigInteger[] biNumbers = new BigInteger[biList.size()]; for (int i = 0; i < biList.size(); i++) { - biNumbers[i] = (BigInteger) biList.elementAt(i); + biNumbers[i] = biList.elementAt(i); } return biNumbers; diff --git a/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java b/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java index cbb233251..5adf9f9f1 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java +++ b/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java @@ -109,7 +109,7 @@ public class EnableEnrollResult extends CMSServlet { X509Certificate sslClientCert = null; sslClientCert = getSSLClientCertificate(httpReq); - String dn = (String) sslClientCert.getSubjectDN().toString(); + String dn = sslClientCert.getSubjectDN().toString(); // Construct an ArgBlock IArgBlock args = cmsReq.getHttpParams(); diff --git a/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java b/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java index 50eaaa94b..90d37f15a 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java @@ -403,11 +403,11 @@ public class EnrollServlet extends CMSServlet { private boolean checkClientCertSigningOnly(X509Certificate sslClientCert) throws EBaseException { - if ((CMS.isSigningCert((X509CertImpl) sslClientCert) == + if ((CMS.isSigningCert(sslClientCert) == false) || - ((CMS.isSigningCert((X509CertImpl) sslClientCert) == + ((CMS.isSigningCert(sslClientCert) == true) && - (CMS.isEncryptionCert((X509CertImpl) sslClientCert) == + (CMS.isEncryptionCert(sslClientCert) == true))) { // either it's not a signing cert, or it's a dual cert @@ -470,7 +470,7 @@ public class EnrollServlet extends CMSServlet { + certBasedOldSubjectDN + ")(!(x509cert.serialNumber=" + certBasedOldSerialNum + "))(certStatus=VALID))"; ICertRecordList list = - (ICertRecordList) mCa.getCertificateRepository().findCertRecordsInList(filter, null, 10); + mCa.getCertificateRepository().findCertRecordsInList(filter, null, 10); int size = list.getSize(); Enumeration en = list.getCertRecords(0, size - 1); @@ -884,10 +884,8 @@ public class EnrollServlet extends CMSServlet { CMS.getUserMessage("CMS_GW_MISSING_SSL_CLIENT_CERT")); } - certBasedOldSubjectDN = (String) - sslClientCert.getSubjectDN().toString(); - certBasedOldSerialNum = (BigInteger) - sslClientCert.getSerialNumber(); + certBasedOldSubjectDN = sslClientCert.getSubjectDN().toString(); + certBasedOldSerialNum = sslClientCert.getSerialNumber(); CMS.debug("EnrollServlet: certBasedOldSubjectDN " + certBasedOldSubjectDN); CMS.debug("EnrollServlet: certBasedOldSerialNum " + certBasedOldSerialNum); @@ -1299,7 +1297,7 @@ public class EnrollServlet extends CMSServlet { (ICertificateAuthority) CMS.getSubsystem("ca"); if (certInfoArray != null && caSub != null) { for (int ix = 0; ix < certInfoArray.length; ix++) { - X509CertInfo ci = (X509CertInfo) certInfoArray[ix]; + X509CertInfo ci = certInfoArray[ix]; String defaultSig = caSub.getDefaultAlgorithm(); AlgorithmId algid = AlgorithmId.get(defaultSig); ci.set(X509CertInfo.ALGORITHM_ID, diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java b/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java index bf985c93e..6c7aefa4d 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java @@ -165,7 +165,7 @@ public class GetBySerial extends CMSServlet { return; } - ICertRecord certRecord = (ICertRecord) getCertRecord(serialNo); + ICertRecord certRecord = getCertRecord(serialNo); if (certRecord == null) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_CERT_SERIAL_NOT_FOUND_1", serialNo.toString(16))); @@ -272,7 +272,7 @@ public class GetBySerial extends CMSServlet { } // use import cert template to return cert. - X509CertImpl[] certs = new X509CertImpl[] { (X509CertImpl) cert }; + X509CertImpl[] certs = new X509CertImpl[] { cert }; cmsReq.setResult(certs); diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java b/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java index da4959268..6fd8be8ea 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java @@ -30,7 +30,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import netscape.security.x509.CertificateChain; -import netscape.security.x509.X509CertImpl; import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.authentication.IAuthToken; @@ -343,8 +342,7 @@ public class GetCAChain extends CMSServlet { throw new IOException("Internal Error"); } - ICertPrettyPrint certDetails = - CMS.getCertPrettyPrint((X509CertImpl) certs[i]); + ICertPrettyPrint certDetails = CMS.getCertPrettyPrint(certs[i]); IArgBlock rarg = CMS.createArgBlock(); diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java b/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java index e9e3c809a..a5a48cc6f 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java @@ -168,7 +168,7 @@ public class GetCRL extends CMSServlet { crlIP = ca.getCRLIssuingPoint(crlId); try { - crlRecord = (ICRLIssuingPointRecord) ca.getCRLRepository().readCRLIssuingPointRecord(crlId); + crlRecord = ca.getCRLRepository().readCRLIssuingPointRecord(crlId); } catch (EBaseException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_NO_CRL_ISSUING_POINT_FOUND", crlId)); diff --git a/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java b/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java index ce60fabc1..c0c575ad3 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java +++ b/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java @@ -316,7 +316,7 @@ class CertFrRequestFiller extends ImportCertsTemplateFiller { if (extensions != null) { for (int i = 0; i < extensions.size(); i++) { - Extension ext = (Extension) extensions.elementAt(i); + Extension ext = extensions.elementAt(i); if (ext instanceof NSCertTypeExtension) { NSCertTypeExtension type = (NSCertTypeExtension) ext; diff --git a/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java b/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java index 0d4b52672..58ff2383c 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java @@ -361,8 +361,8 @@ public class HashEnrollServlet extends CMSServlet { CMS.getUserMessage("CMS_GW_MISSING_SSL_CLIENT_CERT")); } - certBasedOldSubjectDN = (String) sslClientCert.getSubjectDN().toString(); - certBasedOldSerialNum = (BigInteger) sslClientCert.getSerialNumber(); + certBasedOldSubjectDN = sslClientCert.getSubjectDN().toString(); + certBasedOldSerialNum = sslClientCert.getSerialNumber(); try { certInfo = (X509CertInfo) ((X509CertImpl) sslClientCert).get( @@ -442,11 +442,11 @@ public class HashEnrollServlet extends CMSServlet { // first, make sure the client cert is indeed a // signing only cert - if ((CMS.isSigningCert((X509CertImpl) sslClientCert) == + if ((CMS.isSigningCert(sslClientCert) == false) || - ((CMS.isSigningCert((X509CertImpl) sslClientCert) == + ((CMS.isSigningCert(sslClientCert) == true) && - (CMS.isEncryptionCert((X509CertImpl) sslClientCert) == + (CMS.isEncryptionCert(sslClientCert) == true))) { // either it's not a signing cert, or it's a dual cert log(ILogger.LL_FAILURE, @@ -477,8 +477,8 @@ public class HashEnrollServlet extends CMSServlet { + certBasedOldSubjectDN + ")(!(x509cert.serialNumber=" + certBasedOldSerialNum + "))(certStatus=VALID))"; ICertRecordList list = - (ICertRecordList) mCa.getCertificateRepository().findCertRecordsInList(filter, - null, 10); + mCa.getCertificateRepository().findCertRecordsInList(filter, + null, 10); int size = list.getSize(); Enumeration en = list.getCertRecords(0, size - 1); boolean gotEncCert = false; @@ -547,11 +547,11 @@ public class HashEnrollServlet extends CMSServlet { } else if (certauthEnrollType.equals(CERT_AUTH_ENCRYPTION)) { // first, make sure the client cert is indeed a // signing only cert - if ((CMS.isSigningCert((X509CertImpl) sslClientCert) == + if ((CMS.isSigningCert(sslClientCert) == false) || - ((CMS.isSigningCert((X509CertImpl) sslClientCert) == + ((CMS.isSigningCert(sslClientCert) == true) && - (CMS.isEncryptionCert((X509CertImpl) sslClientCert) == + (CMS.isEncryptionCert(sslClientCert) == true))) { // either it's not a signing cert, or it's a dual cert log(ILogger.LL_FAILURE, @@ -810,8 +810,7 @@ public class HashEnrollServlet extends CMSServlet { authToken.getInString(AuthToken.TOKEN_CERT_SUBJECT); if (subjectname != null) { - CertificateSubjectName certSubject = (CertificateSubjectName) - new CertificateSubjectName(new X500Name(subjectname)); + CertificateSubjectName certSubject = new CertificateSubjectName(new X500Name(subjectname)); certInfo.set(X509CertInfo.SUBJECT, certSubject); log(ILogger.LL_INFO, @@ -1223,7 +1222,7 @@ public class HashEnrollServlet extends CMSServlet { newvalue[4] = 0; KeyUsageExtension newext = new KeyUsageExtension(Boolean.valueOf(true), - (Object) newvalue); + newvalue); exts.delete(KeyUsageExtension.NAME); exts.set(KeyUsageExtension.NAME, newext); diff --git a/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java index 016d5a124..a56ac1d88 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java +++ b/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java @@ -156,8 +156,7 @@ public class ImportCertsTemplateFiller implements ICMSTemplateFiller { fixed.set(CERT_TYPE, certType); // this authority - fixed.set(ICMSTemplateFiller.AUTHORITY, - (String) authority.getOfficialName()); + fixed.set(ICMSTemplateFiller.AUTHORITY, authority.getOfficialName()); // CA chain. CertificateChain cachain = diff --git a/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java b/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java index 4185113f4..96b2a9026 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java +++ b/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java @@ -150,7 +150,7 @@ public class ListCerts extends CMSServlet { Enumeration filters = mAllowedClientFilters.elements(); // check to see if the filter is allowed while (filters.hasMoreElements()) { - String filter = (String) filters.nextElement(); + String filter = filters.nextElement(); com.netscape.certsrv.apps.CMS.debug("Comparing filter=" + filter + " queryCertFilter=" + queryCertFilter); if (filter.equals(queryCertFilter)) { @@ -389,7 +389,7 @@ public class ListCerts extends CMSServlet { } else pSize = maxCount; - ICertRecordList list = (ICertRecordList) mCertDB.findCertRecordsInList( + ICertRecordList list = mCertDB.findCertRecordsInList( filter, (String[]) null, jumpTo, mHardJumpTo, "serialno", pSize); // retrive maxCount + 1 entries @@ -402,7 +402,7 @@ public class ListCerts extends CMSServlet { if (!serialToVal.equals(MINUS_ONE)) { // if user specify a range, we need to // calculate the totalRecordCount - tolist = (ICertRecordList) mCertDB.findCertRecordsInList( + tolist = mCertDB.findCertRecordsInList( filter, (String[]) null, serialTo, "serialno", maxCount); @@ -438,7 +438,7 @@ public class ListCerts extends CMSServlet { * last item to be displayed, we need to skip it */ while ((count < ((mReverse && !mHardJumpTo) ? (maxCount + 1) : maxCount)) && e.hasMoreElements()) { - ICertRecord rec = (ICertRecord) e.nextElement(); + ICertRecord rec = e.nextElement(); if (rec == null) { com.netscape.certsrv.apps.CMS.debug("record " + count + " is null"); @@ -505,7 +505,7 @@ public class ListCerts extends CMSServlet { ICertRecord nextRec = null; if (e.hasMoreElements()) { - nextRec = (ICertRecord) e.nextElement(); + nextRec = e.nextElement(); } header.addStringValue("op", req.getParameter("op")); @@ -657,7 +657,7 @@ public class ListCerts extends CMSServlet { int reason = 0; while (enum1.hasMoreElements()) { - Extension ext = (Extension) enum1.nextElement(); + Extension ext = enum1.nextElement(); if (ext instanceof CRLReasonExtension) { reason = ((CRLReasonExtension) ext).getReason().toInt(); diff --git a/base/common/src/com/netscape/cms/servlet/cert/Monitor.java b/base/common/src/com/netscape/cms/servlet/cert/Monitor.java index 7f626a83f..884616fe9 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/Monitor.java +++ b/base/common/src/com/netscape/cms/servlet/cert/Monitor.java @@ -270,9 +270,7 @@ public class Monitor extends CMSServlet { } Date nextDate(Date d, int seconds) { - Date date = new Date((d.getTime()) + ((long) (seconds * 1000))); - - return date; + return new Date(d.getTime() + seconds * 1000); } String getIntervalInfo(IArgBlock arg, Date startDate, Date endDate) { diff --git a/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java b/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java index 3b2a8c3e9..f0840c408 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java @@ -217,8 +217,7 @@ public class RenewalServlet extends CMSServlet { ); // create new certinfo from old_cert contents. X509CertInfo old_certInfo = (X509CertInfo) - ((X509CertImpl) old_cert).get( - X509CertImpl.NAME + "." + X509CertImpl.INFO); + old_cert.get(X509CertImpl.NAME + "." + X509CertImpl.INFO); new_certInfo = new X509CertInfo(old_certInfo.getEncodedInfo()); } else { diff --git a/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java b/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java index 2c1709145..4c4f7e9e0 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java +++ b/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java @@ -209,7 +209,7 @@ public class RevocationServlet extends CMSServlet { if (mNonces != null) { long n = mRandom.nextLong(); - long m = mNonces.addNonce(n, (X509Certificate) old_cert); + long m = mNonces.addNonce(n, old_cert); if ((n + m) != 0) { header.addStringValue("nonce", Long.toString(m)); } diff --git a/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java index 00941776c..2fce3e6e1 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java +++ b/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java @@ -76,8 +76,7 @@ class RevocationSuccessTemplateFiller implements ICMSTemplateFiller { fixed.set(ICMSTemplateFiller.SCHEME, scheme); // this authority - fixed.set(ICMSTemplateFiller.AUTHORITY, - (String) authority.getOfficialName()); + fixed.set(ICMSTemplateFiller.AUTHORITY, authority.getOfficialName()); // XXX CA chain. diff --git a/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java b/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java index 375265331..45b02969d 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java +++ b/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java @@ -105,7 +105,7 @@ public class SrchCerts extends CMSServlet { mTemplates.remove(CMSRequest.SUCCESS); if (mAuthority instanceof ISubsystem) { - ISubsystem sub = (ISubsystem) mAuthority; + ISubsystem sub = mAuthority; IConfigStore authConfig = sub.getConfigStore(); if (authConfig != null) { @@ -686,7 +686,7 @@ public class SrchCerts extends CMSServlet { rarg.addStringValue("serialNumber", cert.getSerialNumber().toString(16)); rarg.addStringValue("serialNumberDecimal", cert.getSerialNumber().toString()); - String subject = (String) cert.getSubjectDN().toString(); + String subject = cert.getSubjectDN().toString(); if (subject.equals("")) { rarg.addStringValue("subject", " "); diff --git a/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java b/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java index df0277b54..3dae379a1 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java +++ b/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java @@ -235,7 +235,7 @@ public class UpdateDir extends CMSServlet { try { if (mCRLRepository != null) { - crlRecord = (ICRLIssuingPointRecord) mCRLRepository.readCRLIssuingPointRecord(crlIssuingPointId); + crlRecord = mCRLRepository.readCRLIssuingPointRecord(crlIssuingPointId); } } catch (EBaseException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_ERR_GET_CRL_RECORD", e.toString())); @@ -383,7 +383,7 @@ public class UpdateDir extends CMSServlet { } } - ICertificateRepository certificateRepository = (ICertificateRepository) mCA.getCertificateRepository(); + ICertificateRepository certificateRepository = mCA.getCertificateRepository(); // all or ca if ((updateValue[UPDATE_ALL] != null && @@ -473,9 +473,9 @@ public class UpdateDir extends CMSServlet { if (r == null) { if (CMS.isEncryptionCert(cert)) - sc.put((Object) "isEncryptionCert", (Object) "true"); + sc.put("isEncryptionCert", "true"); else - sc.put((Object) "isEncryptionCert", (Object) "false"); + sc.put("isEncryptionCert", "false"); mPublisherProcessor.publishCert(cert, null); } else { if (CMS.isEncryptionCert(cert)) diff --git a/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java b/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java index 421381441..e56651ed8 100644 --- a/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java +++ b/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java @@ -211,7 +211,7 @@ public class CRSEnrollment extends HttpServlet { @SuppressWarnings("unchecked") Enumeration names = req.getParameterNames(); while (names.hasMoreElements()) { - String name = (String) names.nextElement(); + String name = names.nextElement(); httpReqHash.put(name, req.getParameter(name)); } return httpReqHash; @@ -421,7 +421,7 @@ public class CRSEnrollment extends HttpServlet { if (authNames != null) { while (authNames.hasMoreElements()) { - String authName = (String) authNames.nextElement(); + String authName = authNames.nextElement(); credentials.set(authName, request.getParameter(authName)); } @@ -468,7 +468,7 @@ public class CRSEnrollment extends HttpServlet { byte[] bytes = null; int i = 0; - String message = (String) httpReq.getParameter(URL_MESSAGE); + String message = httpReq.getParameter(URL_MESSAGE); CMS.debug("handleGetCACert message=" + message); if (message != null) { try { @@ -541,7 +541,7 @@ public class CRSEnrollment extends HttpServlet { try { while (e.hasMoreElements()) { - PKCS10Attribute p10a = (PKCS10Attribute) e.nextElement(); + PKCS10Attribute p10a = e.nextElement(); CertAttrSet attr = p10a.getAttributeValue(); if (attr.getName().equals(ChallengePassword.NAME)) { @@ -679,7 +679,7 @@ public class CRSEnrollment extends HttpServlet { responseData = responseData + "" + mt + ""; - PKCS10 p10 = (PKCS10) req.getP10(); + PKCS10 p10 = req.getP10(); X500Name p10subject = p10.getSubjectName(); responseData = responseData + "" + p10subject.toString() + ""; @@ -689,7 +689,7 @@ public class CRSEnrollment extends HttpServlet { Enumeration e = p10atts.getElements(); while (e.hasMoreElements()) { - PKCS10Attribute p10a = (PKCS10Attribute) e.nextElement(); + PKCS10Attribute p10a = e.nextElement(); CertAttrSet attr = p10a.getAttributeValue(); if (attr.getName().equals(ChallengePassword.NAME)) { @@ -1066,7 +1066,7 @@ public class CRSEnrollment extends HttpServlet { return result; } - ILdapConnFactory connFactory = ((IPublisherProcessor) ldapPub).getLdapConnModule().getLdapConnFactory(); + ILdapConnFactory connFactory = ldapPub.getLdapConnModule().getLdapConnFactory(); if (connFactory == null) { return result; } @@ -1190,7 +1190,7 @@ public class CRSEnrollment extends HttpServlet { X500NameAttrMap xnap = X500NameAttrMap.getDefault(); while (rdne.hasMoreElements()) { - RDN rdn = (RDN) rdne.nextElement(); + RDN rdn = rdne.nextElement(); int i = 0; AVA[] oldavas = rdn.getAssertion(); for (i = 0; i < rdn.getAssertionLength(); i++) { @@ -1229,13 +1229,12 @@ public class CRSEnrollment extends HttpServlet { Enumeration e = p10atts.getElements(); while (e.hasMoreElements()) { - PKCS10Attribute p10a = (PKCS10Attribute) e.nextElement(); + PKCS10Attribute p10a = e.nextElement(); CertAttrSet attr = p10a.getAttributeValue(); if (attr.getName().equals(ChallengePassword.NAME)) { if (attr.get(ChallengePassword.PASSWORD) != null) { - req.put(AUTH_PASSWORD, - (String) attr.get(ChallengePassword.PASSWORD)); + req.put(AUTH_PASSWORD, attr.get(ChallengePassword.PASSWORD)); req.put(ChallengePassword.NAME, hashPassword( (String) attr.get(ChallengePassword.PASSWORD))); @@ -1270,7 +1269,7 @@ public class CRSEnrollment extends HttpServlet { Enumeration gne = v.elements(); while (gne.hasMoreElements()) { - GeneralNameInterface gni = (GeneralNameInterface) gne.nextElement(); + GeneralNameInterface gni = gne.nextElement(); if (gni instanceof GeneralName) { GeneralName genName = (GeneralName) gni; @@ -1361,12 +1360,12 @@ public class CRSEnrollment extends HttpServlet { itemCount = 0; Enumeration en = ht.keys(); while (en.hasMoreElements()) { - String key = (String) en.nextElement(); + String key = en.nextElement(); if (key.equals(SANE_DNSNAME)) { - gn[itemCount++] = new DNSName((String) ht.get(key)); + gn[itemCount++] = new DNSName(ht.get(key)); } if (key.equals(SANE_IPADDRESS)) { - gn[itemCount++] = new IPAddressName((String) ht.get(key)); + gn[itemCount++] = new IPAddressName(ht.get(key)); } } @@ -1711,7 +1710,7 @@ public class CRSEnrollment extends HttpServlet { MessageDigest md; String[] hashes = new String[] { "MD2", "MD5", "SHA1", "SHA256", "SHA512" }; - PKCS10 p10 = (PKCS10) req.getP10(); + PKCS10 p10 = req.getP10(); for (int i = 0; i < hashes.length; i++) { try { -- cgit