diff options
Diffstat (limited to 'base/common/src/com/netscape/cmscore/ldap')
6 files changed, 46 insertions, 52 deletions
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) { |