From 3f24e55923fc986af4c6a08b2b8d45704a905627 Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Thu, 5 Apr 2012 15:08:18 -0500 Subject: Removed unnecessary type casts. Unnecessary type casts have been removed using Eclipse Quick Fix. Ticket #134 --- .../src/com/netscape/cms/publish/mappers/AVAPattern.java | 3 +-- .../src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java | 8 ++------ .../src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java | 6 ++---- .../src/com/netscape/cms/publish/mappers/LdapCertExactMap.java | 8 ++------ .../src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java | 10 +++------- .../netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java | 3 +-- .../src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java | 10 +++++----- .../src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java | 9 ++------- .../src/com/netscape/cms/publish/mappers/LdapSimpleMap.java | 8 ++------ .../src/com/netscape/cms/publish/mappers/MapAVAPattern.java | 3 +-- .../src/com/netscape/cms/publish/mappers/MapDNPattern.java | 4 ++-- .../src/com/netscape/cms/publish/mappers/MapRDNPattern.java | 4 ++-- .../cms/publish/publishers/LdapEncryptCertPublisher.java | 2 +- 13 files changed, 26 insertions(+), 52 deletions(-) (limited to 'base/common/src/com/netscape/cms/publish') diff --git a/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java b/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java index acac975cb..0dff1da6b 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java +++ b/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java @@ -431,8 +431,7 @@ class AVAPattern { if (extensions != null) { for (int i = 0; i < extensions.size(); i++) { - Extension ext = (Extension) - extensions.elementAt(i); + Extension ext = extensions.elementAt(i); String extName = OIDMap.getName(ext.getExtensionId()); diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java index a1a65a342..1b1531000 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java @@ -287,9 +287,7 @@ public class LdapCaSimpleMap implements ILdapMapper, IExtendedPluginInfo { try { X509Certificate cert = (X509Certificate) obj; - - subjectDN = - (X500Name) ((X509Certificate) cert).getSubjectDN(); + subjectDN = (X500Name) cert.getSubjectDN(); CMS.debug("LdapCaSimpleMap: cert subject dn:" + subjectDN.toString()); X509CertInfo info = (X509CertInfo) @@ -307,9 +305,7 @@ public class LdapCaSimpleMap implements ILdapMapper, IExtendedPluginInfo { } catch (ClassCastException e) { try { X509CRLImpl crl = (X509CRLImpl) obj; - - subjectDN = - (X500Name) ((X509CRLImpl) crl).getIssuerDN(); + subjectDN = (X500Name) crl.getIssuerDN(); CMS.debug("LdapCaSimpleMap: crl issuer dn: " + subjectDN.toString()); diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java index d1a734b82..8ed702f50 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java @@ -129,8 +129,7 @@ public class LdapCertCompsMap X509Certificate cert = (X509Certificate) obj; String result = null; // form dn and filter for search. - X500Name subjectDN = - (X500Name) ((X509Certificate) cert).getSubjectDN(); + X500Name subjectDN = (X500Name) cert.getSubjectDN(); CMS.debug("LdapCertCompsMap: " + subjectDN.toString()); @@ -146,8 +145,7 @@ public class LdapCertCompsMap try { X509CRLImpl crl = (X509CRLImpl) obj; String result = null; - X500Name issuerDN = - (X500Name) ((X509CRLImpl) crl).getIssuerDN(); + X500Name issuerDN = (X500Name) crl.getIssuerDN(); CMS.debug("LdapCertCompsMap: " + issuerDN.toString()); diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java index 5c085481d..21a3a0794 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java @@ -117,17 +117,13 @@ public class LdapCertExactMap implements ILdapMapper, IExtendedPluginInfo { try { X509Certificate cert = (X509Certificate) obj; - - subjectDN = - (X500Name) ((X509Certificate) cert).getSubjectDN(); + subjectDN = (X500Name) cert.getSubjectDN(); CMS.debug("LdapCertExactMap: cert subject dn:" + subjectDN.toString()); } catch (ClassCastException e) { try { X509CRLImpl crl = (X509CRLImpl) obj; - - subjectDN = - (X500Name) ((X509CRLImpl) crl).getIssuerDN(); + subjectDN = (X500Name) crl.getIssuerDN(); CMS.debug("LdapCertExactMap: crl issuer dn: " + subjectDN.toString()); diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java index 61ffef947..a1f7207f6 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java @@ -185,17 +185,13 @@ public class LdapCertSubjMap implements ILdapMapper, IExtendedPluginInfo { try { X509Certificate cert = (X509Certificate) obj; - - subjectDN = - (X500Name) ((X509Certificate) cert).getSubjectDN(); + subjectDN = (X500Name) cert.getSubjectDN(); CMS.debug("LdapCertSubjMap: cert subject dn:" + subjectDN.toString()); } catch (ClassCastException e) { try { X509CRLImpl crl = (X509CRLImpl) obj; - - subjectDN = - (X500Name) ((X509CRLImpl) crl).getIssuerDN(); + subjectDN = (X500Name) crl.getIssuerDN(); CMS.debug("LdapCertSubjMap: crl issuer dn: " + subjectDN.toString()); @@ -271,7 +267,7 @@ public class LdapCertSubjMap implements ILdapMapper, IExtendedPluginInfo { try { X509Certificate cert = (X509Certificate) obj; - subjectDN = (X500Name) ((X509Certificate) cert).getSubjectDN(); + subjectDN = (X500Name) cert.getSubjectDN(); CMS.debug("LdapCertSubjMap: cert subject dn:" + subjectDN.toString()); } catch (ClassCastException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("PUBLISH_NOT_SUPPORTED_OBJECT")); diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java index 7c4c3c4b0..ca5903ee0 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java @@ -124,8 +124,7 @@ public class LdapCrlIssuerCompsMap try { String result = null; - X500Name issuerDN = - (X500Name) ((X509CRLImpl) crl).getIssuerDN(); + X500Name issuerDN = (X500Name) crl.getIssuerDN(); CMS.debug("LdapCrlIssuerCompsMap: " + issuerDN.toString()); diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java index 1f7f06f69..96ff2a11e 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java @@ -185,9 +185,9 @@ public class LdapDNCompsMap mBaseDN = baseDN; if (dnComps != null) - mDnComps = (ObjectIdentifier[]) dnComps.clone(); + mDnComps = dnComps.clone(); if (filterComps != null) - mFilterComps = (ObjectIdentifier[]) filterComps.clone(); + mFilterComps = filterComps.clone(); // log debug info. for (int i = 0; i < mDnComps.length; i++) { @@ -317,7 +317,7 @@ public class LdapDNCompsMap try { // get the base DN & filter. for (Enumeration n = subjName.getRDNs(); n.hasMoreElements();) { - RDN rdn = (RDN) n.nextElement(); + RDN rdn = n.nextElement(); // NOTE assumes one AVA per RDN. AVA ava = rdn.getAssertion()[0]; ObjectIdentifier oid = ava.getOid(); @@ -378,11 +378,11 @@ public class LdapDNCompsMap } public ObjectIdentifier[] getDnComps() { - return (ObjectIdentifier[]) mDnComps.clone(); + return mDnComps.clone(); } public ObjectIdentifier[] getFilterComps() { - return (ObjectIdentifier[]) mFilterComps.clone(); + return mFilterComps.clone(); } /** diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java index d94032071..a970602bd 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java @@ -217,9 +217,7 @@ public class LdapEnhancedMap try { X509Certificate cert = (X509Certificate) obj; - - subjectDN = - (X500Name) ((X509Certificate) cert).getSubjectDN(); + subjectDN = (X500Name) cert.getSubjectDN(); CMS.debug( "LdapEnhancedMap: cert subject dn:" + subjectDN.toString()); @@ -248,13 +246,10 @@ public class LdapEnhancedMap try { X509CRLImpl crl = (X509CRLImpl) obj; - - subjectDN = (X500Name) - ((X509CRLImpl) crl).getIssuerDN(); + subjectDN = (X500Name) crl.getIssuerDN(); CMS.debug( "LdapEnhancedMap: crl issuer dn: " + - subjectDN.toString()); } catch (ClassCastException ex) { log(ILogger.LL_FAILURE, diff --git a/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java index 67d98f4cc..8f88ffaba 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java +++ b/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java @@ -248,9 +248,7 @@ public class LdapSimpleMap implements ILdapMapper, IExtendedPluginInfo { try { X509Certificate cert = (X509Certificate) obj; - - subjectDN = - (X500Name) ((X509Certificate) cert).getSubjectDN(); + subjectDN = (X500Name) cert.getSubjectDN(); CMS.debug("LdapSimpleMap: cert subject dn:" + subjectDN.toString()); //certExt = (CertificateExtensions) @@ -270,9 +268,7 @@ public class LdapSimpleMap implements ILdapMapper, IExtendedPluginInfo { } catch (ClassCastException e) { try { X509CRLImpl crl = (X509CRLImpl) obj; - - subjectDN = - (X500Name) ((X509CRLImpl) crl).getIssuerDN(); + subjectDN = (X500Name) crl.getIssuerDN(); CMS.debug("LdapSimpleMap: crl issuer dn: " + subjectDN.toString()); diff --git a/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java b/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java index ef7fa9d13..cd298bc3b 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java +++ b/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java @@ -522,8 +522,7 @@ class MapAVAPattern { if (TYPE_EXT.equals(mType)) { if (extensions != null) { for (int i = 0; i < extensions.size(); i++) { - Extension ext = (Extension) - extensions.elementAt(i); + Extension ext = extensions.elementAt(i); String extName = OIDMap.getName(ext.getExtensionId()); int index = extName.lastIndexOf("."); diff --git a/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java b/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java index dc446a7b7..6656f4a1f 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java +++ b/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java @@ -192,10 +192,10 @@ public class MapDNPattern { } public String[] getReqAttrs() { - return (String[]) mReqAttrs.clone(); + return mReqAttrs.clone(); } public String[] getCertAttrs() { - return (String[]) mCertAttrs.clone(); + return mCertAttrs.clone(); } } diff --git a/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java b/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java index 61da1d7d2..058294d7c 100644 --- a/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java +++ b/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java @@ -208,10 +208,10 @@ class MapRDNPattern { } public String[] getReqAttrs() { - return (String[]) mReqAttrs.clone(); + return mReqAttrs.clone(); } public String[] getCertAttrs() { - return (String[]) mCertAttrs.clone(); + return mCertAttrs.clone(); } } diff --git a/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java index 8dada61fb..68b1205ad 100644 --- a/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java +++ b/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java @@ -328,7 +328,7 @@ public class LdapEncryptCertPublisher implements ILdapPublisher, IExtendedPlugin byte[] val = null; while (vals.hasMoreElements()) { - val = (byte[]) vals.nextElement(); + val = vals.nextElement(); if (PublisherUtils.byteArraysAreEqual(val, bval)) { return true; } -- cgit