diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2012-04-05 15:08:18 -0500 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-04-09 10:22:03 -0500 |
| commit | 3f24e55923fc986af4c6a08b2b8d45704a905627 (patch) | |
| tree | 716415853b5676b801f6707634305b59b9af8603 /base | |
| parent | 7c7b9d023cd466c1771068badc020dab36beb553 (diff) | |
| download | pki-3f24e55923fc986af4c6a08b2b8d45704a905627.tar.gz pki-3f24e55923fc986af4c6a08b2b8d45704a905627.tar.xz pki-3f24e55923fc986af4c6a08b2b8d45704a905627.zip | |
Removed unnecessary type casts.
Unnecessary type casts have been removed using Eclipse Quick Fix.
Ticket #134
Diffstat (limited to 'base')
268 files changed, 957 insertions, 1124 deletions
diff --git a/base/ca/src/com/netscape/ca/CAService.java b/base/ca/src/com/netscape/ca/CAService.java index 919f01e96..21702d90c 100644 --- a/base/ca/src/com/netscape/ca/CAService.java +++ b/base/ca/src/com/netscape/ca/CAService.java @@ -689,7 +689,7 @@ public class CAService implements ICAService, IService { Enumeration<Extension> e = exts.getAttributes(); while (e.hasMoreElements()) { - netscape.security.x509.Extension ext = (netscape.security.x509.Extension) e.nextElement(); + netscape.security.x509.Extension ext = e.nextElement(); if (ext.getExtensionId().toString().equals(PKIXExtensions.BasicConstraints_Id.toString())) { bc_ext = (BasicConstraintsExtension) ext; @@ -1004,7 +1004,7 @@ public class CAService implements ICAService, IService { Enumeration<ICRLIssuingPoint> eIPs = mCRLIssuingPoints.elements(); while (eIPs.hasMoreElements()) { - ICRLIssuingPoint ip = (ICRLIssuingPoint) eIPs.nextElement(); + ICRLIssuingPoint ip = eIPs.nextElement(); if (ip != null) { boolean b = true; diff --git a/base/ca/src/com/netscape/ca/CRLIssuingPoint.java b/base/ca/src/com/netscape/ca/CRLIssuingPoint.java index e55c95cfd..f2ca2026c 100644 --- a/base/ca/src/com/netscape/ca/CRLIssuingPoint.java +++ b/base/ca/src/com/netscape/ca/CRLIssuingPoint.java @@ -1500,14 +1500,14 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { TimeZone tz = TimeZone.getDefault(); int offset = tz.getOffset(now); long oneDay = 1440L * MINUTE; - long nowToday = (now + (long) offset) % oneDay; + long nowToday = (now + offset) % oneDay; long startOfToday = now - nowToday; long lastUpdated = (mLastUpdate != null) ? mLastUpdate.getTime() : now; - long lastUpdateDay = lastUpdated - ((lastUpdated + (long) offset) % oneDay); + long lastUpdateDay = lastUpdated - ((lastUpdated + offset) % oneDay); long lastUpdate = (mLastUpdate != null && fromLastUpdate) ? mLastUpdate.getTime() : now; - long last = (lastUpdate + (long) offset) % oneDay; + long last = (lastUpdate + offset) % oneDay; long lastDay = lastUpdate - last; boolean isDeltaEnabled = isDeltaCRLEnabled(); @@ -1537,7 +1537,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { if (mDailyUpdates.size() == 1 && mDailyUpdates.elementAt(0).size() == 1 && mEnableUpdateFreq && mAutoUpdateInterval > 0) { // Interval updates with starting time - long firstTime = MINUTE * ((Integer) mDailyUpdates.elementAt(0).elementAt(0)).longValue(); + long firstTime = MINUTE * mDailyUpdates.elementAt(0).elementAt(0).longValue(); long t = firstTime; long interval = mAutoUpdateInterval; if (mExtendedNextUpdate && (!fromLastUpdate) && (!delta) && @@ -1580,7 +1580,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { } // search the current day for (i = 0; i < mDailyUpdates.elementAt(mCurrentDay).size(); i++) { - long t = MINUTE * ((Integer) mDailyUpdates.elementAt(mCurrentDay).elementAt(i)).longValue(); + long t = MINUTE * mDailyUpdates.elementAt(mCurrentDay).elementAt(i).longValue(); if (mEnableDailyUpdates && mExtendedTimeList) { if (mExtendedNextUpdate && (!fromLastUpdate) && (!delta) && isDeltaEnabled) { if (t < 0) { @@ -1607,7 +1607,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { if (i < mDailyUpdates.elementAt(mCurrentDay).size()) { // found inside the current day - next = (MINUTE * ((Integer) mDailyUpdates.elementAt(mCurrentDay).elementAt(i)).longValue()); + next = (MINUTE * mDailyUpdates.elementAt(mCurrentDay).elementAt(i).longValue()); if (mEnableDailyUpdates && mExtendedTimeList && next < 0) { next *= -1; if (fromLastUpdate) { @@ -1637,7 +1637,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { if (j < mDailyUpdates.elementAt(nextDay).size()) { if (nextDay == 0 && (!(mEnableDailyUpdates && mExtendedTimeList))) j = 0; - t = MINUTE * ((Integer) mDailyUpdates.elementAt(nextDay).elementAt(j)).longValue(); + t = MINUTE * mDailyUpdates.elementAt(nextDay).elementAt(j).longValue(); if (mEnableDailyUpdates && mExtendedTimeList) { if (mExtendedNextUpdate && (!fromLastUpdate) && (!delta) && isDeltaEnabled) { if (t < 0) { @@ -2018,7 +2018,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { int k; for (k = 0; k < exts.size(); k++) { - Extension ext = (Extension) exts.elementAt(k); + Extension ext = exts.elementAt(k); String name = mCMSCRLExtensions.getCRLExtensionName( ext.getExtensionId().toString()); @@ -2085,7 +2085,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { RevokedCertImpl newRevokedCert = new RevokedCertImpl(serialNumber, revocationDate, entryExt); - mRevokedCerts.put(serialNumber, (RevokedCertificate) newRevokedCert); + mRevokedCerts.put(serialNumber, newRevokedCert); } } else if (certType == UNREVOKED_CERT) { if (mRevokedCerts.containsKey(serialNumber)) { @@ -2101,7 +2101,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { RevokedCertImpl newRevokedCert = new RevokedCertImpl(serialNumber, CMS.getCurrentDate(), entryExt); - mUnrevokedCerts.put(serialNumber, (RevokedCertificate) newRevokedCert); + mUnrevokedCerts.put(serialNumber, newRevokedCert); } } } @@ -2177,7 +2177,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { RevokedCertImpl newRevokedCert = new RevokedCertImpl(serialNumber, CMS.getCurrentDate(), entryExt); - mExpiredCerts.put(serialNumber, (RevokedCertificate) newRevokedCert); + mExpiredCerts.put(serialNumber, newRevokedCert); } if (mCacheUpdateInterval == 0) { @@ -2221,7 +2221,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { if (crlExtensions != null) { for (int k = 0; k < crlExtensions.size(); k++) { - Extension ext = (Extension) crlExtensions.elementAt(k); + Extension ext = crlExtensions.elementAt(k); if (DeltaCRLIndicatorExtension.OID.equals(ext.getExtensionId().toString())) { DeltaCRLIndicatorExtension dExt = (DeltaCRLIndicatorExtension) ext; diff --git a/base/ca/src/com/netscape/ca/CertificateAuthority.java b/base/ca/src/com/netscape/ca/CertificateAuthority.java index 592f1557b..321fd9410 100644 --- a/base/ca/src/com/netscape/ca/CertificateAuthority.java +++ b/base/ca/src/com/netscape/ca/CertificateAuthority.java @@ -809,7 +809,7 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori try { issuingPointClassName = c.getString(PROP_CLASS); issuingPointClass = (Class<CRLIssuingPoint>) Class.forName(issuingPointClassName); - issuingPoint = (CRLIssuingPoint) issuingPointClass.newInstance(); + issuingPoint = issuingPointClass.newInstance(); issuingPoint.init(this, id, c); mCRLIssuePoints.put(id, issuingPoint); } catch (EPropertyNotFound e) { @@ -1506,13 +1506,13 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori Enumeration<String> instances = instc.getSubStoreNames(); while (instances.hasMoreElements()) { - String id = (String) instances.nextElement(); + String id = instances.nextElement(); if (Debug.ON) Debug.trace("registering listener instance: " + id); IConfigStore iConfig = instc.getSubStore(id); String implName = instc.getString(id + "." + PROP_PLUGIN); - ListenerPlugin plugin = (ListenerPlugin) mListenerPlugins.get(implName); + ListenerPlugin plugin = mListenerPlugins.get(implName); if (plugin == null) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_CA_CA_ERROR_LISTENER", implName)); @@ -1618,7 +1618,7 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori private void initRequestQueue() throws EBaseException { mPolicy = new CAPolicy(); - ((CAPolicy) mPolicy).init(this, mConfig.getSubStore(PROP_POLICY)); + mPolicy.init(this, mConfig.getSubStore(PROP_POLICY)); CMS.debug("CA policy inited"); mService = new CAService(this); CMS.debug("CA service inited"); diff --git a/base/common/src/com/netscape/certsrv/acls/ACL.java b/base/common/src/com/netscape/certsrv/acls/ACL.java index ea962975c..086b26015 100644 --- a/base/common/src/com/netscape/certsrv/acls/ACL.java +++ b/base/common/src/com/netscape/certsrv/acls/ACL.java @@ -155,7 +155,7 @@ public class ACL implements IACL, java.io.Serializable { Enumeration<ACLEntry> e = entries(); for (; e.hasMoreElements();) { - ACLEntry entry = (ACLEntry) e.nextElement(); + ACLEntry entry = e.nextElement(); entries += entry.toString(); if (e.hasMoreElements()) @@ -180,7 +180,7 @@ public class ACL implements IACL, java.io.Serializable { * @return true if it's one of the "rights"; false otherwise */ public boolean checkRight(String permission) { - return (mRights.contains((Object) permission)); + return mRights.contains(permission); } /** diff --git a/base/common/src/com/netscape/certsrv/base/MetaAttributeDef.java b/base/common/src/com/netscape/certsrv/base/MetaAttributeDef.java index a9a1e448f..63480478f 100644 --- a/base/common/src/com/netscape/certsrv/base/MetaAttributeDef.java +++ b/base/common/src/com/netscape/certsrv/base/MetaAttributeDef.java @@ -111,13 +111,13 @@ public class MetaAttributeDef { MetaAttributeDef newDef = new MetaAttributeDef(name, valueClass, oid); MetaAttributeDef oldDef; - if ((oldDef = (MetaAttributeDef) mNameToAttrDef.get(name)) != null && + if ((oldDef = mNameToAttrDef.get(name)) != null && !oldDef.equals(newDef)) { throw new IllegalArgumentException( "Attribute \'" + name + "\' is already defined"); } if (oid != null && - (oldDef = (MetaAttributeDef) mOidToAttrDef.get(oid)) != null && + (oldDef = mOidToAttrDef.get(oid)) != null && !oldDef.equals(newDef)) { throw new IllegalArgumentException( "OID \'" + oid + "\' is already in use"); @@ -162,7 +162,7 @@ public class MetaAttributeDef { * @return attribute definition or null if not found */ public static MetaAttributeDef forName(String name) { - return (MetaAttributeDef) mNameToAttrDef.get(name); + return mNameToAttrDef.get(name); } /** @@ -173,7 +173,7 @@ public class MetaAttributeDef { * @return attribute definition or null if not found */ public static MetaAttributeDef forOID(ObjectIdentifier oid) { - return (MetaAttributeDef) mOidToAttrDef.get(oid); + return mOidToAttrDef.get(oid); } /** diff --git a/base/common/src/com/netscape/certsrv/base/MetaInfo.java b/base/common/src/com/netscape/certsrv/base/MetaInfo.java index 1ad561489..64f9fe821 100644 --- a/base/common/src/com/netscape/certsrv/base/MetaInfo.java +++ b/base/common/src/com/netscape/certsrv/base/MetaInfo.java @@ -60,7 +60,7 @@ public class MetaInfo implements IAttrSet { Enumeration<String> enum1 = content.keys(); while (enum1.hasMoreElements()) { - String key = (String) enum1.nextElement(); + String key = enum1.nextElement(); sb.append(" " + key + " : " + content.get(key) + "\n"); } diff --git a/base/common/src/com/netscape/certsrv/base/Nonces.java b/base/common/src/com/netscape/certsrv/base/Nonces.java index c041ec777..c28a74fae 100644 --- a/base/common/src/com/netscape/certsrv/base/Nonces.java +++ b/base/common/src/com/netscape/certsrv/base/Nonces.java @@ -48,17 +48,17 @@ public class Nonces { long i; long k = 0; long n = nonce; - long m = (long) ((mNonceLimit / 2) + 1); + long m = (mNonceLimit / 2) + 1; for (i = 0; i < m; i++) { k = n + i; // avoid collisions - if (!mNonceList.contains((Object) k)) { + if (!mNonceList.contains(k)) { break; } k = n - i; // avoid collisions - if (!mNonceList.contains((Object) k)) { + if (!mNonceList.contains(k)) { break; } } @@ -66,9 +66,9 @@ public class Nonces { mNonceList.add(k); mNonces.put(k, cert); if (mNonceList.size() > mNonceLimit) { - n = ((Long) (mNonceList.firstElement())).longValue(); + n = mNonceList.firstElement().longValue(); mNonceList.remove(0); - mNonces.remove((Object) n); + mNonces.remove(n); } } else { // failed to resolved collision @@ -78,15 +78,15 @@ public class Nonces { } public X509Certificate getCertificate(long nonce) { - X509Certificate cert = (X509Certificate) mNonces.get(nonce); + X509Certificate cert = mNonces.get(nonce); return cert; } public X509Certificate getCertificate(int index) { X509Certificate cert = null; if (index >= 0 && index < mNonceList.size()) { - long nonce = ((Long) (mNonceList.elementAt(index))).longValue(); - cert = (X509Certificate) mNonces.get(nonce); + long nonce = mNonceList.elementAt(index).longValue(); + cert = mNonces.get(nonce); } return cert; } @@ -94,14 +94,14 @@ public class Nonces { public long getNonce(int index) { long nonce = 0; if (index >= 0 && index < mNonceList.size()) { - nonce = ((Long) (mNonceList.elementAt(index))).longValue(); + nonce = mNonceList.elementAt(index).longValue(); } return nonce; } public void removeNonce(long nonce) { - mNonceList.remove((Object) nonce); - mNonces.remove((Object) nonce); + mNonceList.remove(nonce); + mNonces.remove(nonce); } public int size() { diff --git a/base/common/src/com/netscape/certsrv/base/SessionContext.java b/base/common/src/com/netscape/certsrv/base/SessionContext.java index c3c568f77..79b75508f 100644 --- a/base/common/src/com/netscape/certsrv/base/SessionContext.java +++ b/base/common/src/com/netscape/certsrv/base/SessionContext.java @@ -125,8 +125,7 @@ public class SessionContext extends Hashtable<Object, Object> { * @return sesssion context */ public static SessionContext getContext() { - SessionContext sc = (SessionContext) mContexts.get( - Thread.currentThread()); + SessionContext sc = mContexts.get(Thread.currentThread()); if (sc == null) { sc = createContext(); @@ -142,8 +141,7 @@ public class SessionContext extends Hashtable<Object, Object> { * @return sesssion context */ public static SessionContext getExistingContext() { - SessionContext sc = (SessionContext) - mContexts.get(Thread.currentThread()); + SessionContext sc = mContexts.get(Thread.currentThread()); if (sc == null) { return null; @@ -156,8 +154,7 @@ public class SessionContext extends Hashtable<Object, Object> { * Releases the current session context. */ public static void releaseContext() { - SessionContext sc = (SessionContext) mContexts.get( - Thread.currentThread()); + SessionContext sc = mContexts.get(Thread.currentThread()); if (sc != null) { mContexts.remove(Thread.currentThread()); diff --git a/base/common/src/com/netscape/certsrv/pattern/AttrSetCollection.java b/base/common/src/com/netscape/certsrv/pattern/AttrSetCollection.java index 036840633..5b6c5f334 100644 --- a/base/common/src/com/netscape/certsrv/pattern/AttrSetCollection.java +++ b/base/common/src/com/netscape/certsrv/pattern/AttrSetCollection.java @@ -48,7 +48,7 @@ public class AttrSetCollection extends Hashtable<String, IAttrSet> { * @return attribute set */ public IAttrSet getAttrSet(String name) { - return (IAttrSet) get(name); + return get(name); } /** diff --git a/base/common/src/com/netscape/certsrv/pattern/Pattern.java b/base/common/src/com/netscape/certsrv/pattern/Pattern.java index 3d33bcae8..496b1d4c3 100644 --- a/base/common/src/com/netscape/certsrv/pattern/Pattern.java +++ b/base/common/src/com/netscape/certsrv/pattern/Pattern.java @@ -70,7 +70,7 @@ public class Pattern { Enumeration<String> keys = attrSetCollection.keys(); while (keys.hasMoreElements()) { - String key = (String) keys.nextElement(); + String key = keys.nextElement(); Pattern p = new Pattern(temp); temp = p.substitute(key, diff --git a/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java b/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java index 5c192e9cd..38379c283 100644 --- a/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java +++ b/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java @@ -43,7 +43,7 @@ public class CertInfoProfile { mProfileSetIDMapping = config.getString("profileSetIDMapping"); StringTokenizer st = new StringTokenizer(config.getString("list"), ","); while (st.hasMoreTokens()) { - String id = (String) st.nextToken(); + String id = st.nextToken(); String c = config.getString(id + ".default.class"); try { /* load defaults */ @@ -89,8 +89,7 @@ public class CertInfoProfile { public void populate(X509CertInfo info) { Enumeration<ICertInfoPolicyDefault> e1 = mDefaults.elements(); while (e1.hasMoreElements()) { - ICertInfoPolicyDefault def = - (ICertInfoPolicyDefault) e1.nextElement(); + ICertInfoPolicyDefault def = e1.nextElement(); try { def.populate(null /* request */, info); } catch (Exception e) { diff --git a/base/common/src/com/netscape/certsrv/property/PropertySet.java b/base/common/src/com/netscape/certsrv/property/PropertySet.java index dc839deb1..3ffedffcb 100644 --- a/base/common/src/com/netscape/certsrv/property/PropertySet.java +++ b/base/common/src/com/netscape/certsrv/property/PropertySet.java @@ -39,7 +39,7 @@ public class PropertySet { } public IDescriptor getDescriptor(String name) { - return (IDescriptor) mProperties.get(name); + return mProperties.get(name); } public void remove(String name) { diff --git a/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java b/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java index 98338601a..ac57c1313 100644 --- a/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java +++ b/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java @@ -161,7 +161,7 @@ public class ARequestNotifier implements IRequestNotifier { * @return listener */ public IRequestListener getListener(String name) { - return (IRequestListener) mListeners.get(name); + return mListeners.get(name); } /** @@ -205,7 +205,7 @@ public class ARequestNotifier implements IRequestNotifier { CMS.debug("getRequest mRequests=" + mRequests.size() + " mSearchForRequests=" + mSearchForRequests); if (mSearchForRequests && mRequests.size() == 1) { - id = (String) mRequests.elementAt(0); + id = mRequests.elementAt(0); if (mCA != null && mRequestQueue == null) mRequestQueue = mCA.getRequestQueue(); if (id != null && mRequestQueue != null) { @@ -258,7 +258,7 @@ public class ARequestNotifier implements IRequestNotifier { } } if (mRequests.size() > 0) { - id = (String) mRequests.elementAt(0); + id = mRequests.elementAt(0); if (id != null) { CMS.debug("getRequest getting request: " + id); if (mCA != null && mRequestQueue == null) @@ -332,7 +332,7 @@ public class ARequestNotifier implements IRequestNotifier { Enumeration<IRequestListener> listeners = mListeners.elements(); if (listeners != null && r != null) { while (listeners.hasMoreElements()) { - IRequestListener l = (IRequestListener) listeners.nextElement(); + IRequestListener l = listeners.nextElement(); CMS.debug("RunListeners: IRequestListener = " + l.getClass().getName()); l.accept(r); } @@ -428,7 +428,7 @@ public class ARequestNotifier implements IRequestNotifier { " requests by adding request " + r.getRequestId().toString()); if (morePublishingThreads()) { try { - Thread notifierThread = new Thread(new RunListeners((IRequestNotifier) this)); + Thread notifierThread = new Thread(new RunListeners(this)); if (notifierThread != null) { mNotifierThreads.addElement(notifierThread); CMS.debug("Number of publishing threads: " + mNotifierThreads.size()); @@ -462,7 +462,7 @@ public class ARequestNotifier implements IRequestNotifier { if (morePublishingThreads()) { mSearchForRequests = true; try { - Thread notifierThread = new Thread(new RunListeners((IRequestNotifier) this)); + Thread notifierThread = new Thread(new RunListeners(this)); if (notifierThread != null) { mNotifierThreads.addElement(notifierThread); CMS.debug("Number of publishing threads: " + mNotifierThreads.size()); @@ -520,10 +520,10 @@ class RunListeners implements Runnable { " " + ((mRequest != null) ? " SingleRequest" : " noSingleRequest")); do { if (mRequestNotifier != null) - mRequest = (IRequest) mRequestNotifier.getRequest(); + mRequest = mRequestNotifier.getRequest(); if (mListeners != null && mRequest != null) { while (mListeners.hasMoreElements()) { - IRequestListener l = (IRequestListener) mListeners.nextElement(); + IRequestListener l = mListeners.nextElement(); CMS.debug("RunListeners: IRequestListener = " + l.getClass().getName()); l.accept(mRequest); } diff --git a/base/common/src/com/netscape/certsrv/request/AgentApprovals.java b/base/common/src/com/netscape/certsrv/request/AgentApprovals.java index 2c957b6ee..cb3dd2ceb 100644 --- a/base/common/src/com/netscape/certsrv/request/AgentApprovals.java +++ b/base/common/src/com/netscape/certsrv/request/AgentApprovals.java @@ -113,7 +113,7 @@ public class AgentApprovals public Vector<String> toStringVector() { Vector<String> retval = new Vector<String>(mVector.size()); for (int i = 0; i < mVector.size(); i++) { - AgentApproval a = (AgentApproval) mVector.elementAt(i); + AgentApproval a = mVector.elementAt(i); retval.add(a.getDate().getTime() + ";" + a.getUserName()); } diff --git a/base/common/src/com/netscape/certsrv/template/ArgList.java b/base/common/src/com/netscape/certsrv/template/ArgList.java index 03b2b5645..34d931c84 100644 --- a/base/common/src/com/netscape/certsrv/template/ArgList.java +++ b/base/common/src/com/netscape/certsrv/template/ArgList.java @@ -63,6 +63,6 @@ public class ArgList implements IArgValue { * @return argument */ public IArgValue get(int pos) { - return (IArgValue) mList.elementAt(pos); + return mList.elementAt(pos); } } diff --git a/base/common/src/com/netscape/certsrv/template/ArgSet.java b/base/common/src/com/netscape/certsrv/template/ArgSet.java index 8f3ff8b04..d65e6ad56 100644 --- a/base/common/src/com/netscape/certsrv/template/ArgSet.java +++ b/base/common/src/com/netscape/certsrv/template/ArgSet.java @@ -69,6 +69,6 @@ public class ArgSet implements IArgValue { * @return argument value */ public IArgValue get(String name) { - return (IArgValue) mArgs.get(name); + return mArgs.get(name); } } diff --git a/base/common/src/com/netscape/cms/authentication/AVAPattern.java b/base/common/src/com/netscape/cms/authentication/AVAPattern.java index 55c62eeb1..823b396e9 100644 --- a/base/common/src/com/netscape/cms/authentication/AVAPattern.java +++ b/base/common/src/com/netscape/cms/authentication/AVAPattern.java @@ -457,7 +457,7 @@ class AVAPattern { Enumeration<String> ldapValues = ldapAttr.getStringValues(); for (int i = 0; ldapValues.hasMoreElements(); i++) { - String val = (String) ldapValues.nextElement(); + String val = ldapValues.nextElement(); if (i == mElement) { value = val; diff --git a/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java b/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java index 03428102d..b8216d6bc 100644 --- a/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java +++ b/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java @@ -199,7 +199,7 @@ public class AgentCertAuthentication implements IAuthManager, Certificates certs = new Certificates(ci); try { - user = (IUser) mCULocator.locateUser(certs); + user = mCULocator.locateUser(certs); } catch (EUsrGrpException e) { throw new EInvalidCredentials(CMS.getUserMessage("CMS_AUTHENTICATION_INVALID_CREDENTIAL")); } catch (netscape.ldap.LDAPException e) { diff --git a/base/common/src/com/netscape/cms/authentication/DNPattern.java b/base/common/src/com/netscape/cms/authentication/DNPattern.java index e44f40e9d..ccee3b512 100644 --- a/base/common/src/com/netscape/cms/authentication/DNPattern.java +++ b/base/common/src/com/netscape/cms/authentication/DNPattern.java @@ -211,6 +211,6 @@ public class DNPattern { } public String[] getLdapAttrs() { - return (String[]) mLdapAttrs.clone(); + return mLdapAttrs.clone(); } } diff --git a/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java b/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java index 2394ede4c..81537f707 100644 --- a/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java +++ b/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java @@ -514,7 +514,7 @@ public class FlatFileAuth AuthToken authToken = new AuthToken(this); for (int i = 0; i < authAttrs.length; i++) { - String ffvalue = (String) user.get(authAttrs[i]); + String ffvalue = user.get(authAttrs[i]); String uservalue = (String) authCred.get(authAttrs[i]); // print("checking authentication token (" + authAttrs[i] + ": " + uservalue + " against ff value: " + ffvalue); @@ -589,7 +589,7 @@ public class FlatFileAuth // if a dn was specified in the password file for this user, // replace the requested dn with the one in the pwfile if (user != null) { - String dn = (String) user.get("dn"); + String dn = user.get("dn"); if (dn != null && authToken != null) { authToken.set(AuthToken.TOKEN_CERT_SUBJECT, dn); diff --git a/base/common/src/com/netscape/cms/authentication/PortalEnroll.java b/base/common/src/com/netscape/cms/authentication/PortalEnroll.java index 2e5b9d394..c94cec617 100644 --- a/base/common/src/com/netscape/cms/authentication/PortalEnroll.java +++ b/base/common/src/com/netscape/cms/authentication/PortalEnroll.java @@ -352,7 +352,7 @@ public class PortalEnroll extends DirBasedAuthentication { objectclass_values = mObjClasses; for (int i = objectclass_values.size() - 1; i >= 0; i--) - attr.addValue((String) objectclass_values.elementAt(i)); + attr.addValue(objectclass_values.elementAt(i)); attrs.add(attr); Enumeration<Enumeration<String>> objClasses = mRequiredAttrs.elements(); @@ -369,7 +369,7 @@ public class PortalEnroll extends DirBasedAuthentication { if (attrname.equalsIgnoreCase("objectclass") == true) continue; try { - attrval = (String) argblk.getValueAsString(attrname); + attrval = argblk.getValueAsString(attrname); } catch (EBaseException e) { if (e.getMessage().equalsIgnoreCase(CMS.getUserMessage("CMS_BASE_ATTRIBUTE_NOT_FOUND")) == true) continue; @@ -393,7 +393,7 @@ public class PortalEnroll extends DirBasedAuthentication { CMS.debug("PortalEnroll: attrname is: " + attrname); try { - attrval = (String) argblk.getValueAsString(attrname); + attrval = argblk.getValueAsString(attrname); } catch (EBaseException e) { if (e.getMessage().equalsIgnoreCase(CMS.getUserMessage("CMS_BASE_ATTRIBUTE_NOT_FOUND")) == true) continue; diff --git a/base/common/src/com/netscape/cms/authentication/RDNPattern.java b/base/common/src/com/netscape/cms/authentication/RDNPattern.java index 35e3eb59a..14d5a2f8f 100644 --- a/base/common/src/com/netscape/cms/authentication/RDNPattern.java +++ b/base/common/src/com/netscape/cms/authentication/RDNPattern.java @@ -227,6 +227,6 @@ class RDNPattern { } public String[] getLdapAttrs() { - return (String[]) mLdapAttrs.clone(); + return mLdapAttrs.clone(); } } diff --git a/base/common/src/com/netscape/cms/authorization/AAclAuthz.java b/base/common/src/com/netscape/cms/authorization/AAclAuthz.java index 2e6636f27..b47956fb3 100644 --- a/base/common/src/com/netscape/cms/authorization/AAclAuthz.java +++ b/base/common/src/com/netscape/cms/authorization/AAclAuthz.java @@ -110,7 +110,7 @@ public abstract class AAclAuthz { Enumeration<String> mImpls = i.getSubStoreNames(); while (mImpls.hasMoreElements()) { - String type = (String) mImpls.nextElement(); + String type = mImpls.nextElement(); String evalClassPath = null; try { @@ -171,7 +171,7 @@ public abstract class AAclAuthz { } public IACL getACL(String target) { - return (ACL) mACLs.get(target); + return mACLs.get(target); } protected Enumeration<String> getTargetNames() { @@ -310,7 +310,7 @@ public abstract class AAclAuthz { */ private boolean checkACLs(String name, String perm) throws EACLsException { - ACL acl = (ACL) mACLs.get(name); + ACL acl = mACLs.get(name); // no such resource, pass it down if (acl == null) { @@ -338,7 +338,7 @@ public abstract class AAclAuthz { * must pass all ACLEntry */ for (; e.hasMoreElements();) { - ACLEntry entry = (ACLEntry) e.nextElement(); + ACLEntry entry = e.nextElement(); // if permission not pertinent, move on to next ACLEntry if (entry.containPermission(perm) == true) { @@ -430,7 +430,7 @@ public abstract class AAclAuthz { int i = expression.indexOf("="); String type = expression.substring(0, i); String value = expression.substring(i + 1); - IAccessEvaluator evaluator = (IAccessEvaluator) mEvaluators.get(type); + IAccessEvaluator evaluator = mEvaluators.get(type); if (evaluator == null) { log(ILogger.LL_FAILURE, CMS.getLogMessage("AUTHZ_EVALUATOR_NOT_FOUND", type)); @@ -486,7 +486,7 @@ public abstract class AAclAuthz { boolean permitted = false; while (entries.hasMoreElements()) { - ACLEntry entry = (ACLEntry) entries.nextElement(); + ACLEntry entry = entries.nextElement(); CMS.debug("checkACLS(): ACLEntry expressions= " + entry.getAttributeExpressions()); @@ -504,7 +504,7 @@ public abstract class AAclAuthz { entries = getDenyEntries(nodes, perm); while (entries.hasMoreElements()) { - ACLEntry entry = (ACLEntry) entries.nextElement(); + ACLEntry entry = entries.nextElement(); CMS.debug("checkACLS(): ACLEntry expressions= " + entry.getAttributeExpressions()); @@ -541,13 +541,13 @@ public abstract class AAclAuthz { Vector<ACLEntry> v = new Vector<ACLEntry>(); while (nodes.hasMoreElements()) { - name = (String) nodes.nextElement(); - acl = (ACL) mACLs.get(name); + name = nodes.nextElement(); + acl = mACLs.get(name); if (acl == null) continue; e = acl.entries(); while (e.hasMoreElements()) { - ACLEntry entry = (ACLEntry) e.nextElement(); + ACLEntry entry = e.nextElement(); if (!entry.isNegative() && entry.containPermission(operation)) { @@ -566,8 +566,8 @@ public abstract class AAclAuthz { Vector<ACLEntry> v = new Vector<ACLEntry>(); while (nodes.hasMoreElements()) { - name = (String) nodes.nextElement(); - acl = (ACL) mACLs.get(name); + name = nodes.nextElement(); + acl = mACLs.get(name); if (acl == null) continue; e = acl.entries(); @@ -690,7 +690,7 @@ public abstract class AAclAuthz { type = expression.substring(0, i).trim(); value = expression.substring(i + len).trim(); } - IAccessEvaluator evaluator = (IAccessEvaluator) mEvaluators.get(type); + IAccessEvaluator evaluator = mEvaluators.get(type); if (evaluator == null) { log(ILogger.LL_FAILURE, CMS.getLogMessage("AUTHZ_EVALUATOR_NOT_FOUND", type)); @@ -799,7 +799,7 @@ public abstract class AAclAuthz { * @return true if unique; false otherwise */ public boolean isTypeUnique(String type) { - if (mACLs.containsKey((Object) type)) { + if (mACLs.containsKey(type)) { return false; } else { return true; diff --git a/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java b/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java index 040ff5297..bf4ca7f5a 100644 --- a/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java +++ b/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java @@ -164,7 +164,7 @@ public class DirAclAuthz extends AAclAuthz LDAPAttribute aclRes = entry.getAttribute("resourceACLS"); @SuppressWarnings("unchecked") - Enumeration<String> en = (Enumeration<String>) aclRes.getStringValues(); + Enumeration<String> en = aclRes.getStringValues(); for (; en != null && en.hasMoreElements();) { addACLs(en.nextElement()); @@ -294,7 +294,7 @@ public class DirAclAuthz extends AAclAuthz if (en.hasMoreElements() == true) { while (en.hasMoreElements()) { - ACL a = (ACL) en.nextElement(); + ACL a = en.nextElement(); String resAclString = a.getResourceACLs(); attrs.addValue(resAclString); diff --git a/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java b/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java index 3f5ea2399..a34a99373 100644 --- a/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java +++ b/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java @@ -95,7 +95,7 @@ public class CMSAuthorityKeyIdentifierExtension if (caCertExtensions != null) { for (int i = 0; i < caCertExtensions.size(); i++) { - Extension caCertExt = (Extension) caCertExtensions.elementAt(i); + Extension caCertExt = caCertExtensions.elementAt(i); if (caCertExt instanceof SubjectKeyIdentifierExtension) { SubjectKeyIdentifierExtension id = diff --git a/base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java b/base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java index cddb8d56a..b28e93751 100644 --- a/base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java +++ b/base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java @@ -17,7 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.jobs; -import java.security.cert.X509Certificate; import java.text.DateFormat; import java.util.Date; import java.util.Enumeration; @@ -286,7 +285,7 @@ public class UnpublishExpiredJob extends AJobBase try { if ((mPublisherProcessor != null) && mPublisherProcessor.enabled()) { - mPublisherProcessor.unpublishCert((X509Certificate) cert, req); + mPublisherProcessor.unpublishCert(cert, req); if (mSummary == true) buildItemParams(IEmailFormProcessor.TOKEN_STATUS, STATUS_SUCCESS); @@ -309,7 +308,7 @@ public class UnpublishExpiredJob extends AJobBase try { if ((mPublisherProcessor != null) && mPublisherProcessor.enabled()) { - mPublisherProcessor.unpublishCert((X509Certificate) cert, null); + mPublisherProcessor.unpublishCert(cert, null); if (mSummary == true) buildItemParams(IEmailFormProcessor.TOKEN_STATUS, STATUS_SUCCESS); diff --git a/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java b/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java index dc0222dda..44ff46a9b 100644 --- a/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java +++ b/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java @@ -354,11 +354,10 @@ public class CertificateIssuedListener implements IRequestListener { } // build some token data - mContentParams.put(IEmailFormProcessor.TOKEN_ID, - mConfig.getName()); + mContentParams.put(IEmailFormProcessor.TOKEN_ID, mConfig.getName()); mReqId = r.getRequestId(); mContentParams.put(IEmailFormProcessor.TOKEN_REQUEST_ID, - (Object) mReqId.toString()); + mReqId.toString()); IEmailFormProcessor et = CMS.getEmailFormProcessor(); String c = et.getEmailContent(template.toString(), mContentParams); @@ -402,12 +401,12 @@ public class CertificateIssuedListener implements IRequestListener { mContentParams.put(IEmailFormProcessor.TOKEN_SUBJECT_DN, issuedCert[0].getSubjectDN().toString()); - Date date = (Date) issuedCert[0].getNotAfter(); + Date date = issuedCert[0].getNotAfter(); mContentParams.put(IEmailFormProcessor.TOKEN_NOT_AFTER, mDateFormat.format(date)); - date = (Date) issuedCert[0].getNotBefore(); + date = issuedCert[0].getNotBefore(); mContentParams.put(IEmailFormProcessor.TOKEN_NOT_BEFORE, mDateFormat.format(date)); diff --git a/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java b/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java index ad91738e9..b361057b4 100644 --- a/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java +++ b/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java @@ -311,7 +311,7 @@ public class CertificateRevokedListener implements IRequestListener { mHttpPort); try { - RevokedCertImpl revCert = (RevokedCertImpl) crlentries[0]; + RevokedCertImpl revCert = crlentries[0]; ICertificateAuthority ca = (ICertificateAuthority) CMS.getSubsystem(CMS.SUBSYSTEM_CA); ICertificateRepository certDB = ca.getCertificateRepository(); X509Certificate cert = certDB.getX509Certificate(revCert.getSerialNumber()); @@ -320,7 +320,7 @@ public class CertificateRevokedListener implements IRequestListener { cert.getIssuerDN().toString()); mContentParams.put(IEmailFormProcessor.TOKEN_SUBJECT_DN, cert.getSubjectDN().toString()); - Date date = (Date) crlentries[0].getRevocationDate(); + Date date = crlentries[0].getRevocationDate(); mContentParams.put(IEmailFormProcessor.TOKEN_REVOCATION_DATE, mDateFormat.format(date)); diff --git a/base/common/src/com/netscape/cms/listeners/RequestInQListener.java b/base/common/src/com/netscape/cms/listeners/RequestInQListener.java index 3d236baea..f1f396ca3 100644 --- a/base/common/src/com/netscape/cms/listeners/RequestInQListener.java +++ b/base/common/src/com/netscape/cms/listeners/RequestInQListener.java @@ -227,25 +227,19 @@ public class RequestInQListener implements IRequestListener { RequestId reqId = r.getRequestId(); - mContentParams.put(IEmailFormProcessor.TOKEN_REQUEST_ID, - (Object) reqId.toString()); + mContentParams.put(IEmailFormProcessor.TOKEN_REQUEST_ID, reqId.toString()); mContentParams.put(IEmailFormProcessor.TOKEN_ID, mId); val = r.getRequestType(); if (val != null) - mContentParams.put(IEmailFormProcessor.TOKEN_REQUEST_TYPE, - val); + mContentParams.put(IEmailFormProcessor.TOKEN_REQUEST_TYPE, val); - mContentParams.put(IEmailFormProcessor.TOKEN_HTTP_HOST, - (Object) mHttpHost); - mContentParams.put(IEmailFormProcessor.TOKEN_HTTP_PORT, - (Object) mAgentPort); + mContentParams.put(IEmailFormProcessor.TOKEN_HTTP_HOST, mHttpHost); + mContentParams.put(IEmailFormProcessor.TOKEN_HTTP_PORT, mAgentPort); - mContentParams.put(IEmailFormProcessor.TOKEN_SENDER_EMAIL, - (Object) mSenderEmail); - mContentParams.put(IEmailFormProcessor.TOKEN_RECIPIENT_EMAIL, - (Object) mRecipientEmail); + mContentParams.put(IEmailFormProcessor.TOKEN_SENDER_EMAIL, mSenderEmail); + mContentParams.put(IEmailFormProcessor.TOKEN_RECIPIENT_EMAIL, mRecipientEmail); } /** diff --git a/base/common/src/com/netscape/cms/logging/LogFile.java b/base/common/src/com/netscape/cms/logging/LogFile.java index fa5531a8e..95d4b34bf 100644 --- a/base/common/src/com/netscape/cms/logging/LogFile.java +++ b/base/common/src/com/netscape/cms/logging/LogFile.java @@ -1321,16 +1321,16 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { int maxLine = -1, level = -1, source = -1; Vector<LogEntry> entries = null; - if ((tmp = (String) req.get(Constants.PR_LOG_ENTRY)) != null) { + if ((tmp = req.get(Constants.PR_LOG_ENTRY)) != null) { maxLine = Integer.parseInt(tmp); } - if ((tmp = (String) req.get(Constants.PR_LOG_LEVEL)) != null) { + if ((tmp = req.get(Constants.PR_LOG_LEVEL)) != null) { level = Integer.parseInt(tmp); } - if ((tmp = (String) req.get(Constants.PR_LOG_SOURCE)) != null) { + if ((tmp = req.get(Constants.PR_LOG_SOURCE)) != null) { source = Integer.parseInt(tmp); } - tmp = (String) req.get(Constants.PR_LOG_NAME); + tmp = req.get(Constants.PR_LOG_NAME); if (!(tmp.equals(Constants.PR_CURRENT_LOG))) { fName = tmp; } else { @@ -1341,7 +1341,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { entries = readEntry(maxLine, level, source, fName); for (int i = 0; i < entries.size(); i++) { params.put(Integer.toString(i) + - ((LogEntry) entries.elementAt(i)).getEntry(), ""); + entries.elementAt(i).getEntry(), ""); } } catch (Exception e) { CMS.getLogger().log(ILogger.EV_SYSTEM, ILogger.S_OTHER, diff --git a/base/common/src/com/netscape/cms/logging/RollingLogFile.java b/base/common/src/com/netscape/cms/logging/RollingLogFile.java index 312978fae..d420f547d 100644 --- a/base/common/src/com/netscape/cms/logging/RollingLogFile.java +++ b/base/common/src/com/netscape/cms/logging/RollingLogFile.java @@ -461,7 +461,7 @@ public class RollingLogFile extends LogFile { // First, remove any old log files and figure out when the // next one expires try { - wakeupTime = expire((long) (mExpirationTime / 1000)); + wakeupTime = expire(mExpirationTime / 1000); } catch (SecurityException e) { ConsoleError.send(new SystemEvent(CMS.getUserMessage("CMS_LOG_EXPIRE_LOG_FAILED", e.toString()))); diff --git a/base/common/src/com/netscape/cms/ocsp/DefStore.java b/base/common/src/com/netscape/cms/ocsp/DefStore.java index f9798270a..5cee87273 100644 --- a/base/common/src/com/netscape/cms/ocsp/DefStore.java +++ b/base/common/src/com/netscape/cms/ocsp/DefStore.java @@ -203,7 +203,7 @@ public class DefStore implements IDefStore, IExtendedPluginInfo { } public long getReqCount(String id) { - Long c = (Long) mReqCounts.get(id); + Long c = mReqCounts.get(id); if (c == null) return 0; @@ -234,8 +234,7 @@ public class DefStore implements IDefStore, IExtendedPluginInfo { IDBSSession s = mDBService.createSession(); try { - ICRLIssuingPointRecord cp = (ICRLIssuingPointRecord) - readCRLIssuingPoint(caName); + ICRLIssuingPointRecord cp = readCRLIssuingPoint(caName); if (cp == null) return; // nothing to do @@ -264,7 +263,7 @@ public class DefStore implements IDefStore, IExtendedPluginInfo { getBaseDN(); while (recs != null && recs.hasMoreElements()) { - ICertRecord rec = (ICertRecord) recs.nextElement(); + ICertRecord rec = recs.nextElement(); String cert_dn = "cn=" + rec.getSerialNumber().toString() + "," + rep_dn; @@ -424,8 +423,7 @@ public class DefStore implements IDefStore, IExtendedPluginInfo { X509CRLImpl theCRL = null; ICRLIssuingPointRecord theRec = null; byte keyhsh[] = cid.getIssuerKeyHash().toByteArray(); - CRLIPContainer matched = (CRLIPContainer) - mCacheCRLIssuingPoints.get(new String(keyhsh)); + CRLIPContainer matched = mCacheCRLIssuingPoints.get(new String(keyhsh)); if (matched == null) { Enumeration<ICRLIssuingPointRecord> recs = searchCRLIssuingPointRecord( @@ -513,8 +511,7 @@ public class DefStore implements IDefStore, IExtendedPluginInfo { CMS.debug("DefStore: evaluating crl cache"); Hashtable<BigInteger, RevokedCertificate> cache = theRec.getCRLCacheNoClone(); if (cache != null) { - RevokedCertificate rc = (RevokedCertificate) - cache.get(new BigInteger(serialNo.toString())); + RevokedCertificate rc = cache.get(new BigInteger(serialNo.toString())); if (rc == null) { if (isNotFoundGood()) { certStatus = new GoodInfo(); @@ -671,7 +668,7 @@ public class DefStore implements IDefStore, IExtendedPluginInfo { String dn = "cn=" + transformDN(name) + "," + getBaseDN(); - s.add(dn, (ICRLIssuingPointRecord) rec); + s.add(dn, rec); } finally { if (s != null) s.close(); diff --git a/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java b/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java index f8cd03f75..2129f0f00 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java +++ b/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java @@ -68,7 +68,7 @@ public class AgentPolicy extends APolicyRule throws EPolicyException { // Create subordinate object - String className = (String) config.get("class"); + String className = config.get("class"); System.err.println("Creating agent policy with class " + className); if (className != null) { diff --git a/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java index 4ee689915..06f94d599 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java @@ -350,7 +350,7 @@ public class AttributePresentConstraints extends APolicyRule while (e.hasMoreElements()) { try { - String paramName = (String) e.nextElement(); + String paramName = e.nextElement(); String paramValue = mParamValue.get(paramName).toString(); String temp = paramName + "=" + paramValue; @@ -369,7 +369,7 @@ public class AttributePresentConstraints extends APolicyRule while (e.hasMoreElements()) { try { - String paramName = (String) e.nextElement(); + String paramName = e.nextElement(); String paramValue = mParamDefault.get(paramName).toString(); String temp = paramName + "=" + paramValue; diff --git a/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java index 43b7e1fd6..efd306bf3 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java @@ -150,8 +150,7 @@ public class IssuerConstraints extends APolicyRule } for (int i = 0; i < certInfo.length; i++) { - String oldIssuer = (String) - certInfo[i].get(X509CertInfo.ISSUER).toString(); + String oldIssuer = certInfo[i].get(X509CertInfo.ISSUER).toString(); if (oldIssuer == null) { setError(req, diff --git a/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java index a1f0805d0..363856197 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java @@ -224,7 +224,7 @@ public class RSAKeyConstraints extends APolicyRule StringBuffer sb = new StringBuffer(); for (Enumeration<BigInt> e = mExponents.elements(); e.hasMoreElements();) { - BigInt bi = (BigInt) e.nextElement(); + BigInt bi = e.nextElement(); sb.append(bi.toBigInteger().toString()); sb.append(" "); diff --git a/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java index 90a8cc167..15b12af40 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java @@ -131,7 +131,7 @@ public class SigningAlgorithmConstraints extends APolicyRule mAllowedAlgs = new String[itemCount]; for (int i = 0; i < itemCount; i++) { - mAllowedAlgs[i] = (String) algs.elementAt(i); + mAllowedAlgs[i] = algs.elementAt(i); } } @@ -239,7 +239,7 @@ public class SigningAlgorithmConstraints extends APolicyRule if (mAllowedAlgs.length != goodSize) { mAllowedAlgs = new String[goodSize]; for (i = 0; i < goodSize; i++) { - mAllowedAlgs[i] = (String) goodAlgs.elementAt(i); + mAllowedAlgs[i] = goodAlgs.elementAt(i); } } } diff --git a/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java b/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java index 93267bd1e..5f33efe1b 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java @@ -174,7 +174,7 @@ public class ExtendedKeyUsageExt extends APolicyRule params.addElement(PROP_PURPOSE_ID + Integer.toString(i) + "="); } else { - usage = ((ObjectIdentifier) mUsages.elementAt(i)).toString(); + usage = mUsages.elementAt(i).toString(); if (usage == null) { params.addElement(PROP_PURPOSE_ID + Integer.toString(i) + "="); diff --git a/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java b/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java index eb8ab2285..35f5313c1 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java +++ b/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java @@ -434,7 +434,7 @@ public class GenericASN1Ext extends APolicyRule implements Enumeration<String> e = mConfig.getPropertyNames(); while (e.hasMoreElements()) { - String n = (String) e.nextElement(); + String n = e.nextElement(); h.put(n, mConfig.getString(n)); } diff --git a/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java b/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java index 46bc1a787..b44a71ee8 100644 --- a/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java +++ b/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java @@ -107,8 +107,7 @@ public class CAEnrollProfile extends EnrollProfile { // do not archive keys for renewal requests if ((optionsData != null) && (!request.getRequestType().equals(IRequest.RENEWAL_REQUEST))) { - PKIArchiveOptions options = (PKIArchiveOptions) - toPKIArchiveOptions(optionsData); + PKIArchiveOptions options = toPKIArchiveOptions(optionsData); if (options != null) { CMS.debug("CAEnrollProfile: execute found " + diff --git a/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java b/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java index 8bcb59c86..1fe2fa514 100644 --- a/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java +++ b/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java @@ -73,7 +73,7 @@ public class RAEnrollProfile extends EnrollProfile { IRegistrationAuthority ra = (IRegistrationAuthority) getAuthority(); - IRAService raService = (IRAService) ra.getRAService(); + IRAService raService = ra.getRAService(); if (raService == null) { throw new EProfileException("No RA Service"); diff --git a/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java index 8d7a67a77..869f0e2cc 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java @@ -126,7 +126,6 @@ public class UniqueKeyConstraint extends EnrollConstraint { String pub_s = escapeBinaryData(pub); String filter = "(" + ICertRecord.ATTR_X509CERT_PUBLIC_KEY_DATA + "=" + pub_s + ")"; list = - (ICertRecordList) mCA.getCertificateRepository().findCertRecordsInList(filter, null, 10); size = list.getSize(); diff --git a/base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java b/base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java index e68ffca07..9629e4990 100644 --- a/base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java @@ -247,7 +247,7 @@ public class CertificatePoliciesExtDefault extends EnrollExtDefault { StringTokenizer st = new StringTokenizer(value, "\r\n"); Hashtable<String, String> table = new Hashtable<String, String>(); while (st.hasMoreTokens()) { - String token = (String) st.nextToken(); + String token = st.nextToken(); int index = token.indexOf(":"); if (index <= 0) throw new EPropertyException(CMS.getUserMessage( @@ -287,15 +287,15 @@ public class CertificatePoliciesExtDefault extends EnrollExtDefault { Hashtable<String, String> h = buildRecords(value); - String numStr = (String) h.get(CONFIG_POLICY_NUM); + String numStr = h.get(CONFIG_POLICY_NUM); int size = Integer.parseInt(numStr); Vector<CertificatePolicyInfo> certificatePolicies = new Vector<CertificatePolicyInfo>(); for (int i = 0; i < size; i++) { - String enable = (String) h.get(CONFIG_PREFIX + i + SEPARATOR + CONFIG_POLICY_ENABLE); + String enable = h.get(CONFIG_PREFIX + i + SEPARATOR + CONFIG_POLICY_ENABLE); CertificatePolicyInfo cinfo = null; if (enable != null && enable.equals("true")) { - String policyId = (String) h.get(CONFIG_PREFIX + i + SEPARATOR + CONFIG_POLICY_ID); + String policyId = h.get(CONFIG_PREFIX + i + SEPARATOR + CONFIG_POLICY_ID); if (policyId == null || policyId.length() == 0) throw new EPropertyException(CMS.getUserMessage( @@ -303,40 +303,39 @@ public class CertificatePoliciesExtDefault extends EnrollExtDefault { CertificatePolicyId cpolicyId = getPolicyId(policyId); String qualifersNum = - (String) h.get(CONFIG_PREFIX + i + SEPARATOR + CONFIG_POLICY_QUALIFIERS_NUM); + h.get(CONFIG_PREFIX + i + SEPARATOR + CONFIG_POLICY_QUALIFIERS_NUM); PolicyQualifiers policyQualifiers = new PolicyQualifiers(); int num = 0; if (qualifersNum != null && qualifersNum.length() > 0) num = Integer.parseInt(qualifersNum); for (int j = 0; j < num; j++) { String cpsuriEnable = - (String) h.get(CONFIG_PREFIX - + i + SEPARATOR + CONFIG_PREFIX1 + j + SEPARATOR + CONFIG_CPSURI_ENABLE); + h.get(CONFIG_PREFIX + + i + SEPARATOR + CONFIG_PREFIX1 + j + SEPARATOR + CONFIG_CPSURI_ENABLE); String usernoticeEnable = - (String) h - .get(CONFIG_PREFIX - + i + SEPARATOR + CONFIG_PREFIX1 + j + SEPARATOR - + CONFIG_USERNOTICE_ENABLE); + h.get(CONFIG_PREFIX + + i + SEPARATOR + CONFIG_PREFIX1 + j + SEPARATOR + + CONFIG_USERNOTICE_ENABLE); if (cpsuriEnable != null && cpsuriEnable.equals("true")) { String cpsuri = - (String) h.get(CONFIG_PREFIX - + i + SEPARATOR + CONFIG_PREFIX1 + j + SEPARATOR + CONFIG_CPSURI_VALUE); + h.get(CONFIG_PREFIX + + i + SEPARATOR + CONFIG_PREFIX1 + j + SEPARATOR + CONFIG_CPSURI_VALUE); netscape.security.x509.PolicyQualifierInfo qualifierInfo = createCPSuri(cpsuri); if (qualifierInfo != null) policyQualifiers.add(qualifierInfo); } else if (usernoticeEnable != null && enable.equals("true")) { String org = - (String) h.get(CONFIG_PREFIX - + i + SEPARATOR + CONFIG_PREFIX1 + j + SEPARATOR - + CONFIG_USERNOTICE_ORG); + h.get(CONFIG_PREFIX + + i + SEPARATOR + CONFIG_PREFIX1 + j + SEPARATOR + + CONFIG_USERNOTICE_ORG); String noticenumbers = - (String) h.get(CONFIG_PREFIX - + i + SEPARATOR + CONFIG_PREFIX1 + j + SEPARATOR - + CONFIG_USERNOTICE_NUMBERS); + h.get(CONFIG_PREFIX + + i + SEPARATOR + CONFIG_PREFIX1 + j + SEPARATOR + + CONFIG_USERNOTICE_NUMBERS); String explicitText = - (String) h.get(CONFIG_PREFIX - + i + SEPARATOR + CONFIG_PREFIX1 + j + SEPARATOR - + CONFIG_USERNOTICE_TEXT); + h.get(CONFIG_PREFIX + + i + SEPARATOR + CONFIG_PREFIX1 + j + SEPARATOR + + CONFIG_USERNOTICE_TEXT); netscape.security.x509.PolicyQualifierInfo qualifierInfo = createUserNotice(org, noticenumbers, explicitText); if (qualifierInfo != null) @@ -345,11 +344,9 @@ public class CertificatePoliciesExtDefault extends EnrollExtDefault { } if (policyQualifiers.size() <= 0) { - cinfo = - new CertificatePolicyInfo(cpolicyId); + cinfo = new CertificatePolicyInfo(cpolicyId); } else { - cinfo = - new CertificatePolicyInfo(cpolicyId, policyQualifiers); + cinfo = new CertificatePolicyInfo(cpolicyId, policyQualifiers); } if (cinfo != null) certificatePolicies.addElement(cinfo); @@ -762,7 +759,7 @@ public class CertificatePoliciesExtDefault extends EnrollExtDefault { nums = new int[numsVector.size()]; try { for (int i = 0; i < numsVector.size(); i++) { - Integer ii = new Integer((String) numsVector.elementAt(i)); + Integer ii = new Integer(numsVector.elementAt(i)); nums[i] = ii.intValue(); } } catch (Exception e) { diff --git a/base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java b/base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java index d5d88c29e..4a8acace1 100644 --- a/base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java @@ -109,24 +109,21 @@ public class GenericExtDefault extends EnrollExtDefault { ObjectIdentifier oid = new ObjectIdentifier(getConfig(CONFIG_OID)); - ext = (Extension) - getExtension(oid.toString(), info); + ext = getExtension(oid.toString(), info); if (ext == null) { populate(null, info); } if (name.equals(VAL_CRITICAL)) { - ext = (Extension) - getExtension(oid.toString(), info); + ext = getExtension(oid.toString(), info); if (ext == null) { return; } boolean val = Boolean.valueOf(value).booleanValue(); ext.setCritical(val); } else if (name.equals(VAL_DATA)) { - ext = (Extension) - getExtension(oid.toString(), info); + ext = getExtension(oid.toString(), info); if (ext == null) { return; } @@ -155,8 +152,7 @@ public class GenericExtDefault extends EnrollExtDefault { ObjectIdentifier oid = new ObjectIdentifier(getConfig(CONFIG_OID)); - ext = (Extension) - getExtension(oid.toString(), info); + ext = getExtension(oid.toString(), info); if (ext == null) { try { @@ -171,8 +167,7 @@ public class GenericExtDefault extends EnrollExtDefault { if (name.equals(VAL_CRITICAL)) { - ext = (Extension) - getExtension(oid.toString(), info); + ext = getExtension(oid.toString(), info); if (ext == null) { return null; @@ -184,8 +179,7 @@ public class GenericExtDefault extends EnrollExtDefault { } } else if (name.equals(VAL_DATA)) { - ext = (Extension) - getExtension(oid.toString(), info); + ext = getExtension(oid.toString(), info); if (ext == null) return ""; @@ -218,7 +212,7 @@ public class GenericExtDefault extends EnrollExtDefault { if ((data[i] & 0xff) < 16) { b.append("0"); } - b.append(Integer.toString((int) (data[i] & 0xff), 0x10)); + b.append(Integer.toString((data[i] & 0xff), 0x10)); } return b.toString(); } diff --git a/base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java b/base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java index 3feddd628..ec203713b 100644 --- a/base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java @@ -160,7 +160,7 @@ public class IssuerAltNameExtDefault extends EnrollExtDefault { StringTokenizer st = new StringTokenizer(value, "\r\n"); while (st.hasMoreTokens()) { - String gname = (String) st.nextToken(); + String gname = st.nextToken(); GeneralNameInterface n = parseGeneralName(gname); if (n != null) { diff --git a/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java b/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java index 929878de3..f010b6134 100644 --- a/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java @@ -516,7 +516,7 @@ public class NameConstraintsExtDefault extends EnrollExtDefault { Vector<NameValuePairs> recs = new Vector<NameValuePairs>(); for (int i = 0; i < size; i++) { - GeneralSubtree tree = (GeneralSubtree) trees.elementAt(i); + GeneralSubtree tree = trees.elementAt(i); GeneralName gn = tree.getGeneralName(); String type = getGeneralNameType(gn); diff --git a/base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java b/base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java index 55a9e420e..56d67a93e 100644 --- a/base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java @@ -316,8 +316,7 @@ public class PolicyMappingsExtDefault extends EnrollExtDefault { NameValuePairs pairs = new NameValuePairs(); if (maps.hasMoreElements()) { - CertificatePolicyMap map = - (CertificatePolicyMap) maps.nextElement(); + CertificatePolicyMap map = maps.nextElement(); CertificatePolicyId i1 = map.getIssuerIdentifier(); CertificatePolicyId s1 = map.getSubjectIdentifier(); diff --git a/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java b/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java index 0aa92937f..4bb1d0309 100644 --- a/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java @@ -268,7 +268,7 @@ public class SubjectAltNameExtDefault extends EnrollExtDefault { StringTokenizer st = new StringTokenizer(value, "\r\n"); while (st.hasMoreTokens()) { - String gname = (String) st.nextToken(); + String gname = st.nextToken(); CMS.debug("SubjectAltNameExtDefault: setValue GN:" + gname); if (!isGeneralNameValid(gname)) { diff --git a/base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java b/base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java index 813e92a28..a60721733 100644 --- a/base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java +++ b/base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java @@ -333,10 +333,10 @@ public class SubjectDirAttributesExtDefault extends EnrollExtDefault { StringBuffer ss = new StringBuffer(); while (v.hasMoreElements()) { if (ss.length() == 0) - ss.append((String) (v.nextElement())); + ss.append(v.nextElement()); else { ss.append(","); - ss.append((String) (v.nextElement())); + ss.append(v.nextElement()); } } diff --git a/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java b/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java index acac975cb..0dff1da6b 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java +++ b/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java @@ -431,8 +431,7 @@ class AVAPattern { if (extensions != null) { for (int i = 0; i < extensions.size(); i++) { - Extension ext = (Extension) - extensions.elementAt(i); + Extension ext = extensions.elementAt(i); String extName = OIDMap.getName(ext.getExtensionId()); diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java index a1a65a342..1b1531000 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java @@ -287,9 +287,7 @@ public class LdapCaSimpleMap implements ILdapMapper, IExtendedPluginInfo { try { X509Certificate cert = (X509Certificate) obj; - - subjectDN = - (X500Name) ((X509Certificate) cert).getSubjectDN(); + subjectDN = (X500Name) cert.getSubjectDN(); CMS.debug("LdapCaSimpleMap: cert subject dn:" + subjectDN.toString()); X509CertInfo info = (X509CertInfo) @@ -307,9 +305,7 @@ public class LdapCaSimpleMap implements ILdapMapper, IExtendedPluginInfo { } catch (ClassCastException e) { try { X509CRLImpl crl = (X509CRLImpl) obj; - - subjectDN = - (X500Name) ((X509CRLImpl) crl).getIssuerDN(); + subjectDN = (X500Name) crl.getIssuerDN(); CMS.debug("LdapCaSimpleMap: crl issuer dn: " + subjectDN.toString()); diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java index d1a734b82..8ed702f50 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java @@ -129,8 +129,7 @@ public class LdapCertCompsMap X509Certificate cert = (X509Certificate) obj; String result = null; // form dn and filter for search. - X500Name subjectDN = - (X500Name) ((X509Certificate) cert).getSubjectDN(); + X500Name subjectDN = (X500Name) cert.getSubjectDN(); CMS.debug("LdapCertCompsMap: " + subjectDN.toString()); @@ -146,8 +145,7 @@ public class LdapCertCompsMap try { X509CRLImpl crl = (X509CRLImpl) obj; String result = null; - X500Name issuerDN = - (X500Name) ((X509CRLImpl) crl).getIssuerDN(); + X500Name issuerDN = (X500Name) crl.getIssuerDN(); CMS.debug("LdapCertCompsMap: " + issuerDN.toString()); diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java index 5c085481d..21a3a0794 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java @@ -117,17 +117,13 @@ public class LdapCertExactMap implements ILdapMapper, IExtendedPluginInfo { try { X509Certificate cert = (X509Certificate) obj; - - subjectDN = - (X500Name) ((X509Certificate) cert).getSubjectDN(); + subjectDN = (X500Name) cert.getSubjectDN(); CMS.debug("LdapCertExactMap: cert subject dn:" + subjectDN.toString()); } catch (ClassCastException e) { try { X509CRLImpl crl = (X509CRLImpl) obj; - - subjectDN = - (X500Name) ((X509CRLImpl) crl).getIssuerDN(); + subjectDN = (X500Name) crl.getIssuerDN(); CMS.debug("LdapCertExactMap: crl issuer dn: " + subjectDN.toString()); diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java index 61ffef947..a1f7207f6 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java @@ -185,17 +185,13 @@ public class LdapCertSubjMap implements ILdapMapper, IExtendedPluginInfo { try { X509Certificate cert = (X509Certificate) obj; - - subjectDN = - (X500Name) ((X509Certificate) cert).getSubjectDN(); + subjectDN = (X500Name) cert.getSubjectDN(); CMS.debug("LdapCertSubjMap: cert subject dn:" + subjectDN.toString()); } catch (ClassCastException e) { try { X509CRLImpl crl = (X509CRLImpl) obj; - - subjectDN = - (X500Name) ((X509CRLImpl) crl).getIssuerDN(); + subjectDN = (X500Name) crl.getIssuerDN(); CMS.debug("LdapCertSubjMap: crl issuer dn: " + subjectDN.toString()); @@ -271,7 +267,7 @@ public class LdapCertSubjMap implements ILdapMapper, IExtendedPluginInfo { try { X509Certificate cert = (X509Certificate) obj; - subjectDN = (X500Name) ((X509Certificate) cert).getSubjectDN(); + subjectDN = (X500Name) cert.getSubjectDN(); CMS.debug("LdapCertSubjMap: cert subject dn:" + subjectDN.toString()); } catch (ClassCastException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("PUBLISH_NOT_SUPPORTED_OBJECT")); diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java index 7c4c3c4b0..ca5903ee0 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java @@ -124,8 +124,7 @@ public class LdapCrlIssuerCompsMap try { String result = null; - X500Name issuerDN = - (X500Name) ((X509CRLImpl) crl).getIssuerDN(); + X500Name issuerDN = (X500Name) crl.getIssuerDN(); CMS.debug("LdapCrlIssuerCompsMap: " + issuerDN.toString()); diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java index 1f7f06f69..96ff2a11e 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java @@ -185,9 +185,9 @@ public class LdapDNCompsMap mBaseDN = baseDN; if (dnComps != null) - mDnComps = (ObjectIdentifier[]) dnComps.clone(); + mDnComps = dnComps.clone(); if (filterComps != null) - mFilterComps = (ObjectIdentifier[]) filterComps.clone(); + mFilterComps = filterComps.clone(); // log debug info. for (int i = 0; i < mDnComps.length; i++) { @@ -317,7 +317,7 @@ public class LdapDNCompsMap try { // get the base DN & filter. for (Enumeration<RDN> n = subjName.getRDNs(); n.hasMoreElements();) { - RDN rdn = (RDN) n.nextElement(); + RDN rdn = n.nextElement(); // NOTE assumes one AVA per RDN. AVA ava = rdn.getAssertion()[0]; ObjectIdentifier oid = ava.getOid(); @@ -378,11 +378,11 @@ public class LdapDNCompsMap } public ObjectIdentifier[] getDnComps() { - return (ObjectIdentifier[]) mDnComps.clone(); + return mDnComps.clone(); } public ObjectIdentifier[] getFilterComps() { - return (ObjectIdentifier[]) mFilterComps.clone(); + return mFilterComps.clone(); } /** diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java index d94032071..a970602bd 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java @@ -217,9 +217,7 @@ public class LdapEnhancedMap try { X509Certificate cert = (X509Certificate) obj; - - subjectDN = - (X500Name) ((X509Certificate) cert).getSubjectDN(); + subjectDN = (X500Name) cert.getSubjectDN(); CMS.debug( "LdapEnhancedMap: cert subject dn:" + subjectDN.toString()); @@ -248,13 +246,10 @@ public class LdapEnhancedMap try { X509CRLImpl crl = (X509CRLImpl) obj; - - subjectDN = (X500Name) - ((X509CRLImpl) crl).getIssuerDN(); + subjectDN = (X500Name) crl.getIssuerDN(); CMS.debug( "LdapEnhancedMap: crl issuer dn: " + - subjectDN.toString()); } catch (ClassCastException ex) { log(ILogger.LL_FAILURE, diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java index 67d98f4cc..8f88ffaba 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java @@ -248,9 +248,7 @@ public class LdapSimpleMap implements ILdapMapper, IExtendedPluginInfo { try { X509Certificate cert = (X509Certificate) obj; - - subjectDN = - (X500Name) ((X509Certificate) cert).getSubjectDN(); + subjectDN = (X500Name) cert.getSubjectDN(); CMS.debug("LdapSimpleMap: cert subject dn:" + subjectDN.toString()); //certExt = (CertificateExtensions) @@ -270,9 +268,7 @@ public class LdapSimpleMap implements ILdapMapper, IExtendedPluginInfo { } catch (ClassCastException e) { try { X509CRLImpl crl = (X509CRLImpl) obj; - - subjectDN = - (X500Name) ((X509CRLImpl) crl).getIssuerDN(); + subjectDN = (X500Name) crl.getIssuerDN(); CMS.debug("LdapSimpleMap: crl issuer dn: " + subjectDN.toString()); diff --git a/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java b/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java index ef7fa9d13..cd298bc3b 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java +++ b/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java @@ -522,8 +522,7 @@ class MapAVAPattern { if (TYPE_EXT.equals(mType)) { if (extensions != null) { for (int i = 0; i < extensions.size(); i++) { - Extension ext = (Extension) - extensions.elementAt(i); + Extension ext = extensions.elementAt(i); String extName = OIDMap.getName(ext.getExtensionId()); int index = extName.lastIndexOf("."); diff --git a/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java b/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java index dc446a7b7..6656f4a1f 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java +++ b/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java @@ -192,10 +192,10 @@ public class MapDNPattern { } public String[] getReqAttrs() { - return (String[]) mReqAttrs.clone(); + return mReqAttrs.clone(); } public String[] getCertAttrs() { - return (String[]) mCertAttrs.clone(); + return mCertAttrs.clone(); } } diff --git a/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java b/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java index 61da1d7d2..058294d7c 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java +++ b/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java @@ -208,10 +208,10 @@ class MapRDNPattern { } public String[] getReqAttrs() { - return (String[]) mReqAttrs.clone(); + return mReqAttrs.clone(); } public String[] getCertAttrs() { - return (String[]) mCertAttrs.clone(); + return mCertAttrs.clone(); } } diff --git a/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java index 8dada61fb..68b1205ad 100644 --- a/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java +++ b/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java @@ -328,7 +328,7 @@ public class LdapEncryptCertPublisher implements ILdapPublisher, IExtendedPlugin byte[] val = null; while (vals.hasMoreElements()) { - val = (byte[]) vals.nextElement(); + val = vals.nextElement(); if (PublisherUtils.byteArraysAreEqual(val, bval)) { return true; } diff --git a/base/common/src/com/netscape/cms/request/RequestScheduler.java b/base/common/src/com/netscape/cms/request/RequestScheduler.java index 073bdcce4..568d6f412 100644 --- a/base/common/src/com/netscape/cms/request/RequestScheduler.java +++ b/base/common/src/com/netscape/cms/request/RequestScheduler.java @@ -54,12 +54,12 @@ public class RequestScheduler implements IRequestScheduler { */ public synchronized void requestOut(IRequest r) { Thread current = Thread.currentThread(); - Thread first = (Thread) mRequestThreads.elementAt(0); + Thread first = mRequestThreads.elementAt(0); if (current.equals(first)) { // reprioritize try { - Thread second = (Thread) mRequestThreads.elementAt(1); + Thread second = mRequestThreads.elementAt(1); second.setPriority(Thread.MAX_PRIORITY); } catch (Exception e) { diff --git a/base/common/src/com/netscape/cms/selftests/ASelfTest.java b/base/common/src/com/netscape/cms/selftests/ASelfTest.java index 6857f3c46..e77ece551 100644 --- a/base/common/src/com/netscape/cms/selftests/ASelfTest.java +++ b/base/common/src/com/netscape/cms/selftests/ASelfTest.java @@ -94,7 +94,7 @@ public abstract class ASelfTest EInvalidSelfTestException, EMissingSelfTestException { // store individual self test class values for this instance - mSelfTestSubsystem = (ISelfTestSubsystem) subsystem; + mSelfTestSubsystem = subsystem; // strip preceding/trailing whitespace // from passed-in String parameters diff --git a/base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java b/base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java index 7183db613..832d2b747 100644 --- a/base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java +++ b/base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java @@ -225,7 +225,7 @@ public class KRAPresence } // Retrieve the KRA certificate public key - kraPubKey = (PublicKey) kraCert.getPublicKey(); + kraPubKey = kraCert.getPublicKey(); if (kraPubKey == null) { // log that something is seriously wrong with the KRA diff --git a/base/common/src/com/netscape/cms/selftests/ra/RAPresence.java b/base/common/src/com/netscape/cms/selftests/ra/RAPresence.java index e279cf608..6facd807c 100644 --- a/base/common/src/com/netscape/cms/selftests/ra/RAPresence.java +++ b/base/common/src/com/netscape/cms/selftests/ra/RAPresence.java @@ -235,7 +235,7 @@ public class RAPresence } // Retrieve the RA certificate public key - raPubKey = (PublicKey) raCert.getPublicKey(); + raPubKey = raCert.getPublicKey(); if (raPubKey == null) { // log that something is seriously wrong with the RA diff --git a/base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java b/base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java index bee89a59c..985b4ef8b 100644 --- a/base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java +++ b/base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java @@ -102,7 +102,7 @@ public class TKSKnownSessionKey mUseSoftToken = getConfigString("useSoftToken"); String defKeySetMacKey = null; - tks = (ISubsystem) CMS.getSubsystem(mTksSubId); + tks = CMS.getSubsystem(mTksSubId); if (tks != null) { tksConfig = tks.getConfigStore(); if (tksConfig != null) { diff --git a/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java index 7a08ce966..22c979f28 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java @@ -236,7 +236,7 @@ public class ACLAdminServlet extends AdminServlet { Enumeration<ACL> res = mAuthzMgr.getACLs(); while (res.hasMoreElements()) { - ACL acl = (ACL) res.nextElement(); + ACL acl = res.nextElement(); String desc = acl.getDescription(); if (desc == null) @@ -296,7 +296,7 @@ public class ACLAdminServlet extends AdminServlet { if (acis != "") { acis += ";"; } - ACLEntry aclEntry = (ACLEntry) aclEntryEnum.nextElement(); + ACLEntry aclEntry = aclEntryEnum.nextElement(); String aci = aclEntry.getACLEntryString(); acis += aci; @@ -788,7 +788,7 @@ public class ACLAdminServlet extends AdminServlet { // it's possibl that it's being used...we have to assume that // the administrator knows what she is doing, for now - mEvaluators.remove((Object) id); + mEvaluators.remove(id); try { IConfigStore destStore = diff --git a/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java index 5e6e7889f..ee1b53ed5 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java @@ -36,7 +36,6 @@ import javax.servlet.http.HttpServletResponse; import netscape.security.x509.X509CertImpl; import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.authentication.AuthToken; import com.netscape.certsrv.authentication.IAuthCredentials; import com.netscape.certsrv.authentication.IAuthManager; import com.netscape.certsrv.authentication.IAuthSubsystem; @@ -261,7 +260,7 @@ public class AdminServlet extends HttpServlet { StringTokenizer tokenizer = new StringTokenizer(info, "#"); while (tokenizer.hasMoreTokens()) { - String acl = (String) tokenizer.nextToken(); + String acl = tokenizer.nextToken(); mAuthz.authzMgrAccessInit(mAclMethod, acl); } @@ -362,7 +361,7 @@ public class AdminServlet extends HttpServlet { IAuthCredentials authCreds = getAuthCreds(authMgr, cert); - token = (AuthToken) authMgr.authenticate(authCreds); + token = authMgr.authenticate(authCreds); } else { String authToken = req.getHeader(HDR_AUTHORIZATION); String b64s = authToken.substring( @@ -826,7 +825,7 @@ public class AdminServlet extends HttpServlet { ByteArrayOutputStream out = new ByteArrayOutputStream(s.length()); for (int i = 0; i < s.length(); i++) { - int c = (int) s.charAt(i); + int c = s.charAt(i); if (c == '+') { out.write(' '); diff --git a/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java index 6ccfcdca9..24e701d7a 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java @@ -397,7 +397,7 @@ public class AuthAdminServlet extends AdminServlet { return; } // is the manager id unique? - if (mAuths.getPlugins().containsKey((Object) id)) { + if (mAuths.getPlugins().containsKey(id)) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( LOGGING_SIGNED_AUDIT_CONFIG_AUTH, @@ -653,7 +653,7 @@ public class AuthAdminServlet extends AdminServlet { } // is the manager instance id unique? - if (mAuths.getInstances().containsKey((Object) id)) { + if (mAuths.getInstances().containsKey(id)) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( LOGGING_SIGNED_AUDIT_CONFIG_AUTH, @@ -699,7 +699,7 @@ public class AuthAdminServlet extends AdminServlet { // check if implementation exists. AuthMgrPlugin plugin = - (AuthMgrPlugin) mAuths.getPlugins().get(implname); + mAuths.getPlugins().get(implname); if (plugin == null) { // store a message in the signed audit log file @@ -916,9 +916,8 @@ public class AuthAdminServlet extends AdminServlet { Enumeration<String> e = mAuths.getPlugins().keys(); while (e.hasMoreElements()) { - String name = (String) e.nextElement(); - AuthMgrPlugin value = (AuthMgrPlugin) - mAuths.getPlugins().get(name); + String name = e.nextElement(); + AuthMgrPlugin value = mAuths.getPlugins().get(name); if (value.isVisible()) { params.put(name, value.getClassPath() + EDIT); @@ -944,8 +943,7 @@ public class AuthAdminServlet extends AdminServlet { enableStr = "disabled"; } - AuthMgrPlugin amgrplugin = (AuthMgrPlugin) - mAuths.getPlugins().get(value.getImplName()); + AuthMgrPlugin amgrplugin = mAuths.getPlugins().get(value.getImplName()); if (!amgrplugin.isVisible()) { params.put(name, value.getImplName() + ";invisible;" + enableStr); @@ -1032,7 +1030,7 @@ public class AuthAdminServlet extends AdminServlet { // first check if any instances from this auth manager // DON'T remove auth manager if any instance for (Enumeration<?> e = mAuths.getInstances().keys(); e.hasMoreElements();) { - IAuthManager authMgr = (IAuthManager) mAuths.get((String) e.nextElement()); + IAuthManager authMgr = mAuths.get((String) e.nextElement()); if (authMgr.getImplName() == id) { // store a message in the signed audit log file @@ -1052,7 +1050,7 @@ public class AuthAdminServlet extends AdminServlet { } // then delete this auth manager - mAuths.getPlugins().remove((Object) id); + mAuths.getPlugins().remove(id); IConfigStore destStore = mConfig.getSubStore(DestDef.DEST_AUTH_ADMIN); @@ -1350,7 +1348,7 @@ public class AuthAdminServlet extends AdminServlet { return; } - IAuthManager mgrInst = (IAuthManager) mAuths.get(id); + IAuthManager mgrInst = mAuths.get(id); IConfigStore config = mgrInst.getConfigStore(); String[] configParams = mgrInst.getConfigParams(); NameValuePairs params = new NameValuePairs(); @@ -1360,7 +1358,7 @@ public class AuthAdminServlet extends AdminServlet { if (configParams != null) { for (int i = 0; i < configParams.length; i++) { String key = configParams[i]; - String val = (String) config.get(key); + String val = config.get(key); if (val != null) { params.put(key, val); @@ -1434,7 +1432,7 @@ public class AuthAdminServlet extends AdminServlet { } // Does the manager instance exist? - if (!mAuths.getInstances().containsKey((Object) id)) { + if (!mAuths.getInstances().containsKey(id)) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( LOGGING_SIGNED_AUDIT_CONFIG_AUTH, @@ -1470,8 +1468,7 @@ public class AuthAdminServlet extends AdminServlet { } // get plugin for implementation - AuthMgrPlugin plugin = - (AuthMgrPlugin) mAuths.getPlugins().get(implname); + AuthMgrPlugin plugin = mAuths.getPlugins().get(implname); if (plugin == null) { // store a message in the signed audit log file @@ -1493,8 +1490,7 @@ public class AuthAdminServlet extends AdminServlet { // save old instance substore params in case new one fails. - IAuthManager oldinst = - (IAuthManager) mAuths.get(id); + IAuthManager oldinst = mAuths.get(id); IConfigStore oldConfig = oldinst.getConfigStore(); String[] oldConfigParms = oldinst.getConfigParams(); @@ -1502,7 +1498,7 @@ public class AuthAdminServlet extends AdminServlet { // implName is always required so always include it it. saveParams.put(IAuthSubsystem.PROP_PLUGIN, - (String) oldConfig.get(IAuthSubsystem.PROP_PLUGIN)); + oldConfig.get(IAuthSubsystem.PROP_PLUGIN)); if (oldConfigParms != null) { for (int i = 0; i < oldConfigParms.length; i++) { String key = oldConfigParms[i]; diff --git a/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java index 5aa422730..a47c7ae0d 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java @@ -357,7 +357,7 @@ public final class CMSAdminServlet extends AdminServlet { Enumeration<ISubsystem> e = CMS.getSubsystems(); while (e.hasMoreElements()) { - ISubsystem sys = (ISubsystem) e.nextElement(); + ISubsystem sys = e.nextElement(); //get subsystem type if ((sys instanceof IKeyRecoveryAuthority) && @@ -387,7 +387,7 @@ public final class CMSAdminServlet extends AdminServlet { boolean isKRAInstalled = false; while (e.hasMoreElements()) { - ISubsystem sys = (ISubsystem) e.nextElement(); + ISubsystem sys = e.nextElement(); //get subsystem type if (sys instanceof IKeyRecoveryAuthority) @@ -538,7 +538,7 @@ public final class CMSAdminServlet extends AdminServlet { boolean isKRAInstalled = false; while (e.hasMoreElements()) { - ISubsystem sys = (ISubsystem) e.nextElement(); + ISubsystem sys = e.nextElement(); //get subsystem type if (sys instanceof IKeyRecoveryAuthority) @@ -563,7 +563,7 @@ public final class CMSAdminServlet extends AdminServlet { boolean isCACert = true; while (enum1.hasMoreElements()) { - String name = (String) enum1.nextElement(); + String name = enum1.nextElement(); String val = req.getParameter(name); if (name.equals(Constants.PR_CIPHER_PREF)) { @@ -781,7 +781,7 @@ public final class CMSAdminServlet extends AdminServlet { while (e.hasMoreElements()) { String type = ""; - ISubsystem sys = (ISubsystem) e.nextElement(); + ISubsystem sys = e.nextElement(); //get subsystem type if (sys instanceof IKeyRecoveryAuthority) @@ -846,7 +846,7 @@ public final class CMSAdminServlet extends AdminServlet { Enumeration<String> enum1 = req.getParameterNames(); while (enum1.hasMoreElements()) { - String key = (String) enum1.nextElement(); + String key = enum1.nextElement(); if (key.equals(Constants.OP_TYPE)) continue; @@ -874,7 +874,7 @@ public final class CMSAdminServlet extends AdminServlet { Enumeration<String> e = req.getParameterNames(); String newKeyName = null, selectedToken = null; while (e.hasMoreElements()) { - String name = (String) e.nextElement(); + String name = e.nextElement(); if (name.equals(Constants.PR_KEY_LIST)) { newKeyName = req.getParameter(name); @@ -908,7 +908,7 @@ public final class CMSAdminServlet extends AdminServlet { Enumeration<String> e = req.getParameterNames(); while (e.hasMoreElements()) { - String name = (String) e.nextElement(); + String name = e.nextElement(); if (name.equals(Constants.PR_TOKEN_LIST)) { String selectedToken = req.getParameter(name); @@ -957,7 +957,7 @@ public final class CMSAdminServlet extends AdminServlet { Enumeration<String> e = req.getParameterNames(); while (e.hasMoreElements()) { - String name = (String) e.nextElement(); + String name = e.nextElement(); if (name.equals(Constants.OP_TYPE)) continue; @@ -1022,7 +1022,7 @@ public final class CMSAdminServlet extends AdminServlet { String pwd = ""; while (enum1.hasMoreElements()) { - String key = (String) enum1.nextElement(); + String key = enum1.nextElement(); String value = req.getParameter(key); if (key.equals(Constants.PR_TOKEN_NAME)) { @@ -1051,7 +1051,7 @@ public final class CMSAdminServlet extends AdminServlet { String value = ""; while (enum1.hasMoreElements()) { - key = (String) enum1.nextElement(); + key = enum1.nextElement(); value = req.getParameter(key); if (key.equals(Constants.PR_TOKEN_NAME)) { break; @@ -1105,7 +1105,7 @@ public final class CMSAdminServlet extends AdminServlet { String keyCurveName = ""; while (enum1.hasMoreElements()) { - String key = (String) enum1.nextElement(); + String key = enum1.nextElement(); String value = req.getParameter(key); if (key.equals(Constants.PR_TOKEN_NAME)) { @@ -1472,7 +1472,7 @@ public final class CMSAdminServlet extends AdminServlet { String newtokenname = null; while (enum1.hasMoreElements()) { - String key = (String) enum1.nextElement(); + String key = enum1.nextElement(); String value = req.getParameter(key); if (!key.equals("pathname")) { @@ -1489,7 +1489,7 @@ public final class CMSAdminServlet extends AdminServlet { ICertificateAuthority ca = (ICertificateAuthority) CMS.getSubsystem(CMS.SUBSYSTEM_CA); ICertificateRepository repository = - (ICertificateRepository) ca.getCertificateRepository(); + ca.getCertificateRepository(); ISigningUnit signingUnit = ca.getSigningUnit(); String oldtokenname = null; //this is the old nick name @@ -1891,7 +1891,7 @@ public final class CMSAdminServlet extends AdminServlet { Enumeration<String> enum1 = req.getParameterNames(); while (enum1.hasMoreElements()) { - String key = (String) enum1.nextElement(); + String key = enum1.nextElement(); String value = req.getParameter(key); if (key.equals(Constants.PR_PKCS10)) @@ -2309,7 +2309,7 @@ public final class CMSAdminServlet extends AdminServlet { NameValuePairs results = new NameValuePairs(); while (enum1.hasMoreElements()) { - String key = (String) enum1.nextElement(); + String key = enum1.nextElement(); String value = req.getParameter(key); // really should be PR_CERT_CONTENT @@ -2539,7 +2539,7 @@ public final class CMSAdminServlet extends AdminServlet { String otherNickname = ""; while (enum1.hasMoreElements()) { - String key = (String) enum1.nextElement(); + String key = enum1.nextElement(); String value = req.getParameter(key); if (key.equals(Constants.PR_PKCS10)) { @@ -2639,7 +2639,7 @@ public final class CMSAdminServlet extends AdminServlet { NameValuePairs pairs = new NameValuePairs(); while (enum1.hasMoreElements()) { - String key = (String) enum1.nextElement(); + String key = enum1.nextElement(); String value = req.getParameter(key); if (key.equals(Constants.OP_TYPE)) @@ -2682,7 +2682,7 @@ public final class CMSAdminServlet extends AdminServlet { NameValuePairs pairs = new NameValuePairs(); while (enum1.hasMoreElements()) { - String key = (String) enum1.nextElement(); + String key = enum1.nextElement(); String value = req.getParameter(key); if (key.equals(Constants.OP_TYPE)) @@ -2796,7 +2796,7 @@ public final class CMSAdminServlet extends AdminServlet { String date = ""; while (enum1.hasMoreElements()) { - String key = (String) enum1.nextElement(); + String key = enum1.nextElement(); String value = req.getParameter(key); if (key.equals(Constants.OP_TYPE)) @@ -2825,7 +2825,7 @@ public final class CMSAdminServlet extends AdminServlet { Enumeration<String> enum1 = req.getParameterNames(); while (enum1.hasMoreElements()) { - String key = (String) enum1.nextElement(); + String key = enum1.nextElement(); String value = req.getParameter(key); if (key.equals(Constants.PR_SUBJECT_NAME)) { @@ -2854,7 +2854,7 @@ public final class CMSAdminServlet extends AdminServlet { String curveName = null; while (enum1.hasMoreElements()) { - String key = (String) enum1.nextElement(); + String key = enum1.nextElement(); String value = req.getParameter(key); if (key.equals(Constants.PR_KEY_CURVENAME)) { @@ -2885,7 +2885,7 @@ public final class CMSAdminServlet extends AdminServlet { String certExt = ""; while (enum1.hasMoreElements()) { - String key = (String) enum1.nextElement(); + String key = enum1.nextElement(); String value = req.getParameter(key); if (key.equals(ConfigConstants.PR_CERTIFICATE_EXTENSION)) { @@ -2911,7 +2911,7 @@ public final class CMSAdminServlet extends AdminServlet { String nickname = ""; while (enum1.hasMoreElements()) { - String key = (String) enum1.nextElement(); + String key = enum1.nextElement(); String value = req.getParameter(key); if (key.equals(Constants.RS_ID)) { @@ -2938,7 +2938,7 @@ public final class CMSAdminServlet extends AdminServlet { String nickname = ""; while (enum1.hasMoreElements()) { - String key = (String) enum1.nextElement(); + String key = enum1.nextElement(); String value = req.getParameter(key); if (key.equals(Constants.PR_NICKNAME)) { @@ -3025,7 +3025,7 @@ public final class CMSAdminServlet extends AdminServlet { String trust = ""; while (enum1.hasMoreElements()) { - String key = (String) enum1.nextElement(); + String key = enum1.nextElement(); String value = req.getParameter(key); if (key.equals(Constants.RS_ID)) { @@ -3129,7 +3129,7 @@ public final class CMSAdminServlet extends AdminServlet { String logMessage = null; while (enum1.hasMoreElements()) { - String key = (String) enum1.nextElement(); + String key = enum1.nextElement(); String value = req.getParameter(key); if (key.equals(Constants.PR_RUN_SELFTESTS_ON_DEMAND)) { @@ -3222,8 +3222,7 @@ public final class CMSAdminServlet extends AdminServlet { throw new EMissingSelfTestException(); } - ISelfTest test = (ISelfTest) - mSelfTestSubsystem.getSelfTest(instanceName); + ISelfTest test = mSelfTestSubsystem.getSelfTest(instanceName); if (test == null) { // self test plugin instance property name is not present diff --git a/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java index a89933c69..47eeebe92 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java @@ -109,7 +109,7 @@ public class JobsAdminServlet extends AdminServlet { Object impl = null; JobPlugin jp = - (JobPlugin) mJobsSched.getPlugins().get(implName); + mJobsSched.getPlugins().get(implName); if (jp != null) impl = getClassByNameAsExtendedPluginInfo(jp.getClassPath()); @@ -288,7 +288,7 @@ public class JobsAdminServlet extends AdminServlet { return; } // is the job plugin id unique? - if (mJobsSched.getPlugins().containsKey((Object) id)) { + if (mJobsSched.getPlugins().containsKey(id)) { sendResponse(ERROR, new EJobsException(CMS.getUserMessage(getLocale(req), "CMS_JOB_SRVLT_ILL_JOB_PLUGIN_ID", id)) .toString(), @@ -384,7 +384,7 @@ public class JobsAdminServlet extends AdminServlet { } // is the job instance id unique? - if (mJobsSched.getInstances().containsKey((Object) id)) { + if (mJobsSched.getInstances().containsKey(id)) { sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_JOB_SRVLT_ILL_JOB_INST_ID"), null, resp); @@ -405,7 +405,7 @@ public class JobsAdminServlet extends AdminServlet { // check if implementation exists. JobPlugin plugin = - (JobPlugin) mJobsSched.getPlugins().get(implname); + mJobsSched.getPlugins().get(implname); if (plugin == null) { sendResponse(ERROR, @@ -541,7 +541,7 @@ public class JobsAdminServlet extends AdminServlet { for (Enumeration<String> e = mJobsSched.getInstances().keys(); e.hasMoreElements();) { String name = e.nextElement(); - IJob value = mJobsSched.getInstances().get((Object) name); + IJob value = mJobsSched.getInstances().get(name); // params.add(name, value.getImplName()); params.put(name, value.getImplName() + VISIBLE + @@ -591,7 +591,7 @@ public class JobsAdminServlet extends AdminServlet { } // then delete this job plugin - mJobsSched.getPlugins().remove((Object) id); + mJobsSched.getPlugins().remove(id); IConfigStore destStore = mConfig.getSubStore(DestDef.DEST_JOBS_ADMIN); @@ -723,7 +723,7 @@ public class JobsAdminServlet extends AdminServlet { return; } - IJob jobInst = (IJob) mJobsSched.getInstances().get(id); + IJob jobInst = mJobsSched.getInstances().get(id); IConfigStore config = jobInst.getConfigStore(); String[] configParams = jobInst.getConfigParams(); NameValuePairs params = new NameValuePairs(); @@ -735,7 +735,7 @@ public class JobsAdminServlet extends AdminServlet { for (int i = 0; i < configParams.length; i++) { String key = configParams[i]; - String val = (String) config.get(key); + String val = config.get(key); if (val != null && !val.equals("")) { params.put(key, val); @@ -774,7 +774,7 @@ public class JobsAdminServlet extends AdminServlet { } // Does the job instance exist? - if (!mJobsSched.getInstances().containsKey((Object) id)) { + if (!mJobsSched.getInstances().containsKey(id)) { sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_JOB_SRVLT_ILL_JOB_INST_ID"), null, resp); @@ -793,7 +793,7 @@ public class JobsAdminServlet extends AdminServlet { // get plugin for implementation JobPlugin plugin = - (JobPlugin) mJobsSched.getPlugins().get(implname); + mJobsSched.getPlugins().get(implname); if (plugin == null) { sendResponse(ERROR, @@ -806,7 +806,7 @@ public class JobsAdminServlet extends AdminServlet { // save old instance substore params in case new one fails. IJob oldinst = - (IJob) mJobsSched.getInstances().get((Object) id); + mJobsSched.getInstances().get(id); IConfigStore oldConfig = oldinst.getConfigStore(); String[] oldConfigParms = oldinst.getConfigParams(); @@ -814,7 +814,7 @@ public class JobsAdminServlet extends AdminServlet { // implName is always required so always include it it. saveParams.put(IJobsScheduler.PROP_PLUGIN, - (String) oldConfig.get(IJobsScheduler.PROP_PLUGIN)); + oldConfig.get(IJobsScheduler.PROP_PLUGIN)); if (oldConfigParms != null) { for (int i = 0; i < oldConfigParms.length; i++) { String key = oldConfigParms[i]; diff --git a/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java index fb73cec98..9600c5e56 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java @@ -342,14 +342,13 @@ public class LogAdminServlet extends AdminServlet { Enumeration<String> e = mSys.getLogInsts().keys(); for (; e.hasMoreElements();) { - String name = (String) e.nextElement(); + String name = e.nextElement(); ILogEventListener value = ((ILogSubsystem) CMS.getSubsystem(CMS.SUBSYSTEM_LOG)).getLogInstance(name); if (value == null) continue; String pName = mSys.getLogPluginName(value); - LogPlugin pClass = (LogPlugin) - mSys.getLogPlugins().get(pName); + LogPlugin pClass = mSys.getLogPlugins().get(pName); String c = pClass.getClassPath(); // not show ntEventlog here @@ -381,7 +380,7 @@ public class LogAdminServlet extends AdminServlet { private NameValuePairs getExtendedPluginInfo(Locale locale, String implType, String implName) { IExtendedPluginInfo ext_info = null; Object impl = null; - LogPlugin lp = (LogPlugin) mSys.getLogPlugins().get(implName); + LogPlugin lp = mSys.getLogPlugins().get(implName); if (lp != null) { impl = getClassByNameAsExtendedPluginInfo(lp.getClassPath()); @@ -460,7 +459,7 @@ public class LogAdminServlet extends AdminServlet { } // is the log id unique? - if (mSys.getLogPlugins().containsKey((Object) id)) { + if (mSys.getLogPlugins().containsKey(id)) { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( @@ -746,7 +745,7 @@ public class LogAdminServlet extends AdminServlet { return; } - if (mSys.getLogInsts().containsKey((Object) id)) { + if (mSys.getLogInsts().containsKey(id)) { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( @@ -788,8 +787,8 @@ public class LogAdminServlet extends AdminServlet { // check if implementation exists. LogPlugin plugin = - (LogPlugin) mSys.getLogPlugins().get( - implname); + mSys.getLogPlugins().get( + implname); if (plugin == null) { // store a message in the signed audit log file @@ -821,7 +820,7 @@ public class LogAdminServlet extends AdminServlet { if (configParams != null) { for (int i = 0; i < configParams.size(); i++) { - String kv = (String) configParams.elementAt(i); + String kv = configParams.elementAt(i); int index = kv.indexOf('='); String val = req.getParameter(kv.substring(0, index)); @@ -1036,9 +1035,8 @@ public class LogAdminServlet extends AdminServlet { Enumeration<String> e = mSys.getLogPlugins().keys(); while (e.hasMoreElements()) { - String name = (String) e.nextElement(); - LogPlugin value = (LogPlugin) - mSys.getLogPlugins().get(name); + String name = e.nextElement(); + LogPlugin value = mSys.getLogPlugins().get(name); // get Description String c = value.getClassPath(); String desc = "unknown"; @@ -1308,7 +1306,7 @@ public class LogAdminServlet extends AdminServlet { // first check if any instances from this log // DON'T remove log if any instance for (Enumeration<String> e = mSys.getLogInsts().keys(); e.hasMoreElements();) { - String name = (String) e.nextElement(); + String name = e.nextElement(); ILogEventListener log = mSys.getLogInstance(name); if (getLogPluginName(log) == id) { @@ -1331,7 +1329,7 @@ public class LogAdminServlet extends AdminServlet { } // then delete this log - mSys.getLogPlugins().remove((Object) id); + mSys.getLogPlugins().remove(id); IConfigStore destStore = mConfig.getSubStore("log"); @@ -1494,7 +1492,7 @@ public class LogAdminServlet extends AdminServlet { } // Does the manager instance exist? - if (!mSys.getLogInsts().containsKey((Object) id)) { + if (!mSys.getLogInsts().containsKey(id)) { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( @@ -1535,7 +1533,7 @@ public class LogAdminServlet extends AdminServlet { } // get plugin for implementation LogPlugin plugin = - (LogPlugin) mSys.getLogPlugins().get(implname); + mSys.getLogPlugins().get(implname); if (plugin == null) { // store a message in the signed audit log file @@ -1559,7 +1557,7 @@ public class LogAdminServlet extends AdminServlet { // save old instance substore params in case new one fails. ILogEventListener oldinst = - (ILogEventListener) mSys.getLogInstance(id); + mSys.getLogInstance(id); Vector<String> oldConfigParms = oldinst.getInstanceParams(); NameValuePairs saveParams = new NameValuePairs(); @@ -1567,7 +1565,7 @@ public class LogAdminServlet extends AdminServlet { saveParams.put("pluginName", implname); if (oldConfigParms != null) { for (int i = 0; i < oldConfigParms.size(); i++) { - String kv = (String) oldConfigParms.elementAt(i); + String kv = oldConfigParms.elementAt(i); int index = kv.indexOf('='); saveParams.put(kv.substring(0, index), @@ -1629,7 +1627,7 @@ public class LogAdminServlet extends AdminServlet { for (int i = 0; i < configParams.size(); i++) { AUTHZ_RES_NAME = "certServer.log.configuration"; - String kv = (String) configParams.elementAt(i); + String kv = configParams.elementAt(i); int index = kv.indexOf('='); String key = kv.substring(0, index); String val = req.getParameter(key); @@ -2209,7 +2207,7 @@ public class LogAdminServlet extends AdminServlet { params.put(Constants.PR_LOG_IMPL_NAME, ""); if (configParams != null) { for (int i = 0; i < configParams.size(); i++) { - String kv = (String) configParams.elementAt(i); + String kv = configParams.elementAt(i); int index = kv.indexOf('='); if (index == -1) { @@ -2246,8 +2244,7 @@ public class LogAdminServlet extends AdminServlet { return; } - ILogEventListener logInst = (ILogEventListener) - mSys.getLogInstance(id); + ILogEventListener logInst = mSys.getLogInstance(id); Vector<String> configParams = logInst.getInstanceParams(); NameValuePairs params = new NameValuePairs(); @@ -2256,7 +2253,7 @@ public class LogAdminServlet extends AdminServlet { // implName is always required so always send it. if (configParams != null) { for (int i = 0; i < configParams.size(); i++) { - String kv = (String) configParams.elementAt(i); + String kv = configParams.elementAt(i); int index = kv.indexOf('='); params.put(kv.substring(0, index), diff --git a/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java index 4149fae94..a7c2c6c50 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java @@ -493,7 +493,7 @@ public class OCSPAdminServlet extends AdminServlet { Enumeration<String> enum1 = req.getParameterNames(); while (enum1.hasMoreElements()) { - String key = (String) enum1.nextElement(); + String key = enum1.nextElement(); String value = req.getParameter(key); if (key.equals(Constants.PR_DEFAULT_ALGORITHM)) { diff --git a/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java index 3ca222135..19677e748 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java @@ -384,7 +384,7 @@ public class ProfileAdminServlet extends AdminServlet { NameValuePairs nvp = new NameValuePairs(); while (impls.hasMoreElements()) { - String id = (String) impls.nextElement(); + String id = impls.nextElement(); IPluginInfo info = mRegistry.getPluginInfo("profile", id); nvp.put(id, info.getClassName() + "," + @@ -1057,7 +1057,7 @@ public class ProfileAdminServlet extends AdminServlet { Enumeration<String> names = req.getParameterNames(); while (names.hasMoreElements()) { - String name = (String) names.nextElement(); + String name = names.nextElement(); if (name.equals("OP_SCOPE")) continue; @@ -1206,7 +1206,7 @@ public class ProfileAdminServlet extends AdminServlet { Enumeration<String> names = req.getParameterNames(); while (names.hasMoreElements()) { - String name = (String) names.nextElement(); + String name = names.nextElement(); if (name.equals("OP_SCOPE")) continue; @@ -1481,7 +1481,7 @@ public class ProfileAdminServlet extends AdminServlet { Enumeration<String> names = req.getParameterNames(); while (names.hasMoreElements()) { - String name = (String) names.nextElement(); + String name = names.nextElement(); if (name.equals("OP_SCOPE")) continue; @@ -1610,7 +1610,7 @@ public class ProfileAdminServlet extends AdminServlet { Enumeration<String> names = req.getParameterNames(); while (names.hasMoreElements()) { - String name = (String) names.nextElement(); + String name = names.nextElement(); if (name.equals("OP_SCOPE")) continue; @@ -1730,7 +1730,7 @@ public class ProfileAdminServlet extends AdminServlet { Enumeration<String> names = req.getParameterNames(); while (names.hasMoreElements()) { - String name = (String) names.nextElement(); + String name = names.nextElement(); if (name.equals("OP_SCOPE")) continue; @@ -1855,7 +1855,7 @@ public class ProfileAdminServlet extends AdminServlet { CMS.debug("ProfileAdminServlet: modifyPolicyConstraintConfig policy " + policy + " con " + con); while (names.hasMoreElements()) { - String name = (String) names.nextElement(); + String name = names.nextElement(); if (name.equals("OP_SCOPE")) continue; @@ -2056,11 +2056,11 @@ public class ProfileAdminServlet extends AdminServlet { return; } while (setIds.hasMoreElements()) { - String setId = (String) setIds.nextElement(); + String setId = setIds.nextElement(); Enumeration<ProfilePolicy> policies = profile.getProfilePolicies(setId); while (policies.hasMoreElements()) { - IProfilePolicy policy = (IProfilePolicy) policies.nextElement(); + IProfilePolicy policy = policies.nextElement(); IPolicyDefault def = policy.getDefault(); IPolicyConstraint con = policy.getConstraint(); @@ -2091,7 +2091,7 @@ public class ProfileAdminServlet extends AdminServlet { Enumeration<String> outputs = profile.getProfileOutputIds(); while (outputs.hasMoreElements()) { - String outputId = (String) outputs.nextElement(); + String outputId = outputs.nextElement(); IProfileOutput output = profile.getProfileOutput(outputId); nvp.put(outputId, output.getName(getLocale(req))); @@ -2118,7 +2118,7 @@ public class ProfileAdminServlet extends AdminServlet { Enumeration<String> inputs = profile.getProfileInputIds(); while (inputs.hasMoreElements()) { - String inputId = (String) inputs.nextElement(); + String inputId = inputs.nextElement(); IProfileInput input = profile.getProfileInput(inputId); nvp.put(inputId, input.getName(getLocale(req))); diff --git a/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java index 8daadbce0..adbdc8279 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java @@ -345,7 +345,7 @@ public class PublisherAdminServlet extends AdminServlet { StringBuffer publish = new StringBuffer(); for (; publishers.hasMoreElements();) { - String name = (String) publishers.nextElement(); + String name = publishers.nextElement(); publish.append(","); publish.append(name); @@ -379,14 +379,14 @@ public class PublisherAdminServlet extends AdminServlet { impl = getExtendedPluginInfo(p_processor); } else if (implType.equals(Constants.PR_EXT_PLUGIN_IMPLTYPE_MAPPER)) { IPublisherProcessor p_processor = mProcessor; - Plugin plugin = (Plugin) p_processor.getMapperPlugins().get(implName + Plugin plugin = p_processor.getMapperPlugins().get(implName ); impl = getClassByNameAsExtendedPluginInfo(plugin.getClassPath()); } else if (implType.equals(Constants.PR_EXT_PLUGIN_IMPLTYPE_PUBLISHER)) { IPublisherProcessor p_processor = mProcessor; - Plugin plugin = (Plugin) p_processor.getPublisherPlugins().get(implName); + Plugin plugin = p_processor.getPublisherPlugins().get(implName); impl = getClassByNameAsExtendedPluginInfo(plugin.getClassPath()); } @@ -1018,7 +1018,7 @@ public class PublisherAdminServlet extends AdminServlet { } // is the manager id unique? - if (mProcessor.getMapperPlugins().containsKey((Object) id)) { + if (mProcessor.getMapperPlugins().containsKey(id)) { sendResponse(ERROR, new ELdapException(CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_PLUGIN_ID", id)) .toString(), @@ -1119,7 +1119,7 @@ public class PublisherAdminServlet extends AdminServlet { return; } - if (mProcessor.getMapperInsts().containsKey((Object) id)) { + if (mProcessor.getMapperInsts().containsKey(id)) { sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_INST_ID", id), null, resp); return; @@ -1136,8 +1136,8 @@ public class PublisherAdminServlet extends AdminServlet { // check if implementation exists. MapperPlugin plugin = - (MapperPlugin) mProcessor.getMapperPlugins().get( - implname); + mProcessor.getMapperPlugins().get( + implname); if (plugin == null) { sendResponse( @@ -1156,7 +1156,7 @@ public class PublisherAdminServlet extends AdminServlet { if (configParams != null) { for (int i = 0; i < configParams.size(); i++) { - String kv = (String) configParams.elementAt(i); + String kv = configParams.elementAt(i); int index = kv.indexOf('='); String val = req.getParameter(kv.substring(0, index)); @@ -1248,8 +1248,7 @@ public class PublisherAdminServlet extends AdminServlet { while (e.hasMoreElements()) { String name = e.nextElement(); - MapperPlugin value = (MapperPlugin) - mProcessor.getMapperPlugins().get(name); + MapperPlugin value = mProcessor.getMapperPlugins().get(name); // get Description String c = value.getClassPath(); String desc = "unknown"; @@ -1372,7 +1371,7 @@ public class PublisherAdminServlet extends AdminServlet { // first check if any instances from this mapper // DON'T remove mapper if any instance for (Enumeration<String> e = mProcessor.getMapperInsts().keys(); e.hasMoreElements();) { - String name = (String) e.nextElement(); + String name = e.nextElement(); ILdapMapper mapper = mProcessor.getMapperInstance(name); if (id.equals(getMapperPluginName(mapper))) { @@ -1382,7 +1381,7 @@ public class PublisherAdminServlet extends AdminServlet { } // then delete this mapper - mProcessor.getMapperPlugins().remove((Object) id); + mProcessor.getMapperPlugins().remove(id); IConfigStore destStore = mConfig.getSubStore( @@ -1459,8 +1458,7 @@ public class PublisherAdminServlet extends AdminServlet { return; } - ILdapMapper mapperInst = (ILdapMapper) - mProcessor.getMapperInstance(id); + ILdapMapper mapperInst = mProcessor.getMapperInstance(id); Vector<String> configParams = mapperInst.getInstanceParams(); NameValuePairs params = new NameValuePairs(); @@ -1496,7 +1494,7 @@ public class PublisherAdminServlet extends AdminServlet { } // Does the manager instance exist? - if (!mProcessor.getMapperInsts().containsKey((Object) id)) { + if (!mProcessor.getMapperInsts().containsKey(id)) { sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_INST_ID", id), null, resp); return; @@ -1511,7 +1509,7 @@ public class PublisherAdminServlet extends AdminServlet { } // get plugin for implementation MapperPlugin plugin = - (MapperPlugin) mProcessor.getMapperPlugins().get(implname); + mProcessor.getMapperPlugins().get(implname); if (plugin == null) { sendResponse( @@ -1525,7 +1523,7 @@ public class PublisherAdminServlet extends AdminServlet { // save old instance substore params in case new one fails. ILdapMapper oldinst = - (ILdapMapper) mProcessor.getMapperInstance(id); + mProcessor.getMapperInstance(id); Vector<String> oldConfigParms = oldinst.getInstanceParams(); NameValuePairs saveParams = new NameValuePairs(); @@ -1659,7 +1657,7 @@ public class PublisherAdminServlet extends AdminServlet { } // is the rule id unique? - if (mProcessor.getRulePlugins().containsKey((Object) id)) { + if (mProcessor.getRulePlugins().containsKey(id)) { sendResponse( ERROR, new ELdapException(CMS.getUserMessage("CMS_LDAP_SRVLT_ILL_PLUGIN_ID", id)).toString(getLocale(req)), @@ -1750,7 +1748,7 @@ public class PublisherAdminServlet extends AdminServlet { return; } - if (mProcessor.getRuleInsts().containsKey((Object) id)) { + if (mProcessor.getRuleInsts().containsKey(id)) { sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_INST_ID", id), null, resp); return; @@ -1767,8 +1765,7 @@ public class PublisherAdminServlet extends AdminServlet { // check if implementation exists. RulePlugin plugin = - (RulePlugin) mProcessor.getRulePlugins().get( - implname); + mProcessor.getRulePlugins().get(implname); if (plugin == null) { sendResponse( @@ -1884,8 +1881,7 @@ public class PublisherAdminServlet extends AdminServlet { while (e.hasMoreElements()) { String name = e.nextElement(); - RulePlugin value = (RulePlugin) - mProcessor.getRulePlugins().get(name); + RulePlugin value = mProcessor.getRulePlugins().get(name); // get Description String c = value.getClassPath(); String desc = "unknown"; @@ -1911,8 +1907,7 @@ public class PublisherAdminServlet extends AdminServlet { for (; e.hasMoreElements();) { String name = e.nextElement(); - ILdapRule value = (ILdapRule) - mProcessor.getRuleInsts().get((Object) name); + ILdapRule value = mProcessor.getRuleInsts().get(name); String enabled = value.enabled() ? "enabled" : "disabled"; params.put(name, value.getInstanceName() + ";visible;" + enabled); @@ -1966,7 +1961,7 @@ public class PublisherAdminServlet extends AdminServlet { } // then delete this rule - mProcessor.getRulePlugins().remove((Object) id); + mProcessor.getRulePlugins().remove(id); IConfigStore destStore = mConfig.getSubStore( @@ -2058,7 +2053,7 @@ public class PublisherAdminServlet extends AdminServlet { params.put(Constants.PR_RULE_IMPL_NAME, ""); if (configParams != null) { for (int i = 0; i < configParams.size(); i++) { - String kv = (String) configParams.elementAt(i); + String kv = configParams.elementAt(i); int index = kv.indexOf('='); params.put(kv.substring(0, index), @@ -2090,8 +2085,7 @@ public class PublisherAdminServlet extends AdminServlet { return; } - ILdapRule ruleInst = (ILdapRule) - mProcessor.getRuleInsts().get(id); + ILdapRule ruleInst = mProcessor.getRuleInsts().get(id); Vector<String> configParams = ruleInst.getInstanceParams(); NameValuePairs params = new NameValuePairs(); @@ -2100,7 +2094,7 @@ public class PublisherAdminServlet extends AdminServlet { // implName is always required so always send it. if (configParams != null) { for (int i = 0; i < configParams.size(); i++) { - String kv = (String) configParams.elementAt(i); + String kv = configParams.elementAt(i); int index = kv.indexOf('='); params.put(kv.substring(0, index), @@ -2126,7 +2120,7 @@ public class PublisherAdminServlet extends AdminServlet { } // Does the manager instance exist? - if (!mProcessor.getRuleInsts().containsKey((Object) id)) { + if (!mProcessor.getRuleInsts().containsKey(id)) { sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_INST_ID", id), null, resp); return; @@ -2142,7 +2136,7 @@ public class PublisherAdminServlet extends AdminServlet { // get plugin for implementation RulePlugin plugin = - (RulePlugin) mProcessor.getRulePlugins().get(implname); + mProcessor.getRulePlugins().get(implname); if (plugin == null) { sendResponse(ERROR, @@ -2155,7 +2149,7 @@ public class PublisherAdminServlet extends AdminServlet { // save old instance substore params in case new one fails. ILdapRule oldinst = - (ILdapRule) mProcessor.getRuleInsts().get((Object) id); + mProcessor.getRuleInsts().get(id); Vector<String> oldConfigParms = oldinst.getInstanceParams(); NameValuePairs saveParams = new NameValuePairs(); @@ -2293,7 +2287,7 @@ public class PublisherAdminServlet extends AdminServlet { } // is the manager id unique? - if (mProcessor.getPublisherPlugins().containsKey((Object) id)) { + if (mProcessor.getPublisherPlugins().containsKey(id)) { sendResponse(ERROR, new ELdapException(CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_PLUGIN_ID", id)) .toString(), @@ -2386,7 +2380,7 @@ public class PublisherAdminServlet extends AdminServlet { return; } - if (mProcessor.getPublisherInsts().containsKey((Object) id)) { + if (mProcessor.getPublisherInsts().containsKey(id)) { sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_INST_ID", id), null, resp); return; @@ -2403,8 +2397,7 @@ public class PublisherAdminServlet extends AdminServlet { // check if implementation exists. PublisherPlugin plugin = - (PublisherPlugin) mProcessor.getPublisherPlugins().get( - implname); + mProcessor.getPublisherPlugins().get(implname); if (plugin == null) { sendResponse( @@ -2530,8 +2523,7 @@ public class PublisherAdminServlet extends AdminServlet { while (e.hasMoreElements()) { String name = e.nextElement(); - PublisherPlugin value = (PublisherPlugin) - mProcessor.getPublisherPlugins().get(name); + PublisherPlugin value = mProcessor.getPublisherPlugins().get(name); // get Description String c = value.getClassPath(); String desc = "unknown"; @@ -2617,7 +2609,7 @@ public class PublisherAdminServlet extends AdminServlet { } // then delete this publisher - mProcessor.getPublisherPlugins().remove((Object) id); + mProcessor.getPublisherPlugins().remove(id); IConfigStore destStore = mConfig.getSubStore(mAuth.getId() + ".publish.publisher"); @@ -2719,7 +2711,7 @@ public class PublisherAdminServlet extends AdminServlet { params.put(Constants.PR_PUBLISHER_IMPL_NAME, ""); if (configParams != null) { for (int i = 0; i < configParams.size(); i++) { - String kv = (String) configParams.elementAt(i); + String kv = configParams.elementAt(i); int index = kv.indexOf('='); if (index == -1) { @@ -2757,8 +2749,7 @@ public class PublisherAdminServlet extends AdminServlet { return; } - ILdapPublisher publisherInst = (ILdapPublisher) - mProcessor.getPublisherInstance(id); + ILdapPublisher publisherInst = mProcessor.getPublisherInstance(id); Vector<String> configParams = publisherInst.getInstanceParams(); NameValuePairs params = new NameValuePairs(); @@ -2767,7 +2758,7 @@ public class PublisherAdminServlet extends AdminServlet { // implName is always required so always send it. if (configParams != null) { for (int i = 0; i < configParams.size(); i++) { - String kv = (String) configParams.elementAt(i); + String kv = configParams.elementAt(i); int index = kv.indexOf('='); params.put(kv.substring(0, index), @@ -2804,7 +2795,7 @@ public class PublisherAdminServlet extends AdminServlet { } // Does the manager instance exist? - if (!mProcessor.getPublisherInsts().containsKey((Object) id)) { + if (!mProcessor.getPublisherInsts().containsKey(id)) { sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_INST_ID", id), null, resp); return; @@ -2820,7 +2811,7 @@ public class PublisherAdminServlet extends AdminServlet { // get plugin for implementation PublisherPlugin plugin = - (PublisherPlugin) mProcessor.getPublisherPlugins().get(implname); + mProcessor.getPublisherPlugins().get(implname); if (plugin == null) { sendResponse( @@ -2842,7 +2833,7 @@ public class PublisherAdminServlet extends AdminServlet { saveParams.put("pluginName", implname); if (oldConfigParms != null) { for (int i = 0; i < oldConfigParms.size(); i++) { - String kv = (String) oldConfigParms.elementAt(i); + String kv = oldConfigParms.elementAt(i); int index = kv.indexOf('='); if (index > -1) { if (kv.substring(0, index).equalsIgnoreCase("caObjectClass")) { @@ -2885,7 +2876,7 @@ public class PublisherAdminServlet extends AdminServlet { substore.put("pluginName", implname); if (configParams != null) { for (int i = 0; i < configParams.size(); i++) { - String kv = (String) configParams.elementAt(i); + String kv = configParams.elementAt(i); int index = kv.indexOf('='); String key = kv.substring(0, index); String val = req.getParameter(key); @@ -2995,7 +2986,7 @@ public class PublisherAdminServlet extends AdminServlet { extras.add(list1[i].trim()); } - return (String[]) extras.toArray(new String[extras.size()]); + return extras.toArray(new String[extras.size()]); } // convenience function - takes list1, list2. Concatenates the two @@ -3018,7 +3009,7 @@ public class PublisherAdminServlet extends AdminServlet { sum.add(list2[i].trim()); } - return (String[]) sum.toArray(new String[sum.size()]); + return sum.toArray(new String[sum.size()]); } // convenience funtion. Takes a string array and delimiter diff --git a/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java index 4f5afbb20..487fd9f2e 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java @@ -277,7 +277,7 @@ public class RegistryAdminServlet extends AdminServlet { Enumeration<String> impls = mRegistry.getIds("constraintPolicy"); while (impls.hasMoreElements()) { - String constraintID = (String) impls.nextElement(); + String constraintID = impls.nextElement(); IPluginInfo constraintInfo = mRegistry.getPluginInfo( "constraintPolicy", constraintID); IPolicyConstraint policyConstraintClass = (IPolicyConstraint) diff --git a/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java index 90dc92221..2cd337123 100644 --- a/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java +++ b/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java @@ -506,7 +506,7 @@ public class UsrGrpAdminServlet extends AdminServlet { } X509Certificate[] certs = - (X509Certificate[]) user.getX509Certificates(); + user.getX509Certificates(); if (certs != null) { for (int i = 0; i < certs.length; i++) { @@ -1548,7 +1548,7 @@ public class UsrGrpAdminServlet extends AdminServlet { } while (e.hasMoreElements()) { - IGroup group = (IGroup) e.nextElement(); + IGroup group = e.nextElement(); if (group.isMember(id) == true) { if (mustDelete) { @@ -1697,9 +1697,9 @@ public class UsrGrpAdminServlet extends AdminServlet { Constants.PR_GROUP_DESC); if (desc != null) { - group.set("description", (Object) desc); + group.set("description", desc); } else { - group.set("description", (Object) ""); + group.set("description", ""); } if (members != null) { @@ -1941,7 +1941,7 @@ public class UsrGrpAdminServlet extends AdminServlet { Constants.PR_GROUP_DESC); if (desc != null) { - group.set("description", (Object) desc); + group.set("description", desc); } String members = super.getParameter(req, Constants.PR_GROUP_USER); diff --git a/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java b/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java index f1de3ce4a..97573d877 100644 --- a/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java +++ b/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java @@ -329,7 +329,7 @@ public abstract class CMSServlet extends HttpServlet { Enumeration<CMSLoadTemplate> templs = mTemplates.elements(); while (templs.hasMoreElements()) { - CMSLoadTemplate templ = (CMSLoadTemplate) templs.nextElement(); + CMSLoadTemplate templ = templs.nextElement(); if (templ == null || templ.mPropName == null) { continue; @@ -495,16 +495,16 @@ public abstract class CMSServlet extends HttpServlet { CMS.debug(CMS.DEBUG_INFORM, "CMSServlet: curDate=" + endDate + " id=" + mId + " time=" + (endTime - startTime)); } - iCommandQueue.unRegisterProccess((Object) cmsRequest, (Object) this); + iCommandQueue.unRegisterProccess(cmsRequest, this); } catch (EBaseException e) { - iCommandQueue.unRegisterProccess((Object) cmsRequest, (Object) this); + iCommandQueue.unRegisterProccess(cmsRequest, this); // ByteArrayOutputStream os = new ByteArrayOutputStream(); for debugging only // PrintStream ps = new PrintStream(os); //e.printStackTrace(ps); log(e.toString()); renderException(cmsRequest, e); } catch (Exception ex) { - iCommandQueue.unRegisterProccess((Object) cmsRequest, (Object) this); + iCommandQueue.unRegisterProccess(cmsRequest, this); ByteArrayOutputStream os = new ByteArrayOutputStream(); PrintStream ps = new PrintStream(os); @@ -554,7 +554,7 @@ public abstract class CMSServlet extends HttpServlet { return; Integer status = cmsReq.getStatus(); - CMSLoadTemplate ltempl = (CMSLoadTemplate) mTemplates.get(status); + CMSLoadTemplate ltempl = mTemplates.get(status); if (ltempl == null || ltempl.mTemplateName == null) { // result is previously outputed. @@ -575,7 +575,7 @@ public abstract class CMSServlet extends HttpServlet { if (argBlock != null) { Enumeration<String> names = argBlock.getElements(); while (names.hasMoreElements()) { - String name = (String) names.nextElement(); + String name = names.nextElement(); String val = argBlock.get(name).toString(); val = val.trim(); xmlObj.addItemToContainer(argBlockContainer, name, val); @@ -596,7 +596,7 @@ public abstract class CMSServlet extends HttpServlet { Node recordsNode = xmlObj.createContainer(root, "records"); if (records != null) { while (records.hasMoreElements()) { - IArgBlock record = (IArgBlock) records.nextElement(); + IArgBlock record = records.nextElement(); outputArgBlockAsXML(xmlObj, recordsNode, "record", record); } } @@ -697,7 +697,7 @@ public abstract class CMSServlet extends HttpServlet { try { Locale[] locale = new Locale[1]; CMSLoadTemplate loadTempl = - (CMSLoadTemplate) mTemplates.get(CMSRequest.EXCEPTION); + mTemplates.get(CMSRequest.EXCEPTION); CMSTemplate template = getTemplate(loadTempl.mTemplateName, cmsReq.getHttpReq(), locale); ICMSTemplateFiller filler = loadTempl.mFiller; diff --git a/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java b/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java index 4d7ff24f5..c34840588 100644 --- a/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java +++ b/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java @@ -205,7 +205,7 @@ class ProxyWrapper extends HttpServletRequestWrapper { String[] values = me.getValue(); String newname = null; if (name != null) { - newname = (String) mMap.get(name); + newname = mMap.get(name); } // No mapping specified, just use existing name/value @@ -217,7 +217,7 @@ class ProxyWrapper extends HttpServletRequestWrapper { if (o == null) { n.put(newname, values); } else { - String newvalues[] = (String[]) mValueMap.get(newname); + String newvalues[] = mValueMap.get(newname); n.put(newname, newvalues); } } 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<ICertRecord> 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<ICertRecord> 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<ICertRecord> 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<ICertRecord> 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<String> 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<String> 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 + "<MessageType>" + mt + "</MessageType>"; - PKCS10 p10 = (PKCS10) req.getP10(); + PKCS10 p10 = req.getP10(); X500Name p10subject = p10.getSubjectName(); responseData = responseData + "<SubjectName>" + p10subject.toString() + "</SubjectName>"; @@ -689,7 +689,7 @@ public class CRSEnrollment extends HttpServlet { Enumeration<PKCS10Attribute> 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<PKCS10Attribute> 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<GeneralNameInterface> 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<String> 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 { diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java b/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java index a8d753e7c..e0716cb70 100644 --- a/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java +++ b/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java @@ -94,7 +94,7 @@ public class CMSFileLoader { // Change end String absPath = file.getAbsolutePath(); long modified = file.lastModified(); - CMSFile cmsFile = (CMSFile) mLoadedFiles.get(absPath); + CMSFile cmsFile = mLoadedFiles.get(absPath); long lastModified = (cmsFile == null ? 0 : cmsFile.getLastModified()); // new file. diff --git a/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java b/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java index 055a025b2..6d51c8d4c 100644 --- a/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java +++ b/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java @@ -155,7 +155,7 @@ public class CMSTemplate extends CMSFile { Enumeration<String> e = null; Enumeration<IArgBlock> q = null; IArgBlock r = null; - CMSTemplateParams data = (CMSTemplateParams) input; + CMSTemplateParams data = input; HTTPOutputStreamWriter http_out = null; if (mCharset == null) diff --git a/base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java index 60b79a81e..83a2d8cf0 100644 --- a/base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java +++ b/base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java @@ -19,7 +19,6 @@ package com.netscape.cms.servlet.common; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.OutputStream; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Date; @@ -226,7 +225,7 @@ public class GenPendingTemplateFiller implements ICMSTemplateFiller { ByteArrayOutputStream ostream = new ByteArrayOutputStream(); - rb.encode((OutputStream) ostream); + rb.encode(ostream); digest = SHADigest.digest(ostream.toByteArray()); } catch (NoSuchAlgorithmException ex) { //log("digest fail"); @@ -259,7 +258,7 @@ public class GenPendingTemplateFiller implements ICMSTemplateFiller { ByteArrayOutputStream ostream = new ByteArrayOutputStream(); - fullResponse.encode((OutputStream) ostream); + fullResponse.encode(ostream); byte[] fr = ostream.toByteArray(); fixed.set(FULL_RESPONSE, CMS.BtoA(fr)); diff --git a/base/common/src/com/netscape/cms/servlet/common/ServletUtils.java b/base/common/src/com/netscape/cms/servlet/common/ServletUtils.java index 1d19a0b17..856679e3a 100644 --- a/base/common/src/com/netscape/cms/servlet/common/ServletUtils.java +++ b/base/common/src/com/netscape/cms/servlet/common/ServletUtils.java @@ -98,7 +98,7 @@ public class ServletUtils { StringTokenizer tokenizer = new StringTokenizer(aclInfo, "#"); while (tokenizer.hasMoreTokens()) { - String acl = (String) tokenizer.nextToken(); + String acl = tokenizer.nextToken(); authz.authzMgrAccessInit(aclMethod, acl); } diff --git a/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java b/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java index 467cc1cf4..7a2c64d33 100644 --- a/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java +++ b/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java @@ -185,7 +185,7 @@ public class CloneServlet extends CMSServlet { // cfu maybe don't need CCA_Id, because the above check // was good enough CCAUserId = token.getInString("userid"); - CCA_Id = (String) peerCert.getSubjectDN().toString(); + CCA_Id = peerCert.getSubjectDN().toString(); } catch (EInvalidCredentials e) { // already logged. resp.sendError(HttpServletResponse.SC_UNAUTHORIZED); diff --git a/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java b/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java index c566753b6..e8b8f12f8 100644 --- a/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java +++ b/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java @@ -131,8 +131,8 @@ public class ConnectorServlet extends CMSServlet { throw new IOException( "CMS server is not ready to serve."); - HttpServletRequest req = (HttpServletRequest) request; - HttpServletResponse resp = (HttpServletResponse) response; + HttpServletRequest req = request; + HttpServletResponse resp = response; CMSRequest cmsRequest = newCMSRequest(); @@ -215,7 +215,7 @@ public class ConnectorServlet extends CMSServlet { try { token = authenticate(request); raUserId = token.getInString("userid"); - RA_Id = (String) peerCert.getSubjectDN().toString(); + RA_Id = peerCert.getSubjectDN().toString(); } catch (EInvalidCredentials e) { // already logged. resp.sendError(HttpServletResponse.SC_UNAUTHORIZED); diff --git a/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java b/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java index 0f79d6394..860cc68f8 100644 --- a/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java +++ b/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java @@ -101,7 +101,7 @@ public class TokenKeyRecoveryServlet extends CMSServlet { ByteArrayOutputStream out = new ByteArrayOutputStream(s.length()); for (int i = 0; i < s.length(); i++) { - int c = (int) s.charAt(i); + int c = s.charAt(i); if (c == '+') { out.write(' '); diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java index a3d933993..cc9d5f35a 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java @@ -175,7 +175,7 @@ public class AdminPanel extends WizardPanelBase { context.put("admin_pwd_again", ""); context.put("admin_uid", ADMIN_UID); } - ISubsystem ca = (ISubsystem) CMS.getSubsystem("ca"); + ISubsystem ca = CMS.getSubsystem("ca"); if (ca == null) { context.put("ca", "false"); @@ -260,7 +260,7 @@ public class AdminPanel extends WizardPanelBase { } catch (Exception e) { } - ISubsystem ca = (ISubsystem) CMS.getSubsystem("ca"); + ISubsystem ca = CMS.getSubsystem("ca"); if (ca == null) { context.put("ca", "false"); @@ -606,7 +606,7 @@ public class AdminPanel extends WizardPanelBase { // update the locally created request for renewal CertUtil.updateLocalRequest(cs, CERT_TAG, cert_request, cert_request_type, subject); - ISubsystem ca = (ISubsystem) CMS.getSubsystem("ca"); + ISubsystem ca = CMS.getSubsystem("ca"); if (ca != null) { createPKCS7(impl); } @@ -627,7 +627,7 @@ public class AdminPanel extends WizardPanelBase { context.put("title", "Administrator"); context.put("panel", "admin/console/config/adminpanel.vm"); - ISubsystem ca = (ISubsystem) CMS.getSubsystem("ca"); + ISubsystem ca = CMS.getSubsystem("ca"); IConfigStore cs = CMS.getConfigStore(); String type = ""; String info = ""; diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java index 20ddf9f2d..634be8748 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java @@ -502,7 +502,7 @@ public class CertRequestPanel extends WizardPanelBase { } while (c.hasMoreElements()) { - Cert cert = (Cert) c.nextElement(); + Cert cert = c.nextElement(); String certTag = cert.getCertTag(); String subsystem = cert.getSubsystem(); boolean enable = config.getBoolean(PCERT_PREFIX + certTag + ".enable", true); diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java b/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java index 71703c888..e3068d7b3 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java @@ -350,7 +350,7 @@ public class CertUtil { } ca = (ICertificateAuthority) CMS.getSubsystem( ICertificateAuthority.ID); - cr = (ICertificateRepository) ca.getCertificateRepository(); + cr = ca.getCertificateRepository(); BigInteger serialNo = cr.getNextSerialNumber(); if (type.equals("selfsign")) { CMS.debug("Creating local certificate... issuerdn=" + dn); @@ -466,7 +466,7 @@ public class CertUtil { } meta.set(ICertRecord.META_PROFILE_ID, profileId); - record = (ICertRecord) cr.createCertRecord( + record = cr.createCertRecord( cert.getSerialNumber(), cert, meta); } catch (Exception e) { CMS.debug( diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java index a12bb164f..7019d1492 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java @@ -113,7 +113,7 @@ public class ImportAdminCertPanel extends WizardPanelBase { context.put("caType", type); - ISubsystem ca = (ISubsystem) CMS.getSubsystem("ca"); + ISubsystem ca = CMS.getSubsystem("ca"); if (ca == null) { context.put("ca", "false"); diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java index d0ccb58e9..bc4af9828 100755 --- a/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java @@ -93,7 +93,7 @@ public class ImportCAChainPanel extends WizardPanelBase { context.put("errorString", "Error loading values for Import CA Certificate Panel"); } - ISubsystem ca = (ISubsystem) CMS.getSubsystem("ca"); + ISubsystem ca = CMS.getSubsystem("ca"); if (ca == null) { context.put("ca", "false"); diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java b/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java index 2f6238304..4ea150ea2 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java @@ -164,13 +164,13 @@ public class RegisterUser extends CMSServlet { X509CertImpl cert = null; bCert = Utils.base64decode(certsString); cert = new X509CertImpl(bCert); - certs[0] = (X509Certificate) cert; + certs[0] = cert; // test to see if the cert already belongs to a user ICertUserLocator cul = ugsys.getCertUserLocator(); com.netscape.certsrv.usrgrp.Certificates c = new com.netscape.certsrv.usrgrp.Certificates(certs); - user = (IUser) cul.locateUser(c); + user = cul.locateUser(c); } catch (Exception ec) { CMS.debug("RegisterUser: exception thrown: " + ec.toString()); } diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java index 5dd05b2cd..fe6507f37 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java @@ -429,7 +429,7 @@ public class UpdateDomainXML extends CMSServlet { int len = nodeList.getLength(); for (int i = 0; i < len; i++) { - Node nn = (Node) nodeList.item(i); + Node nn = nodeList.item(i); Vector<String> v_name = parser.getValuesFromContainer(nn, "SubsystemName"); Vector<String> v_host = parser.getValuesFromContainer(nn, "Host"); Vector<String> v_adminport = parser.getValuesFromContainer(nn, "SecureAdminPort"); diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java b/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java index 55f7171ef..276b76d4e 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java @@ -1052,7 +1052,7 @@ public class WizardPanelBase implements IWizardPanel { for (int i = 0; i < len; i++) { Vector<String> v_clone = parser.getValuesFromContainer(nodeList.item(i), "Clone"); - String clone = (String) v_clone.elementAt(0); + String clone = v_clone.elementAt(0); if (clone.equalsIgnoreCase("true")) continue; Vector<String> v_name = parser.getValuesFromContainer(nodeList.item(i), diff --git a/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java b/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java index aa51ec35f..3b5567bdb 100644 --- a/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java +++ b/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java @@ -177,7 +177,7 @@ public class ConfirmRecoverBySerial extends CMSServlet { header.addStringValue(OUT_SERVICE_URL, req.getRequestURI()); - IKeyRecord rec = (IKeyRecord) mKeyDB.readKeyRecord(seq); + IKeyRecord rec = mKeyDB.readKeyRecord(seq); KeyRecordParser.fillRecordIntoArg(rec, header); } catch (EBaseException e) { diff --git a/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java b/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java index e414dde9a..9c7454ec9 100644 --- a/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java +++ b/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java @@ -184,7 +184,7 @@ public class DisplayBySerial extends CMSServlet { req.getParameter(OUT_OP)); header.addStringValue(OUT_SERVICE_URL, req.getRequestURI()); - IKeyRecord rec = (IKeyRecord) mKeyDB.readKeyRecord(seq); + IKeyRecord rec = mKeyDB.readKeyRecord(seq); KeyRecordParser.fillRecordIntoArg(rec, header); } catch (EBaseException e) { diff --git a/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java b/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java index 9bc1c1b4f..bfe47a957 100644 --- a/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java +++ b/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java @@ -200,7 +200,7 @@ public class DisplayBySerialForRecovery extends CMSServlet { header.addStringValue("publicKeyData", publicKeyData); } - IKeyRecord rec = (IKeyRecord) mKeyDB.readKeyRecord(seq); + IKeyRecord rec = mKeyDB.readKeyRecord(seq); KeyRecordParser.fillRecordIntoArg(rec, header); diff --git a/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java b/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java index 630ef1b14..4ee751f1a 100644 --- a/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java +++ b/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java @@ -231,7 +231,7 @@ public class ExamineRecovery extends CMSServlet { IKeyRepository mKeyDB = ((IKeyRecoveryAuthority) mAuthority).getKeyRepository(); - IKeyRecord rec = (IKeyRecord) mKeyDB.readKeyRecord(new + IKeyRecord rec = mKeyDB.readKeyRecord(new BigInteger(keyID)); KeyRecordParser.fillRecordIntoArg(rec, header); diff --git a/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java b/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java index 9ce331412..554e0e9ef 100644 --- a/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java +++ b/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java @@ -174,13 +174,11 @@ public class PKCS10Processor extends PKIProcessor { PKCS10Attributes p10Attrs = p10.getAttributes(); if (p10Attrs != null) { - PKCS10Attribute p10Attr = (PKCS10Attribute) - (p10Attrs.getAttribute(CertificateExtensions.NAME)); + PKCS10Attribute p10Attr = p10Attrs.getAttribute(CertificateExtensions.NAME); if (p10Attr != null && p10Attr.getAttributeId().equals( PKCS9Attribute.EXTENSION_REQUEST_OID)) { - Extensions exts0 = (Extensions) - (p10Attr.getAttributeValue()); + Extensions exts0 = (Extensions) p10Attr.getAttributeValue(); DerOutputStream extOut = new DerOutputStream(); exts0.encode(extOut); diff --git a/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java b/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java index b3859ad2f..d51494928 100644 --- a/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java +++ b/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java @@ -115,8 +115,7 @@ public class PKIProcessor implements IPKIProcessor { 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, diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java index 9556da8e3..fed0b1ee2 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java @@ -130,7 +130,7 @@ public class ProfileListServlet extends ProfileServlet { if (e != null) { while (e.hasMoreElements()) { - String id = (String) e.nextElement(); + String id = e.nextElement(); IProfile profile = null; try { diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java index a4213e3a1..10013c88c 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java @@ -201,8 +201,7 @@ public class ProfileSelectServlet extends ProfileServlet { if (policyIds != null) { while (policyIds.hasMoreElements()) { String id = policyIds.nextElement(); - IProfilePolicy policy = (IProfilePolicy) - profile.getProfilePolicy(setId, id); + IProfilePolicy policy = profile.getProfilePolicy(setId, id); // (3) query all the profile policies // (4) default plugins convert request parameters into string diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java index 64ab5f82d..7292be519 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java @@ -134,12 +134,12 @@ public class ProfileSubmitServlet extends ProfileServlet { if (inputIds != null) { while (inputIds.hasMoreElements()) { - String inputId = (String) inputIds.nextElement(); + String inputId = inputIds.nextElement(); IProfileInput profileInput = profile.getProfileInput(inputId); Enumeration<String> inputNames = profileInput.getValueNames(); while (inputNames.hasMoreElements()) { - String inputName = (String) inputNames.nextElement(); + String inputName = inputNames.nextElement(); if (request.getParameter(inputName) != null) { // all subject name parameters start with sn_, no other input parameters do if (inputName.matches("^sn_.*")) { @@ -165,12 +165,12 @@ public class ProfileSubmitServlet extends ProfileServlet { if (inputIds != null) { while (inputIds.hasMoreElements()) { - String inputId = (String) inputIds.nextElement(); + String inputId = inputIds.nextElement(); IProfileInput profileInput = profile.getProfileInput(inputId); Enumeration<String> inputNames = profileInput.getValueNames(); while (inputNames.hasMoreElements()) { - String inputName = (String) inputNames.nextElement(); + String inputName = inputNames.nextElement(); String inputValue = ""; CMS.debug("ProfileSubmitServlet: setInputsIntoContext() getting input name= " + inputName); try { @@ -198,7 +198,7 @@ public class ProfileSubmitServlet extends ProfileServlet { if (authIds != null) { CMS.debug("ProfileSubmitServlet:setCredentialsIntoContext() authNames not null"); while (authIds.hasMoreElements()) { - String authName = (String) authIds.nextElement(); + String authName = authIds.nextElement(); CMS.debug("ProfileSubmitServlet:setCredentialsIntoContext() authName:" + authName); @@ -307,7 +307,7 @@ public class ProfileSubmitServlet extends ProfileServlet { if (authNames != null) { while (authNames.hasMoreElements()) { - String authName = (String) authNames.nextElement(); + String authName = authNames.nextElement(); credentials.set(authName, request.getParameter(authName)); } @@ -333,13 +333,13 @@ public class ProfileSubmitServlet extends ProfileServlet { if (inputIds != null) { while (inputIds.hasMoreElements()) { - String inputId = (String) inputIds.nextElement(); + String inputId = inputIds.nextElement(); IProfileInput profileInput = profile.getProfileInput(inputId); Enumeration<String> inputNames = profileInput.getValueNames(); if (inputNames != null) { while (inputNames.hasMoreElements()) { - String inputName = (String) inputNames.nextElement(); + String inputName = inputNames.nextElement(); if (request.getParameter(inputName) != null) { // special characters in subject names parameters must be escaped @@ -367,12 +367,12 @@ public class ProfileSubmitServlet extends ProfileServlet { if (inputIds != null) { while (inputIds.hasMoreElements()) { - String inputId = (String) inputIds.nextElement(); + String inputId = inputIds.nextElement(); IProfileInput profileInput = profile.getProfileInput(inputId); Enumeration<String> inputNames = profileInput.getValueNames(); while (inputNames.hasMoreElements()) { - String inputName = (String) inputNames.nextElement(); + String inputName = inputNames.nextElement(); String inputValue = ""; CMS.debug("ProfileSubmitServlet: setInputsIntoRequest() getting input name= " + inputName); try { @@ -398,7 +398,7 @@ public class ProfileSubmitServlet extends ProfileServlet { if (outputIds != null) { while (outputIds.hasMoreElements()) { - String outputId = (String) outputIds.nextElement(); + String outputId = outputIds.nextElement(); IProfileOutput profileOutput = profile.getProfileOutput(outputId); Enumeration<String> outputNames = profileOutput.getValueNames(); @@ -406,7 +406,7 @@ public class ProfileSubmitServlet extends ProfileServlet { if (outputNames != null) { while (outputNames.hasMoreElements()) { ArgSet outputset = new ArgSet(); - String outputName = (String) outputNames.nextElement(); + String outputName = outputNames.nextElement(); IDescriptor outputDesc = profileOutput.getValueDescriptor(locale, outputName); @@ -560,7 +560,7 @@ public class ProfileSubmitServlet extends ProfileServlet { if ((renewal != null) && (renewal.equalsIgnoreCase("true"))) { CMS.debug("ProfileSubmitServlet: isRenewal true"); isRenewal = true; - request.setAttribute("reqType", (Object) "renewal"); + request.setAttribute("reqType", "renewal"); } else { CMS.debug("ProfileSubmitServlet: isRenewal false"); } @@ -715,7 +715,7 @@ public class ProfileSubmitServlet extends ProfileServlet { outputTemplate(request, response, args); return; } - ICertRecord rec = (ICertRecord) certDB.readCertificateRecord(certSerial); + ICertRecord rec = certDB.readCertificateRecord(certSerial); if (rec == null) { CMS.debug("ProfileSubmitServlet: renewal cert record not found for serial number " + certSerial.toString()); @@ -1486,7 +1486,7 @@ public class ProfileSubmitServlet extends ProfileServlet { reqs[i].getExtDataInCertInfo(IEnrollProfile.REQUEST_CERTINFO); if (certInfo != null) { String subject = ""; - subject = (String) certInfo.get(X509CertInfo.SUBJECT).toString(); + subject = certInfo.get(X509CertInfo.SUBJECT).toString(); xmlObj.addItemToContainer(subnode, "SubjectDN", subject); } else { CMS.debug("ProfileSubmitServlet xmlOutput: no certInfo found in request"); diff --git a/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java b/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java index b2043238b..1733998aa 100644 --- a/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java +++ b/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java @@ -148,7 +148,7 @@ public class CertReqParser extends ReqParser { if (certType != null) { arg.addStringValue(IRequest.CERT_TYPE, certType); } - String presenceServerExt = (String) http_params.get("PresenceServerExtension"); + String presenceServerExt = http_params.get("PresenceServerExtension"); if (presenceServerExt != null) { arg.addStringValue("PresenceServerExtension", presenceServerExt); @@ -616,8 +616,7 @@ public class CertReqParser extends ReqParser { public String getRequestorDN(IRequest request) { try { - X509CertInfo info = (X509CertInfo) - request.getExtDataInCertInfo(IEnrollProfile.REQUEST_CERTINFO); + X509CertInfo info = request.getExtDataInCertInfo(IEnrollProfile.REQUEST_CERTINFO); // retrieve the subject name CertificateSubjectName sn = (CertificateSubjectName) info.get(X509CertInfo.SUBJECT); @@ -688,7 +687,7 @@ public class CertReqParser extends ReqParser { prefix = "header."; while (enum1.hasMoreElements()) { - String name = (String) enum1.nextElement(); + String name = enum1.nextElement(); if (mDetails) { // show all http parameters stored in request. @@ -708,7 +707,7 @@ public class CertReqParser extends ReqParser { String parami = IRequest.HTTP_PARAMS + LB + String.valueOf(counter++) + RB; // hack - String n = (String) elms.nextElement(); + String n = elms.nextElement(); String rawJS = "new Object;\n\r" + prefix + parami + ".name=\"" + CMSTemplate.escapeJavaScriptString(n) + "\";\n\r" + @@ -748,7 +747,7 @@ public class CertReqParser extends ReqParser { String parami = IRequest.AUTH_TOKEN + LB + String.valueOf(counter++) + RB; // hack - String n = (String) elms.nextElement(); + String n = elms.nextElement(); String v = expandValue(prefix + parami + ".value", auth_token.getInString(n)); @@ -833,7 +832,7 @@ public class CertReqParser extends ReqParser { if (crlExtensions != null) { for (int k = 0; k < crlExtensions.size(); k++) { - Extension ext = (Extension) crlExtensions.elementAt(k); + Extension ext = crlExtensions.elementAt(k); if (ext instanceof CRLReasonExtension) { rarg.addStringValue("reason", @@ -874,7 +873,7 @@ public class CertReqParser extends ReqParser { //X509CertImpl oldCert[] = // (X509CertImpl[])req.get(IRequest.OLD_CERTS); Certificate oldCert[] = - (Certificate[]) req.getExtDataInCertArray(IRequest.OLD_CERTS); + req.getExtDataInCertArray(IRequest.OLD_CERTS); if (oldCert != null && oldCert.length > 0) { if (oldCert[0] instanceof X509CertImpl) { @@ -906,7 +905,7 @@ public class CertReqParser extends ReqParser { CRLExtensions crlExtensions = revokedCert[0].getExtensions(); for (int k = 0; k < crlExtensions.size(); k++) { - Extension ext = (Extension) crlExtensions.elementAt(k); + Extension ext = crlExtensions.elementAt(k); if (ext instanceof CRLReasonExtension) { arg.addStringValue("reason", diff --git a/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java b/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java index 43b6d8901..41e6523a5 100644 --- a/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java +++ b/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java @@ -21,7 +21,6 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; -import java.io.OutputStream; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.cert.X509Certificate; @@ -419,7 +418,7 @@ public class CheckRequest extends CMSServlet { StringBuffer res = new StringBuffer(); while (tokenizer.hasMoreTokens()) { - String elem = (String) tokenizer.nextToken(); + String elem = tokenizer.nextToken(); res.append(elem); } @@ -528,7 +527,7 @@ public class CheckRequest extends CMSServlet { digestAlg = DigestAlgorithm.SHA1; ByteArrayOutputStream ostream = new ByteArrayOutputStream(); - rb.encode((OutputStream) ostream); + rb.encode(ostream); digest = SHADigest.digest(ostream.toByteArray()); } catch (NoSuchAlgorithmException ex) { //log("digest fail"); @@ -575,7 +574,7 @@ public class CheckRequest extends CMSServlet { ByteArrayOutputStream ostream = new ByteArrayOutputStream(); - fullResponse.encode((OutputStream) ostream); + fullResponse.encode(ostream); byte[] fr = ostream.toByteArray(); header.addStringValue(FULL_RESPONSE, CMS.BtoA(fr)); diff --git a/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java b/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java index 6c863733f..9e1247520 100644 --- a/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java +++ b/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java @@ -71,7 +71,7 @@ public class KeyReqParser extends ReqParser { arg.addStringValue(OUTPUT_SERIALNO, kid.toString()); // for async recovery - String agents = (String) req.getExtDataInString("approvingAgents"); + String agents = req.getExtDataInString("approvingAgents"); arg.addStringValue("approvingAgents", agents); } else { System.out.println("Bad Request " + type); diff --git a/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java b/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java index b9fa461fd..02dac53f9 100644 --- a/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java +++ b/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java @@ -99,7 +99,7 @@ public class SearchReqs extends CMSServlet { mTemplates.remove(CMSRequest.SUCCESS); if (mAuthority instanceof ISubsystem) { - ISubsystem sub = (ISubsystem) mAuthority; + ISubsystem sub = mAuthority; IConfigStore authConfig = sub.getConfigStore(); if (authConfig != null) { @@ -293,7 +293,7 @@ public class SearchReqs extends CMSServlet { int count = 0; while (list != null && list.hasMoreElements()) { - IRequest request = (IRequest) list.nextRequestObject(); + IRequest request = list.nextRequestObject(); if (request != null) { count++; diff --git a/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java b/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java index d4801e794..ea0b10a67 100644 --- a/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java +++ b/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java @@ -152,7 +152,7 @@ public class TokenServlet extends CMSServlet { ByteArrayOutputStream out = new ByteArrayOutputStream(s.length()); for (int i = 0; i < s.length(); i++) { - int c = (int) s.charAt(i); + int c = s.charAt(i); if (c == '+') { out.write(' '); @@ -284,7 +284,7 @@ public class TokenServlet extends CMSServlet { if (!useSoftToken_s.equalsIgnoreCase("true")) useSoftToken_s = "false"; - String rServersideKeygen = (String) req.getParameter("serversideKeygen"); + String rServersideKeygen = req.getParameter("serversideKeygen"); if (rServersideKeygen.equals("true")) { CMS.debug("TokenServlet: serversideKeygen requested"); serversideKeygen = true; diff --git a/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java b/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java index 6c5211650..b4e03a7cc 100644 --- a/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java +++ b/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java @@ -88,7 +88,7 @@ public class WizardServlet extends VelocityServlet { Enumeration<IWizardPanel> e = mPanels.elements(); Vector<IWizardPanel> panels = new Vector<IWizardPanel>(); while (e.hasMoreElements()) { - IWizardPanel p = (IWizardPanel) e.nextElement(); + IWizardPanel p = e.nextElement(); panels.addElement(p); } context.put("panels", panels); @@ -101,7 +101,7 @@ public class WizardServlet extends VelocityServlet { /* panel number starts from zero */ int s = mPanels.size(); for (int i = pno; i < s; i++) { - IWizardPanel panel = (IWizardPanel) mPanels.elementAt(i); + IWizardPanel panel = mPanels.elementAt(i); panel.cleanUp(); } } diff --git a/base/common/src/com/netscape/cmscore/apps/CMSEngine.java b/base/common/src/com/netscape/cmscore/apps/CMSEngine.java index 2635541fa..4c808132c 100644 --- a/base/common/src/com/netscape/cmscore/apps/CMSEngine.java +++ b/base/common/src/com/netscape/cmscore/apps/CMSEngine.java @@ -398,7 +398,7 @@ public class CMSEngine implements ICMSEngine { initSubsystems(mDynSubsystems, true); initSubsystems(mFinalSubsystems, false); - CMS.debug("Java version=" + (String) System.getProperty("java.version")); + CMS.debug("Java version=" + System.getProperty("java.version")); java.security.Provider ps[] = java.security.Security.getProviders(); if (ps == null || ps.length <= 0) { @@ -487,7 +487,7 @@ public class CMSEngine implements ICMSEngine { StringTokenizer atok = new StringTokenizer(aclStr, ";"); while (atok.hasMoreTokens()) { - String acs = (String) atok.nextToken(); + String acs = atok.nextToken(); // construct ACL entry ACLEntry entry = ACLEntry.parseACLEntry(acl, acs); @@ -856,7 +856,7 @@ public class CMSEngine implements ICMSEngine { } public ISubsystem getSubsystem(String name) { - return (ISubsystem) mSSReg.get(name); + return mSSReg.get(name); } /** @@ -1547,7 +1547,7 @@ public class CMSEngine implements ICMSEngine { HttpServlet thisServlet = (HttpServlet) CommandQueue.mCommandQueue.get(thisRequest); if (thisServlet != null) { - CommandQueue.mCommandQueue.remove((Object) thisRequest); + CommandQueue.mCommandQueue.remove(thisRequest); thisServlet.destroy(); } } @@ -1782,7 +1782,7 @@ public class CMSEngine implements ICMSEngine { SubsystemRegistry.getInstance().get("ca"); if (ca != null) { - certDB = (ICertificateRepository) ca.getCertificateRepository(); + certDB = ca.getCertificateRepository(); } } catch (Exception e) { CMS.debug("CMSEngine: " + CMS.getLogMessage("CMSCORE_AUTH_AGENT_CERT_REPO")); diff --git a/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java b/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java index 5c27d8c6a..fbb589376 100644 --- a/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java +++ b/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java @@ -125,7 +125,7 @@ public class AuthSubsystem implements IAuthSubsystem { Enumeration<String> mImpls = c.getSubStoreNames(); while (mImpls.hasMoreElements()) { - String id = (String) mImpls.nextElement(); + String id = mImpls.nextElement(); String pluginPath = c.getString(id + "." + PROP_CLASS); AuthMgrPlugin plugin = new AuthMgrPlugin(id, pluginPath); @@ -194,10 +194,10 @@ public class AuthSubsystem implements IAuthSubsystem { Enumeration<String> instances = c.getSubStoreNames(); while (instances.hasMoreElements()) { - String insName = (String) instances.nextElement(); + String insName = instances.nextElement(); String implName = c.getString(insName + "." + PROP_PLUGIN); AuthMgrPlugin plugin = - (AuthMgrPlugin) mAuthMgrPlugins.get(implName); + mAuthMgrPlugins.get(implName); if (plugin == null) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_AUTH_CANT_FIND_PLUGIN", implName)); @@ -275,8 +275,7 @@ public class AuthSubsystem implements IAuthSubsystem { IAuthCredentials authCred, String authMgrInstName) throws EMissingCredential, EInvalidCredentials, EAuthMgrNotFound, EBaseException { - AuthManagerProxy proxy = (AuthManagerProxy) - mAuthMgrInsts.get(authMgrInstName); + AuthManagerProxy proxy = mAuthMgrInsts.get(authMgrInstName); if (proxy == null) { throw new EAuthMgrNotFound(CMS.getUserMessage("CMS_AUTHENTICATION_AUTHMGR_NOT_FOUND", authMgrInstName)); @@ -316,7 +315,7 @@ public class AuthSubsystem implements IAuthSubsystem { public String[] getConfigParams(String implName) throws EAuthMgrPluginNotFound, EBaseException { // is this a registered implname? - AuthMgrPlugin plugin = (AuthMgrPlugin) mAuthMgrPlugins.get(implName); + AuthMgrPlugin plugin = mAuthMgrPlugins.get(implName); if (plugin == null) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_AUTH_PLUGIN_NOT_FOUND", implName)); @@ -368,7 +367,7 @@ public class AuthSubsystem implements IAuthSubsystem { * @return the named authentication manager instance */ public IAuthManager get(String name) { - AuthManagerProxy proxy = (AuthManagerProxy) mAuthMgrInsts.get(name); + AuthManagerProxy proxy = mAuthMgrInsts.get(name); if (proxy == null) return null; @@ -403,7 +402,7 @@ public class AuthSubsystem implements IAuthSubsystem { * retrieve a single auth manager plugin by name */ public AuthMgrPlugin getAuthManagerPluginImpl(String name) { - return (AuthMgrPlugin) mAuthMgrPlugins.get(name); + return mAuthMgrPlugins.get(name); } /** @@ -412,7 +411,7 @@ public class AuthSubsystem implements IAuthSubsystem { /* getconfigparams above should be recoded to use this func */ public IAuthManager getAuthManagerPlugin(String name) { - AuthMgrPlugin plugin = (AuthMgrPlugin) mAuthMgrPlugins.get(name); + AuthMgrPlugin plugin = mAuthMgrPlugins.get(name); String classpath = plugin.getClassPath(); IAuthManager authMgrInst = null; @@ -461,7 +460,7 @@ public class AuthSubsystem implements IAuthSubsystem { public void shutdown() { for (Enumeration<String> e = mAuthMgrInsts.keys(); e.hasMoreElements();) { - IAuthManager mgr = (IAuthManager) get((String) e.nextElement()); + IAuthManager mgr = get(e.nextElement()); log(ILogger.LL_INFO, CMS.getLogMessage("CMSCORE_AUTH_INSTANCE_SHUTDOWN", mgr.getName())); @@ -499,7 +498,7 @@ public class AuthSubsystem implements IAuthSubsystem { * @return the named authentication manager */ public IAuthManager getAuthManager(String name) { - return ((IAuthManager) get(name)); + return get(name); } /** diff --git a/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java b/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java index e9fb6c891..d8db16ad0 100644 --- a/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java +++ b/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java @@ -99,8 +99,8 @@ public class CertUserDBAuthentication implements IAuthManager { mRevocationCheckingEnabled = mRevocationChecking.getBoolean("enabled", false); if (mRevocationCheckingEnabled) { int size = mRevocationChecking.getInteger("bufferSize", 0); - long interval = (long) mRevocationChecking.getInteger("validityInterval", 28800); - long unknownStateInterval = (long) mRevocationChecking.getInteger("unknownStateInterval", 1800); + long interval = mRevocationChecking.getInteger("validityInterval", 28800); + long unknownStateInterval = mRevocationChecking.getInteger("unknownStateInterval", 1800); if (size > 0) CMS.setListOfVerifiedCerts(size, interval, unknownStateInterval); diff --git a/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java b/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java index f40145938..1040e6034 100644 --- a/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java +++ b/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java @@ -43,7 +43,6 @@ import com.netscape.certsrv.request.RequestStatus; import com.netscape.certsrv.usrgrp.ICertUserLocator; import com.netscape.cmscore.base.SubsystemRegistry; import com.netscape.cmscore.dbs.CertRecord; -import com.netscape.cmscore.dbs.CertificateRepository; import com.netscape.cmscore.util.Debug; import com.netscape.cmsutil.util.Utils; @@ -149,7 +148,7 @@ public class ChallengePhraseAuthentication implements IAuthManager { SubsystemRegistry.getInstance().get("ca"); if (mCA != null) { - mCertDB = (CertificateRepository) mCA.getCertificateRepository(); + mCertDB = mCA.getCertificateRepository(); } AuthToken authToken = new AuthToken(this); diff --git a/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java b/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java index 183cebcfb..4906d5c50 100644 --- a/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java +++ b/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java @@ -113,7 +113,7 @@ public class SSLClientCertAuthentication implements IAuthManager { mCA = (ICertificateAuthority) CMS.getSubsystem("ca"); if (mCA != null) { - mCertDB = (ICertificateRepository) mCA.getCertificateRepository(); + mCertDB = mCA.getCertificateRepository(); } X509CertImpl clientCert = (X509CertImpl) x509Certs[0]; @@ -121,7 +121,7 @@ public class SSLClientCertAuthentication implements IAuthManager { BigInteger serialNum = null; try { - serialNum = (BigInteger) clientCert.getSerialNumber(); + serialNum = clientCert.getSerialNumber(); //serialNum = new BigInteger(s.substring(2), 16); } catch (NumberFormatException e) { throw new EAuthUserError(CMS.getUserMessage("CMS_AUTHENTICATION_INVALID_ATTRIBUTE_VALUE", @@ -134,7 +134,7 @@ public class SSLClientCertAuthentication implements IAuthManager { ICertRecord record = null; try { - record = (ICertRecord) mCertDB.readCertificateRecord(serialNum); + record = mCertDB.readCertificateRecord(serialNum); } catch (EBaseException ee) { if (Debug.ON) { Debug.trace(ee.toString()); diff --git a/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java b/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java index 344de6cf9..4ad6db528 100644 --- a/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java +++ b/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java @@ -87,7 +87,7 @@ public class AuthzSubsystem implements IAuthzSubsystem { Enumeration<String> mImpls = c.getSubStoreNames(); while (mImpls.hasMoreElements()) { - String id = (String) mImpls.nextElement(); + String id = mImpls.nextElement(); String pluginPath = c.getString(id + "." + PROP_CLASS); AuthzMgrPlugin plugin = new AuthzMgrPlugin(id, pluginPath); @@ -104,10 +104,10 @@ public class AuthzSubsystem implements IAuthzSubsystem { Enumeration<String> instances = c.getSubStoreNames(); while (instances.hasMoreElements()) { - String insName = (String) instances.nextElement(); + String insName = instances.nextElement(); String implName = c.getString(insName + "." + PROP_PLUGIN); AuthzMgrPlugin plugin = - (AuthzMgrPlugin) mAuthzMgrPlugins.get(implName); + mAuthzMgrPlugins.get(implName); if (plugin == null) { log(ILogger.LL_FAILURE, @@ -191,8 +191,7 @@ public class AuthzSubsystem implements IAuthzSubsystem { */ public void authzMgrAccessInit(String authzMgrInstName, String accessInfo) throws EAuthzMgrNotFound, EBaseException { - AuthzManagerProxy proxy = (AuthzManagerProxy) - mAuthzMgrInsts.get(authzMgrInstName); + AuthzManagerProxy proxy = mAuthzMgrInsts.get(authzMgrInstName); if (proxy == null) { throw new EAuthzMgrNotFound(CMS.getUserMessage("CMS_AUTHORIZATION_AUTHZMGR_NOT_FOUND", authzMgrInstName)); @@ -225,8 +224,7 @@ public class AuthzSubsystem implements IAuthzSubsystem { String resource, String operation) throws EAuthzMgrNotFound, EBaseException { - AuthzManagerProxy proxy = (AuthzManagerProxy) - mAuthzMgrInsts.get(authzMgrInstName); + AuthzManagerProxy proxy = mAuthzMgrInsts.get(authzMgrInstName); if (proxy == null) { throw new EAuthzMgrNotFound(CMS.getUserMessage("CMS_AUTHORIZATION_AUTHZMGR_NOT_FOUND", authzMgrInstName)); @@ -246,8 +244,7 @@ public class AuthzSubsystem implements IAuthzSubsystem { String authzMgrInstName, IAuthToken authToken, String exp) throws EAuthzMgrNotFound, EBaseException { - AuthzManagerProxy proxy = (AuthzManagerProxy) - mAuthzMgrInsts.get(authzMgrInstName); + AuthzManagerProxy proxy = mAuthzMgrInsts.get(authzMgrInstName); if (proxy == null) { throw new EAuthzMgrNotFound(CMS.getUserMessage("CMS_AUTHORIZATION_AUTHZMGR_NOT_FOUND", authzMgrInstName)); @@ -273,7 +270,7 @@ public class AuthzSubsystem implements IAuthzSubsystem { public String[] getConfigParams(String implName) throws EAuthzMgrPluginNotFound, EBaseException { // is this a registered implname? - AuthzMgrPlugin plugin = (AuthzMgrPlugin) mAuthzMgrPlugins.get(implName); + AuthzMgrPlugin plugin = mAuthzMgrPlugins.get(implName); if (plugin == null) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_AUTHZ_PLUGIN_NOT_FOUND", implName)); @@ -326,7 +323,7 @@ public class AuthzSubsystem implements IAuthzSubsystem { * @return the named authorization manager instance */ public IAuthzManager get(String name) { - AuthzManagerProxy proxy = (AuthzManagerProxy) mAuthzMgrInsts.get(name); + AuthzManagerProxy proxy = mAuthzMgrInsts.get(name); if (proxy == null) return null; @@ -341,7 +338,7 @@ public class AuthzSubsystem implements IAuthzSubsystem { Enumeration<String> e = mAuthzMgrInsts.keys(); while (e.hasMoreElements()) { - IAuthzManager p = get((String) e.nextElement()); + IAuthzManager p = get(e.nextElement()); if (p != null) { inst.addElement(p); @@ -361,7 +358,7 @@ public class AuthzSubsystem implements IAuthzSubsystem { * retrieve a single authz manager plugin by name */ public AuthzMgrPlugin getAuthzManagerPluginImpl(String name) { - return (AuthzMgrPlugin) mAuthzMgrPlugins.get(name); + return mAuthzMgrPlugins.get(name); } /** @@ -370,7 +367,7 @@ public class AuthzSubsystem implements IAuthzSubsystem { /* getconfigparams above should be recoded to use this func */ public IAuthzManager getAuthzManagerPlugin(String name) { - AuthzMgrPlugin plugin = (AuthzMgrPlugin) mAuthzMgrPlugins.get(name); + AuthzMgrPlugin plugin = mAuthzMgrPlugins.get(name); String classpath = plugin.getClassPath(); IAuthzManager authzMgrInst = null; @@ -419,7 +416,7 @@ public class AuthzSubsystem implements IAuthzSubsystem { public void shutdown() { for (Enumeration<String> e = mAuthzMgrInsts.keys(); e.hasMoreElements();) { - IAuthzManager mgr = (IAuthzManager) get((String) e.nextElement()); + IAuthzManager mgr = get(e.nextElement()); //String infoMsg = // "Shutting down authz manager instance " + mgr.getName(); @@ -458,7 +455,7 @@ public class AuthzSubsystem implements IAuthzSubsystem { * @return the named authorization manager */ public IAuthzManager getAuthzManager(String name) { - return ((IAuthzManager) get(name)); + return get(name); } /** diff --git a/base/common/src/com/netscape/cmscore/base/FileConfigStore.java b/base/common/src/com/netscape/cmscore/base/FileConfigStore.java index 393547f53..a91acdbcb 100644 --- a/base/common/src/com/netscape/cmscore/base/FileConfigStore.java +++ b/base/common/src/com/netscape/cmscore/base/FileConfigStore.java @@ -181,15 +181,15 @@ public class FileConfigStore extends PropConfigStore implements // sorting them lexicographically while (v.size() > 0) { - String pname = (String) v.firstElement(); + String pname = v.firstElement(); int j = 0; for (int i = 1; i < v.size(); i++) { - String s = (String) v.elementAt(i); + String s = v.elementAt(i); if (pname.compareTo(s) > 0) { j = i; - pname = (String) v.elementAt(i); + pname = v.elementAt(i); } } v.removeElementAt(j); @@ -203,15 +203,15 @@ public class FileConfigStore extends PropConfigStore implements v.addElement(e1.nextElement()); } while (v.size() > 0) { - String pname = (String) v.firstElement(); + String pname = v.firstElement(); int j = 0; for (int i = 1; i < v.size(); i++) { - String s = (String) v.elementAt(i); + String s = v.elementAt(i); if (pname.compareTo(s) > 0) { j = i; - pname = (String) v.elementAt(i); + pname = v.elementAt(i); } } v.removeElementAt(j); diff --git a/base/common/src/com/netscape/cmscore/base/PropConfigStore.java b/base/common/src/com/netscape/cmscore/base/PropConfigStore.java index ee4370053..075d4be78 100644 --- a/base/common/src/com/netscape/cmscore/base/PropConfigStore.java +++ b/base/common/src/com/netscape/cmscore/base/PropConfigStore.java @@ -334,7 +334,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { */ public byte[] getByteArray(String name, byte defval[]) throws EBaseException { - String str = (String) get(name); + String str = get(name); if (str == null || str.length() == 0) { CMS.traceHashKey(mDebugType, getFullName(name), @@ -379,7 +379,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { * @exception EBaseException failed to retrieve */ public boolean getBoolean(String name) throws EBaseException { - String value = (String) get(name); + String value = get(name); if (value == null) { CMS.traceHashKey(mDebugType, getFullName(name), "<notpresent>"); @@ -445,7 +445,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { * @exception EBaseException failed to retrieve value */ public int getInteger(String name) throws EBaseException { - String value = (String) get(name); + String value = get(name); if (value == null) { CMS.traceHashKey(mDebugType, getFullName(name), "<notpresent>"); @@ -505,7 +505,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { * @exception EBaseException failed to retrieve value */ public BigInteger getBigInteger(String name) throws EBaseException { - String value = (String) get(name); + String value = get(name); if (value == null) { CMS.traceHashKey(mDebugType, getFullName(name), "<notpresent>"); diff --git a/base/common/src/com/netscape/cmscore/cert/CertificatePair.java b/base/common/src/com/netscape/cmscore/cert/CertificatePair.java index 0a68da2d9..306b9d3bd 100644 --- a/base/common/src/com/netscape/cmscore/cert/CertificatePair.java +++ b/base/common/src/com/netscape/cmscore/cert/CertificatePair.java @@ -104,7 +104,7 @@ public class CertificatePair implements ASN1Value { debug("in certOrders() with X509Cert"); ICertificateAuthority ca = (ICertificateAuthority) CMS.getSubsystem("ca"); - X509Certificate caCert = (X509Certificate) ca.getCACert(); + X509Certificate caCert = ca.getCACert(); debug("got this caCert"); // reverse cert is the one signed by this ca diff --git a/base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java b/base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java index 532211c42..86746619b 100644 --- a/base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java +++ b/base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java @@ -231,7 +231,7 @@ public class CrlCachePrettyPrint implements ICRLPrettyPrint { if (crlExtensions != null) { for (int k = 0; k < crlExtensions.size(); k++) { - Extension ext = (Extension) crlExtensions.elementAt(k); + Extension ext = crlExtensions.elementAt(k); ExtPrettyPrint extpp = new ExtPrettyPrint(ext, 20); sb.append(extpp.toString()); diff --git a/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java b/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java index 9b950e239..1aa53d9e4 100644 --- a/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java +++ b/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java @@ -155,7 +155,7 @@ public class CrossCertPairSubsystem implements ICrossCertPairSubsystem { } - importCert((Object) cert); + importCert(cert); } /** @@ -284,8 +284,8 @@ public class CrossCertPairSubsystem implements ICrossCertPairSubsystem { protected boolean arePair(X509Certificate cert1, X509Certificate cert2) { // 1. does cert1's issuer match cert2's subject? // 2. does cert2's issuer match cert1's subject? - if ((cert1.getIssuerDN().equals((Object) cert2.getSubjectDN())) - && (cert2.getIssuerDN().equals((Object) cert1.getSubjectDN()))) + if (cert1.getIssuerDN().equals(cert2.getSubjectDN()) + && cert2.getIssuerDN().equals(cert1.getSubjectDN())) return true; else return false; diff --git a/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java b/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java index c4983d7c8..0feebb7ec 100644 --- a/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java +++ b/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java @@ -149,7 +149,7 @@ public class OidLoaderSubsystem implements ISubsystem { // load dynamic extensions while (names.hasMoreElements()) { - String substorename = (String) names.nextElement(); + String substorename = names.nextElement(); IConfigStore substore = mConfig.getSubStore(substorename); try { diff --git a/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java b/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java index 0d58973f8..96dc64e57 100644 --- a/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java +++ b/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java @@ -157,7 +157,7 @@ public class X500NameSubsystem implements ISubsystem { Enumeration<String> attrNames = attrSubStore.getSubStoreNames(); while (attrNames.hasMoreElements()) { - String name = (String) attrNames.nextElement(); + String name = attrNames.nextElement(); IConfigStore substore = attrSubStore.getSubStore(name); String oidString = substore.getString(PROP_OID); ObjectIdentifier oid = CertUtils.checkOID(name, oidString); @@ -203,7 +203,7 @@ public class X500NameSubsystem implements ISubsystem { byte[] tags = new byte[numTokens]; for (int i = 0; toker.hasMoreTokens(); i++) { - String nextTag = (String) toker.nextToken(); + String nextTag = toker.nextToken(); try { tags[i] = derStr2Tag(nextTag); diff --git a/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java b/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java index 2d8c98ee4..6e4ec113f 100644 --- a/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java +++ b/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java @@ -162,7 +162,7 @@ public class HttpConnFactory { CMS.debug( "increasing minimum connections by " + increment); for (int i = increment - 1; i >= 0; i--) { - mConns[i] = (IHttpConnection) createConnection(); + mConns[i] = createConnection(); } mTotal += increment; mNumConns += increment; @@ -279,7 +279,7 @@ public class HttpConnFactory { if (conn == null) { return; } - IHttpConnection boundconn = (IHttpConnection) conn; + IHttpConnection boundconn = conn; for (int i = 0; i < mNumConns; i++) { if (mConns[i] == conn) { diff --git a/base/common/src/com/netscape/cmscore/dbs/ByteArrayMapper.java b/base/common/src/com/netscape/cmscore/dbs/ByteArrayMapper.java index 1d1f218b2..88d205b20 100644 --- a/base/common/src/com/netscape/cmscore/dbs/ByteArrayMapper.java +++ b/base/common/src/com/netscape/cmscore/dbs/ByteArrayMapper.java @@ -83,7 +83,7 @@ public class ByteArrayMapper implements IDBAttrMapper { if (attr == null) return; - parent.set(name, (byte[]) attr.getByteValues().nextElement()); + parent.set(name, attr.getByteValues().nextElement()); } /** diff --git a/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java b/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java index 6a4e23f19..5169bc4c9 100644 --- a/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java +++ b/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java @@ -265,7 +265,7 @@ public class DBRegistry implements IDBRegistry, ISubsystem { String result = ""; for (int i = 0; i < v.size(); i++) { - result += (String) v.elementAt(i); + result += v.elementAt(i); } return result; } @@ -316,8 +316,7 @@ public class DBRegistry implements IDBRegistry, ISubsystem { // if value contains no '*', then it is equality if (value.indexOf('*') == -1) { if (type.equals("objectclass")) { - String ldapNames[] = (String[]) - mOCclassNames.get(value); + String ldapNames[] = mOCclassNames.get(value); if (ldapNames == null) throw new EDBException( @@ -342,8 +341,7 @@ public class DBRegistry implements IDBRegistry, ISubsystem { */ public void mapObject(IDBObj parent, String name, Object obj, LDAPAttributeSet attrs) throws EBaseException { - IDBAttrMapper mapper = (IDBAttrMapper) mAttrufNames.get( - name.toLowerCase()); + IDBAttrMapper mapper = mAttrufNames.get(name.toLowerCase()); if (mapper == null) { return; // no mapper found, just skip this attribute @@ -373,15 +371,14 @@ public class DBRegistry implements IDBRegistry, ISubsystem { } if (isAttributeRegistered(attrs[i])) { - mapper = (IDBAttrMapper) - mAttrufNames.get(attrs[i].toLowerCase()); + mapper = mAttrufNames.get(attrs[i].toLowerCase()); if (mapper == null) { throw new EDBException(CMS.getUserMessage("CMS_DBS_INVALID_ATTRS")); } Enumeration<String> e = mapper.getSupportedLDAPAttributeNames(); while (e.hasMoreElements()) { - String s = (String) e.nextElement(); + String s = e.nextElement(); if (!v.contains(s)) { v.addElement(s); @@ -392,7 +389,7 @@ public class DBRegistry implements IDBRegistry, ISubsystem { // check if a dynamic mapper can handle the attribute for (Iterator<IDBDynAttrMapper> dynMapperIter = mDynAttrMappers.iterator(); dynMapperIter.hasNext();) { IDBDynAttrMapper dynAttrMapper = - (IDBDynAttrMapper) dynMapperIter.next(); + dynMapperIter.next(); if (dynAttrMapper.supportsLDAPAttributeName(attrs[i])) { matchingDynAttrMapper = dynAttrMapper; break; @@ -432,13 +429,13 @@ public class DBRegistry implements IDBRegistry, ISubsystem { // add object class to attribute set String className = ((Object) obj).getClass().getName(); - String vals[] = (String[]) mOCclassNames.get(className); + String vals[] = mOCclassNames.get(className); attrs.add(new LDAPAttribute("objectclass", vals)); // give every attribute a chance to put stuff in attr set while (e.hasMoreElements()) { - String name = (String) e.nextElement(); + String name = e.nextElement(); if (obj.get(name) != null) { mapObject(obj, name, obj.get(name), attrs); @@ -471,7 +468,7 @@ public class DBRegistry implements IDBRegistry, ISubsystem { v.copyInto(s); String sorted = sortAndConcate(s).toLowerCase(); - NameAndObject no = (NameAndObject) mOCldapNames.get(sorted); + NameAndObject no = mOCldapNames.get(sorted); if (no == null) { throw new EDBException( @@ -484,10 +481,8 @@ public class DBRegistry implements IDBRegistry, ISubsystem { Enumeration<String> ee = obj.getSerializableAttrNames(); while (ee.hasMoreElements()) { - String oname = (String) ee.nextElement(); - IDBAttrMapper mapper = (IDBAttrMapper) - mAttrufNames.get( - oname.toLowerCase()); + String oname = ee.nextElement(); + IDBAttrMapper mapper = mAttrufNames.get(oname.toLowerCase()); if (mapper == null) { throw new EDBException( @@ -520,7 +515,7 @@ public class DBRegistry implements IDBRegistry, ISubsystem { // sort it first for (int i = 0; i < s.length; i++) { for (int j = 0; j < v.size(); j++) { - String t = (String) v.elementAt(j); + String t = v.elementAt(j); if (s[i].compareTo(t) < 0) { v.insertElementAt(s[i], j); @@ -535,7 +530,7 @@ public class DBRegistry implements IDBRegistry, ISubsystem { String result = ""; for (int i = 0; i < v.size(); i++) { - result += ((String) v.elementAt(i) + "+"); + result += v.elementAt(i) + "+"; } return result; } diff --git a/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java b/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java index 82e688c03..ece755fc3 100644 --- a/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java +++ b/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java @@ -323,7 +323,7 @@ public class DBSubsystem implements IDBSubsystem { CMS.debug("DBSubsystem: Setting max serial number for " + h.get(NAME) + ": " + serial); //persist to file - mDBConfig.putString((String) h.get(PROP_MAX_NAME), serial); + mDBConfig.putString(h.get(PROP_MAX_NAME), serial); IConfigStore rootStore = getOwner().getConfigStore(); rootStore.commit(false); @@ -344,7 +344,7 @@ public class DBSubsystem implements IDBSubsystem { CMS.debug("DBSubsystem: Setting min serial number for " + h.get(NAME) + ": " + serial); //persist to file - mDBConfig.putString((String) h.get(PROP_MIN_NAME), serial); + mDBConfig.putString(h.get(PROP_MIN_NAME), serial); IConfigStore rootStore = getOwner().getConfigStore(); rootStore.commit(false); @@ -364,10 +364,10 @@ public class DBSubsystem implements IDBSubsystem { Hashtable<String, String> h = mRepos[repo]; if (serial == null) { CMS.debug("DBSubsystem: Removing next max " + h.get(NAME) + " number"); - mDBConfig.remove((String) h.get(PROP_NEXT_MAX_NAME)); + mDBConfig.remove(h.get(PROP_NEXT_MAX_NAME)); } else { CMS.debug("DBSubsystem: Setting next max " + h.get(NAME) + " number: " + serial); - mDBConfig.putString((String) h.get(PROP_NEXT_MAX_NAME), serial); + mDBConfig.putString(h.get(PROP_NEXT_MAX_NAME), serial); } IConfigStore rootStore = getOwner().getConfigStore(); rootStore.commit(false); @@ -391,10 +391,10 @@ public class DBSubsystem implements IDBSubsystem { Hashtable<String, String> h = mRepos[repo]; if (serial == null) { CMS.debug("DBSubsystem: Removing next min " + h.get(NAME) + " number"); - mDBConfig.remove((String) h.get(PROP_NEXT_MIN_NAME)); + mDBConfig.remove(h.get(PROP_NEXT_MIN_NAME)); } else { CMS.debug("DBSubsystem: Setting next min " + h.get(NAME) + " number: " + serial); - mDBConfig.putString((String) h.get(PROP_NEXT_MIN_NAME), serial); + mDBConfig.putString(h.get(PROP_NEXT_MIN_NAME), serial); } IConfigStore rootStore = getOwner().getConfigStore(); rootStore.commit(false); @@ -420,15 +420,15 @@ public class DBSubsystem implements IDBSubsystem { try { Hashtable<String, String> h = mRepos[repo]; conn = mLdapConnFactory.getConn(); - String dn = (String) h.get(PROP_BASEDN) + "," + mBaseDN; - String rangeDN = (String) h.get(PROP_RANGE_DN) + "," + mBaseDN; + String dn = h.get(PROP_BASEDN) + "," + mBaseDN; + String rangeDN = h.get(PROP_RANGE_DN) + "," + mBaseDN; LDAPEntry entry = conn.read(dn); LDAPAttribute attr = entry.getAttribute(PROP_NEXT_RANGE); nextRange = (String) attr.getStringValues().nextElement(); BigInteger nextRangeNo = new BigInteger(nextRange); - BigInteger incrementNo = new BigInteger((String) h.get(PROP_INCREMENT)); + BigInteger incrementNo = new BigInteger(h.get(PROP_INCREMENT)); // To make sure attrNextRange always increments, first delete the current value and then // increment. Two operations in the same transaction LDAPAttribute attrNextRange = new LDAPAttribute(PROP_NEXT_RANGE, nextRangeNo.add(incrementNo).toString()); @@ -486,7 +486,7 @@ public class DBSubsystem implements IDBSubsystem { } Hashtable<String, String> h = mRepos[repo]; conn = mLdapConnFactory.getConn(); - String rangedn = (String) h.get(PROP_RANGE_DN) + "," + mBaseDN; + String rangedn = h.get(PROP_RANGE_DN) + "," + mBaseDN; String filter = "(&(nsds5ReplConflict=*)(objectClass=pkiRange)(host= " + CMS.getEESSLHost() + ")(SecurePort=" + CMS.getEESSLPort() + ")(beginRange=" + nextRangeStart + "))"; diff --git a/base/common/src/com/netscape/cmscore/dbs/LdapFilterConverter.java b/base/common/src/com/netscape/cmscore/dbs/LdapFilterConverter.java index 4bd31bcad..e31cf1019 100644 --- a/base/common/src/com/netscape/cmscore/dbs/LdapFilterConverter.java +++ b/base/common/src/com/netscape/cmscore/dbs/LdapFilterConverter.java @@ -48,7 +48,7 @@ public class LdapFilterConverter implements IFilterConverter { */ public String convert(String name, String op, String value) { AttributeNameHelper h = new AttributeNameHelper(name); - IDBAttrMapper mapper = (IDBAttrMapper) mReg.get( + IDBAttrMapper mapper = mReg.get( h.getPrefix().toLowerCase()); if (mapper == null) diff --git a/base/common/src/com/netscape/cmscore/dbs/PublicKeyMapper.java b/base/common/src/com/netscape/cmscore/dbs/PublicKeyMapper.java index ba5880282..c1bf43b48 100644 --- a/base/common/src/com/netscape/cmscore/dbs/PublicKeyMapper.java +++ b/base/common/src/com/netscape/cmscore/dbs/PublicKeyMapper.java @@ -83,7 +83,7 @@ public class PublicKeyMapper implements IDBAttrMapper { if (attr == null) { return; } - parent.set(name, (byte[]) attr.getByteValues().nextElement()); + parent.set(name, attr.getByteValues().nextElement()); } /** diff --git a/base/common/src/com/netscape/cmscore/dbs/StringMapper.java b/base/common/src/com/netscape/cmscore/dbs/StringMapper.java index d3b1ea710..3282e11b5 100644 --- a/base/common/src/com/netscape/cmscore/dbs/StringMapper.java +++ b/base/common/src/com/netscape/cmscore/dbs/StringMapper.java @@ -78,8 +78,7 @@ public class StringMapper implements IDBAttrMapper { return; } try { - parent.set(name, (String) - attr.getStringValues().nextElement()); + parent.set(name, attr.getStringValues().nextElement()); } catch (NoSuchElementException e) { // attribute present, but without value } diff --git a/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java b/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java index ba02eff23..0d3ab35f7 100644 --- a/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java +++ b/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java @@ -65,7 +65,7 @@ public class CMSExtensionsMap implements ISubsystem { Enumeration<String> sstores = mConfig.getSubStoreNames(); while (sstores.hasMoreElements()) { - String name = (String) sstores.nextElement(); + String name = sstores.nextElement(); IConfigStore c = mConfig.getSubStore(name); String className = c.getString(PROP_CLASS); @@ -145,7 +145,7 @@ public class CMSExtensionsMap implements ISubsystem { * @return the extension class. */ public ICMSExtension getByName(String name) { - return (ICMSExtension) mName2Ext.get(name); + return mName2Ext.get(name); } /** @@ -155,6 +155,6 @@ public class CMSExtensionsMap implements ISubsystem { * @return the extension class. */ public ICMSExtension getByOID(ObjectIdentifier oid) { - return (ICMSExtension) mOID2Ext.get(oid.toString()); + return mOID2Ext.get(oid.toString()); } } diff --git a/base/common/src/com/netscape/cmscore/jobs/CronItem.java b/base/common/src/com/netscape/cmscore/jobs/CronItem.java index f15e0402a..5e6a3296e 100644 --- a/base/common/src/com/netscape/cmscore/jobs/CronItem.java +++ b/base/common/src/com/netscape/cmscore/jobs/CronItem.java @@ -74,7 +74,7 @@ public class CronItem { StringTokenizer st = new StringTokenizer(sItem, DELIM); while (st.hasMoreTokens()) { - String tok = (String) st.nextToken(); + String tok = st.nextToken(); // elements could be ranges (separated by '-') int r = tok.indexOf(RANGE); diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java b/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java index 14263a951..b0505c16b 100644 --- a/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java +++ b/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java @@ -127,11 +127,10 @@ public class LdapPredicateParser { if (size == 0) return null; LdapOrExpression orExp = new - LdapOrExpression((ILdapExpression) expSet.elementAt(0), null); + LdapOrExpression(expSet.elementAt(0), null); for (int i = 1; i < size; i++) - orExp = new LdapOrExpression(orExp, - (ILdapExpression) expSet.elementAt(i)); + orExp = new LdapOrExpression(orExp, expSet.elementAt(i)); return orExp; } @@ -173,12 +172,12 @@ public class LdapPredicateParser { } int size = expVector.size(); - LdapSimpleExpression exp1 = (LdapSimpleExpression) expVector.elementAt(0); - LdapSimpleExpression exp2 = (LdapSimpleExpression) expVector.elementAt(1); + LdapSimpleExpression exp1 = expVector.elementAt(0); + LdapSimpleExpression exp2 = expVector.elementAt(1); LdapAndExpression andExp = new LdapAndExpression(exp1, exp2); for (int i = 2; i < size; i++) { - andExp = new LdapAndExpression(andExp, (LdapSimpleExpression) expVector.elementAt(i)); + andExp = new LdapAndExpression(andExp, expVector.elementAt(i)); } return andExp; } diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java b/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java index 263187bf3..c4ff20515 100644 --- a/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java +++ b/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java @@ -170,9 +170,9 @@ public class LdapPublishModule implements ILdapPublishModule { LdapMappers mappers = null; if (certType == null) { - mappers = (LdapMappers) mMappers.get(PROP_TYPE_CLIENT); + mappers = mMappers.get(PROP_TYPE_CLIENT); } else { - mappers = (LdapMappers) mMappers.get(certType); + mappers = mMappers.get(certType); } return mappers; } @@ -326,8 +326,8 @@ public class LdapPublishModule implements ILdapPublishModule { ICertificateAuthority ca = (ICertificateAuthority) mAuthority; try { - ICertificateRepository certdb = (ICertificateRepository) ca.getCertificateRepository(); - ICertRecord certRec = (ICertRecord) certdb.readCertificateRecord(serialNo); + ICertificateRepository certdb = ca.getCertificateRepository(); + ICertRecord certRec = certdb.readCertificateRecord(serialNo); MetaInfo metaInfo = certRec.getMetaInfo(); if (metaInfo == null) { @@ -464,7 +464,7 @@ public class LdapPublishModule implements ILdapPublishModule { throw e; } catch (IOException e) { CMS.debug("Error publishing CRL to " + dn + ": " + e); - throw new ELdapException(CMS.getUserMessage("CMS_LDAP_GET_ISSUER_FROM_CRL_FAILED", (String) "")); + throw new ELdapException(CMS.getUserMessage("CMS_LDAP_GET_ISSUER_FROM_CRL_FAILED", "")); } finally { if (conn != null) { mLdapConnFactory.returnConn(conn); @@ -631,7 +631,7 @@ class HandleRenewal implements IRequestListener { boolean error = false; for (int i = 0; i < certs.length; i++) { - cert = (X509CertImpl) certs[i]; + cert = certs[i]; if (cert == null) continue; // there was an error issuing this cert. try { diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java b/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java index dd567efe7..c9180630f 100644 --- a/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java +++ b/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java @@ -358,13 +358,13 @@ class LdapRevocationListener implements IRequestListener { "Trying to get a certificate from non certificate authority."); } else { ICertificateRepository certdb = - (ICertificateRepository) ((ICertificateAuthority) auth).getCertificateRepository(); + ((ICertificateAuthority) auth).getCertificateRepository(); if (certdb == null) { mProcessor.log(ILogger.LL_WARN, "Cert DB is null for " + auth); } else { try { - certRecord = (ICertRecord) certdb.readCertificateRecord(serial); + certRecord = certdb.readCertificateRecord(serial); } catch (EBaseException e) { mProcessor.log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_LDAP_GET_CERT_RECORD", @@ -468,14 +468,13 @@ class LdapUnrevocationListener implements IRequestListener { mProcessor.log(ILogger.LL_WARN, "Trying to get a certificate from non certificate authority."); } else { - ICertificateRepository certdb = (ICertificateRepository) - ((ICertificateAuthority) auth).getCertificateRepository(); + ICertificateRepository certdb = ((ICertificateAuthority) auth).getCertificateRepository(); if (certdb == null) { mProcessor.log(ILogger.LL_WARN, "Cert DB is null for " + auth); } else { try { - certRecord = (ICertRecord) certdb.readCertificateRecord(serial); + certRecord = certdb.readCertificateRecord(serial); } catch (EBaseException e) { mProcessor .log(ILogger.LL_FAILURE, diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapRule.java b/base/common/src/com/netscape/cmscore/ldap/LdapRule.java index df8153366..f5fdcc502 100644 --- a/base/common/src/com/netscape/cmscore/ldap/LdapRule.java +++ b/base/common/src/com/netscape/cmscore/ldap/LdapRule.java @@ -176,14 +176,14 @@ public class LdapRule implements ILdapRule, IExtendedPluginInfo { String map = NOMAPPER; for (; mappers.hasMoreElements();) { - String name = (String) mappers.nextElement(); + String name = mappers.nextElement(); map = map + "," + name; } String publish = ""; for (; publishers.hasMoreElements();) { - String name = (String) publishers.nextElement(); + String name = publishers.nextElement(); publish = publish + "," + name; } diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java b/base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java index 2c5caf2bd..4be580cbc 100644 --- a/base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java +++ b/base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java @@ -122,9 +122,9 @@ public class LdapSimpleExpression implements ILdapExpression { try { // Try exact case first. - givenVal = (String) sc.get(mVar); + givenVal = sc.get(mVar); } catch (Exception e) { - givenVal = (String) null; + givenVal = null; } // It is kind of a problem here if all letters are in @@ -132,17 +132,17 @@ public class LdapSimpleExpression implements ILdapExpression { // of directory attributes. if (givenVal == null) { try { - givenVal = (String) sc.get(mVar.toLowerCase()); + givenVal = sc.get(mVar.toLowerCase()); } catch (Exception e) { - givenVal = (String) null; + givenVal = null; } } if (givenVal == null) { try { - givenVal = (String) sc.get(mVar.toUpperCase()); + givenVal = sc.get(mVar.toUpperCase()); } catch (Exception e) { - givenVal = (String) null; + givenVal = null; } } @@ -170,7 +170,7 @@ public class LdapSimpleExpression implements ILdapExpression { private boolean matchVector(Vector<Object> value) throws ELdapException { boolean result = false; - Enumeration<Object> e = (Enumeration<Object>) value.elements(); + Enumeration<Object> e = value.elements(); for (; e.hasMoreElements();) { result = matchValue(e.nextElement()); diff --git a/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java b/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java index 74ac574da..1314899b7 100644 --- a/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java +++ b/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java @@ -112,7 +112,7 @@ public class PublisherProcessor implements Enumeration<String> mImpls = c.getSubStoreNames(); while (mImpls.hasMoreElements()) { - String id = (String) mImpls.nextElement(); + String id = mImpls.nextElement(); String pluginPath = c.getString(id + "." + PROP_CLASS); PublisherPlugin plugin = new PublisherPlugin(id, pluginPath); @@ -126,11 +126,11 @@ public class PublisherProcessor implements Enumeration<String> instances = c.getSubStoreNames(); while (instances.hasMoreElements()) { - String insName = (String) instances.nextElement(); + String insName = instances.nextElement(); String implName = c.getString(insName + "." + PROP_PLUGIN); PublisherPlugin plugin = - (PublisherPlugin) mPublisherPlugins.get(implName); + mPublisherPlugins.get(implName); if (plugin == null) { log(ILogger.LL_FAILURE, @@ -195,7 +195,7 @@ public class PublisherProcessor implements c = mapperConfig.getSubStore(PROP_IMPL); mImpls = c.getSubStoreNames(); while (mImpls.hasMoreElements()) { - String id = (String) mImpls.nextElement(); + String id = mImpls.nextElement(); String pluginPath = c.getString(id + "." + PROP_CLASS); MapperPlugin plugin = new MapperPlugin(id, pluginPath); @@ -208,11 +208,11 @@ public class PublisherProcessor implements c = mapperConfig.getSubStore(PROP_INSTANCE); instances = c.getSubStoreNames(); while (instances.hasMoreElements()) { - String insName = (String) instances.nextElement(); + String insName = instances.nextElement(); String implName = c.getString(insName + "." + PROP_PLUGIN); MapperPlugin plugin = - (MapperPlugin) mMapperPlugins.get(implName); + mMapperPlugins.get(implName); if (plugin == null) { log(ILogger.LL_FAILURE, @@ -276,7 +276,7 @@ public class PublisherProcessor implements c = ruleConfig.getSubStore(PROP_IMPL); mImpls = c.getSubStoreNames(); while (mImpls.hasMoreElements()) { - String id = (String) mImpls.nextElement(); + String id = mImpls.nextElement(); String pluginPath = c.getString(id + "." + PROP_CLASS); RulePlugin plugin = new RulePlugin(id, pluginPath); @@ -289,11 +289,11 @@ public class PublisherProcessor implements c = ruleConfig.getSubStore(PROP_INSTANCE); instances = c.getSubStoreNames(); while (instances.hasMoreElements()) { - String insName = (String) instances.nextElement(); + String insName = instances.nextElement(); String implName = c.getString(insName + "." + PROP_PLUGIN); RulePlugin plugin = - (RulePlugin) mRulePlugins.get(implName); + mRulePlugins.get(implName); if (plugin == null) { log(ILogger.LL_FAILURE, @@ -479,7 +479,7 @@ public class PublisherProcessor implements Enumeration<String> e = mRuleInsts.keys(); while (e.hasMoreElements()) { - String name = (String) e.nextElement(); + String name = e.nextElement(); if (name == null) { if (Debug.ON) @@ -522,7 +522,7 @@ public class PublisherProcessor implements Enumeration<String> e = mRuleInsts.keys(); while (e.hasMoreElements()) { - String name = (String) e.nextElement(); + String name = e.nextElement(); if (name == null) { if (Debug.ON) @@ -653,8 +653,7 @@ public class PublisherProcessor implements } public boolean isMapperInstanceEnable(String insName) { - MapperProxy proxy = (MapperProxy) - mMapperInsts.get(insName); + MapperProxy proxy = mMapperInsts.get(insName); if (proxy == null) { return false; @@ -663,7 +662,7 @@ public class PublisherProcessor implements } public ILdapMapper getActiveMapperInstance(String insName) { - MapperProxy proxy = (MapperProxy) mMapperInsts.get(insName); + MapperProxy proxy = mMapperInsts.get(insName); if (proxy == null) return null; @@ -674,7 +673,7 @@ public class PublisherProcessor implements } public ILdapMapper getMapperInstance(String insName) { - MapperProxy proxy = (MapperProxy) mMapperInsts.get(insName); + MapperProxy proxy = mMapperInsts.get(insName); if (proxy == null) return null; @@ -682,8 +681,7 @@ public class PublisherProcessor implements } public boolean isPublisherInstanceEnable(String insName) { - PublisherProxy proxy = (PublisherProxy) - mPublisherInsts.get(insName); + PublisherProxy proxy = mPublisherInsts.get(insName); if (proxy == null) { return false; @@ -692,8 +690,7 @@ public class PublisherProcessor implements } public ILdapPublisher getActivePublisherInstance(String insName) { - PublisherProxy proxy = (PublisherProxy) - mPublisherInsts.get(insName); + PublisherProxy proxy = mPublisherInsts.get(insName); if (proxy == null) { return null; @@ -705,8 +702,7 @@ public class PublisherProcessor implements } public ILdapPublisher getPublisherInstance(String insName) { - PublisherProxy proxy = (PublisherProxy) - mPublisherInsts.get(insName); + PublisherProxy proxy = mPublisherInsts.get(insName); if (proxy == null) { return null; @@ -809,8 +805,8 @@ public class PublisherProcessor implements ICertificateAuthority ca = (ICertificateAuthority) mAuthority; try { - ICertificateRepository certdb = (ICertificateRepository) ca.getCertificateRepository(); - ICertRecord certRec = (ICertRecord) certdb.readCertificateRecord(serialNo); + ICertificateRepository certdb = ca.getCertificateRepository(); + ICertRecord certRec = certdb.readCertificateRecord(serialNo); MetaInfo metaInfo = certRec.getMetaInfo(); if (metaInfo == null) { @@ -1206,7 +1202,7 @@ public class PublisherProcessor implements dn = ((X500Name) crl.getIssuerDN()).toLdapDNString(); } else { - result = ((ILdapMapper) mapper).map(conn, crl); + result = mapper.map(conn, crl); dn = result; if (!mCreateOwnDNEntry) { if (dn == null) { @@ -1382,7 +1378,7 @@ public class PublisherProcessor implements // use ca cert publishing map and rule ICertificateAuthority ca = (ICertificateAuthority) mAuthority; - X509Certificate caCert = (X509Certificate) ca.getCACert(); + X509Certificate caCert = ca.getCACert(); LDAPConnection conn = null; @@ -1394,7 +1390,7 @@ public class PublisherProcessor implements conn = mLdapConnModule.getConn(); } try { - dirdn = mapper.map(conn, r, (Object) caCert); + dirdn = mapper.map(conn, r, caCert); CMS.debug("PublisherProcessor: dirdn=" + dirdn); } catch (Throwable e1) { diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java index c1822113d..eb3fde26c 100644 --- a/base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java +++ b/base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java @@ -273,7 +273,7 @@ public class LdapAuthInfo implements ILdapAuthInfo { * @return array of parameters for this authentication. */ public String[] getParms() { - return (String[]) mParms.clone(); + return mParms.clone(); } /** diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java index f05fc237e..47dfb0fb1 100644 --- a/base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java +++ b/base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java @@ -53,7 +53,7 @@ public class LdapConnInfo implements ILdapConnInfo { public void init(IConfigStore config) throws EBaseException, ELdapException { mHost = config.getString(PROP_HOST); mPort = config.getInteger(PROP_PORT); - String version = (String) config.get(PROP_PROTOCOL); + String version = config.get(PROP_PROTOCOL); if (version != null && version.equals("")) { // provide a default when this field is blank from the diff --git a/base/common/src/com/netscape/cmscore/logging/LogQueue.java b/base/common/src/com/netscape/cmscore/logging/LogQueue.java index f5b31b082..2a63fe478 100644 --- a/base/common/src/com/netscape/cmscore/logging/LogQueue.java +++ b/base/common/src/com/netscape/cmscore/logging/LogQueue.java @@ -64,7 +64,7 @@ public class LogQueue implements ILogQueue { if (mListeners == null) return; for (int i = 0; i < mListeners.size(); i++) { - ((ILogEventListener) mListeners.elementAt(i)).shutdown(); + mListeners.elementAt(i).shutdown(); } mListeners = null; } @@ -99,7 +99,7 @@ public class LogQueue implements ILogQueue { return; for (int i = 0; i < mListeners.size(); i++) { try { - ((ILogEventListener) mListeners.elementAt(i)).log(event); + mListeners.elementAt(i).log(event); } catch (ELogException e) { // Raidzilla Bug #57592: Don't display potentially // incorrect log message. @@ -107,7 +107,7 @@ public class LogQueue implements ILogQueue { // event.getEventType(), e.toString()))); // Don't do this again. - removeLogEventListener((ILogEventListener) mListeners.elementAt(i)); + removeLogEventListener(mListeners.elementAt(i)); } } } @@ -117,7 +117,7 @@ public class LogQueue implements ILogQueue { */ public void flush() { for (int i = 0; i < mListeners.size(); i++) { - ((ILogEventListener) mListeners.elementAt(i)).flush(); + mListeners.elementAt(i).flush(); } } } diff --git a/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java b/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java index 86e7f529c..9607cf892 100644 --- a/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java +++ b/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java @@ -89,7 +89,7 @@ public class LogSubsystem implements ILogSubsystem { Enumeration<String> mImpls = c.getSubStoreNames(); while (mImpls.hasMoreElements()) { - String id = (String) mImpls.nextElement(); + String id = mImpls.nextElement(); String pluginPath = c.getString(id + "." + PROP_CLASS); LogPlugin plugin = new LogPlugin(id, pluginPath); @@ -103,11 +103,11 @@ public class LogSubsystem implements ILogSubsystem { Enumeration<String> instances = c.getSubStoreNames(); while (instances.hasMoreElements()) { - String insName = (String) instances.nextElement(); + String insName = instances.nextElement(); String implName = c.getString(insName + "." + PROP_PLUGIN); LogPlugin plugin = - (LogPlugin) mLogPlugins.get(implName); + mLogPlugins.get(implName); if (plugin == null) { throw new EBaseException(implName); @@ -157,11 +157,10 @@ public class LogSubsystem implements ILogSubsystem { Enumeration<String> enum1 = mLogInsts.keys(); while (enum1.hasMoreElements()) { - String instName = (String) enum1.nextElement(); + String instName = enum1.nextElement(); Debug.trace("about to call inst=" + instName + " in LogSubsystem.startup()"); - ILogEventListener inst = (ILogEventListener) - mLogInsts.get(instName); + ILogEventListener inst = mLogInsts.get(instName); inst.startup(); } @@ -213,7 +212,7 @@ public class LogSubsystem implements ILogSubsystem { * Retrieve log instance by it's name */ public ILogEventListener getLogInstance(String insName) { - return (ILogEventListener) mLogInsts.get(insName); + return mLogInsts.get(insName); } public Hashtable<String, LogPlugin> getLogPlugins() { @@ -227,8 +226,7 @@ public class LogSubsystem implements ILogSubsystem { public Vector<String> getLogDefaultParams(String implName) throws ELogException { // is this a registered implname? - LogPlugin plugin = (LogPlugin) - mLogPlugins.get(implName); + LogPlugin plugin = mLogPlugins.get(implName); if (plugin == null) { throw new ELogException(implName); diff --git a/base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java b/base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java index 4848238b7..d187a7fed 100644 --- a/base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java +++ b/base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java @@ -155,7 +155,7 @@ public class EmailFormProcessor implements IEmailFormProcessor { for (Enumeration<String> e = mTok2vals.keys(); e.hasMoreElements();) { // get key - tok = (String) e.nextElement(); + tok = e.nextElement(); // compare key with $token if (t.startsWith(tok)) { diff --git a/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java b/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java index a3f64915d..8d8c05bc6 100644 --- a/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java +++ b/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java @@ -311,7 +311,7 @@ public class GeneralNameUtil implements IGeneralNameUtil { } public GeneralNameConfig[] getGenNameConfig() { - return (GeneralNameConfig[]) mGenNameConfigs.clone(); + return mGenNameConfigs.clone(); } public int getNumGeneralNames() { diff --git a/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java b/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java index 823c416dc..baf86da31 100644 --- a/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java +++ b/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java @@ -210,7 +210,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { Enumeration<String> mImpls = c.getSubStoreNames(); while (mImpls.hasMoreElements()) { - String id = (String) mImpls.nextElement(); + String id = mImpls.nextElement(); // The implementation id should be unique if (mImplTable.containsKey(id)) @@ -270,7 +270,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { IConfigStore ruleStore = config.getSubStore(PROP_RULE); for (int i = 0; i < numPolicies; i++) { - String instanceName = (String) mPolicyOrder.elementAt(i); + String instanceName = mPolicyOrder.elementAt(i); // The instance id should be unique if (mInstanceTable.containsKey(instanceName)) @@ -302,8 +302,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { } // Make an instance of the specified policy. - RegisteredPolicy regPolicy = - (RegisteredPolicy) mImplTable.get(implName); + RegisteredPolicy regPolicy = mImplTable.get(implName); if (regPolicy == null) { String[] params = { implName, instanceName }; @@ -318,7 +317,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { rule = (IPolicyRule) Class.forName(classpath).newInstance(); if (rule instanceof IPolicyRule) - ((IPolicyRule) rule).setInstanceName(instanceName); + rule.setInstanceName(instanceName); rule.init(this, c); } catch (Throwable e) { mAuthority.log(ILogger.LL_FAILURE, @@ -378,7 +377,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { */ public PolicyResult apply(IRequest req) { IPolicySet rules = null; - String op = (String) req.getRequestType(); + String op = req.getRequestType(); CMS.debug("GenericPolicyProcessor: apply begins"); if (op == null) { @@ -465,8 +464,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { try { while (enum1.hasMoreElements()) { - RegisteredPolicy regPolicy = - (RegisteredPolicy) enum1.nextElement(); + RegisteredPolicy regPolicy = enum1.nextElement(); // Make an Instance of it IPolicyRule ruleImpl = (IPolicyRule) @@ -488,11 +486,8 @@ public class GenericPolicyProcessor implements IPolicyProcessor { try { while (enum1.hasMoreElements()) { - RegisteredPolicy regPolicy = - (RegisteredPolicy) enum1.nextElement(); - + RegisteredPolicy regPolicy = enum1.nextElement(); impls.addElement(regPolicy.getId()); - } ret = impls.elements(); } catch (Exception e) { @@ -502,8 +497,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { } public IPolicyRule getPolicyImpl(String id) { - RegisteredPolicy regImpl = (RegisteredPolicy) - mImplTable.get(id); + RegisteredPolicy regImpl = mImplTable.get(id); if (regImpl == null) return null; @@ -535,8 +529,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { public void deletePolicyImpl(String id) throws EBaseException { // First check if the id is valid; - RegisteredPolicy regPolicy = - (RegisteredPolicy) mImplTable.get(id); + RegisteredPolicy regPolicy = mImplTable.get(id); if (regPolicy == null) throw new EPolicyException( @@ -547,7 +540,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { Enumeration<PolicyInstance> e = mInstanceTable.elements(); for (; e.hasMoreElements();) { - PolicyInstance inst = (PolicyInstance) e.nextElement(); + PolicyInstance inst = e.nextElement(); if (inst.isInstanceOf(id)) { instanceExist = true; @@ -636,8 +629,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { try { while (enum1.hasMoreElements()) { - PolicyInstance instance = - (PolicyInstance) mInstanceTable.get((String) enum1.nextElement()); + PolicyInstance instance = mInstanceTable.get(enum1.nextElement()); rules.addElement(instance.getRule()); @@ -668,15 +660,13 @@ public class GenericPolicyProcessor implements IPolicyProcessor { } public IPolicyRule getPolicyInstance(String id) { - PolicyInstance policyInstance = (PolicyInstance) - mInstanceTable.get(id); + PolicyInstance policyInstance = mInstanceTable.get(id); return (policyInstance == null) ? null : policyInstance.getRule(); } public Vector<String> getPolicyInstanceConfig(String id) { - PolicyInstance policyInstance = (PolicyInstance) - mInstanceTable.get(id); + PolicyInstance policyInstance = mInstanceTable.get(id); if (policyInstance == null) return null; @@ -702,8 +692,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { CMS.getUserMessage("CMS_POLICY_CANT_DELETE_PERSISTENT_POLICY", id)); // First check if the instance is present. - PolicyInstance instance = - (PolicyInstance) mInstanceTable.get(id); + PolicyInstance instance = mInstanceTable.get(id); if (instance == null) throw new EPolicyException( @@ -762,7 +751,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { throw new EPolicyException( CMS.getUserMessage("CMS_POLICY_DUPLICATE_INST_ID", id)); // There should be an implmentation for this rule. - String implName = (String) ht.get(IPolicyRule.PROP_IMPLNAME); + String implName = ht.get(IPolicyRule.PROP_IMPLNAME); // See if there is an implementation with this name. IPolicyRule rule = getPolicyImpl(implName); @@ -793,7 +782,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { rule.init(this, newStore); // Add the rule to the table. - String enabledStr = (String) ht.get(IPolicyRule.PROP_ENABLE); + String enabledStr = ht.get(IPolicyRule.PROP_ENABLE); boolean active = false; if (enabledStr == null || enabledStr.trim().length() == 0 || @@ -801,7 +790,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { active = true; // Set the predicate if any present on the rule. - String predicate = ((String) ht.get(IPolicyRule.PROP_PREDICATE)).trim(); + String predicate = ht.get(IPolicyRule.PROP_PREDICATE).trim(); IExpression exp = null; if (predicate.trim().length() > 0) @@ -837,8 +826,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { public void modifyPolicyInstance(String id, Hashtable<String, String> ht) throws EBaseException { // The instance id should be there already - PolicyInstance policyInstance = (PolicyInstance) - mInstanceTable.get(id); + PolicyInstance policyInstance = mInstanceTable.get(id); if (policyInstance == null) throw new EPolicyException( @@ -846,7 +834,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { IPolicyRule rule = policyInstance.getRule(); // The impl id shouldn't change - String implId = (String) ht.get(IPolicyRule.PROP_IMPLNAME); + String implId = ht.get(IPolicyRule.PROP_IMPLNAME); if (!implId.equals(policyInstance.getImplId())) throw new EPolicyException( @@ -868,7 +856,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { IConfigStore newStore = new PropConfigStore(id); // See if the rule is disabled. - String enabledStr = (String) ht.get(IPolicyRule.PROP_ENABLE); + String enabledStr = ht.get(IPolicyRule.PROP_ENABLE); boolean active = false; if (enabledStr == null || enabledStr.trim().length() == 0 || @@ -876,7 +864,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { active = true; // Set the predicate expression. - String predicate = ((String) ht.get(IPolicyRule.PROP_PREDICATE)).trim(); + String predicate = ht.get(IPolicyRule.PROP_PREDICATE).trim(); IExpression exp = null; if (predicate.trim().length() > 0) @@ -890,8 +878,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { CMS.getUserMessage("CMS_POLICY_PERSISTENT_RULE_INACTIVE", id)); } - IExpression defPred = (IExpression) - mUndeletablePolicies.get(id); + IExpression defPred = mUndeletablePolicies.get(id); if (defPred == SimpleExpression.NULL_EXPRESSION) defPred = null; @@ -922,16 +909,16 @@ public class GenericPolicyProcessor implements IPolicyProcessor { // put old config store parameters first. for (Enumeration<String> oldkeys = oldStore.keys(); oldkeys.hasMoreElements();) { - String k = (String) oldkeys.nextElement(); - String v = (String) oldStore.getString(k); + String k = oldkeys.nextElement(); + String v = oldStore.getString(k); newStore.put(k, v); } // put modified params. for (Enumeration<String> newkeys = ht.keys(); newkeys.hasMoreElements();) { - String k = (String) newkeys.nextElement(); - String v = (String) ht.get(k); + String k = newkeys.nextElement(); + String v = ht.get(k); Debug.trace("newstore key " + k + "=" + v); if (v != null) { @@ -969,13 +956,13 @@ public class GenericPolicyProcessor implements IPolicyProcessor { // Store the changes in the file. try { for (Enumeration<String> e = newStore.keys(); e.hasMoreElements();) { - String key = (String) e.nextElement(); + String key = e.nextElement(); if (key != null) { Debug.trace( "oldstore.put(" + key + "," + - (String) newStore.getString(key) + ")"); - oldStore.put(key, (String) newStore.getString(key)); + newStore.getString(key) + ")"); + oldStore.put(key, newStore.getString(key)); } } mGlobalStore.commit(true); @@ -1078,9 +1065,8 @@ public class GenericPolicyProcessor implements IPolicyProcessor { // add rules specified in the new order. for (Enumeration<String> enum1 = policyOrder.elements(); enum1.hasMoreElements();) { - String instanceName = (String) enum1.nextElement(); - PolicyInstance pInstance = (PolicyInstance) - mInstanceTable.get(instanceName); + String instanceName = enum1.nextElement(); + PolicyInstance pInstance = mInstanceTable.get(instanceName); if (!pInstance.isActive()) continue; @@ -1141,7 +1127,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { StringBuffer sb = new StringBuffer(); for (Enumeration<String> e = rules.elements(); e.hasMoreElements();) { - sb.append((String) e.nextElement()); + sb.append(e.nextElement()); sb.append(","); } if (sb.length() > 0) @@ -1379,7 +1365,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { // predicate is set. mUndeletablePolicies = new Hashtable<String, IExpression>(); for (Enumeration<String> e = rules.elements(); e.hasMoreElements();) { - String urn = (String) e.nextElement(); + String urn = e.nextElement(); // See if there is predicate in the file String pred = mConfig.getString(PROP_UNDELETABLE_POLICIES + @@ -1426,10 +1412,10 @@ public class GenericPolicyProcessor implements IPolicyProcessor { // the policy is present, is not disabled and its predicate // is not tampered with. for (Enumeration<String> e = mUndeletablePolicies.keys(); e.hasMoreElements();) { - String urn = (String) e.nextElement(); + String urn = e.nextElement(); // See if the rule is in the instance table. - PolicyInstance inst = (PolicyInstance) mInstanceTable.get(urn); + PolicyInstance inst = mInstanceTable.get(urn); if (inst == null) throw new EPolicyException( @@ -1441,8 +1427,7 @@ public class GenericPolicyProcessor implements IPolicyProcessor { CMS.getUserMessage("CMS_POLICY_PERSISTENT_RULE_INACTIVE", urn)); // See if the predicated is misconfigured. - IExpression defPred = (IExpression) - mUndeletablePolicies.get(urn); + IExpression defPred = mUndeletablePolicies.get(urn); // We used SimpleExpression.NULL_EXPRESSION to indicate a null. if (defPred == SimpleExpression.NULL_EXPRESSION) diff --git a/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java b/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java index b40a50699..f6c01b041 100644 --- a/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java +++ b/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java @@ -128,11 +128,11 @@ public class PolicyPredicateParser { if (size == 0) return null; OrExpression orExp = new - OrExpression((IExpression) expSet.elementAt(0), null); + OrExpression(expSet.elementAt(0), null); for (int i = 1; i < size; i++) orExp = new OrExpression(orExp, - (IExpression) expSet.elementAt(i)); + expSet.elementAt(i)); return orExp; } @@ -174,12 +174,12 @@ public class PolicyPredicateParser { } int size = expVector.size(); - SimpleExpression exp1 = (SimpleExpression) expVector.elementAt(0); - SimpleExpression exp2 = (SimpleExpression) expVector.elementAt(1); + SimpleExpression exp1 = expVector.elementAt(0); + SimpleExpression exp2 = expVector.elementAt(1); AndExpression andExp = new AndExpression(exp1, exp2); for (int i = 2; i < size; i++) { - andExp = new AndExpression(andExp, (SimpleExpression) expVector.elementAt(i)); + andExp = new AndExpression(andExp, expVector.elementAt(i)); } return andExp; } diff --git a/base/common/src/com/netscape/cmscore/policy/PolicySet.java b/base/common/src/com/netscape/cmscore/policy/PolicySet.java index d824d2629..8e8d60046 100644 --- a/base/common/src/com/netscape/cmscore/policy/PolicySet.java +++ b/base/common/src/com/netscape/cmscore/policy/PolicySet.java @@ -131,7 +131,7 @@ public class PolicySet implements IPolicySet { if (index < 0) return null; - return (IPolicyRule) mRules.elementAt(index); + return mRules.elementAt(index); } /** @@ -167,8 +167,8 @@ public class PolicySet implements IPolicySet { int size = mRules.size(); for (int index = 0; index < size; index++) { - String name = (String) mRuleNames.elementAt(index); - IPolicyRule rule = (IPolicyRule) mRules.elementAt(index); + String name = mRuleNames.elementAt(index); + IPolicyRule rule = mRules.elementAt(index); IExpression exp = rule.getPredicate(); try { @@ -238,7 +238,7 @@ public class PolicySet implements IPolicySet { // treat as rejected to prevent request from going into // a weird state. request queue doesn't handle this case. rejected = true; - ((IPolicyRule) rule).setError( + rule.setError( req, CMS.getUserMessage("CMS_POLICY_UNEXPECTED_POLICY_ERROR", rule.getName(), ex.toString()), null); } @@ -265,7 +265,7 @@ public class PolicySet implements IPolicySet { int size = mRules.size(); for (int index = 0; index < size; index++) { - String ruleName = (String) mRuleNames.elementAt(index); + String ruleName = mRuleNames.elementAt(index); System.out.println("Rule Name: " + ruleName); System.out.println("Implementation: " + diff --git a/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java b/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java index cf6e44bb0..97b75fa4f 100644 --- a/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java +++ b/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java @@ -131,7 +131,7 @@ public class SimpleExpression implements IExpression { private boolean matchVector(Vector<?> value) throws EPolicyException { boolean result = false; - Enumeration<?> e = (Enumeration<?>) value.elements(); + Enumeration<?> e = value.elements(); for (; e.hasMoreElements();) { result = matchValue(e.nextElement()); @@ -146,7 +146,7 @@ public class SimpleExpression implements IExpression { boolean result = false; for (int i = 0; i < value.length; i++) { - result = matchValue((Object) value[i]); + result = matchValue(value[i]); if (result) break; } diff --git a/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java b/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java index 54f54e009..6fecf8810 100644 --- a/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java +++ b/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java @@ -91,7 +91,7 @@ public class ProfileSubsystem implements IProfileSubsystem { StringTokenizer st = new StringTokenizer(ids, ","); while (st.hasMoreTokens()) { - String id = (String) st.nextToken(); + String id = st.nextToken(); IConfigStore subStore = config.getSubStore(id); String classid = subStore.getString(PROP_CLASS_ID); IPluginInfo info = registry.getPluginInfo("profile", classid); @@ -107,7 +107,7 @@ public class ProfileSubsystem implements IProfileSubsystem { Enumeration<String> ee = getProfileIds(); while (ee.hasMoreElements()) { - String id = (String) ee.nextElement(); + String id = ee.nextElement(); CMS.debug("Registered Confirmation - " + id); } @@ -156,7 +156,7 @@ public class ProfileSubsystem implements IProfileSubsystem { String list = ""; while (tokenizer.hasMoreTokens()) { - String element = (String) tokenizer.nextToken(); + String element = tokenizer.nextToken(); if (!element.equals(id)) { list = list + element + ","; @@ -235,7 +235,7 @@ public class ProfileSubsystem implements IProfileSubsystem { } public boolean isProfileEnable(String id) { - IProfile profile = (IProfile) mProfiles.get(id); + IProfile profile = mProfiles.get(id); String enable = null; try { @@ -266,7 +266,7 @@ public class ProfileSubsystem implements IProfileSubsystem { */ public void enableProfile(String id, String enableBy) throws EProfileException { - IProfile profile = (IProfile) mProfiles.get(id); + IProfile profile = mProfiles.get(id); profile.getConfigStore().putString(PROP_ENABLE, "true"); profile.getConfigStore().putString(PROP_ENABLE_BY, enableBy); @@ -281,7 +281,7 @@ public class ProfileSubsystem implements IProfileSubsystem { */ public void disableProfile(String id) throws EProfileException { - IProfile profile = (IProfile) mProfiles.get(id); + IProfile profile = mProfiles.get(id); profile.getConfigStore().putString(PROP_ENABLE, "false"); try { diff --git a/base/common/src/com/netscape/cmscore/realm/ACL.java b/base/common/src/com/netscape/cmscore/realm/ACL.java index 5c7defd1d..6c06c92c1 100644 --- a/base/common/src/com/netscape/cmscore/realm/ACL.java +++ b/base/common/src/com/netscape/cmscore/realm/ACL.java @@ -154,7 +154,7 @@ public class ACL { Enumeration<ACLEntry> e = entries(); for (; e.hasMoreElements();) { - ACLEntry entry = (ACLEntry) e.nextElement(); + ACLEntry entry = e.nextElement(); entries += entry.toString(); if (e.hasMoreElements()) @@ -179,7 +179,7 @@ public class ACL { * @return true if it's one of the "rights"; false otherwise */ public boolean checkRight(String permission) { - return (rights.contains((Object) permission)); + return (rights.contains(permission)); } /** diff --git a/base/common/src/com/netscape/cmscore/realm/PKIJNDIRealm.java b/base/common/src/com/netscape/cmscore/realm/PKIJNDIRealm.java index b847332c6..683dc60f8 100644 --- a/base/common/src/com/netscape/cmscore/realm/PKIJNDIRealm.java +++ b/base/common/src/com/netscape/cmscore/realm/PKIJNDIRealm.java @@ -819,7 +819,7 @@ public class PKIJNDIRealm extends JNDIRealm { StringTokenizer atok = new StringTokenizer(tr, ";"); while (atok.hasMoreTokens()) { - String acs = (String) atok.nextToken(); + String acs = atok.nextToken(); // construct ACL entry ACLEntry entry = ACLEntry.parseACLEntry(acl, acs); diff --git a/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java b/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java index 95a723785..747fe9ce7 100644 --- a/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java +++ b/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java @@ -195,7 +195,7 @@ public class PluginRegistry implements IPluginRegistry { StringBuffer typesBuf = new StringBuffer(); while (types.hasMoreElements()) { - String type = (String) types.nextElement(); + String type = types.nextElement(); typesBuf.append(type); if (types.hasMoreElements()) { @@ -206,13 +206,13 @@ public class PluginRegistry implements IPluginRegistry { Enumeration<String> plugins = mPlugins.keys(); while (plugins.hasMoreElements()) { - String id = (String) plugins.nextElement(); + String id = plugins.nextElement(); idsBuf.append(id); if (plugins.hasMoreElements()) { idsBuf.append(","); } - IPluginInfo plugin = (IPluginInfo) mPlugins.get(id); + IPluginInfo plugin = mPlugins.get(id); mFileConfig.putString(type + "." + id + ".class", plugin.getClassName()); diff --git a/base/common/src/com/netscape/cmscore/request/ARequestQueue.java b/base/common/src/com/netscape/cmscore/request/ARequestQueue.java index 1d247ab0c..0a156b003 100644 --- a/base/common/src/com/netscape/cmscore/request/ARequestQueue.java +++ b/base/common/src/com/netscape/cmscore/request/ARequestQueue.java @@ -435,7 +435,7 @@ public abstract class ARequestQueue throw new EBaseException("Missing agent information"); aas.addApproval(agentName); - r.setExtData(AgentApprovals.class.getName(), (Vector<?>) aas.toStringVector()); + r.setExtData(AgentApprovals.class.getName(), aas.toStringVector()); PolicyResult pr = mPolicy.apply(r); @@ -842,7 +842,7 @@ class Request public void copyContents(IRequest req) { Enumeration<String> e = req.getExtDataKeys(); while (e.hasMoreElements()) { - String key = (String) e.nextElement(); + String key = e.nextElement(); if (!key.equals(IRequest.ISSUED_CERTS) && !key.equals(IRequest.ERRORS) && !key.equals(IRequest.REMOTE_REQID)) { @@ -1236,7 +1236,7 @@ class Request return false; } try { - stringArray = (String[]) stringVector.toArray(new String[0]); + stringArray = stringVector.toArray(new String[0]); } catch (ArrayStoreException e) { return false; } @@ -1291,8 +1291,8 @@ class Request Enumeration<String> keys = hash.keys(); while (keys.hasMoreElements()) { try { - String hashKey = (String) keys.nextElement(); - authToken.set(hashKey, (String) hash.get(hashKey)); + String hashKey = keys.nextElement(); + authToken.set(hashKey, hash.get(hashKey)); } catch (ClassCastException e) { return null; } @@ -1546,7 +1546,7 @@ class RequestList } public RequestId nextRequestId() { - return (RequestId) mEnumeration.nextElement(); + return mEnumeration.nextElement(); } public Object nextRequest() { diff --git a/base/common/src/com/netscape/cmscore/request/ExtDataHashtable.java b/base/common/src/com/netscape/cmscore/request/ExtDataHashtable.java index 86e6c0530..44197b406 100644 --- a/base/common/src/com/netscape/cmscore/request/ExtDataHashtable.java +++ b/base/common/src/com/netscape/cmscore/request/ExtDataHashtable.java @@ -54,7 +54,7 @@ public class ExtDataHashtable<V> extends Hashtable<String, V> { public V put(String oKey, V val) { if (oKey instanceof String) { - String key = (String) oKey; + String key = oKey; return super.put(key.toLowerCase(), val); } return super.put(oKey, val); diff --git a/base/common/src/com/netscape/cmscore/request/RequestQueue.java b/base/common/src/com/netscape/cmscore/request/RequestQueue.java index 95335724a..6159a2ed5 100644 --- a/base/common/src/com/netscape/cmscore/request/RequestQueue.java +++ b/base/common/src/com/netscape/cmscore/request/RequestQueue.java @@ -598,7 +598,7 @@ public class RequestQueue * return request repository */ public IRepository getRequestRepository() { - return (IRepository) mRepository; + return mRepository; } public String getPublishingStatus() { diff --git a/base/common/src/com/netscape/cmscore/request/RequestRecord.java b/base/common/src/com/netscape/cmscore/request/RequestRecord.java index 3381727e4..fe6320ca6 100644 --- a/base/common/src/com/netscape/cmscore/request/RequestRecord.java +++ b/base/common/src/com/netscape/cmscore/request/RequestRecord.java @@ -579,7 +579,7 @@ class RequestAttrsMapper @SuppressWarnings("unchecked") Enumeration<byte[]> values = attr.getByteValues(); - value = (byte[]) values.nextElement(); + value = values.nextElement(); ht = decodeHashtable(value); } diff --git a/base/common/src/com/netscape/cmscore/security/PWsdrCache.java b/base/common/src/com/netscape/cmscore/security/PWsdrCache.java index ef9b4b823..2e0dfd550 100644 --- a/base/common/src/com/netscape/cmscore/security/PWsdrCache.java +++ b/base/common/src/com/netscape/cmscore/security/PWsdrCache.java @@ -458,7 +458,7 @@ public class PWsdrCache { StringTokenizer st = new StringTokenizer(cache, "\n"); while (st.hasMoreTokens()) { - String line = (String) st.nextToken(); + String line = st.nextToken(); // break into tag:password format for each line int colonIdx = line.indexOf(":"); @@ -514,7 +514,7 @@ public class PWsdrCache { // this is created and destroyed at each use pwTable = string2Hashtable(cache); debug("in getEntry, pw cache parsed"); - pw = (String) pwTable.get(tag); + pw = pwTable.get(tag); } if (pw != null) { @@ -617,7 +617,7 @@ public class PWsdrCache { StringTokenizer st = new StringTokenizer(dcrypts, "\n"); while (st.hasMoreTokens()) { - String line = (String) st.nextToken(); + String line = st.nextToken(); // break into tag:password format for each line int colonIdx = line.indexOf(":"); diff --git a/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java b/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java index 5d56e7a85..c51aa0d46 100644 --- a/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java +++ b/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java @@ -271,8 +271,7 @@ public class SelfTestSubsystem int i = 0; while (instances.hasMoreElements()) { - SelfTestOrderedInstance instance = (SelfTestOrderedInstance) - instances.nextElement(); + SelfTestOrderedInstance instance = instances.nextElement(); mList[i] = instance.getSelfTestName(); if (mList[i] != null) { @@ -314,8 +313,7 @@ public class SelfTestSubsystem Enumeration<SelfTestOrderedInstance> instances = mOnDemandOrder.elements(); while (instances.hasMoreElements()) { - SelfTestOrderedInstance instance = (SelfTestOrderedInstance) - instances.nextElement(); + SelfTestOrderedInstance instance = instances.nextElement(); if (instanceName.equals(instance.getSelfTestName())) { instance.setSelfTestCriticalMode(isCritical); @@ -376,8 +374,7 @@ public class SelfTestSubsystem Enumeration<SelfTestOrderedInstance> instances = mOnDemandOrder.elements(); while (instances.hasMoreElements()) { - SelfTestOrderedInstance instance = (SelfTestOrderedInstance) - instances.nextElement(); + SelfTestOrderedInstance instance = instances.nextElement(); if (instanceName.equals(instance.getSelfTestName())) { mOnDemandOrder.remove(instance); @@ -421,8 +418,7 @@ public class SelfTestSubsystem Enumeration<SelfTestOrderedInstance> instances = mOnDemandOrder.elements(); while (instances.hasMoreElements()) { - SelfTestOrderedInstance instance = (SelfTestOrderedInstance) - instances.nextElement(); + SelfTestOrderedInstance instance = instances.nextElement(); if (instanceName.equals(instance.getSelfTestName())) { return true; @@ -465,8 +461,7 @@ public class SelfTestSubsystem Enumeration<SelfTestOrderedInstance> instances = mOnDemandOrder.elements(); while (instances.hasMoreElements()) { - SelfTestOrderedInstance instance = (SelfTestOrderedInstance) - instances.nextElement(); + SelfTestOrderedInstance instance = instances.nextElement(); if (instanceName.equals(instance.getSelfTestName())) { if (instance.isSelfTestCritical()) { @@ -505,8 +500,7 @@ public class SelfTestSubsystem Enumeration<SelfTestOrderedInstance> instances = mOnDemandOrder.elements(); while (instances.hasMoreElements()) { - SelfTestOrderedInstance instance = (SelfTestOrderedInstance) - instances.nextElement(); + SelfTestOrderedInstance instance = instances.nextElement(); String instanceFullName = null; String instanceName = instance.getSelfTestName(); @@ -524,8 +518,7 @@ public class SelfTestSubsystem } if (mSelfTestInstances.containsKey(instanceName)) { - ISelfTest test = (ISelfTest) - mSelfTestInstances.get(instanceName); + ISelfTest test = mSelfTestInstances.get(instanceName); try { if (CMS.debugOn()) { @@ -596,8 +589,7 @@ public class SelfTestSubsystem int i = 0; while (instances.hasMoreElements()) { - SelfTestOrderedInstance instance = (SelfTestOrderedInstance) - instances.nextElement(); + SelfTestOrderedInstance instance = instances.nextElement(); mList[i] = instance.getSelfTestName(); if (mList[i] != null) { @@ -639,8 +631,7 @@ public class SelfTestSubsystem Enumeration<SelfTestOrderedInstance> instances = mStartupOrder.elements(); while (instances.hasMoreElements()) { - SelfTestOrderedInstance instance = (SelfTestOrderedInstance) - instances.nextElement(); + SelfTestOrderedInstance instance = instances.nextElement(); if (instanceName.equals(instance.getSelfTestName())) { instance.setSelfTestCriticalMode(isCritical); @@ -701,8 +692,7 @@ public class SelfTestSubsystem Enumeration<SelfTestOrderedInstance> instances = mStartupOrder.elements(); while (instances.hasMoreElements()) { - SelfTestOrderedInstance instance = (SelfTestOrderedInstance) - instances.nextElement(); + SelfTestOrderedInstance instance = instances.nextElement(); if (instanceName.equals(instance.getSelfTestName())) { mStartupOrder.remove(instance); @@ -747,8 +737,7 @@ public class SelfTestSubsystem Enumeration<SelfTestOrderedInstance> instances = mStartupOrder.elements(); while (instances.hasMoreElements()) { - SelfTestOrderedInstance instance = (SelfTestOrderedInstance) - instances.nextElement(); + SelfTestOrderedInstance instance = instances.nextElement(); if (instanceName.equals(instance.getSelfTestName())) { return true; @@ -791,8 +780,7 @@ public class SelfTestSubsystem Enumeration<SelfTestOrderedInstance> instances = mStartupOrder.elements(); while (instances.hasMoreElements()) { - SelfTestOrderedInstance instance = (SelfTestOrderedInstance) - instances.nextElement(); + SelfTestOrderedInstance instance = instances.nextElement(); if (instanceName.equals(instance.getSelfTestName())) { if (instance.isSelfTestCritical()) { @@ -840,8 +828,7 @@ public class SelfTestSubsystem Enumeration<SelfTestOrderedInstance> instances = mStartupOrder.elements(); while (instances.hasMoreElements()) { - SelfTestOrderedInstance instance = (SelfTestOrderedInstance) - instances.nextElement(); + SelfTestOrderedInstance instance = instances.nextElement(); String instanceFullName = null; String instanceName = instance.getSelfTestName(); @@ -867,8 +854,7 @@ public class SelfTestSubsystem } if (mSelfTestInstances.containsKey(instanceName)) { - ISelfTest test = (ISelfTest) - mSelfTestInstances.get(instanceName); + ISelfTest test = mSelfTestInstances.get(instanceName); try { if (CMS.debugOn()) { @@ -974,7 +960,7 @@ public class SelfTestSubsystem Enumeration<ISelfTest> instances = mSelfTestInstances.elements(); while (instances.hasMoreElements()) { - ISelfTest instance = (ISelfTest) instances.nextElement(); + ISelfTest instance = instances.nextElement(); if (instanceName.equals(instance.getSelfTestName())) { return instance; @@ -1505,7 +1491,7 @@ public class SelfTestSubsystem while (instances.hasMoreElements()) { // the instance property name should be unique - instanceName = (String) instances.nextElement(); + instanceName = instances.nextElement(); if (instanceName != null) { instanceName = instanceName.trim(); instanceFullName = getFullName(mPrefix, @@ -1834,7 +1820,7 @@ public class SelfTestSubsystem Enumeration<ISelfTest> instances = mSelfTestInstances.elements(); while (instances.hasMoreElements()) { - ISelfTest instance = (ISelfTest) instances.nextElement(); + ISelfTest instance = instances.nextElement(); instance.startupSelfTest(); } @@ -1881,7 +1867,7 @@ public class SelfTestSubsystem ListIterator<ISelfTest> instances = list.listIterator(); while (instances.hasNext()) { - ISelfTest instance = (ISelfTest) instances.next(); + ISelfTest instance = instances.next(); instance.shutdownSelfTest(); } diff --git a/base/common/src/com/netscape/cmscore/usrgrp/Group.java b/base/common/src/com/netscape/cmscore/usrgrp/Group.java index 336e7b029..608348dfb 100644 --- a/base/common/src/com/netscape/cmscore/usrgrp/Group.java +++ b/base/common/src/com/netscape/cmscore/usrgrp/Group.java @@ -79,7 +79,7 @@ public class Group implements IGroup { public boolean isMember(String name) { for (int i = 0; i < mMembers.size(); i++) { - String id = (String) mMembers.elementAt(i); + String id = mMembers.elementAt(i); if (name.equals(id)) { return true; diff --git a/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java b/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java index cd46bcae3..ee9fa575e 100644 --- a/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java +++ b/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java @@ -197,7 +197,7 @@ public final class UGSubsystem implements IUGSubsystem { Enumeration<IUser> e = findUsers(userid); if (e != null && e.hasMoreElements()) { - IUser u = (IUser) e.nextElement(); + IUser u = e.nextElement(); return u; } else { @@ -215,7 +215,7 @@ public final class UGSubsystem implements IUGSubsystem { Enumeration<IUser> e = buildUsers(res); if (e.hasMoreElements()) { - return (IUser) e.nextElement(); + return e.nextElement(); } } finally { if (ldapconn != null) @@ -460,8 +460,7 @@ public final class UGSubsystem implements IUGSubsystem { int i = 0; while (en.hasMoreElements()) { - certArray[i++] = (X509Certificate) - en.nextElement(); + certArray[i++] = en.nextElement(); } id.setX509Certificates(certArray); @@ -543,7 +542,7 @@ public final class UGSubsystem implements IUGSubsystem { Enumeration<String> en = phoneAttr.getStringValues(); if (en != null && en.hasMoreElements()) { - String phone = (String) en.nextElement(); + String phone = en.nextElement(); if (phone != null) { id.setPhone(phone); @@ -563,7 +562,7 @@ public final class UGSubsystem implements IUGSubsystem { Enumeration<String> en = userTypeAttr.getStringValues(); if (en != null && en.hasMoreElements()) { - String userType = (String) en.nextElement(); + String userType = en.nextElement(); if ((userType != null) && (!userType.equals("undefined"))) id.setUserType(userType); @@ -582,7 +581,7 @@ public final class UGSubsystem implements IUGSubsystem { Enumeration<String> en = userStateAttr.getStringValues(); if (en != null && en.hasMoreElements()) { - String userState = (String) en.nextElement(); + String userState = en.nextElement(); if (userState != null) id.setState(userState); @@ -602,9 +601,7 @@ public final class UGSubsystem implements IUGSubsystem { try { for (; e != null && e.hasMoreElements();) { - X509Certificate cert = new X509CertImpl( - (byte[]) e.nextElement()); - + X509Certificate cert = new X509CertImpl(e.nextElement()); certVector.addElement(cert); } } catch (Exception ex) { @@ -618,8 +615,7 @@ public final class UGSubsystem implements IUGSubsystem { int i = 0; while (en.hasMoreElements()) { - certArray[i++] = (X509Certificate) - en.nextElement(); + certArray[i++] = en.nextElement(); } id.setX509Certificates(certArray); @@ -1199,7 +1195,7 @@ public final class UGSubsystem implements IUGSubsystem { Enumeration<String> en = grpDesc.getStringValues(); if (en != null && en.hasMoreElements()) { - String desc = (String) en.nextElement(); + String desc = en.nextElement(); if (desc != null) { try { @@ -1231,7 +1227,7 @@ public final class UGSubsystem implements IUGSubsystem { Enumeration<String> e = attr.getStringValues(); while (e.hasMoreElements()) { - String v = (String) e.nextElement(); + String v = e.nextElement(); // grp.addMemberName(v); // DOES NOT SUPPORT NESTED GROUPS... @@ -1289,7 +1285,7 @@ public final class UGSubsystem implements IUGSubsystem { if (e == null || e.hasMoreElements() == false) return null; - return (IGroup) e.nextElement(); + return e.nextElement(); } catch (Exception e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_USRGRP_GET_GROUP", e.toString())); } finally { @@ -1321,7 +1317,7 @@ public final class UGSubsystem implements IUGSubsystem { Enumeration<String> en = attr.getStringValues(); for (; en.hasMoreElements();) { - String v = (String) en.nextElement(); + String v = en.nextElement(); if (v.equalsIgnoreCase(GROUP_ATTR_VALUE)) { return true; @@ -1445,7 +1441,7 @@ public final class UGSubsystem implements IUGSubsystem { LDAPAttribute attrMembers = new LDAPAttribute("uniquemember"); while (e.hasMoreElements()) { - String name = (String) e.nextElement(); + String name = e.nextElement(); // DOES NOT SUPPORT NESTED GROUPS... attrMembers.addValue("uid=" + name + "," + @@ -1523,7 +1519,7 @@ public final class UGSubsystem implements IUGSubsystem { if (e.hasMoreElements() == true) { while (e.hasMoreElements()) { - String name = (String) e.nextElement(); + String name = e.nextElement(); // DOES NOT SUPPORT NESTED GROUPS... attrMembers.addValue("uid=" + name + "," + diff --git a/base/common/src/com/netscape/cmscore/util/StatsSubsystem.java b/base/common/src/com/netscape/cmscore/util/StatsSubsystem.java index c4d870e39..cfac63f21 100644 --- a/base/common/src/com/netscape/cmscore/util/StatsSubsystem.java +++ b/base/common/src/com/netscape/cmscore/util/StatsSubsystem.java @@ -100,7 +100,7 @@ public class StatsSubsystem implements IStatsSubsystem { long startTime = CMS.getCurrentDate().getTime(); StatsEvent currentST = null; for (int i = 0; i < milestones.size(); i++) { - StatsMilestone se = (StatsMilestone) milestones.elementAt(i); + StatsMilestone se = milestones.elementAt(i); if (currentST == null) { currentST = mAllTrans.getSubEvent(se.getId()); } else { diff --git a/base/common/test/com/netscape/certsrv/request/AgentApprovalsTest.java b/base/common/test/com/netscape/certsrv/request/AgentApprovalsTest.java index e7606951d..dbb4c189f 100644 --- a/base/common/test/com/netscape/certsrv/request/AgentApprovalsTest.java +++ b/base/common/test/com/netscape/certsrv/request/AgentApprovalsTest.java @@ -48,15 +48,15 @@ public class AgentApprovalsTest extends CMSBaseTestCase { assertNotNull(approvals); assertEquals(3, approvals.mVector.size()); - AgentApproval approval = (AgentApproval) approvals.mVector.get(0); + AgentApproval approval = approvals.mVector.get(0); assertEquals(approval1.getUserName(), approval.getUserName()); assertEquals(approval1.getDate(), approval.getDate()); - approval = (AgentApproval) approvals.mVector.get(1); + approval = approvals.mVector.get(1); assertEquals(approval2.getUserName(), approval.getUserName()); assertEquals(approval2.getDate(), approval.getDate()); - approval = (AgentApproval) approvals.mVector.get(2); + approval = approvals.mVector.get(2); assertEquals(approval3.getUserName(), approval.getUserName()); assertEquals(approval3.getDate(), approval.getDate()); diff --git a/base/java-tools/src/com/netscape/cmstools/AuditVerify.java b/base/java-tools/src/com/netscape/cmstools/AuditVerify.java index 8e9be012d..fb92cf12c 100644 --- a/base/java-tools/src/com/netscape/cmstools/AuditVerify.java +++ b/base/java-tools/src/com/netscape/cmstools/AuditVerify.java @@ -229,12 +229,12 @@ public class AuditVerify { int sigStartLine = 1; int sigStopLine = 1; - String sigStartFile = (String) logFiles.elementAt(0); + String sigStartFile = logFiles.elementAt(0); String sigStopFile = null; int signedLines = 1; for (int curfile = 0; curfile < logFiles.size(); ++curfile) { - String curfileName = (String) logFiles.elementAt(curfile); + String curfileName = logFiles.elementAt(curfile); BufferedReader br = new BufferedReader(new FileReader(curfileName)); if (verbose) { diff --git a/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java b/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java index 84b92e48c..b7955d70b 100644 --- a/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java +++ b/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java @@ -26,7 +26,6 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStreamReader; -import java.io.OutputStream; import java.io.PrintStream; import java.math.BigInteger; import java.security.MessageDigest; @@ -250,7 +249,7 @@ public class CMCEnroll { ByteArrayOutputStream ostream = new ByteArrayOutputStream(); - pkidata.encode((OutputStream) ostream); + pkidata.encode(ostream); digest = SHADigest.digest(ostream.toByteArray()); } catch (NoSuchAlgorithmException e) { } diff --git a/base/java-tools/src/com/netscape/cmstools/CMCRequest.java b/base/java-tools/src/com/netscape/cmstools/CMCRequest.java index f77bc039d..1dfb36fb2 100644 --- a/base/java-tools/src/com/netscape/cmstools/CMCRequest.java +++ b/base/java-tools/src/com/netscape/cmstools/CMCRequest.java @@ -26,7 +26,6 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStreamReader; -import java.io.OutputStream; import java.io.PrintStream; import java.math.BigInteger; import java.security.MessageDigest; @@ -259,7 +258,7 @@ public class CMCRequest { ByteArrayOutputStream ostream = new ByteArrayOutputStream(); - pkidata.encode((OutputStream) ostream); + pkidata.encode(ostream); digest = SHADigest.digest(ostream.toByteArray()); } catch (NoSuchAlgorithmException e) { } @@ -444,7 +443,7 @@ public class CMCRequest { StringTokenizer tokenizer = new StringTokenizer(bodyPartIDs, " "); SEQUENCE bodyList = new SEQUENCE(); while (tokenizer.hasMoreTokens()) { - String s = (String) tokenizer.nextToken(); + String s = tokenizer.nextToken(); bodyList.addElement(new INTEGER(s)); } LraPopWitness lra = new LraPopWitness(new INTEGER(0), bodyList); @@ -602,7 +601,7 @@ public class CMCRequest { ByteArrayOutputStream ostream = new ByteArrayOutputStream(); - revRequestControl.encode((OutputStream) ostream); + revRequestControl.encode(ostream); rdigest = rSHADigest.digest(ostream.toByteArray()); } catch (NoSuchAlgorithmException e) { } @@ -942,7 +941,7 @@ public class CMCRequest { StringTokenizer tokenizer = new StringTokenizer(ifilename, " "); String[] ifiles = new String[num]; for (int i = 0; i < num; i++) { - String ss = (String) tokenizer.nextToken(); + String ss = tokenizer.nextToken(); ifiles[i] = ss; if (ss == null) { System.out.println("Missing input file for the request."); diff --git a/base/java-tools/src/com/netscape/cmstools/DRMTool.java b/base/java-tools/src/com/netscape/cmstools/DRMTool.java index c536466c6..be6b10afc 100644 --- a/base/java-tools/src/com/netscape/cmstools/DRMTool.java +++ b/base/java-tools/src/com/netscape/cmstools/DRMTool.java @@ -1762,9 +1762,8 @@ public class DRMTool { + "the target storage certificate . . ." + NEWLINE, true); - mWrapPublicKey = (PublicKey) - (PK11PubKey.fromSPKI( - getPublicKey().getEncoded())); + mWrapPublicKey = PK11PubKey.fromSPKI( + getPublicKey().getEncoded()); if (mWrapPublicKey == null) { log("ERROR: Failed extracting " diff --git a/base/java-tools/src/com/netscape/cmstools/PasswordCache.java b/base/java-tools/src/com/netscape/cmstools/PasswordCache.java index cdddb5f1e..dbd8a21f3 100644 --- a/base/java-tools/src/com/netscape/cmstools/PasswordCache.java +++ b/base/java-tools/src/com/netscape/cmstools/PasswordCache.java @@ -696,7 +696,7 @@ class PWsdrCache { StringTokenizer st = new StringTokenizer(cache, "\n"); while (st.hasMoreTokens()) { - String line = (String) st.nextToken(); + String line = st.nextToken(); // break into tag:password format for each line int colonIdx = line.indexOf(":"); @@ -752,7 +752,7 @@ class PWsdrCache { // this is created and destroyed at each use pwTable = string2Hashtable(cache); debug("in getEntry, pw cache parsed"); - pw = (String) pwTable.get(tag); + pw = pwTable.get(tag); } if (pw != null) { @@ -848,7 +848,7 @@ class PWsdrCache { StringTokenizer st = new StringTokenizer(dcrypts, "\n"); while (st.hasMoreTokens()) { - String line = (String) st.nextToken(); + String line = st.nextToken(); // break into tag:password format for each line int colonIdx = line.indexOf(":"); diff --git a/base/kra/src/com/netscape/kra/EnrollmentService.java b/base/kra/src/com/netscape/kra/EnrollmentService.java index 1b6ffcebd..2f3e1dd7a 100644 --- a/base/kra/src/com/netscape/kra/EnrollmentService.java +++ b/base/kra/src/com/netscape/kra/EnrollmentService.java @@ -212,9 +212,8 @@ public class EnrollmentService implements IService { } } else { // profile-based request - PKIArchiveOptions options = (PKIArchiveOptions) - toPKIArchiveOptions( - request.getExtDataInByteArray(IEnrollProfile.REQUEST_ARCHIVE_OPTIONS)); + PKIArchiveOptions options = toPKIArchiveOptions( + request.getExtDataInByteArray(IEnrollProfile.REQUEST_ARCHIVE_OPTIONS)); aOpts = new PKIArchiveOptionsContainer[1]; aOpts[0] = new PKIArchiveOptionsContainer(options, diff --git a/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java b/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java index 41b5fdae8..09f765877 100644 --- a/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java +++ b/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java @@ -608,7 +608,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove public Hashtable<String, Object> getRecoveryParams(String recoveryID) throws EBaseException { - return (Hashtable<String, Object>) mRecoveryParams.get(recoveryID); + return mRecoveryParams.get(recoveryID); } public void createPk12(String recoveryID, byte[] pk12) @@ -658,7 +658,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove Hashtable<String, Object> h = getRecoveryParams(recoveryID); @SuppressWarnings("unchecked") Vector<Credential> dc = (Vector<Credential>) h.get(PARAM_CREDS); - Object lock = (Object) h.get(PARAM_LOCK); + Object lock = h.get(PARAM_LOCK); synchronized (lock) { while (dc.size() < getNoOfRequiredAgents()) { @@ -712,7 +712,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove Hashtable<String, Object> h = getRecoveryParams(recoveryID); @SuppressWarnings("unchecked") Vector<Credential> dc = (Vector<Credential>) h.get(PARAM_CREDS); - Object lock = (Object) h.get(PARAM_LOCK); + Object lock = h.get(PARAM_LOCK); synchronized (lock) { verifyCredential(dc, uid, pwd); @@ -1500,7 +1500,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove } public Hashtable<String, Object> getVolatileRequest(RequestId id) { - return (Hashtable<String, Object>) mVolatileRequests.get(id.toString()); + return mVolatileRequests.get(id.toString()); } public void destroyVolatileRequest(RequestId id) { diff --git a/base/kra/src/com/netscape/kra/NetkeyKeygenService.java b/base/kra/src/com/netscape/kra/NetkeyKeygenService.java index 017538bd5..1fdf9f74e 100644 --- a/base/kra/src/com/netscape/kra/NetkeyKeygenService.java +++ b/base/kra/src/com/netscape/kra/NetkeyKeygenService.java @@ -452,7 +452,7 @@ public class NetkeyKeygenService implements IService { CMS.debug("NetkeyKeygenService: got key wrapper"); CMS.debug("NetkeyKeygenService: key transport key is on slot: " + sk.getOwningToken().getName()); - symWrap.initWrap((SymmetricKey) sk, algParam); + symWrap.initWrap(sk, algParam); byte wrapped[] = symWrap.wrap((PrivateKey) privKey); /* CMS.debug("NetkeyKeygenService: wrap called"); diff --git a/base/kra/src/com/netscape/kra/RecoveryService.java b/base/kra/src/com/netscape/kra/RecoveryService.java index 80f2fc711..135f55b59 100644 --- a/base/kra/src/com/netscape/kra/RecoveryService.java +++ b/base/kra/src/com/netscape/kra/RecoveryService.java @@ -412,7 +412,7 @@ public class RecoveryService implements IService { keyRecord.getAlgorithm(), iv, pri, - (PublicKey) pubkey); + pubkey); if (privKey == null) { mKRA.log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_KRA_PRIVATE_KEY_NOT_FOUND")); diff --git a/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java b/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java index f96ece890..cec1ea434 100644 --- a/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java +++ b/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java @@ -305,7 +305,7 @@ public class SecurityDataRecoveryService implements IService { throw new NoSuchAlgorithmException("Key generation algorithm" + " is not a PBE algorithm"); } - PBEAlgorithm pbeAlg = (PBEAlgorithm) keyGenAlg; + PBEAlgorithm pbeAlg = keyGenAlg; KeyGenerator kg = token.getKeyGenerator(keyGenAlg); PBEKeyGenParams pbekgParams = new PBEKeyGenParams( diff --git a/base/kra/src/com/netscape/kra/StorageKeyUnit.java b/base/kra/src/com/netscape/kra/StorageKeyUnit.java index 510e2f328..3d679e3d8 100644 --- a/base/kra/src/com/netscape/kra/StorageKeyUnit.java +++ b/base/kra/src/com/netscape/kra/StorageKeyUnit.java @@ -942,8 +942,7 @@ public class StorageKeyUnit extends EncryptionUnit implements while (e.hasMoreElements()) { String next = e.nextElement(); - j.addShare(Integer.parseInt(next) + 1, - (byte[]) v.get(next)); + j.addShare(Integer.parseInt(next) + 1, v.get(next)); } try { byte secret[] = j.recoverSecret(); diff --git a/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java b/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java index 298988360..30a23594c 100644 --- a/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java +++ b/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java @@ -108,7 +108,7 @@ public class TokenKeyRecoveryService implements IService { ByteArrayOutputStream out = new ByteArrayOutputStream(s.length()); for (int i = 0; i < s.length(); i++) { - int c = (int) s.charAt(i); + int c = s.charAt(i); if (c == '+') { out.write(' '); @@ -290,7 +290,7 @@ public class TokenKeyRecoveryService implements IService { String cert = normalizeCertStr(cert_s); java.security.cert.X509Certificate x509cert = null; try { - x509cert = (java.security.cert.X509Certificate) Cert.mapCert(cert); + x509cert = Cert.mapCert(cert); if (x509cert == null) { CMS.debug("cert mapping failed"); request.setExtData(IRequest.RESULT, Integer.valueOf(5)); diff --git a/base/migrate/80/MigrateSecurityDomain.java b/base/migrate/80/MigrateSecurityDomain.java index 32dca511d..09fdb28aa 100644 --- a/base/migrate/80/MigrateSecurityDomain.java +++ b/base/migrate/80/MigrateSecurityDomain.java @@ -192,17 +192,17 @@ public class MigrateSecurityDomain { Vector<String> v_host = parser.getValuesFromContainer(nodeList.item(i), "Host"); Vector<String> v_port = parser.getValuesFromContainer(nodeList.item(i), "SecurePort"); - String cn = (String) v_host.elementAt(0) + ":" + (String) v_port.elementAt(0); + String cn = v_host.elementAt(0) + ":" + v_port.elementAt(0); String dn = "cn=" + cn + ",cn=" + type + "List,ou=Security Domain," + basedn; LDAPEntry entry = null; LDAPAttributeSet attrs = null; attrs = new LDAPAttributeSet(); attrs.add(new LDAPAttribute("objectclass", "top")); attrs.add(new LDAPAttribute("objectclass", "pkiSubsystem")); - attrs.add(new LDAPAttribute("Host", (String) v_host.elementAt(0))); - attrs.add(new LDAPAttribute("SecurePort", (String) v_port.elementAt(0))); - attrs.add(new LDAPAttribute("Clone", (String) v_clone.elementAt(0))); - attrs.add(new LDAPAttribute("SubsystemName", (String) v_name.elementAt(0))); + attrs.add(new LDAPAttribute("Host", v_host.elementAt(0))); + attrs.add(new LDAPAttribute("SecurePort", v_port.elementAt(0))); + attrs.add(new LDAPAttribute("Clone", v_clone.elementAt(0))); + attrs.add(new LDAPAttribute("SubsystemName", v_name.elementAt(0))); attrs.add(new LDAPAttribute("cn", cn)); attrs.add(new LDAPAttribute("DomainManager", "true")); // Since the initial port separation feature didn't occur @@ -210,8 +210,8 @@ public class MigrateSecurityDomain { // value for BOTH the "SecureAgentPort" and the // "SecureAdminPort", and DON'T store any values for the // "UnSecurePort" - attrs.add(new LDAPAttribute("SecureAgentPort", (String) v_port.elementAt(0))); - attrs.add(new LDAPAttribute("SecureAdminPort", (String) v_port.elementAt(0))); + attrs.add(new LDAPAttribute("SecureAgentPort", v_port.elementAt(0))); + attrs.add(new LDAPAttribute("SecureAdminPort", v_port.elementAt(0))); entry = new LDAPEntry(dn, attrs); try { diff --git a/base/ocsp/src/com/netscape/ocsp/OCSPAuthority.java b/base/ocsp/src/com/netscape/ocsp/OCSPAuthority.java index 8d2176c83..348a1b2f8 100644 --- a/base/ocsp/src/com/netscape/ocsp/OCSPAuthority.java +++ b/base/ocsp/src/com/netscape/ocsp/OCSPAuthority.java @@ -142,7 +142,7 @@ public class OCSPAuthority implements IOCSPAuthority, IOCSPService, ISubsystem, Enumeration<String> ids = storeConfig.getSubStoreNames(); while (ids.hasMoreElements()) { - String id = (String) ids.nextElement(); + String id = ids.nextElement(); String className = mConfig.getString(PROP_STORE + "." + id + ".class", null); IOCSPStore store = (IOCSPStore) Class.forName(className).newInstance(); diff --git a/base/silent/src/com/netscape/pkisilent/argparser/ArgParser.java b/base/silent/src/com/netscape/pkisilent/argparser/ArgParser.java index ecb6038df..d2791c1e2 100755 --- a/base/silent/src/com/netscape/pkisilent/argparser/ArgParser.java +++ b/base/silent/src/com/netscape/pkisilent/argparser/ArgParser.java @@ -1551,13 +1551,13 @@ public class ArgParser { } Record lastMatchRecord() { - return (Record) matchList.lastElement(); + return matchList.lastElement(); } private Record getRecord(String arg, ObjectHolder ndescHolder) { NameDesc ndesc; for (int i = 0; i < matchList.size(); i++) { - Record rec = (Record) matchList.get(i); + Record rec = matchList.get(i); for (ndesc = rec.nameList; ndesc != null; ndesc = ndesc.next) { if (rec.convertCode != 'v' && ndesc.oneWord) { if (arg.startsWith(ndesc.name)) { @@ -1581,7 +1581,7 @@ public class ArgParser { public void checkRequiredArgs() { for (int i = 1; i < matchList.size(); i++) { - Record rec = (Record) matchList.get(i); + Record rec = matchList.get(i); StringHolder myString = (StringHolder) rec.resHolder; if (((myString.value == null) || (myString.value.equals(""))) && (rec.required)) { printErrorAndExit("Required parameter " + rec.nameList.name + " is not specified."); @@ -1702,7 +1702,7 @@ public class ArgParser { } String[] result = new String[vec.size() + args.length]; for (i = 0; i < vec.size(); i++) { - result[i] = (String) vec.get(i); + result[i] = vec.get(i); } for (k = 0; k < args.length; k++) { result[i++] = args[k]; @@ -1834,7 +1834,7 @@ public class ArgParser { if (unmatched.size() == 0) { return null; } else { - return (String[]) unmatched.toArray(new String[0]); + return unmatched.toArray(new String[0]); } } @@ -2010,7 +2010,7 @@ public class ArgParser { s += "Options include:\n\n"; for (int i = 0; i < matchList.size(); i++) { String optionInfo = ""; - rec = (Record) matchList.get(i); + rec = matchList.get(i); if (rec.convertCode == 'h' && !helpOptionsEnabled) { continue; } diff --git a/base/silent/src/com/netscape/pkisilent/argparser/ArgParserTest.java b/base/silent/src/com/netscape/pkisilent/argparser/ArgParserTest.java index 89ebcc48a..9f7a32185 100644 --- a/base/silent/src/com/netscape/pkisilent/argparser/ArgParserTest.java +++ b/base/silent/src/com/netscape/pkisilent/argparser/ArgParserTest.java @@ -72,7 +72,7 @@ public class ArgParserTest { } String[] result = new String[vec.size()]; for (int i = 0; i < vec.size(); i++) { - result[i] = (String) vec.get(i); + result[i] = vec.get(i); } return result; } @@ -1504,7 +1504,7 @@ public class ArgParserTest { } catch (Exception e) { } } - unmatched = (String[]) vec.toArray(new String[0]); + unmatched = vec.toArray(new String[0]); test.checkStringArray( "My unmatched args:", unmatched, unmatchedCheck); diff --git a/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java b/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java index 482e2ffab..d1941ca30 100644 --- a/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java +++ b/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java @@ -44,7 +44,6 @@ import org.mozilla.jss.crypto.KeyWrapper; import org.mozilla.jss.crypto.PrivateKey; import org.mozilla.jss.crypto.SymmetricKey; import org.mozilla.jss.crypto.X509Certificate; -import org.mozilla.jss.pkcs11.PK11Token; import org.mozilla.jss.pkix.crmf.CertReqMsg; import org.mozilla.jss.pkix.crmf.CertRequest; import org.mozilla.jss.pkix.crmf.CertTemplate; @@ -371,7 +370,7 @@ public class ComCrypto { keys = store.getPrivateKeys(); for (i = 0; i < keys.length; i++) { - PrivateKey key = (PrivateKey) keys[i]; + PrivateKey key = keys[i]; store.deletePrivateKey(key); } @@ -414,7 +413,7 @@ public class ComCrypto { } manager = CryptoManager.getInstance(); - token = (PK11Token) manager.getInternalKeyStorageToken(); + token = manager.getInternalKeyStorageToken(); pass1 = new Password(tokenpwd.toCharArray()); if (token.isLoggedIn() && debug) { System.out.println("Already Logged in "); diff --git a/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java b/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java index bc419fb02..bfaf1eb34 100644 --- a/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java +++ b/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java @@ -29,7 +29,6 @@ import org.mozilla.jss.CryptoManager; import org.mozilla.jss.crypto.AlreadyInitializedException; import org.mozilla.jss.crypto.CryptoToken; import org.mozilla.jss.crypto.X509Certificate; -import org.mozilla.jss.pkcs11.PK11Token; import org.mozilla.jss.ssl.SSLCertificateApprovalCallback; import org.mozilla.jss.ssl.SSLClientCertificateSelectionCallback; import org.mozilla.jss.ssl.SSLSocket; @@ -233,7 +232,7 @@ public class Con2Agent implements SSLClientCertificateSelectionCallback, System.out.println("Step 2: Login to Cert Database"); manager = CryptoManager.getInstance(); - CryptoToken token = (PK11Token) manager.getInternalKeyStorageToken(); + CryptoToken token = manager.getInternalKeyStorageToken(); if (token.isLoggedIn()) { System.out.println("Con2Agent: Logged in incorrect"); @@ -244,7 +243,7 @@ public class Con2Agent implements SSLClientCertificateSelectionCallback, tokenpwd.getChars(0, tokenpwd.length(), passchar1, 0); - pass1 = new Password((char[]) passchar1.clone()); + pass1 = new Password(passchar1.clone()); token.login(pass1); X509Certificate cert2 = manager.findCertByNickname(certnickname); diff --git a/base/silent/src/com/netscape/pkisilent/common/PostQuery.java b/base/silent/src/com/netscape/pkisilent/common/PostQuery.java index 27c9209e8..b7399336f 100644 --- a/base/silent/src/com/netscape/pkisilent/common/PostQuery.java +++ b/base/silent/src/com/netscape/pkisilent/common/PostQuery.java @@ -111,7 +111,7 @@ public class PostQuery { os.flush(); os.close(); - InputStream Content = (InputStream) URLCon.getInputStream(); + InputStream Content = URLCon.getInputStream(); System.out.println("Configuring Cert Instance : Return Response"); BufferedReader in = new BufferedReader( diff --git a/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java b/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java index 6331783b8..428853032 100644 --- a/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java +++ b/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java @@ -921,7 +921,7 @@ public class HTTPClient implements SSLCertificateApprovalCallback { int startPos = 0; byte[] contentData = new byte[totalBytes]; for (int i = 0; i < bufferList.size(); i++) { - ByteBuffer byteBuffer = (ByteBuffer) bufferList.get(i); + ByteBuffer byteBuffer = bufferList.get(i); byteBuffer.flip(); byteBuffer.get(contentData, startPos, byteBuffer.limit()); startPos += byteBuffer.limit(); diff --git a/base/util/src/com/netscape/cmsutil/http/HttpMessage.java b/base/util/src/com/netscape/cmsutil/http/HttpMessage.java index badec5930..398f38400 100644 --- a/base/util/src/com/netscape/cmsutil/http/HttpMessage.java +++ b/base/util/src/com/netscape/cmsutil/http/HttpMessage.java @@ -56,7 +56,7 @@ public class HttpMessage { * get a header */ public String getHeader(String name) { - return (String) mHeaders.get(name.toLowerCase()); + return mHeaders.get(name.toLowerCase()); } /** diff --git a/base/util/src/com/netscape/cmsutil/password/PlainPasswordFile.java b/base/util/src/com/netscape/cmsutil/password/PlainPasswordFile.java index eb43607f0..adad6ee37 100644 --- a/base/util/src/com/netscape/cmsutil/password/PlainPasswordFile.java +++ b/base/util/src/com/netscape/cmsutil/password/PlainPasswordFile.java @@ -44,7 +44,7 @@ public class PlainPasswordFile implements IPasswordStore { } public String getPassword(String tag) { - return (String) mPwdStore.getProperty(tag); + return mPwdStore.getProperty(tag); } // return an array of String-based tag diff --git a/base/util/src/com/netscape/cmsutil/password/PlainPasswordReader.java b/base/util/src/com/netscape/cmsutil/password/PlainPasswordReader.java index 68724a9f6..3a75097ec 100644 --- a/base/util/src/com/netscape/cmsutil/password/PlainPasswordReader.java +++ b/base/util/src/com/netscape/cmsutil/password/PlainPasswordReader.java @@ -43,7 +43,7 @@ public class PlainPasswordReader implements IPasswordReader { } public String getPassword(String tag) { - return (String) mPwdStore.getProperty(tag); + return mPwdStore.getProperty(tag); } // return an array of String-based tag diff --git a/base/util/src/com/netscape/cmsutil/radius/NASPacket.java b/base/util/src/com/netscape/cmsutil/radius/NASPacket.java index 70d143989..18c37af10 100644 --- a/base/util/src/com/netscape/cmsutil/radius/NASPacket.java +++ b/base/util/src/com/netscape/cmsutil/radius/NASPacket.java @@ -30,7 +30,7 @@ public abstract class NASPacket extends Packet { ByteArrayOutputStream attrsOS = new ByteArrayOutputStream(); for (int i = 0; i < _attrs.size(); i++) { - Attribute attr = (Attribute) getAttributeAt(i); + Attribute attr = getAttributeAt(i); attrsOS.write(attr.getData()); } diff --git a/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java b/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java index aef8de0b7..baf66e710 100644 --- a/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java +++ b/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java @@ -712,7 +712,7 @@ public class CRSPKIMessage { sd = (SignedData) sdt.decode( new ByteArrayInputStream( - ((ANY) crsci.getContent()).getEncoded() + crsci.getContent().getEncoded() )); this.decodeSD(); } @@ -736,19 +736,19 @@ public class CRSPKIMessage { sdci = sd.getContentInfo(); // HACK to work with CRS - ANY a = (ANY) sdci.getContent(); + ANY a = sdci.getContent(); ByteArrayInputStream s = new ByteArrayInputStream(a.getEncoded()); OCTET_STRING os = (OCTET_STRING) (new OCTET_STRING.Template()).decode(s); ByteArrayInputStream s2 = new ByteArrayInputStream(os.toByteArray()); ContentInfo ci = (ContentInfo) (new ContentInfo.Template()).decode(s2); - ByteArrayInputStream s3 = new ByteArrayInputStream(((ANY) ci.getContent()).getEncoded()); + ByteArrayInputStream s3 = new ByteArrayInputStream(ci.getContent().getEncoded()); EnvelopedData.Template edt = new EnvelopedData.Template(); sded = (EnvelopedData) edt.decode(s3); - SET signerCerts = (SET) sd.getCertificates(); + SET signerCerts = sd.getCertificates(); Certificate firstCert = (Certificate) signerCerts.elementAt(0); signerCertBytes = ASN1Util.encode(firstCert); @@ -777,7 +777,7 @@ public class CRSPKIMessage { private void decodeED() throws Exception { SET ris; - ris = (SET) sded.getRecipientInfos(); + ris = sded.getRecipientInfos(); if (ris.size() == 0) { throw new Exception("RecipientInfos is empty"); @@ -842,7 +842,7 @@ public class CRSPKIMessage { for (count = 0; count < aa.size(); count++) { Attribute a = (Attribute) aa.elementAt(count); - SET s = (SET) a.getValues(); + SET s = a.getValues(); ANY f = (ANY) s.elementAt(0); PrintableString ps; PrintableString.Template pst = new PrintableString.Template(); diff --git a/base/util/src/com/netscape/cmsutil/util/Utils.java b/base/util/src/com/netscape/cmsutil/util/Utils.java index bfd1e5297..75e63f2b0 100644 --- a/base/util/src/com/netscape/cmsutil/util/Utils.java +++ b/base/util/src/com/netscape/cmsutil/util/Utils.java @@ -98,7 +98,7 @@ public class Utils { ByteArrayOutputStream out = new ByteArrayOutputStream(s.length()); for (int i = 0; i < s.length(); i++) { - int c = (int) s.charAt(i); + int c = s.charAt(i); if (c == '+') { out.write(' '); @@ -120,7 +120,7 @@ public class Utils { ByteArrayOutputStream out = new ByteArrayOutputStream(s.length()); for (int i = 0; i < s.length(); i++) { - int c = (int) s.charAt(i); + int c = s.charAt(i); if (c == '+') { out.write(' '); diff --git a/base/util/src/com/netscape/cmsutil/xml/XMLObject.java b/base/util/src/com/netscape/cmsutil/xml/XMLObject.java index ed2fb67ee..a7715ec99 100644 --- a/base/util/src/com/netscape/cmsutil/xml/XMLObject.java +++ b/base/util/src/com/netscape/cmsutil/xml/XMLObject.java @@ -77,7 +77,7 @@ public class XMLObject { public Node createRoot(String name) { Element root = mDoc.createElement(name); mDoc.appendChild(root); - return (Node) root; + return root; } public Node getRoot() { @@ -98,7 +98,7 @@ public class XMLObject { public Node createContainer(Node containerParent, String containerName) { Element node = mDoc.createElement(containerName); containerParent.appendChild(node); - return (Node) node; + return node; } public void addItemToContainer(Node container, String tagname, String value) { diff --git a/base/util/src/netscape/net/TransferProtocolClient.java b/base/util/src/netscape/net/TransferProtocolClient.java index 587ec85a1..93eb1e06e 100644 --- a/base/util/src/netscape/net/TransferProtocolClient.java +++ b/base/util/src/netscape/net/TransferProtocolClient.java @@ -108,7 +108,7 @@ public class TransferProtocolClient extends NetworkClient { /** converts the server response into a string. */ public String getResponseString() { - return (String) serverResponse.elementAt(0); + return serverResponse.elementAt(0); } /** Returns all server response strings. */ diff --git a/base/util/src/netscape/security/acl/AclEntryImpl.java b/base/util/src/netscape/security/acl/AclEntryImpl.java index 878eacb68..790da68f4 100644 --- a/base/util/src/netscape/security/acl/AclEntryImpl.java +++ b/base/util/src/netscape/security/acl/AclEntryImpl.java @@ -152,7 +152,7 @@ public class AclEntryImpl implements AclEntry { s.append(user + "="); Enumeration<Permission> e = permissions(); while (e.hasMoreElements()) { - Permission p = (Permission) e.nextElement(); + Permission p = e.nextElement(); s.append(p); if (e.hasMoreElements()) s.append(","); diff --git a/base/util/src/netscape/security/acl/AclImpl.java b/base/util/src/netscape/security/acl/AclImpl.java index 75ff02083..884304301 100644 --- a/base/util/src/netscape/security/acl/AclImpl.java +++ b/base/util/src/netscape/security/acl/AclImpl.java @@ -220,7 +220,7 @@ public class AclImpl extends OwnerImpl implements Acl { public boolean checkPermission(Principal principal, Permission permission) { Enumeration<Permission> permSet = getPermissions(principal); while (permSet.hasMoreElements()) { - Permission p = (Permission) permSet.nextElement(); + Permission p = permSet.nextElement(); if (p.equals(permission)) return true; } @@ -244,7 +244,7 @@ public class AclImpl extends OwnerImpl implements Acl { StringBuffer sb = new StringBuffer(); Enumeration<AclEntry> entries = entries(); while (entries.hasMoreElements()) { - AclEntry entry = (AclEntry) entries.nextElement(); + AclEntry entry = entries.nextElement(); sb.append(entry.toString().trim()); sb.append("\n"); } @@ -319,7 +319,7 @@ public class AclImpl extends OwnerImpl implements Acl { while (e.hasMoreElements()) { Group g = (Group) e.nextElement(); if (g.isMember(user)) { - AclEntry ae = (AclEntry) allowedGroupsTable.get(g); + AclEntry ae = allowedGroupsTable.get(g); groupPositive = union(ae.permissions(), groupPositive); } } @@ -332,7 +332,7 @@ public class AclImpl extends OwnerImpl implements Acl { while (e.hasMoreElements()) { Group g = (Group) e.nextElement(); if (g.isMember(user)) { - AclEntry ae = (AclEntry) deniedGroupsTable.get(g); + AclEntry ae = deniedGroupsTable.get(g); groupNegative = union(ae.permissions(), groupNegative); } } @@ -341,7 +341,7 @@ public class AclImpl extends OwnerImpl implements Acl { private Enumeration<Permission> getIndividualPositive(Principal user) { Enumeration<Permission> individualPositive = zeroSet.elements(); - AclEntry ae = (AclEntry) allowedUsersTable.get(user); + AclEntry ae = allowedUsersTable.get(user); if (ae != null) individualPositive = ae.permissions(); return individualPositive; @@ -349,7 +349,7 @@ public class AclImpl extends OwnerImpl implements Acl { private Enumeration<Permission> getIndividualNegative(Principal user) { Enumeration<Permission> individualNegative = zeroSet.elements(); - AclEntry ae = (AclEntry) deniedUsersTable.get(user); + AclEntry ae = deniedUsersTable.get(user); if (ae != null) individualNegative = ae.permissions(); return individualNegative; diff --git a/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java b/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java index 13f8007ed..c3d2bec6c 100644 --- a/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java +++ b/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java @@ -98,7 +98,7 @@ public class AuthInfoAccessExtension extends Extension implements CertAttrSet { throws IOException { this.extensionId = ID; this.critical = critical.booleanValue(); - this.extensionValue = (byte[]) ((byte[]) value).clone(); + this.extensionValue = ((byte[]) value).clone(); decodeThis(); } diff --git a/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java b/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java index f659cd1ad..141959451 100644 --- a/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java +++ b/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java @@ -70,7 +70,7 @@ public class CertificateRenewalWindowExtension extends Extension throws IOException { this.extensionId = ID; this.critical = critical.booleanValue(); - this.extensionValue = (byte[]) ((byte[]) value).clone(); + this.extensionValue = ((byte[]) value).clone(); decodeThis(); } diff --git a/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java b/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java index 7055ad9d1..271bd3606 100644 --- a/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java +++ b/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java @@ -83,7 +83,7 @@ public class CertificateScopeOfUseExtension extends Extension throws IOException { this.extensionId = ID; this.critical = critical.booleanValue(); - this.extensionValue = (byte[]) ((byte[]) value).clone(); + this.extensionValue = ((byte[]) value).clone(); decodeThis(); } @@ -154,8 +154,7 @@ public class CertificateScopeOfUseExtension extends Extension throw new IOException("Invalid Scope Entries"); for (int i = 0; i < mEntries.size(); i++) { - CertificateScopeEntry se = (CertificateScopeEntry) - mEntries.elementAt(i); + CertificateScopeEntry se = mEntries.elementAt(i); se.encode(tmp); } @@ -188,8 +187,7 @@ public class CertificateScopeOfUseExtension extends Extension if (mEntries != null) { for (int i = 0; i < mEntries.size(); i++) { - CertificateScopeEntry se = (CertificateScopeEntry) - mEntries.elementAt(i); + CertificateScopeEntry se = mEntries.elementAt(i); s += se.toString(); } diff --git a/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java b/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java index 939da036f..072a7c974 100644 --- a/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java +++ b/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java @@ -89,7 +89,7 @@ public class ExtendedKeyUsageExtension extends Extension implements CertAttrSet throws IOException { extensionId = ObjectIdentifier.getObjectIdentifier(OID); critical = crit.booleanValue(); - extensionValue = (byte[]) ((byte[]) byteVal).clone(); + extensionValue = ((byte[]) byteVal).clone(); decodeThis(); } @@ -209,7 +209,7 @@ public class ExtendedKeyUsageExtension extends Extension implements CertAttrSet try { while (oidList.hasMoreElements()) { - temp.putOID((ObjectIdentifier) oidList.nextElement()); + temp.putOID(oidList.nextElement()); } } catch (IOException ex) { ex.printStackTrace(); diff --git a/base/util/src/netscape/security/extensions/GenericASN1Extension.java b/base/util/src/netscape/security/extensions/GenericASN1Extension.java index 778f9cdf5..d6bd01223 100644 --- a/base/util/src/netscape/security/extensions/GenericASN1Extension.java +++ b/base/util/src/netscape/security/extensions/GenericASN1Extension.java @@ -104,55 +104,55 @@ public class GenericASN1Extension extends Extension os.write(DerValue.tag_Sequence, tmp); return os.toByteArray(); default: - type = (String) mConfig.get(PROP_ATTRIBUTE + "." + ch + "." + PROP_TYPE); + type = mConfig.get(PROP_ATTRIBUTE + "." + ch + "." + PROP_TYPE); if (type.equalsIgnoreCase("integer")) { - int num = Integer.parseInt((String) mConfig.get(PROP_ATTRIBUTE + "." + ch + "." + PROP_VALUE)); + int num = Integer.parseInt(mConfig.get(PROP_ATTRIBUTE + "." + ch + "." + PROP_VALUE)); PutInteger(tmp, num); } else if (type.equalsIgnoreCase("ia5string")) { - source = (String) mConfig.get(PROP_ATTRIBUTE + "." + ch + "." + PROP_SOURCE); - value = (String) mConfig.get(PROP_ATTRIBUTE + "." + ch + "." + PROP_VALUE); + source = mConfig.get(PROP_ATTRIBUTE + "." + ch + "." + PROP_SOURCE); + value = mConfig.get(PROP_ATTRIBUTE + "." + ch + "." + PROP_VALUE); if (source.equalsIgnoreCase("file")) PutIA5String(tmp, getFromFile(value)); else PutIA5String(tmp, value); } else if (type.equalsIgnoreCase("octetstring")) { - source = (String) mConfig.get(PROP_ATTRIBUTE + "." + ch + "." + PROP_SOURCE); - value = (String) mConfig.get(PROP_ATTRIBUTE + "." + ch + "." + PROP_VALUE); + source = mConfig.get(PROP_ATTRIBUTE + "." + ch + "." + PROP_SOURCE); + value = mConfig.get(PROP_ATTRIBUTE + "." + ch + "." + PROP_VALUE); // It should be colon seperated ASCII Hexdecimal String if (source.equalsIgnoreCase("file")) PutOctetString(tmp, getFromFile(value)); else PutOctetString(tmp, value); } else if (type.equalsIgnoreCase("bmpstring")) { - source = (String) mConfig.get(PROP_ATTRIBUTE + "." + ch + "." + PROP_SOURCE); - value = (String) mConfig.get(PROP_ATTRIBUTE + "." + ch + "." + PROP_VALUE); + source = mConfig.get(PROP_ATTRIBUTE + "." + ch + "." + PROP_SOURCE); + value = mConfig.get(PROP_ATTRIBUTE + "." + ch + "." + PROP_VALUE); if (source.equalsIgnoreCase("file")) PutBMPString(tmp, getFromFile(value)); else PutBMPString(tmp, value); } else if (type.equalsIgnoreCase("printablestring")) { - source = (String) mConfig.get(PROP_ATTRIBUTE + "." + ch + "." + PROP_SOURCE); - value = (String) mConfig.get(PROP_ATTRIBUTE + "." + ch + "." + PROP_VALUE); + source = mConfig.get(PROP_ATTRIBUTE + "." + ch + "." + PROP_SOURCE); + value = mConfig.get(PROP_ATTRIBUTE + "." + ch + "." + PROP_VALUE); if (source.equalsIgnoreCase("file")) PutPrintableString(tmp, getFromFile(value)); else PutPrintableString(tmp, value); } else if (type.equalsIgnoreCase("visiblestring")) { - source = (String) mConfig.get(PROP_ATTRIBUTE + "." + ch + "." + PROP_SOURCE); - value = (String) mConfig.get(PROP_ATTRIBUTE + "." + ch + "." + PROP_VALUE); + source = mConfig.get(PROP_ATTRIBUTE + "." + ch + "." + PROP_SOURCE); + value = mConfig.get(PROP_ATTRIBUTE + "." + ch + "." + PROP_VALUE); if (source.equalsIgnoreCase("file")) PutVisibleString(tmp, getFromFile(value)); else PutVisibleString(tmp, value); } else if (type.equalsIgnoreCase("utctime")) { - value = (String) mConfig.get(PROP_ATTRIBUTE + "." + ch + "." + PROP_VALUE); + value = mConfig.get(PROP_ATTRIBUTE + "." + ch + "." + PROP_VALUE); PutUTCtime(tmp, value); } else if (type.equalsIgnoreCase("oid")) { - value = (String) mConfig.get(PROP_ATTRIBUTE + "." + ch + "." + PROP_VALUE); + value = mConfig.get(PROP_ATTRIBUTE + "." + ch + "." + PROP_VALUE); PutOID(tmp, value); } else if (type.equalsIgnoreCase("boolean")) { boolean bool = false; - String b = (String) mConfig.get(PROP_ATTRIBUTE + "." + ch + "." + PROP_VALUE); + String b = mConfig.get(PROP_ATTRIBUTE + "." + ch + "." + PROP_VALUE); if (b.equalsIgnoreCase("true")) bool = true; else @@ -205,10 +205,10 @@ public class GenericASN1Extension extends Extension public GenericASN1Extension(Hashtable<String, String> config) throws IOException, ParseException { mConfig = config; - ObjectIdentifier tmpid = new ObjectIdentifier((String) mConfig.get(PROP_OID)); - name = (String) mConfig.get(PROP_NAME); - OID = (String) mConfig.get(PROP_OID); - pattern = (String) mConfig.get(PROP_PATTERN); + ObjectIdentifier tmpid = new ObjectIdentifier(mConfig.get(PROP_OID)); + name = mConfig.get(PROP_NAME); + OID = mConfig.get(PROP_OID); + pattern = mConfig.get(PROP_PATTERN); try { if (OIDMap.getName(tmpid) == null) @@ -218,7 +218,7 @@ public class GenericASN1Extension extends Extension this.extensionId = tmpid; this.critical = false; - String b = (String) mConfig.get(PROP_CRITICAL); + String b = mConfig.get(PROP_CRITICAL); if (b.equalsIgnoreCase("true")) this.critical = true; else @@ -428,14 +428,14 @@ public class GenericASN1Extension extends Extension } for (i = 0, j = 0; j < s.length(); j++) { - int ch = (int) s.charAt(j); + int ch = s.charAt(j); if (ch == 10 || ch == 13 || ch == 9) continue; i++; } buff = new byte[i]; for (i = 0, j = 0; j < s.length(); j++) { - int ch = (int) s.charAt(j); + int ch = s.charAt(j); if (ch == 10 || ch == 13 || ch == 9) continue; buff[i++] = (byte) ch; diff --git a/base/util/src/netscape/security/extensions/KerberosName.java b/base/util/src/netscape/security/extensions/KerberosName.java index cf1ddc0a8..a10d70b40 100644 --- a/base/util/src/netscape/security/extensions/KerberosName.java +++ b/base/util/src/netscape/security/extensions/KerberosName.java @@ -86,7 +86,7 @@ public class KerberosName { DerOutputStream name_strings = new DerOutputStream(); DerOutputStream name_string = new DerOutputStream(); for (int i = 0; i < m_name_strings.size(); i++) { - name_string.putGeneralString((String) m_name_strings.elementAt(i)); + name_string.putGeneralString(m_name_strings.elementAt(i)); } name_strings.write(DerValue.tag_SequenceOf, name_string); tmp1.write(DerValue.createTag(DerValue.TAG_CONTEXT, @@ -109,10 +109,10 @@ public class KerberosName { String strings = null; for (int i = 0; i < m_name_strings.size(); i++) { if (strings == null) { - strings = (String) m_name_strings.elementAt(i); + strings = m_name_strings.elementAt(i); } else { strings += ","; - strings += (String) m_name_strings.elementAt(i); + strings += m_name_strings.elementAt(i); } } return "Realm: " + m_realm + " Name Type: " + m_name_type + " Name String(s):" + strings; diff --git a/base/util/src/netscape/security/extensions/NSCertTypeExtension.java b/base/util/src/netscape/security/extensions/NSCertTypeExtension.java index 9865cde0a..f14d113c7 100644 --- a/base/util/src/netscape/security/extensions/NSCertTypeExtension.java +++ b/base/util/src/netscape/security/extensions/NSCertTypeExtension.java @@ -237,7 +237,7 @@ public class NSCertTypeExtension extends Extension implements CertAttrSet { this.extensionId = CertType_Id; this.critical = critical.booleanValue(); - byte[] extValue = (byte[]) ((byte[]) value).clone(); + byte[] extValue = ((byte[]) value).clone(); this.extensionValue = extValue; DerValue val = new DerValue(extValue); diff --git a/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java b/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java index 28da8085f..bd6cf5aa7 100644 --- a/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java +++ b/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java @@ -78,7 +78,7 @@ public class OCSPNoCheckExtension extends Extension implements CertAttrSet { // never here } critical = crit.booleanValue(); - extensionValue = (byte[]) ((byte[]) byteVal).clone(); + extensionValue = ((byte[]) byteVal).clone(); } public void setCritical(boolean newValue) { diff --git a/base/util/src/netscape/security/extensions/PresenceServerExtension.java b/base/util/src/netscape/security/extensions/PresenceServerExtension.java index c67fe9965..1e78ecc94 100644 --- a/base/util/src/netscape/security/extensions/PresenceServerExtension.java +++ b/base/util/src/netscape/security/extensions/PresenceServerExtension.java @@ -62,7 +62,7 @@ public class PresenceServerExtension extends Extension implements CertAttrSet { throws IOException { this.extensionId = new ObjectIdentifier(OID); this.critical = critical.booleanValue(); - this.extensionValue = (byte[]) ((byte[]) value).clone(); + this.extensionValue = ((byte[]) value).clone(); decodeThis(); } diff --git a/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java b/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java index 6bd5c95b6..b11c77634 100644 --- a/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java +++ b/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java @@ -80,7 +80,7 @@ public class SubjectInfoAccessExtension extends Extension implements CertAttrSet throws IOException { this.extensionId = ID; this.critical = critical.booleanValue(); - this.extensionValue = (byte[]) ((byte[]) value).clone(); + this.extensionValue = ((byte[]) value).clone(); decodeThis(); } diff --git a/base/util/src/netscape/security/pkcs/PKCS10Attribute.java b/base/util/src/netscape/security/pkcs/PKCS10Attribute.java index eae4b0479..3a2c7b437 100644 --- a/base/util/src/netscape/security/pkcs/PKCS10Attribute.java +++ b/base/util/src/netscape/security/pkcs/PKCS10Attribute.java @@ -105,8 +105,7 @@ public class PKCS10Attribute implements DerEncoder, Serializable { //DerValue dv = inAttrValue.data.getDerValue(); // hack. toDerInputStream only gives one extension. DerInputStream fi = new DerInputStream(inAttrValue.toByteArray()); - attributeValue = (CertAttrSet) new - Extensions(fi); + attributeValue = new Extensions(fi); //CertificateExtensions(fi); return; } catch (Exception e) { @@ -119,7 +118,7 @@ public class PKCS10Attribute implements DerEncoder, Serializable { @SuppressWarnings("unchecked") Class<CertAttrSet> extClass = (Class<CertAttrSet>) OIDMap.getClass(attributeId); if (extClass != null) { - Constructor<CertAttrSet> cons = (Constructor<CertAttrSet>) extClass.getConstructor(params); + Constructor<CertAttrSet> cons = extClass.getConstructor(params); Object value = Array.newInstance(byte.class, val.length); for (int i = 0; i < val.length; i++) { Array.setByte(value, i, val[i]); diff --git a/base/util/src/netscape/security/pkcs/PKCS7.java b/base/util/src/netscape/security/pkcs/PKCS7.java index 26a0bdb34..8bd514099 100644 --- a/base/util/src/netscape/security/pkcs/PKCS7.java +++ b/base/util/src/netscape/security/pkcs/PKCS7.java @@ -191,7 +191,7 @@ public class PKCS7 { for (int i = 0; i < len; i++) { try { - X509Certificate cert = (X509Certificate) new + X509Certificate cert = new X509CertImpl(certificateVals[i]); certificates[i] = cert; } catch (CertificateException e) { @@ -412,7 +412,7 @@ public class PKCS7 { for (int i = 0; i < certificates.length; i++) { X509Certificate cert = certificates[i]; X500Name thisName = (X500Name) cert.getIssuerDN(); - BigInteger tmpSerial = (BigInteger) cert.getSerialNumber(); + BigInteger tmpSerial = cert.getSerialNumber(); BigInt thisSerial = new BigInt(tmpSerial); if (serial.equals(thisSerial) && name.equals(thisName)) { return cert; diff --git a/base/util/src/netscape/security/pkcs/PKCS9Attribute.java b/base/util/src/netscape/security/pkcs/PKCS9Attribute.java index 1239ccaf3..398fc0174 100644 --- a/base/util/src/netscape/security/pkcs/PKCS9Attribute.java +++ b/base/util/src/netscape/security/pkcs/PKCS9Attribute.java @@ -1013,7 +1013,7 @@ public class PKCS9Attribute implements DerEncoder { * Return the name of this attribute. */ public String getName() { - return (String) OID_NAME_TABLE.get(PKCS9_OIDS[index]); + return OID_NAME_TABLE.get(PKCS9_OIDS[index]); } /** @@ -1021,7 +1021,7 @@ public class PKCS9Attribute implements DerEncoder { * the name. */ public static ObjectIdentifier getOID(String name) { - return (ObjectIdentifier) NAME_OID_TABLE.get(name.toLowerCase()); + return NAME_OID_TABLE.get(name.toLowerCase()); } /** @@ -1029,7 +1029,7 @@ public class PKCS9Attribute implements DerEncoder { * the oid. */ public static String getName(ObjectIdentifier oid) { - return (String) OID_NAME_TABLE.get(oid); + return OID_NAME_TABLE.get(oid); } /** diff --git a/base/util/src/netscape/security/pkcs/PKCS9Attributes.java b/base/util/src/netscape/security/pkcs/PKCS9Attributes.java index 39bf2340e..35996b4b6 100644 --- a/base/util/src/netscape/security/pkcs/PKCS9Attributes.java +++ b/base/util/src/netscape/security/pkcs/PKCS9Attributes.java @@ -204,7 +204,7 @@ public class PKCS9Attributes { * DerValue.tag_SetOf. */ public byte[] getDerEncoding() throws IOException { - return (byte[]) derEncoding.clone(); + return derEncoding.clone(); } diff --git a/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java b/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java index c0fc274a9..dca206d0c 100644 --- a/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java +++ b/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java @@ -273,9 +273,8 @@ public class DSAKeyPairGenerator extends KeyPairGenerator DSAParameterSpec dsaParamSpec; try { - dsaParamSpec = (DSAParameterSpec) - dsaParamGen.generateParameters().getParameterSpec - (DSAParameterSpec.class); + dsaParamSpec = dsaParamGen.generateParameters().getParameterSpec + (DSAParameterSpec.class); } catch (InvalidParameterSpecException e) { // this should never happen throw new RuntimeException(e.getMessage()); diff --git a/base/util/src/netscape/security/provider/DSAPrivateKey.java b/base/util/src/netscape/security/provider/DSAPrivateKey.java index d18206c1e..8b64fbf6c 100644 --- a/base/util/src/netscape/security/provider/DSAPrivateKey.java +++ b/base/util/src/netscape/security/provider/DSAPrivateKey.java @@ -94,14 +94,11 @@ public final class DSAPrivateKey extends PKCS8Key if (algid instanceof DSAParams) { return (DSAParams) algid; } else { - DSAParameterSpec paramSpec; AlgorithmParameters algParams = algid.getParameters(); if (algParams == null) { return null; } - paramSpec = (DSAParameterSpec) algParams.getParameterSpec - (DSAParameterSpec.class); - return (DSAParams) paramSpec; + return algParams.getParameterSpec(DSAParameterSpec.class); } } catch (InvalidParameterSpecException e) { return null; diff --git a/base/util/src/netscape/security/provider/DSAPublicKey.java b/base/util/src/netscape/security/provider/DSAPublicKey.java index 699a28261..66c3eb45a 100644 --- a/base/util/src/netscape/security/provider/DSAPublicKey.java +++ b/base/util/src/netscape/security/provider/DSAPublicKey.java @@ -99,9 +99,9 @@ public final class DSAPublicKey extends X509Key if (algParams == null) { return null; } - paramSpec = (DSAParameterSpec) algParams.getParameterSpec + paramSpec = algParams.getParameterSpec (DSAParameterSpec.class); - return (DSAParams) paramSpec; + return paramSpec; } } catch (InvalidParameterSpecException e) { return null; diff --git a/base/util/src/netscape/security/provider/MD5.java b/base/util/src/netscape/security/provider/MD5.java index 00d3a4c29..47b99eb1b 100644 --- a/base/util/src/netscape/security/provider/MD5.java +++ b/base/util/src/netscape/security/provider/MD5.java @@ -140,9 +140,9 @@ public final class MD5 extends MessageDigestSpi implements Cloneable { d = state[3]; for (int i = 0; i < 16; i++) { - x[i] = (int) buf[i * 4 + offset] & 0xff; + x[i] = buf[i * 4 + offset] & 0xff; for (int j = 1; j < 4; j++) { - x[i] += ((int) buf[i * 4 + j + offset] & 0xff) << (j * 8); + x[i] += (buf[i * 4 + j + offset] & 0xff) << (j * 8); } } @@ -365,10 +365,10 @@ public final class MD5 extends MessageDigestSpi implements Cloneable { MD5 that = null; try { that = (MD5) super.clone(); - that.state = (int[]) this.state.clone(); - that.transformBuffer = (int[]) this.transformBuffer.clone(); - that.buffer = (byte[]) this.buffer.clone(); - that.digestBits = (byte[]) this.digestBits.clone(); + that.state = this.state.clone(); + that.transformBuffer = this.transformBuffer.clone(); + that.buffer = this.buffer.clone(); + that.digestBits = this.digestBits.clone(); that.count = this.count; return that; } catch (CloneNotSupportedException e) { diff --git a/base/util/src/netscape/security/util/BigInt.java b/base/util/src/netscape/security/util/BigInt.java index aed24e7ad..1bf00684e 100644 --- a/base/util/src/netscape/security/util/BigInt.java +++ b/base/util/src/netscape/security/util/BigInt.java @@ -115,7 +115,7 @@ public final class BigInt { throw new NumberFormatException("BigInt.toInt, too big"); int retval = 0, i = 0; for (; i < places.length; i++) - retval = (retval << 8) + ((int) places[i] & 0xff); + retval = (retval << 8) + (places[i] & 0xff); return retval; } diff --git a/base/util/src/netscape/security/util/BitArray.java b/base/util/src/netscape/security/util/BitArray.java index e37de4eb5..9f51e255a 100644 --- a/base/util/src/netscape/security/util/BitArray.java +++ b/base/util/src/netscape/security/util/BitArray.java @@ -107,7 +107,7 @@ public class BitArray { */ private BitArray(BitArray ba) { length = ba.length; - repn = (byte[]) ba.repn.clone(); + repn = ba.repn.clone(); } /** @@ -156,7 +156,7 @@ public class BitArray { * is not a multiple of 8.) */ public byte[] toByteArray() { - return (byte[]) repn.clone(); + return repn.clone(); } public boolean equals(Object obj) { diff --git a/base/util/src/netscape/security/util/CertPrettyPrint.java b/base/util/src/netscape/security/util/CertPrettyPrint.java index 7dfbf1588..1d159aa9a 100644 --- a/base/util/src/netscape/security/util/CertPrettyPrint.java +++ b/base/util/src/netscape/security/util/CertPrettyPrint.java @@ -305,7 +305,7 @@ public class CertPrettyPrint { PrettyPrintResources.TOKEN_EXTENSIONS) + "\n"); if (extensions != null) for (int i = 0; i < extensions.size(); i++) { - Extension ext = (Extension) extensions.elementAt(i); + Extension ext = extensions.elementAt(i); ExtPrettyPrint extpp = new ExtPrettyPrint(ext, 16); sb.append(extpp.toString()); diff --git a/base/util/src/netscape/security/util/CrlPrettyPrint.java b/base/util/src/netscape/security/util/CrlPrettyPrint.java index 77c1e196f..39230f91d 100644 --- a/base/util/src/netscape/security/util/CrlPrettyPrint.java +++ b/base/util/src/netscape/security/util/CrlPrettyPrint.java @@ -223,7 +223,7 @@ public class CrlPrettyPrint { if (crlExtensions != null) { for (int k = 0; k < crlExtensions.size(); k++) { - Extension ext = (Extension) crlExtensions.elementAt(k); + Extension ext = crlExtensions.elementAt(k); ExtPrettyPrint extpp = new ExtPrettyPrint(ext, 20); sb.append(extpp.toString()); @@ -242,7 +242,7 @@ public class CrlPrettyPrint { sb.append(pp.indent(8) + resource.getString( PrettyPrintResources.TOKEN_EXTENSIONS) + "\n"); for (int k = 0; k < crlExtensions.size(); k++) { - Extension ext = (Extension) crlExtensions.elementAt(k); + Extension ext = crlExtensions.elementAt(k); ExtPrettyPrint extpp = new ExtPrettyPrint(ext, 12); sb.append(extpp.toString()); diff --git a/base/util/src/netscape/security/util/DerInputStream.java b/base/util/src/netscape/security/util/DerInputStream.java index 7508f81b9..b8c1c8c93 100644 --- a/base/util/src/netscape/security/util/DerInputStream.java +++ b/base/util/src/netscape/security/util/DerInputStream.java @@ -332,7 +332,7 @@ public class DerInputStream { DerValue[] retval = new DerValue[max]; for (i = 0; i < max; i++) - retval[i] = (DerValue) vec.elementAt(i); + retval[i] = vec.elementAt(i); return retval; } diff --git a/base/util/src/netscape/security/util/ExtPrettyPrint.java b/base/util/src/netscape/security/util/ExtPrettyPrint.java index c0e9050ea..c69f70ebc 100644 --- a/base/util/src/netscape/security/util/ExtPrettyPrint.java +++ b/base/util/src/netscape/security/util/ExtPrettyPrint.java @@ -349,8 +349,7 @@ public class ExtPrettyPrint { SubjectInfoAccessExtension aia = (SubjectInfoAccessExtension) mExt; for (int i = 0; i < aia.numberOfAccessDescription(); i++) { - AccessDescription ad = (AccessDescription) - aia.getAccessDescription(i); + AccessDescription ad = aia.getAccessDescription(i); ObjectIdentifier method = ad.getMethod(); if (method.equals(SubjectInfoAccessExtension.METHOD_OCSP)) { @@ -391,8 +390,7 @@ public class ExtPrettyPrint { AuthInfoAccessExtension aia = (AuthInfoAccessExtension) mExt; for (int i = 0; i < aia.numberOfAccessDescription(); i++) { - AccessDescription ad = (AccessDescription) - aia.getAccessDescription(i); + AccessDescription ad = aia.getAccessDescription(i); ObjectIdentifier method = ad.getMethod(); if (method.equals(AuthInfoAccessExtension.METHOD_OCSP)) { @@ -508,7 +506,7 @@ public class ExtPrettyPrint { if (e != null) { while (e.hasMoreElements()) { - ObjectIdentifier oid = (ObjectIdentifier) e.nextElement(); + ObjectIdentifier oid = e.nextElement(); if (oid.equals(ExtendedKeyUsageExtension.OID_OCSP_SIGNING)) { sb.append(pp.indent(mIndentSize + 8) + "OCSPSigning" + "\n"); @@ -721,7 +719,7 @@ public class ExtPrettyPrint { sb.append(pp.indent(mIndentSize + 4) + mResource.getString(PrettyPrintResources.TOKEN_CRITICAL)); CRLReasonExtension ext = (CRLReasonExtension) mExt; - if (((Extension) mExt).isCritical()) { + if (mExt.isCritical()) { sb.append(mResource.getString(PrettyPrintResources.TOKEN_YES) + "\n"); } else { sb.append(mResource.getString(PrettyPrintResources.TOKEN_NO) + "\n"); @@ -749,7 +747,7 @@ public class ExtPrettyPrint { sb.append(pp.indent(mIndentSize + 4) + mResource.getString(PrettyPrintResources.TOKEN_CRITICAL)); InhibitAnyPolicyExtension ext = (InhibitAnyPolicyExtension) mExt; - if (((Extension) mExt).isCritical()) + if (mExt.isCritical()) sb.append(mResource.getString( PrettyPrintResources.TOKEN_YES) + "\n"); else @@ -778,7 +776,7 @@ public class ExtPrettyPrint { sb.append(pp.indent(mIndentSize + 4) + mResource.getString(PrettyPrintResources.TOKEN_CRITICAL)); BasicConstraintsExtension ext = (BasicConstraintsExtension) mExt; - if (((Extension) mExt).isCritical()) { + if (mExt.isCritical()) { sb.append(mResource.getString(PrettyPrintResources.TOKEN_YES) + "\n"); } else { sb.append(mResource.getString(PrettyPrintResources.TOKEN_NO) + "\n"); @@ -826,7 +824,7 @@ public class ExtPrettyPrint { sb.append(pp.indent(mIndentSize + 4) + mResource.getString(PrettyPrintResources.TOKEN_CRITICAL)); CRLNumberExtension ext = (CRLNumberExtension) mExt; - if (((Extension) mExt).isCritical()) { + if (mExt.isCritical()) { sb.append(mResource.getString(PrettyPrintResources.TOKEN_YES) + "\n"); } else { sb.append(mResource.getString(PrettyPrintResources.TOKEN_NO) + "\n"); @@ -858,7 +856,7 @@ public class ExtPrettyPrint { sb.append(pp.indent(mIndentSize + 4) + mResource.getString(PrettyPrintResources.TOKEN_CRITICAL)); DeltaCRLIndicatorExtension ext = (DeltaCRLIndicatorExtension) mExt; - if (((Extension) mExt).isCritical()) { + if (mExt.isCritical()) { sb.append(mResource.getString(PrettyPrintResources.TOKEN_YES) + "\n"); } else { sb.append(mResource.getString(PrettyPrintResources.TOKEN_NO) + "\n"); @@ -890,7 +888,7 @@ public class ExtPrettyPrint { sb.append(pp.indent(mIndentSize + 4) + mResource.getString(PrettyPrintResources.TOKEN_CRITICAL)); IssuerAlternativeNameExtension ext = (IssuerAlternativeNameExtension) mExt; - if (((Extension) mExt).isCritical()) { + if (mExt.isCritical()) { sb.append(mResource.getString(PrettyPrintResources.TOKEN_YES) + "\n"); } else { sb.append(mResource.getString(PrettyPrintResources.TOKEN_NO) + "\n"); @@ -933,7 +931,7 @@ public class ExtPrettyPrint { sb.append(pp.indent(mIndentSize + 4) + mResource.getString(PrettyPrintResources.TOKEN_CRITICAL)); SubjectAlternativeNameExtension ext = (SubjectAlternativeNameExtension) mExt; - if (((Extension) mExt).isCritical()) { + if (mExt.isCritical()) { sb.append(mResource.getString(PrettyPrintResources.TOKEN_YES) + "\n"); } else { sb.append(mResource.getString(PrettyPrintResources.TOKEN_NO) + "\n"); @@ -984,7 +982,7 @@ public class ExtPrettyPrint { sb.append(pp.indent(mIndentSize + 4) + mResource.getString(PrettyPrintResources.TOKEN_SCOPE_OF_USE) + "\n"); for (int i = 0; i < entries.size(); i++) { - CertificateScopeEntry se = (CertificateScopeEntry) entries.elementAt(i); + CertificateScopeEntry se = entries.elementAt(i); GeneralName gn = se.getGeneralName(); if (gn != null) { @@ -1026,7 +1024,7 @@ public class ExtPrettyPrint { mExt.getExtensionId().toString() + "\n"); sb.append(pp.indent(mIndentSize + 4) + mResource.getString(PrettyPrintResources.TOKEN_CRITICAL)); - if (((Extension) mExt).isCritical()) { + if (mExt.isCritical()) { sb.append(mResource.getString( PrettyPrintResources.TOKEN_YES) + "\n"); } else { @@ -1125,7 +1123,7 @@ public class ExtPrettyPrint { mExt.getExtensionId().toString() + "\n"); sb.append(pp.indent(mIndentSize + 4) + mResource.getString(PrettyPrintResources.TOKEN_CRITICAL)); - if (((Extension) mExt).isCritical()) { + if (mExt.isCritical()) { sb.append(mResource.getString( PrettyPrintResources.TOKEN_YES) + "\n"); } else { @@ -1236,7 +1234,7 @@ public class ExtPrettyPrint { sb.append(mResource.getString(PrettyPrintResources.TOKEN_ISSUING_DIST_POINT) + "- " + mExt.getExtensionId().toString() + "\n"); sb.append(pp.indent(mIndentSize + 4) + mResource.getString(PrettyPrintResources.TOKEN_CRITICAL)); - if (((Extension) mExt).isCritical()) { + if (mExt.isCritical()) { sb.append(mResource.getString(PrettyPrintResources.TOKEN_YES) + "\n"); } else { sb.append(mResource.getString(PrettyPrintResources.TOKEN_NO) + "\n"); @@ -1320,7 +1318,7 @@ public class ExtPrettyPrint { PrettyPrintResources.TOKEN_CRITICAL)); InvalidityDateExtension ext = (InvalidityDateExtension) mExt; - if (((Extension) mExt).isCritical()) { + if (mExt.isCritical()) { sb.append(mResource.getString(PrettyPrintResources.TOKEN_YES) + "\n"); } else { sb.append(mResource.getString(PrettyPrintResources.TOKEN_NO) + "\n"); @@ -1349,7 +1347,7 @@ public class ExtPrettyPrint { PrettyPrintResources.TOKEN_CRITICAL)); CertificateIssuerExtension ext = (CertificateIssuerExtension) mExt; - if (((Extension) mExt).isCritical()) { + if (mExt.isCritical()) { sb.append(mResource.getString(PrettyPrintResources.TOKEN_YES) + "\n"); } else { sb.append(mResource.getString(PrettyPrintResources.TOKEN_NO) + "\n"); @@ -1395,7 +1393,7 @@ public class ExtPrettyPrint { PrettyPrintResources.TOKEN_CRITICAL)); HoldInstructionExtension ext = (HoldInstructionExtension) mExt; - if (((Extension) mExt).isCritical()) { + if (mExt.isCritical()) { sb.append(mResource.getString(PrettyPrintResources.TOKEN_YES) + "\n"); } else { sb.append(mResource.getString(PrettyPrintResources.TOKEN_NO) + "\n"); @@ -1424,7 +1422,7 @@ public class ExtPrettyPrint { "- " + mExt.getExtensionId().toString() + "\n"); sb.append(pp.indent(mIndentSize + 4) + mResource.getString( PrettyPrintResources.TOKEN_CRITICAL)); - if (((Extension) mExt).isCritical()) { + if (mExt.isCritical()) { sb.append(mResource.getString(PrettyPrintResources.TOKEN_YES) + "\n"); } else { sb.append(mResource.getString(PrettyPrintResources.TOKEN_NO) + "\n"); @@ -1467,7 +1465,7 @@ public class ExtPrettyPrint { "- " + mExt.getExtensionId().toString() + "\n"); sb.append(pp.indent(mIndentSize + 4) + mResource.getString( PrettyPrintResources.TOKEN_CRITICAL)); - if (((Extension) mExt).isCritical()) { + if (mExt.isCritical()) { sb.append(mResource.getString(PrettyPrintResources.TOKEN_YES) + "\n"); } else { sb.append(mResource.getString(PrettyPrintResources.TOKEN_NO) + "\n"); @@ -1488,7 +1486,7 @@ public class ExtPrettyPrint { mResource.getString( PrettyPrintResources.TOKEN_MAP) + i + ":" + "\n"); CertificatePolicyMap m = - (CertificatePolicyMap) maps.nextElement(); + maps.nextElement(); sb.append(pp.indent(mIndentSize + 12) + mResource.getString( @@ -1519,7 +1517,7 @@ public class ExtPrettyPrint { "- " + mExt.getExtensionId().toString() + "\n"); sb.append(pp.indent(mIndentSize + 4) + mResource.getString(PrettyPrintResources.TOKEN_CRITICAL)); - if (((Extension) mExt).isCritical()) { + if (mExt.isCritical()) { sb.append(mResource.getString(PrettyPrintResources.TOKEN_YES) + "\n"); } else { sb.append(mResource.getString(PrettyPrintResources.TOKEN_NO) + "\n"); @@ -1538,7 +1536,7 @@ public class ExtPrettyPrint { } else { sb.append("\n"); for (int j = 0; attrs.hasMoreElements(); j++) { - Attribute attr = (Attribute) attrs.nextElement(); + Attribute attr = attrs.nextElement(); sb.append(pp.indent(mIndentSize + 8) + mResource.getString( @@ -1557,7 +1555,7 @@ public class ExtPrettyPrint { PrettyPrintResources.TOKEN_NONE) + "\n"); } else { for (int k = 0; values.hasMoreElements(); k++) { - String v = (String) values.nextElement(); + String v = values.nextElement(); if (k != 0) sb.append(","); diff --git a/base/util/src/netscape/security/util/ObjectIdentifier.java b/base/util/src/netscape/security/util/ObjectIdentifier.java index a1d7b0a75..67846ec55 100644 --- a/base/util/src/netscape/security/util/ObjectIdentifier.java +++ b/base/util/src/netscape/security/util/ObjectIdentifier.java @@ -84,7 +84,7 @@ final public class ObjectIdentifier implements Serializable { */ public ObjectIdentifier(int values[]) { try { - components = (int[]) values.clone(); + components = values.clone(); componentLen = values.length; } catch (Throwable t) { System.out.println("X509.ObjectIdentifier(), no cloning!"); diff --git a/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java b/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java index 6ab962fae..327322b1c 100644 --- a/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java +++ b/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java @@ -85,7 +85,7 @@ public class CRLDistributionPointsExtension extends Extension this.extensionId = PKIXExtensions.CRLDistributionPoints_Id; this.critical = critical.booleanValue(); - this.extensionValue = (byte[]) ((byte[]) value).clone(); + this.extensionValue = ((byte[]) value).clone(); // decode the value try { diff --git a/base/util/src/netscape/security/x509/CRLExtensions.java b/base/util/src/netscape/security/x509/CRLExtensions.java index 4a567e173..3ebc72e41 100755 --- a/base/util/src/netscape/security/x509/CRLExtensions.java +++ b/base/util/src/netscape/security/x509/CRLExtensions.java @@ -198,7 +198,7 @@ public class CRLExtensions extends Vector<Extension> { name = alias.substring(index + 1); } else name = alias; - Extension ext = (Extension) map.get(name); + Extension ext = map.get(name); if (ext == null) throw new X509ExtensionException("No extension found with name: " + alias); diff --git a/base/util/src/netscape/security/x509/CRLReasonExtension.java b/base/util/src/netscape/security/x509/CRLReasonExtension.java index bd82ff2fc..6a5fd6295 100644 --- a/base/util/src/netscape/security/x509/CRLReasonExtension.java +++ b/base/util/src/netscape/security/x509/CRLReasonExtension.java @@ -113,7 +113,7 @@ public final class CRLReasonExtension extends Extension implements CertAttrSet { this.extensionId = PKIXExtensions.ReasonCode_Id; this.critical = critical.booleanValue(); - byte[] extValue = (byte[]) ((byte[]) value).clone(); + byte[] extValue = ((byte[]) value).clone(); this.extensionValue = extValue; DerValue val = new DerValue(extValue); int reasonCode = val.getEnumerated(); diff --git a/base/util/src/netscape/security/x509/CertAndKeyGen.java b/base/util/src/netscape/security/x509/CertAndKeyGen.java index 703585f36..d2a8f2b6f 100644 --- a/base/util/src/netscape/security/x509/CertAndKeyGen.java +++ b/base/util/src/netscape/security/x509/CertAndKeyGen.java @@ -234,7 +234,7 @@ public final class CertAndKeyGen { cert = new X509CertImpl(info); cert.sign(privateKey, algID.getName()); - return (X509Certificate) cert; + return cert; } catch (IOException e) { throw new CertificateEncodingException("getSelfCert: " + diff --git a/base/util/src/netscape/security/x509/CertificateChain.java b/base/util/src/netscape/security/x509/CertificateChain.java index 60df0ec65..346dcc740 100644 --- a/base/util/src/netscape/security/x509/CertificateChain.java +++ b/base/util/src/netscape/security/x509/CertificateChain.java @@ -47,7 +47,7 @@ public class CertificateChain implements Serializable { * @param chain a certificate array. */ public CertificateChain(X509Certificate[] chain) { - mChain = (X509Certificate[]) chain.clone(); + mChain = chain.clone(); } /** @@ -75,7 +75,7 @@ public class CertificateChain implements Serializable { * @return an array of X509 Certificates. */ public X509Certificate[] getChain() { - return (X509Certificate[]) mChain.clone(); + return mChain.clone(); } public void encode(OutputStream out) diff --git a/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java b/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java index 7fdd6ba02..8d45fd110 100644 --- a/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java +++ b/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java @@ -78,7 +78,7 @@ public class CertificatePoliciesExtension extends Extension DerOutputStream tmp = new DerOutputStream(); for (int i = 0; i < mInfos.size(); i++) { - ((CertificatePolicyInfo) mInfos.elementAt(i)).encode(tmp); + mInfos.elementAt(i).encode(tmp); } os.write(DerValue.tag_Sequence, tmp); extensionValue = os.toByteArray(); diff --git a/base/util/src/netscape/security/x509/CertificatePolicySet.java b/base/util/src/netscape/security/x509/CertificatePolicySet.java index 68a5e3139..7b6558df1 100644 --- a/base/util/src/netscape/security/x509/CertificatePolicySet.java +++ b/base/util/src/netscape/security/x509/CertificatePolicySet.java @@ -79,7 +79,7 @@ public class CertificatePolicySet { DerOutputStream tmp = new DerOutputStream(); for (int i = 0; i < ids.size(); i++) { - ((CertificatePolicyId) ids.elementAt(i)).encode(tmp); + ids.elementAt(i).encode(tmp); } out.write(DerValue.tag_Sequence, tmp); } diff --git a/base/util/src/netscape/security/x509/EDIPartyName.java b/base/util/src/netscape/security/x509/EDIPartyName.java index eac5c0953..def86ffa5 100644 --- a/base/util/src/netscape/security/x509/EDIPartyName.java +++ b/base/util/src/netscape/security/x509/EDIPartyName.java @@ -88,7 +88,7 @@ public class EDIPartyName implements GeneralNameInterface { for (int i = 0; i < len; i++) { DerValue opt = seq[i]; - if (opt.isContextSpecific((byte) TAG_ASSIGNER) && + if (opt.isContextSpecific(TAG_ASSIGNER) && !opt.isConstructed()) { if (assigner != null) throw new IOException("Duplicate nameAssigner found in" @@ -96,7 +96,7 @@ public class EDIPartyName implements GeneralNameInterface { opt = opt.data.getDerValue(); assigner = opt.getAsString(); } - if (opt.isContextSpecific((byte) TAG_PARTYNAME) && + if (opt.isContextSpecific(TAG_PARTYNAME) && !opt.isConstructed()) { if (party != null) throw new IOException("Duplicate partyName found in" diff --git a/base/util/src/netscape/security/x509/FreshestCRLExtension.java b/base/util/src/netscape/security/x509/FreshestCRLExtension.java index 8e32bed66..b27f01a61 100644 --- a/base/util/src/netscape/security/x509/FreshestCRLExtension.java +++ b/base/util/src/netscape/security/x509/FreshestCRLExtension.java @@ -105,7 +105,7 @@ public class FreshestCRLExtension extends Extension try { this.extensionId = PKIXExtensions.FreshestCRL_Id; this.critical = critical.booleanValue(); - this.extensionValue = (byte[]) ((byte[]) value).clone(); + this.extensionValue = ((byte[]) value).clone(); // decode the value try { @@ -363,7 +363,7 @@ public class FreshestCRLExtension extends Extension int size = list.size(); Vector<Reason> result = new Vector<Reason>(); for (int i = 0; i < size; i++) { - Reason r = (Reason) list.elementAt(i); + Reason r = list.elementAt(i); byte b = r.getBitMask(); if ((first & b) != 0) { result.addElement(r); diff --git a/base/util/src/netscape/security/x509/GeneralSubtrees.java b/base/util/src/netscape/security/x509/GeneralSubtrees.java index 0c3c64cb2..720b6b225 100644 --- a/base/util/src/netscape/security/x509/GeneralSubtrees.java +++ b/base/util/src/netscape/security/x509/GeneralSubtrees.java @@ -79,7 +79,7 @@ public class GeneralSubtrees { GeneralSubtree element; for (Enumeration<GeneralSubtree> e = trees.elements(); e.hasMoreElements();) { - element = (GeneralSubtree) e.nextElement(); + element = e.nextElement(); s = s + pp.indent(indent + 4) + element.toPrint(indent) + "\n"; } @@ -95,7 +95,7 @@ public class GeneralSubtrees { DerOutputStream seq = new DerOutputStream(); for (int i = 0; i < trees.size(); i++) { - ((GeneralSubtree) trees.elementAt(i)).encode(seq); + trees.elementAt(i).encode(seq); } out.write(DerValue.tag_Sequence, seq); } diff --git a/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java b/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java index bcbaa2e3d..b1cf61180 100644 --- a/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java +++ b/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java @@ -131,7 +131,7 @@ public class IssuingDistributionPointExtension extends Extension this.extensionId = PKIXExtensions.IssuingDistributionPoint_Id; this.critical = critical.booleanValue(); - this.extensionValue = (byte[]) ((byte[]) value).clone(); + this.extensionValue = ((byte[]) value).clone(); byte[] extValue = this.extensionValue; issuingDistributionPoint = new IssuingDistributionPoint(); diff --git a/base/util/src/netscape/security/x509/KeyIdentifier.java b/base/util/src/netscape/security/x509/KeyIdentifier.java index c3d16030e..643e86a31 100644 --- a/base/util/src/netscape/security/x509/KeyIdentifier.java +++ b/base/util/src/netscape/security/x509/KeyIdentifier.java @@ -58,7 +58,7 @@ public class KeyIdentifier implements java.io.Serializable { * Return the value of the KeyIdentifier as byte array. */ public byte[] getIdentifier() { - return ((byte[]) octetString.clone()); + return octetString.clone(); } /** diff --git a/base/util/src/netscape/security/x509/KeyUsageExtension.java b/base/util/src/netscape/security/x509/KeyUsageExtension.java index 52cac0265..d116c4def 100644 --- a/base/util/src/netscape/security/x509/KeyUsageExtension.java +++ b/base/util/src/netscape/security/x509/KeyUsageExtension.java @@ -402,7 +402,7 @@ public class KeyUsageExtension extends Extension } public boolean[] getBits() { - return (boolean[]) bitString.clone(); + return bitString.clone(); } /** diff --git a/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java b/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java index f01da74ec..68bbeb2ad 100644 --- a/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java +++ b/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java @@ -198,7 +198,7 @@ public class LdapV3DNStrConverter extends LdapDNStrConverter { names = new RDN[rdnVector.size()]; for (i = 0, j = rdnVector.size() - 1; i < rdnVector.size(); i++, j--) - names[j] = (RDN) rdnVector.elementAt(i); + names[j] = rdnVector.elementAt(i); return new X500Name(names); } @@ -242,7 +242,7 @@ public class LdapV3DNStrConverter extends LdapDNStrConverter { assertion = new AVA[avaVector.size()]; for (int i = 0; i < avaVector.size(); i++) - assertion[i] = (AVA) avaVector.elementAt(i); + assertion[i] = avaVector.elementAt(i); return new RDN(assertion); } @@ -376,7 +376,7 @@ public class LdapV3DNStrConverter extends LdapDNStrConverter { "expecting escaped char."); if (hexDigits.indexOf((char) c) == -1) { in.unread(c); - in.unread((int) '\\'); + in.unread('\\'); break; } } while (true); diff --git a/base/util/src/netscape/security/x509/OIDMap.java b/base/util/src/netscape/security/x509/OIDMap.java index 41c1fa289..17573a019 100644 --- a/base/util/src/netscape/security/x509/OIDMap.java +++ b/base/util/src/netscape/security/x509/OIDMap.java @@ -245,7 +245,7 @@ public class OIDMap { * is registered for this oid. */ public static String getName(ObjectIdentifier oid) { - return (String) oid2Name.get(oid); + return oid2Name.get(oid); } /** @@ -256,7 +256,7 @@ public class OIDMap { * is registered for this name. */ public static ObjectIdentifier getOID(String name) { - return (ObjectIdentifier) name2OID.get(name); + return name2OID.get(name); } /** @@ -266,7 +266,7 @@ public class OIDMap { * @exception CertificateException if class cannot be instantiated. */ public static Class<?> getClass(String name) throws CertificateException { - String className = (String) name2Class.get(name); + String className = name2Class.get(name); if (className == null) return null; try { @@ -289,7 +289,7 @@ public class OIDMap { String name = getName(oid); if (name == null) return null; - String className = (String) name2Class.get(name); + String className = name2Class.get(name); if (className == null) return null; try { diff --git a/base/util/src/netscape/security/x509/OtherName.java b/base/util/src/netscape/security/x509/OtherName.java index b2533ecbb..ae8398344 100644 --- a/base/util/src/netscape/security/x509/OtherName.java +++ b/base/util/src/netscape/security/x509/OtherName.java @@ -201,7 +201,7 @@ public class OtherName implements GeneralNameInterface { if ((data[i] & 0xff) < 16) { b.append("0"); } - b.append(Integer.toString((int) (data[i] & 0xff), 0x10)); + b.append(Integer.toString((data[i] & 0xff), 0x10)); } return b.toString(); } diff --git a/base/util/src/netscape/security/x509/PolicyMappingsExtension.java b/base/util/src/netscape/security/x509/PolicyMappingsExtension.java index bb782ea52..458e32d4a 100644 --- a/base/util/src/netscape/security/x509/PolicyMappingsExtension.java +++ b/base/util/src/netscape/security/x509/PolicyMappingsExtension.java @@ -73,7 +73,7 @@ public class PolicyMappingsExtension extends Extension DerOutputStream tmp = new DerOutputStream(); for (int i = 0; i < maps.size(); i++) { - ((CertificatePolicyMap) maps.elementAt(i)).encode(tmp); + maps.elementAt(i).encode(tmp); } os.write(DerValue.tag_Sequence, tmp); extensionValue = os.toByteArray(); diff --git a/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java b/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java index 5544fdb75..80af3d1c4 100644 --- a/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java +++ b/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java @@ -149,7 +149,7 @@ public class PrivateKeyUsageExtension extends Extension for (int i = 0; i < seq.length; i++) { DerValue opt = seq[i]; - if (opt.isContextSpecific((byte) TAG_BEFORE) && + if (opt.isContextSpecific(TAG_BEFORE) && !opt.isConstructed()) { if (notBefore != null) { throw new CertificateParsingException( @@ -159,7 +159,7 @@ public class PrivateKeyUsageExtension extends Extension str = new DerInputStream(opt.toByteArray()); notBefore = str.getGeneralizedTime(); - } else if (opt.isContextSpecific((byte) TAG_AFTER) && + } else if (opt.isContextSpecific(TAG_AFTER) && !opt.isConstructed()) { if (notAfter != null) { throw new CertificateParsingException( diff --git a/base/util/src/netscape/security/x509/RDN.java b/base/util/src/netscape/security/x509/RDN.java index 6a4e7e1a9..dc26eb214 100644 --- a/base/util/src/netscape/security/x509/RDN.java +++ b/base/util/src/netscape/security/x509/RDN.java @@ -147,7 +147,7 @@ public class RDN { * @param avas a AVA Array. */ public RDN(AVA avas[]) { - assertion = (AVA[]) avas.clone(); + assertion = avas.clone(); } /** @@ -167,7 +167,7 @@ public class RDN { * @return array of AVA in this RDN. */ public AVA[] getAssertion() { - return (AVA[]) assertion.clone(); + return assertion.clone(); } /** diff --git a/base/util/src/netscape/security/x509/RevokedCertImpl.java b/base/util/src/netscape/security/x509/RevokedCertImpl.java index 45aa78920..866f1c0d9 100755 --- a/base/util/src/netscape/security/x509/RevokedCertImpl.java +++ b/base/util/src/netscape/security/x509/RevokedCertImpl.java @@ -29,7 +29,6 @@ import java.util.Enumeration; import java.util.LinkedHashSet; import java.util.Set; -import netscape.security.util.BigInt; import netscape.security.util.DerInputStream; import netscape.security.util.DerOutputStream; import netscape.security.util.DerValue; @@ -255,7 +254,7 @@ public class RevokedCertImpl extends RevokedCertificate implements Serializable * @return the serial number. */ public BigInteger getSerialNumber() { - return ((BigInt) serialNumber.getNumber()).toBigInteger(); + return serialNumber.getNumber().toBigInteger(); } /** @@ -290,7 +289,7 @@ public class RevokedCertImpl extends RevokedCertificate implements Serializable sb.append("\n"); for (int i = 0; i < extensions.size(); i++) sb.append("Entry Extension[" + i + "]: " - + ((Extension) (extensions.elementAt(i))).toString()); + + (extensions.elementAt(i)).toString()); } sb.append("\n"); return (sb.toString()); diff --git a/base/util/src/netscape/security/x509/X500Name.java b/base/util/src/netscape/security/x509/X500Name.java index abffbe7b1..c2886dab2 100644 --- a/base/util/src/netscape/security/x509/X500Name.java +++ b/base/util/src/netscape/security/x509/X500Name.java @@ -268,7 +268,7 @@ public class X500Name implements Principal, GeneralNameInterface { */ public X500Name(RDN[] rdns) throws IOException { - names = (RDN[]) rdns.clone(); + names = rdns.clone(); } /** @@ -281,7 +281,7 @@ public class X500Name implements Principal, GeneralNameInterface { int size = rdnVector.size(); names = new RDN[size]; for (int i = 0; i < size; i++) { - names[i] = (RDN) rdnVector.elementAt(i); + names[i] = rdnVector.elementAt(i); } } @@ -525,7 +525,7 @@ public class X500Name implements Principal, GeneralNameInterface { * @return array of RDN in this X500name. */ public RDN[] getNames() { - return (RDN[]) names.clone(); + return names.clone(); } /** diff --git a/base/util/src/netscape/security/x509/X500NameAttrMap.java b/base/util/src/netscape/security/x509/X500NameAttrMap.java index 8821c5e71..3947f0990 100644 --- a/base/util/src/netscape/security/x509/X500NameAttrMap.java +++ b/base/util/src/netscape/security/x509/X500NameAttrMap.java @@ -85,7 +85,7 @@ public class X500NameAttrMap { name2OID.get(name.toUpperCase()); if (oid == null) return null; - return (AVAValueConverter) oid2ValueConverter.get(oid); + return oid2ValueConverter.get(oid); } /** @@ -96,7 +96,7 @@ public class X500NameAttrMap { * @return An AVAValueConverter for the OID. */ public AVAValueConverter getValueConverter(ObjectIdentifier oid) { - return (AVAValueConverter) oid2ValueConverter.get(oid); + return oid2ValueConverter.get(oid); } /** diff --git a/base/util/src/netscape/security/x509/X509CRLImpl.java b/base/util/src/netscape/security/x509/X509CRLImpl.java index 05afe2653..9725db640 100755 --- a/base/util/src/netscape/security/x509/X509CRLImpl.java +++ b/base/util/src/netscape/security/x509/X509CRLImpl.java @@ -516,23 +516,22 @@ public class X509CRLImpl extends X509CRL { public String toString() { StringBuffer sb = new StringBuffer(); sb.append("X.509 CRL v" + (version + 1) + "\n"); - sb.append("Signature Algorithm: " + sigAlgId.toString() + - ", OID=" + (sigAlgId.getOID()).toString() + "\n"); - sb.append("Issuer: " + issuer.toString() + "\n"); - sb.append("\nThis Update: " + thisUpdate.toString() + "\n"); + sb.append("Signature Algorithm: " + sigAlgId + + ", OID=" + sigAlgId.getOID() + "\n"); + sb.append("Issuer: " + issuer + "\n"); + sb.append("\nThis Update: " + thisUpdate + "\n"); if (nextUpdate != null) - sb.append("Next Update: " + nextUpdate.toString() + "\n"); + sb.append("Next Update: " + nextUpdate + "\n"); if (revokedCerts.isEmpty()) sb.append("\nNO certificates have been revoked\n"); else { sb.append("\nRevoked Certificates:\n"); for (Enumeration<RevokedCertificate> e = revokedCerts.elements(); e.hasMoreElements();) - sb.append(((RevokedCertificate) e.nextElement()).toString()); + sb.append(e.nextElement()); } if (extensions != null) { for (int i = 0; i < extensions.size(); i++) { - sb.append("\nCRL Extension[" + i + "]: " + - ((Extension) (extensions.elementAt(i))).toString()); + sb.append("\nCRL Extension[" + i + "]: " + extensions.elementAt(i)); } } netscape.security.util.PrettyPrintFormat pp = @@ -614,7 +613,7 @@ public class X509CRLImpl extends X509CRL { * @return the issuer name. */ public Principal getIssuerDN() { - return (Principal) issuer; + return issuer; } /** @@ -650,9 +649,7 @@ public class X509CRLImpl extends X509CRL { public X509CRLEntry getRevokedCertificate(BigInteger serialNumber) { if (revokedCerts == null || revokedCerts.isEmpty()) return null; - RevokedCertificate badCert = - (RevokedCertificate) revokedCerts.get(serialNumber); - return badCert; + return revokedCerts.get(serialNumber); } /** @@ -806,7 +803,7 @@ public class X509CRLImpl extends X509CRL { for (Enumeration<Extension> e = extensions.getElements(); e.hasMoreElements();) { ex = e.nextElement(); if (ex.isCritical()) { - extSet.add(((ObjectIdentifier) ex.getExtensionId()).toString()); + extSet.add(ex.getExtensionId().toString()); } } return extSet; @@ -827,7 +824,7 @@ public class X509CRLImpl extends X509CRL { for (Enumeration<Extension> e = extensions.getElements(); e.hasMoreElements();) { ex = e.nextElement(); if (!ex.isCritical()) - extSet.add(((ObjectIdentifier) ex.getExtensionId()).toString()); + extSet.add(ex.getExtensionId().toString()); } return extSet; } @@ -884,7 +881,7 @@ public class X509CRLImpl extends X509CRL { return null; Enumeration<Extension> e = exts.getElements(); while (e.hasMoreElements()) { - Extension ext = (Extension) e.nextElement(); + Extension ext = e.nextElement(); if (ext instanceof CRLNumberExtension) { CRLNumberExtension numExt = (CRLNumberExtension) ext; return (BigInteger) numExt.get(CRLNumberExtension.NUMBER); @@ -902,7 +899,7 @@ public class X509CRLImpl extends X509CRL { return null; Enumeration<Extension> e = exts.getElements(); while (e.hasMoreElements()) { - Extension ext = (Extension) e.nextElement(); + Extension ext = e.nextElement(); if (ext instanceof DeltaCRLIndicatorExtension) { DeltaCRLIndicatorExtension numExt = (DeltaCRLIndicatorExtension) ext; return (BigInteger) numExt.get(DeltaCRLIndicatorExtension.NUMBER); @@ -920,7 +917,7 @@ public class X509CRLImpl extends X509CRL { return false; Enumeration<Extension> e = exts.getElements(); while (e.hasMoreElements()) { - Extension ext = (Extension) e.nextElement(); + Extension ext = e.nextElement(); if (ext instanceof DeltaCRLIndicatorExtension) { return true; } @@ -1049,7 +1046,7 @@ public class X509CRLImpl extends X509CRL { " not supported in CRL v1 entries."); revokedCerts.put(entry.getSerialNumber(), - (RevokedCertificate) entry); + entry); } } else { derStrm.skipSequence(4); diff --git a/base/util/src/netscape/security/x509/X509Cert.java b/base/util/src/netscape/security/x509/X509Cert.java index 5b6036049..9162cc92f 100644 --- a/base/util/src/netscape/security/x509/X509Cert.java +++ b/base/util/src/netscape/security/x509/X509Cert.java @@ -403,7 +403,7 @@ public class X509Cert implements Certificate, Serializable { Signature sig; if (privateKey instanceof Key) { - Key key = (Key) privateKey; + Key key = privateKey; algorithm = key.getAlgorithm(); } else { throw new InvalidKeyException("private key not a key!"); diff --git a/base/util/src/netscape/security/x509/X509CertImpl.java b/base/util/src/netscape/security/x509/X509CertImpl.java index f93fb9009..26b88fe3d 100755 --- a/base/util/src/netscape/security/x509/X509CertImpl.java +++ b/base/util/src/netscape/security/x509/X509CertImpl.java @@ -45,7 +45,6 @@ import java.util.LinkedHashSet; import java.util.Set; import java.util.Vector; -import netscape.security.util.BigInt; import netscape.security.util.DerEncoder; import netscape.security.util.DerOutputStream; import netscape.security.util.DerValue; @@ -707,7 +706,7 @@ public class X509CertImpl extends X509Certificate SerialNumber ser = (SerialNumber) info.get( CertificateSerialNumber.NAME + DOT + CertificateSerialNumber.NUMBER); - return ((BigInt) ser.getNumber()).toBigInteger(); + return ser.getNumber().toBigInteger(); } catch (Exception e) { return null; } @@ -915,7 +914,7 @@ public class X509CertImpl extends X509Certificate for (Enumeration<Extension> e = exts.getAttributes(); e.hasMoreElements();) { ex = e.nextElement(); if (ex.isCritical()) - extSet.add(((ObjectIdentifier) ex.getExtensionId()).toString()); + extSet.add(ex.getExtensionId().toString()); } return extSet; } catch (Exception e) { @@ -944,7 +943,7 @@ public class X509CertImpl extends X509Certificate for (Enumeration<Extension> e = exts.getAttributes(); e.hasMoreElements();) { ex = e.nextElement(); if (!ex.isCritical()) - extSet.add(((ObjectIdentifier) ex.getExtensionId()).toString()); + extSet.add(ex.getExtensionId().toString()); } return extSet; } catch (Exception e) { diff --git a/base/util/src/netscape/security/x509/X509CertInfo.java b/base/util/src/netscape/security/x509/X509CertInfo.java index 20ef2bd6a..314c3ad2b 100644 --- a/base/util/src/netscape/security/x509/X509CertInfo.java +++ b/base/util/src/netscape/security/x509/X509CertInfo.java @@ -356,7 +356,7 @@ public class X509CertInfo implements CertAttrSet, Serializable { new netscape.security.util.PrettyPrintFormat(" ", 20); for (int i = 0; i < extensions.size(); i++) { sb.append(" Extension[" + i + "] = "); - Extension ext = (Extension) extensions.elementAt(i); + Extension ext = extensions.elementAt(i); try { if (OIDMap.getClass(ext.getExtensionId()) == null) { sb.append(ext.toString()); |