Removed unnecessary type casts.

Unnecessary type casts have been removed using Eclipse Quick Fix.

Ticket #134

6 files changed, 27 insertions, 33 deletions

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
         }