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/common/src/com/netscape/cmscore | |
| 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/common/src/com/netscape/cmscore')
51 files changed, 252 insertions, 304 deletions
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 { |