Removed unnecessary type casts.

Unnecessary type casts have been removed using Eclipse Quick Fix.

Ticket #134

11 files changed, 139 insertions, 157 deletions

diff --git a/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java
index 7a08ce966..22c979f28 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java
@@ -236,7 +236,7 @@ public class ACLAdminServlet extends AdminServlet {
         Enumeration<ACL> res = mAuthzMgr.getACLs();
 
         while (res.hasMoreElements()) {
-            ACL acl = (ACL) res.nextElement();
+            ACL acl = res.nextElement();
             String desc = acl.getDescription();
 
             if (desc == null)
@@ -296,7 +296,7 @@ public class ACLAdminServlet extends AdminServlet {
                     if (acis != "") {
                         acis += ";";
                     }
-                    ACLEntry aclEntry = (ACLEntry) aclEntryEnum.nextElement();
+                    ACLEntry aclEntry = aclEntryEnum.nextElement();
                     String aci = aclEntry.getACLEntryString();
 
                     acis += aci;
@@ -788,7 +788,7 @@ public class ACLAdminServlet extends AdminServlet {
 
             // it's possibl that it's being used...we have to assume that
             // the administrator knows what she is doing, for now
-            mEvaluators.remove((Object) id);
+            mEvaluators.remove(id);
 
             try {
                 IConfigStore destStore =
diff --git a/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java
index 5e6e7889f..ee1b53ed5 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java
@@ -36,7 +36,6 @@ import javax.servlet.http.HttpServletResponse;
 import netscape.security.x509.X509CertImpl;
 
 import com.netscape.certsrv.apps.CMS;
-import com.netscape.certsrv.authentication.AuthToken;
 import com.netscape.certsrv.authentication.IAuthCredentials;
 import com.netscape.certsrv.authentication.IAuthManager;
 import com.netscape.certsrv.authentication.IAuthSubsystem;
@@ -261,7 +260,7 @@ public class AdminServlet extends HttpServlet {
         StringTokenizer tokenizer = new StringTokenizer(info, "#");
 
         while (tokenizer.hasMoreTokens()) {
-            String acl = (String) tokenizer.nextToken();
+            String acl = tokenizer.nextToken();
 
             mAuthz.authzMgrAccessInit(mAclMethod, acl);
         }
@@ -362,7 +361,7 @@ public class AdminServlet extends HttpServlet {
                     IAuthCredentials authCreds =
                             getAuthCreds(authMgr, cert);
 
-                    token = (AuthToken) authMgr.authenticate(authCreds);
+                    token = authMgr.authenticate(authCreds);
                 } else {
                     String authToken = req.getHeader(HDR_AUTHORIZATION);
                     String b64s = authToken.substring(
@@ -826,7 +825,7 @@ public class AdminServlet extends HttpServlet {
         ByteArrayOutputStream out = new ByteArrayOutputStream(s.length());
 
         for (int i = 0; i < s.length(); i++) {
-            int c = (int) s.charAt(i);
+            int c = s.charAt(i);
 
             if (c == '+') {
                 out.write(' ');
diff --git a/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java
index 6ccfcdca9..24e701d7a 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java
@@ -397,7 +397,7 @@ public class AuthAdminServlet extends AdminServlet {
                 return;
             }
             // is the manager id unique?
-            if (mAuths.getPlugins().containsKey((Object) id)) {
+            if (mAuths.getPlugins().containsKey(id)) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
                             LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
@@ -653,7 +653,7 @@ public class AuthAdminServlet extends AdminServlet {
             }
 
             // is the manager instance id unique?
-            if (mAuths.getInstances().containsKey((Object) id)) {
+            if (mAuths.getInstances().containsKey(id)) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
                             LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
@@ -699,7 +699,7 @@ public class AuthAdminServlet extends AdminServlet {
 
             // check if implementation exists.
             AuthMgrPlugin plugin =
-                    (AuthMgrPlugin) mAuths.getPlugins().get(implname);
+                    mAuths.getPlugins().get(implname);
 
             if (plugin == null) {
                 // store a message in the signed audit log file
@@ -916,9 +916,8 @@ public class AuthAdminServlet extends AdminServlet {
         Enumeration<String> e = mAuths.getPlugins().keys();
 
         while (e.hasMoreElements()) {
-            String name = (String) e.nextElement();
-            AuthMgrPlugin value = (AuthMgrPlugin)
-                    mAuths.getPlugins().get(name);
+            String name = e.nextElement();
+            AuthMgrPlugin value = mAuths.getPlugins().get(name);
 
             if (value.isVisible()) {
                 params.put(name, value.getClassPath() + EDIT);
@@ -944,8 +943,7 @@ public class AuthAdminServlet extends AdminServlet {
                 enableStr = "disabled";
             }
 
-            AuthMgrPlugin amgrplugin = (AuthMgrPlugin)
-                    mAuths.getPlugins().get(value.getImplName());
+            AuthMgrPlugin amgrplugin = mAuths.getPlugins().get(value.getImplName());
 
             if (!amgrplugin.isVisible()) {
                 params.put(name, value.getImplName() + ";invisible;" + enableStr);
@@ -1032,7 +1030,7 @@ public class AuthAdminServlet extends AdminServlet {
             // first check if any instances from this auth manager
             // DON'T remove auth manager if any instance
             for (Enumeration<?> e = mAuths.getInstances().keys(); e.hasMoreElements();) {
-                IAuthManager authMgr = (IAuthManager) mAuths.get((String) e.nextElement());
+                IAuthManager authMgr = mAuths.get((String) e.nextElement());
 
                 if (authMgr.getImplName() == id) {
                     // store a message in the signed audit log file
@@ -1052,7 +1050,7 @@ public class AuthAdminServlet extends AdminServlet {
             }
 
             // then delete this auth manager
-            mAuths.getPlugins().remove((Object) id);
+            mAuths.getPlugins().remove(id);
 
             IConfigStore destStore =
                     mConfig.getSubStore(DestDef.DEST_AUTH_ADMIN);
@@ -1350,7 +1348,7 @@ public class AuthAdminServlet extends AdminServlet {
             return;
         }
 
-        IAuthManager mgrInst = (IAuthManager) mAuths.get(id);
+        IAuthManager mgrInst = mAuths.get(id);
         IConfigStore config = mgrInst.getConfigStore();
         String[] configParams = mgrInst.getConfigParams();
         NameValuePairs params = new NameValuePairs();
@@ -1360,7 +1358,7 @@ public class AuthAdminServlet extends AdminServlet {
         if (configParams != null) {
             for (int i = 0; i < configParams.length; i++) {
                 String key = configParams[i];
-                String val = (String) config.get(key);
+                String val = config.get(key);
 
                 if (val != null) {
                     params.put(key, val);
@@ -1434,7 +1432,7 @@ public class AuthAdminServlet extends AdminServlet {
             }
 
             // Does the manager instance exist?
-            if (!mAuths.getInstances().containsKey((Object) id)) {
+            if (!mAuths.getInstances().containsKey(id)) {
                 // store a message in the signed audit log file
                 auditMessage = CMS.getLogMessage(
                             LOGGING_SIGNED_AUDIT_CONFIG_AUTH,
@@ -1470,8 +1468,7 @@ public class AuthAdminServlet extends AdminServlet {
             }
 
             // get plugin for implementation
-            AuthMgrPlugin plugin =
-                    (AuthMgrPlugin) mAuths.getPlugins().get(implname);
+            AuthMgrPlugin plugin = mAuths.getPlugins().get(implname);
 
             if (plugin == null) {
                 // store a message in the signed audit log file
@@ -1493,8 +1490,7 @@ public class AuthAdminServlet extends AdminServlet {
 
             // save old instance substore params in case new one fails.
 
-            IAuthManager oldinst =
-                    (IAuthManager) mAuths.get(id);
+            IAuthManager oldinst = mAuths.get(id);
             IConfigStore oldConfig = oldinst.getConfigStore();
 
             String[] oldConfigParms = oldinst.getConfigParams();
@@ -1502,7 +1498,7 @@ public class AuthAdminServlet extends AdminServlet {
 
             // implName is always required so always include it it.
             saveParams.put(IAuthSubsystem.PROP_PLUGIN,
-                    (String) oldConfig.get(IAuthSubsystem.PROP_PLUGIN));
+                    oldConfig.get(IAuthSubsystem.PROP_PLUGIN));
             if (oldConfigParms != null) {
                 for (int i = 0; i < oldConfigParms.length; i++) {
                     String key = oldConfigParms[i];
diff --git a/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
index 5aa422730..a47c7ae0d 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
@@ -357,7 +357,7 @@ public final class CMSAdminServlet extends AdminServlet {
         Enumeration<ISubsystem> e = CMS.getSubsystems();
 
         while (e.hasMoreElements()) {
-            ISubsystem sys = (ISubsystem) e.nextElement();
+            ISubsystem sys = e.nextElement();
 
             //get subsystem type
             if ((sys instanceof IKeyRecoveryAuthority) &&
@@ -387,7 +387,7 @@ public final class CMSAdminServlet extends AdminServlet {
         boolean isKRAInstalled = false;
 
         while (e.hasMoreElements()) {
-            ISubsystem sys = (ISubsystem) e.nextElement();
+            ISubsystem sys = e.nextElement();
 
             //get subsystem type
             if (sys instanceof IKeyRecoveryAuthority)
@@ -538,7 +538,7 @@ public final class CMSAdminServlet extends AdminServlet {
             boolean isKRAInstalled = false;
 
             while (e.hasMoreElements()) {
-                ISubsystem sys = (ISubsystem) e.nextElement();
+                ISubsystem sys = e.nextElement();
 
                 //get subsystem type
                 if (sys instanceof IKeyRecoveryAuthority)
@@ -563,7 +563,7 @@ public final class CMSAdminServlet extends AdminServlet {
             boolean isCACert = true;
 
             while (enum1.hasMoreElements()) {
-                String name = (String) enum1.nextElement();
+                String name = enum1.nextElement();
                 String val = req.getParameter(name);
 
                 if (name.equals(Constants.PR_CIPHER_PREF)) {
@@ -781,7 +781,7 @@ public final class CMSAdminServlet extends AdminServlet {
 
         while (e.hasMoreElements()) {
             String type = "";
-            ISubsystem sys = (ISubsystem) e.nextElement();
+            ISubsystem sys = e.nextElement();
 
             //get subsystem type
             if (sys instanceof IKeyRecoveryAuthority)
@@ -846,7 +846,7 @@ public final class CMSAdminServlet extends AdminServlet {
         Enumeration<String> enum1 = req.getParameterNames();
 
         while (enum1.hasMoreElements()) {
-            String key = (String) enum1.nextElement();
+            String key = enum1.nextElement();
 
             if (key.equals(Constants.OP_TYPE))
                 continue;
@@ -874,7 +874,7 @@ public final class CMSAdminServlet extends AdminServlet {
         Enumeration<String> e = req.getParameterNames();
         String newKeyName = null, selectedToken = null;
         while (e.hasMoreElements()) {
-            String name = (String) e.nextElement();
+            String name = e.nextElement();
 
             if (name.equals(Constants.PR_KEY_LIST)) {
                 newKeyName = req.getParameter(name);
@@ -908,7 +908,7 @@ public final class CMSAdminServlet extends AdminServlet {
         Enumeration<String> e = req.getParameterNames();
 
         while (e.hasMoreElements()) {
-            String name = (String) e.nextElement();
+            String name = e.nextElement();
 
             if (name.equals(Constants.PR_TOKEN_LIST)) {
                 String selectedToken = req.getParameter(name);
@@ -957,7 +957,7 @@ public final class CMSAdminServlet extends AdminServlet {
         Enumeration<String> e = req.getParameterNames();
 
         while (e.hasMoreElements()) {
-            String name = (String) e.nextElement();
+            String name = e.nextElement();
 
             if (name.equals(Constants.OP_TYPE))
                 continue;
@@ -1022,7 +1022,7 @@ public final class CMSAdminServlet extends AdminServlet {
         String pwd = "";
 
         while (enum1.hasMoreElements()) {
-            String key = (String) enum1.nextElement();
+            String key = enum1.nextElement();
             String value = req.getParameter(key);
 
             if (key.equals(Constants.PR_TOKEN_NAME)) {
@@ -1051,7 +1051,7 @@ public final class CMSAdminServlet extends AdminServlet {
         String value = "";
 
         while (enum1.hasMoreElements()) {
-            key = (String) enum1.nextElement();
+            key = enum1.nextElement();
             value = req.getParameter(key);
             if (key.equals(Constants.PR_TOKEN_NAME)) {
                 break;
@@ -1105,7 +1105,7 @@ public final class CMSAdminServlet extends AdminServlet {
             String keyCurveName = "";
 
             while (enum1.hasMoreElements()) {
-                String key = (String) enum1.nextElement();
+                String key = enum1.nextElement();
                 String value = req.getParameter(key);
 
                 if (key.equals(Constants.PR_TOKEN_NAME)) {
@@ -1472,7 +1472,7 @@ public final class CMSAdminServlet extends AdminServlet {
             String newtokenname = null;
 
             while (enum1.hasMoreElements()) {
-                String key = (String) enum1.nextElement();
+                String key = enum1.nextElement();
                 String value = req.getParameter(key);
 
                 if (!key.equals("pathname")) {
@@ -1489,7 +1489,7 @@ public final class CMSAdminServlet extends AdminServlet {
             ICertificateAuthority ca = (ICertificateAuthority)
                     CMS.getSubsystem(CMS.SUBSYSTEM_CA);
             ICertificateRepository repository =
-                    (ICertificateRepository) ca.getCertificateRepository();
+                    ca.getCertificateRepository();
             ISigningUnit signingUnit = ca.getSigningUnit();
             String oldtokenname = null;
             //this is the old nick name
@@ -1891,7 +1891,7 @@ public final class CMSAdminServlet extends AdminServlet {
             Enumeration<String> enum1 = req.getParameterNames();
 
             while (enum1.hasMoreElements()) {
-                String key = (String) enum1.nextElement();
+                String key = enum1.nextElement();
                 String value = req.getParameter(key);
 
                 if (key.equals(Constants.PR_PKCS10))
@@ -2309,7 +2309,7 @@ public final class CMSAdminServlet extends AdminServlet {
             NameValuePairs results = new NameValuePairs();
 
             while (enum1.hasMoreElements()) {
-                String key = (String) enum1.nextElement();
+                String key = enum1.nextElement();
                 String value = req.getParameter(key);
 
                 // really should be PR_CERT_CONTENT
@@ -2539,7 +2539,7 @@ public final class CMSAdminServlet extends AdminServlet {
         String otherNickname = "";
 
         while (enum1.hasMoreElements()) {
-            String key = (String) enum1.nextElement();
+            String key = enum1.nextElement();
             String value = req.getParameter(key);
 
             if (key.equals(Constants.PR_PKCS10)) {
@@ -2639,7 +2639,7 @@ public final class CMSAdminServlet extends AdminServlet {
         NameValuePairs pairs = new NameValuePairs();
 
         while (enum1.hasMoreElements()) {
-            String key = (String) enum1.nextElement();
+            String key = enum1.nextElement();
             String value = req.getParameter(key);
 
             if (key.equals(Constants.OP_TYPE))
@@ -2682,7 +2682,7 @@ public final class CMSAdminServlet extends AdminServlet {
         NameValuePairs pairs = new NameValuePairs();
 
         while (enum1.hasMoreElements()) {
-            String key = (String) enum1.nextElement();
+            String key = enum1.nextElement();
             String value = req.getParameter(key);
 
             if (key.equals(Constants.OP_TYPE))
@@ -2796,7 +2796,7 @@ public final class CMSAdminServlet extends AdminServlet {
         String date = "";
 
         while (enum1.hasMoreElements()) {
-            String key = (String) enum1.nextElement();
+            String key = enum1.nextElement();
             String value = req.getParameter(key);
 
             if (key.equals(Constants.OP_TYPE))
@@ -2825,7 +2825,7 @@ public final class CMSAdminServlet extends AdminServlet {
         Enumeration<String> enum1 = req.getParameterNames();
 
         while (enum1.hasMoreElements()) {
-            String key = (String) enum1.nextElement();
+            String key = enum1.nextElement();
             String value = req.getParameter(key);
 
             if (key.equals(Constants.PR_SUBJECT_NAME)) {
@@ -2854,7 +2854,7 @@ public final class CMSAdminServlet extends AdminServlet {
         String curveName = null;
 
         while (enum1.hasMoreElements()) {
-            String key = (String) enum1.nextElement();
+            String key = enum1.nextElement();
             String value = req.getParameter(key);
 
             if (key.equals(Constants.PR_KEY_CURVENAME)) {
@@ -2885,7 +2885,7 @@ public final class CMSAdminServlet extends AdminServlet {
         String certExt = "";
 
         while (enum1.hasMoreElements()) {
-            String key = (String) enum1.nextElement();
+            String key = enum1.nextElement();
             String value = req.getParameter(key);
 
             if (key.equals(ConfigConstants.PR_CERTIFICATE_EXTENSION)) {
@@ -2911,7 +2911,7 @@ public final class CMSAdminServlet extends AdminServlet {
         String nickname = "";
 
         while (enum1.hasMoreElements()) {
-            String key = (String) enum1.nextElement();
+            String key = enum1.nextElement();
             String value = req.getParameter(key);
 
             if (key.equals(Constants.RS_ID)) {
@@ -2938,7 +2938,7 @@ public final class CMSAdminServlet extends AdminServlet {
         String nickname = "";
 
         while (enum1.hasMoreElements()) {
-            String key = (String) enum1.nextElement();
+            String key = enum1.nextElement();
             String value = req.getParameter(key);
 
             if (key.equals(Constants.PR_NICKNAME)) {
@@ -3025,7 +3025,7 @@ public final class CMSAdminServlet extends AdminServlet {
             String trust = "";
 
             while (enum1.hasMoreElements()) {
-                String key = (String) enum1.nextElement();
+                String key = enum1.nextElement();
                 String value = req.getParameter(key);
 
                 if (key.equals(Constants.RS_ID)) {
@@ -3129,7 +3129,7 @@ public final class CMSAdminServlet extends AdminServlet {
             String logMessage = null;
 
             while (enum1.hasMoreElements()) {
-                String key = (String) enum1.nextElement();
+                String key = enum1.nextElement();
                 String value = req.getParameter(key);
 
                 if (key.equals(Constants.PR_RUN_SELFTESTS_ON_DEMAND)) {
@@ -3222,8 +3222,7 @@ public final class CMSAdminServlet extends AdminServlet {
                         throw new EMissingSelfTestException();
                     }
 
-                    ISelfTest test = (ISelfTest)
-                            mSelfTestSubsystem.getSelfTest(instanceName);
+                    ISelfTest test = mSelfTestSubsystem.getSelfTest(instanceName);
 
                     if (test == null) {
                         // self test plugin instance property name is not present
diff --git a/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java
index a89933c69..47eeebe92 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java
@@ -109,7 +109,7 @@ public class JobsAdminServlet extends AdminServlet {
         Object impl = null;
 
         JobPlugin jp =
-                (JobPlugin) mJobsSched.getPlugins().get(implName);
+                mJobsSched.getPlugins().get(implName);
 
         if (jp != null)
             impl = getClassByNameAsExtendedPluginInfo(jp.getClassPath());
@@ -288,7 +288,7 @@ public class JobsAdminServlet extends AdminServlet {
             return;
         }
         // is the job plugin id unique?
-        if (mJobsSched.getPlugins().containsKey((Object) id)) {
+        if (mJobsSched.getPlugins().containsKey(id)) {
             sendResponse(ERROR,
                     new EJobsException(CMS.getUserMessage(getLocale(req), "CMS_JOB_SRVLT_ILL_JOB_PLUGIN_ID", id))
                             .toString(),
@@ -384,7 +384,7 @@ public class JobsAdminServlet extends AdminServlet {
         }
 
         // is the job instance id unique?
-        if (mJobsSched.getInstances().containsKey((Object) id)) {
+        if (mJobsSched.getInstances().containsKey(id)) {
             sendResponse(ERROR,
                     CMS.getUserMessage(getLocale(req), "CMS_JOB_SRVLT_ILL_JOB_INST_ID"),
                     null, resp);
@@ -405,7 +405,7 @@ public class JobsAdminServlet extends AdminServlet {
 
         // check if implementation exists.
         JobPlugin plugin =
-                (JobPlugin) mJobsSched.getPlugins().get(implname);
+                mJobsSched.getPlugins().get(implname);
 
         if (plugin == null) {
             sendResponse(ERROR,
@@ -541,7 +541,7 @@ public class JobsAdminServlet extends AdminServlet {
 
         for (Enumeration<String> e = mJobsSched.getInstances().keys(); e.hasMoreElements();) {
             String name = e.nextElement();
-            IJob value = mJobsSched.getInstances().get((Object) name);
+            IJob value = mJobsSched.getInstances().get(name);
 
             //				params.add(name, value.getImplName());
             params.put(name, value.getImplName() + VISIBLE +
@@ -591,7 +591,7 @@ public class JobsAdminServlet extends AdminServlet {
         }
 
         // then delete this job plugin
-        mJobsSched.getPlugins().remove((Object) id);
+        mJobsSched.getPlugins().remove(id);
 
         IConfigStore destStore =
                 mConfig.getSubStore(DestDef.DEST_JOBS_ADMIN);
@@ -723,7 +723,7 @@ public class JobsAdminServlet extends AdminServlet {
             return;
         }
 
-        IJob jobInst = (IJob) mJobsSched.getInstances().get(id);
+        IJob jobInst = mJobsSched.getInstances().get(id);
         IConfigStore config = jobInst.getConfigStore();
         String[] configParams = jobInst.getConfigParams();
         NameValuePairs params = new NameValuePairs();
@@ -735,7 +735,7 @@ public class JobsAdminServlet extends AdminServlet {
             for (int i = 0; i < configParams.length; i++) {
                 String key = configParams[i];
 
-                String val = (String) config.get(key);
+                String val = config.get(key);
 
                 if (val != null && !val.equals("")) {
                     params.put(key, val);
@@ -774,7 +774,7 @@ public class JobsAdminServlet extends AdminServlet {
         }
 
         // Does the job instance exist?
-        if (!mJobsSched.getInstances().containsKey((Object) id)) {
+        if (!mJobsSched.getInstances().containsKey(id)) {
             sendResponse(ERROR,
                     CMS.getUserMessage(getLocale(req), "CMS_JOB_SRVLT_ILL_JOB_INST_ID"),
                     null, resp);
@@ -793,7 +793,7 @@ public class JobsAdminServlet extends AdminServlet {
 
         // get plugin for implementation
         JobPlugin plugin =
-                (JobPlugin) mJobsSched.getPlugins().get(implname);
+                mJobsSched.getPlugins().get(implname);
 
         if (plugin == null) {
             sendResponse(ERROR,
@@ -806,7 +806,7 @@ public class JobsAdminServlet extends AdminServlet {
         // save old instance substore params in case new one fails.
 
         IJob oldinst =
-                (IJob) mJobsSched.getInstances().get((Object) id);
+                mJobsSched.getInstances().get(id);
         IConfigStore oldConfig = oldinst.getConfigStore();
 
         String[] oldConfigParms = oldinst.getConfigParams();
@@ -814,7 +814,7 @@ public class JobsAdminServlet extends AdminServlet {
 
         // implName is always required so always include it it.
         saveParams.put(IJobsScheduler.PROP_PLUGIN,
-                (String) oldConfig.get(IJobsScheduler.PROP_PLUGIN));
+                oldConfig.get(IJobsScheduler.PROP_PLUGIN));
         if (oldConfigParms != null) {
             for (int i = 0; i < oldConfigParms.length; i++) {
                 String key = oldConfigParms[i];
diff --git a/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java
index fb73cec98..9600c5e56 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java
@@ -342,14 +342,13 @@ public class LogAdminServlet extends AdminServlet {
         Enumeration<String> e = mSys.getLogInsts().keys();
 
         for (; e.hasMoreElements();) {
-            String name = (String) e.nextElement();
+            String name = e.nextElement();
             ILogEventListener value = ((ILogSubsystem) CMS.getSubsystem(CMS.SUBSYSTEM_LOG)).getLogInstance(name);
 
             if (value == null)
                 continue;
             String pName = mSys.getLogPluginName(value);
-            LogPlugin pClass = (LogPlugin)
-                    mSys.getLogPlugins().get(pName);
+            LogPlugin pClass = mSys.getLogPlugins().get(pName);
             String c = pClass.getClassPath();
 
             // not show ntEventlog here
@@ -381,7 +380,7 @@ public class LogAdminServlet extends AdminServlet {
     private NameValuePairs getExtendedPluginInfo(Locale locale, String implType, String implName) {
         IExtendedPluginInfo ext_info = null;
         Object impl = null;
-        LogPlugin lp = (LogPlugin) mSys.getLogPlugins().get(implName);
+        LogPlugin lp = mSys.getLogPlugins().get(implName);
 
         if (lp != null) {
             impl = getClassByNameAsExtendedPluginInfo(lp.getClassPath());
@@ -460,7 +459,7 @@ public class LogAdminServlet extends AdminServlet {
             }
 
             // is the log id unique?
-            if (mSys.getLogPlugins().containsKey((Object) id)) {
+            if (mSys.getLogPlugins().containsKey(id)) {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
@@ -746,7 +745,7 @@ public class LogAdminServlet extends AdminServlet {
                 return;
             }
 
-            if (mSys.getLogInsts().containsKey((Object) id)) {
+            if (mSys.getLogInsts().containsKey(id)) {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
@@ -788,8 +787,8 @@ public class LogAdminServlet extends AdminServlet {
 
             // check if implementation exists.
             LogPlugin plugin =
-                    (LogPlugin) mSys.getLogPlugins().get(
-                            implname);
+                    mSys.getLogPlugins().get(
+                    implname);
 
             if (plugin == null) {
                 // store a message in the signed audit log file
@@ -821,7 +820,7 @@ public class LogAdminServlet extends AdminServlet {
 
             if (configParams != null) {
                 for (int i = 0; i < configParams.size(); i++) {
-                    String kv = (String) configParams.elementAt(i);
+                    String kv = configParams.elementAt(i);
                     int index = kv.indexOf('=');
                     String val = req.getParameter(kv.substring(0, index));
 
@@ -1036,9 +1035,8 @@ public class LogAdminServlet extends AdminServlet {
         Enumeration<String> e = mSys.getLogPlugins().keys();
 
         while (e.hasMoreElements()) {
-            String name = (String) e.nextElement();
-            LogPlugin value = (LogPlugin)
-                    mSys.getLogPlugins().get(name);
+            String name = e.nextElement();
+            LogPlugin value = mSys.getLogPlugins().get(name);
             // get Description
             String c = value.getClassPath();
             String desc = "unknown";
@@ -1308,7 +1306,7 @@ public class LogAdminServlet extends AdminServlet {
             // first check if any instances from this log
             // DON'T remove log if any instance
             for (Enumeration<String> e = mSys.getLogInsts().keys(); e.hasMoreElements();) {
-                String name = (String) e.nextElement();
+                String name = e.nextElement();
                 ILogEventListener log = mSys.getLogInstance(name);
 
                 if (getLogPluginName(log) == id) {
@@ -1331,7 +1329,7 @@ public class LogAdminServlet extends AdminServlet {
             }
 
             // then delete this log
-            mSys.getLogPlugins().remove((Object) id);
+            mSys.getLogPlugins().remove(id);
 
             IConfigStore destStore =
                     mConfig.getSubStore("log");
@@ -1494,7 +1492,7 @@ public class LogAdminServlet extends AdminServlet {
             }
 
             // Does the manager instance exist?
-            if (!mSys.getLogInsts().containsKey((Object) id)) {
+            if (!mSys.getLogInsts().containsKey(id)) {
                 // store a message in the signed audit log file
                 if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) {
                     auditMessage = CMS.getLogMessage(
@@ -1535,7 +1533,7 @@ public class LogAdminServlet extends AdminServlet {
             }
             // get plugin for implementation
             LogPlugin plugin =
-                    (LogPlugin) mSys.getLogPlugins().get(implname);
+                    mSys.getLogPlugins().get(implname);
 
             if (plugin == null) {
                 // store a message in the signed audit log file
@@ -1559,7 +1557,7 @@ public class LogAdminServlet extends AdminServlet {
             // save old instance substore params in case new one fails.
 
             ILogEventListener oldinst =
-                    (ILogEventListener) mSys.getLogInstance(id);
+                    mSys.getLogInstance(id);
             Vector<String> oldConfigParms = oldinst.getInstanceParams();
             NameValuePairs saveParams = new NameValuePairs();
 
@@ -1567,7 +1565,7 @@ public class LogAdminServlet extends AdminServlet {
             saveParams.put("pluginName", implname);
             if (oldConfigParms != null) {
                 for (int i = 0; i < oldConfigParms.size(); i++) {
-                    String kv = (String) oldConfigParms.elementAt(i);
+                    String kv = oldConfigParms.elementAt(i);
                     int index = kv.indexOf('=');
 
                     saveParams.put(kv.substring(0, index),
@@ -1629,7 +1627,7 @@ public class LogAdminServlet extends AdminServlet {
                 for (int i = 0; i < configParams.size(); i++) {
                     AUTHZ_RES_NAME =
                             "certServer.log.configuration";
-                    String kv = (String) configParams.elementAt(i);
+                    String kv = configParams.elementAt(i);
                     int index = kv.indexOf('=');
                     String key = kv.substring(0, index);
                     String val = req.getParameter(key);
@@ -2209,7 +2207,7 @@ public class LogAdminServlet extends AdminServlet {
         params.put(Constants.PR_LOG_IMPL_NAME, "");
         if (configParams != null) {
             for (int i = 0; i < configParams.size(); i++) {
-                String kv = (String) configParams.elementAt(i);
+                String kv = configParams.elementAt(i);
                 int index = kv.indexOf('=');
 
                 if (index == -1) {
@@ -2246,8 +2244,7 @@ public class LogAdminServlet extends AdminServlet {
             return;
         }
 
-        ILogEventListener logInst = (ILogEventListener)
-                mSys.getLogInstance(id);
+        ILogEventListener logInst = mSys.getLogInstance(id);
         Vector<String> configParams = logInst.getInstanceParams();
         NameValuePairs params = new NameValuePairs();
 
@@ -2256,7 +2253,7 @@ public class LogAdminServlet extends AdminServlet {
         // implName is always required so always send it.
         if (configParams != null) {
             for (int i = 0; i < configParams.size(); i++) {
-                String kv = (String) configParams.elementAt(i);
+                String kv = configParams.elementAt(i);
                 int index = kv.indexOf('=');
 
                 params.put(kv.substring(0, index),
diff --git a/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java
index 4149fae94..a7c2c6c50 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java
@@ -493,7 +493,7 @@ public class OCSPAdminServlet extends AdminServlet {
             Enumeration<String> enum1 = req.getParameterNames();
 
             while (enum1.hasMoreElements()) {
-                String key = (String) enum1.nextElement();
+                String key = enum1.nextElement();
                 String value = req.getParameter(key);
 
                 if (key.equals(Constants.PR_DEFAULT_ALGORITHM)) {
diff --git a/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java
index 3ca222135..19677e748 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java
@@ -384,7 +384,7 @@ public class ProfileAdminServlet extends AdminServlet {
         NameValuePairs nvp = new NameValuePairs();
 
         while (impls.hasMoreElements()) {
-            String id = (String) impls.nextElement();
+            String id = impls.nextElement();
             IPluginInfo info = mRegistry.getPluginInfo("profile", id);
 
             nvp.put(id, info.getClassName() + "," +
@@ -1057,7 +1057,7 @@ public class ProfileAdminServlet extends AdminServlet {
             Enumeration<String> names = req.getParameterNames();
 
             while (names.hasMoreElements()) {
-                String name = (String) names.nextElement();
+                String name = names.nextElement();
 
                 if (name.equals("OP_SCOPE"))
                     continue;
@@ -1206,7 +1206,7 @@ public class ProfileAdminServlet extends AdminServlet {
             Enumeration<String> names = req.getParameterNames();
 
             while (names.hasMoreElements()) {
-                String name = (String) names.nextElement();
+                String name = names.nextElement();
 
                 if (name.equals("OP_SCOPE"))
                     continue;
@@ -1481,7 +1481,7 @@ public class ProfileAdminServlet extends AdminServlet {
             Enumeration<String> names = req.getParameterNames();
 
             while (names.hasMoreElements()) {
-                String name = (String) names.nextElement();
+                String name = names.nextElement();
 
                 if (name.equals("OP_SCOPE"))
                     continue;
@@ -1610,7 +1610,7 @@ public class ProfileAdminServlet extends AdminServlet {
             Enumeration<String> names = req.getParameterNames();
 
             while (names.hasMoreElements()) {
-                String name = (String) names.nextElement();
+                String name = names.nextElement();
 
                 if (name.equals("OP_SCOPE"))
                     continue;
@@ -1730,7 +1730,7 @@ public class ProfileAdminServlet extends AdminServlet {
             Enumeration<String> names = req.getParameterNames();
 
             while (names.hasMoreElements()) {
-                String name = (String) names.nextElement();
+                String name = names.nextElement();
 
                 if (name.equals("OP_SCOPE"))
                     continue;
@@ -1855,7 +1855,7 @@ public class ProfileAdminServlet extends AdminServlet {
 
             CMS.debug("ProfileAdminServlet: modifyPolicyConstraintConfig policy " + policy + " con " + con);
             while (names.hasMoreElements()) {
-                String name = (String) names.nextElement();
+                String name = names.nextElement();
 
                 if (name.equals("OP_SCOPE"))
                     continue;
@@ -2056,11 +2056,11 @@ public class ProfileAdminServlet extends AdminServlet {
             return;
         }
         while (setIds.hasMoreElements()) {
-            String setId = (String) setIds.nextElement();
+            String setId = setIds.nextElement();
             Enumeration<ProfilePolicy> policies = profile.getProfilePolicies(setId);
 
             while (policies.hasMoreElements()) {
-                IProfilePolicy policy = (IProfilePolicy) policies.nextElement();
+                IProfilePolicy policy = policies.nextElement();
                 IPolicyDefault def = policy.getDefault();
                 IPolicyConstraint con = policy.getConstraint();
 
@@ -2091,7 +2091,7 @@ public class ProfileAdminServlet extends AdminServlet {
         Enumeration<String> outputs = profile.getProfileOutputIds();
 
         while (outputs.hasMoreElements()) {
-            String outputId = (String) outputs.nextElement();
+            String outputId = outputs.nextElement();
             IProfileOutput output = profile.getProfileOutput(outputId);
 
             nvp.put(outputId, output.getName(getLocale(req)));
@@ -2118,7 +2118,7 @@ public class ProfileAdminServlet extends AdminServlet {
         Enumeration<String> inputs = profile.getProfileInputIds();
 
         while (inputs.hasMoreElements()) {
-            String inputId = (String) inputs.nextElement();
+            String inputId = inputs.nextElement();
             IProfileInput input = profile.getProfileInput(inputId);
 
             nvp.put(inputId, input.getName(getLocale(req)));
diff --git a/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
index 8daadbce0..adbdc8279 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
@@ -345,7 +345,7 @@ public class PublisherAdminServlet extends AdminServlet {
         StringBuffer publish = new StringBuffer();
 
         for (; publishers.hasMoreElements();) {
-            String name = (String) publishers.nextElement();
+            String name = publishers.nextElement();
 
             publish.append(",");
             publish.append(name);
@@ -379,14 +379,14 @@ public class PublisherAdminServlet extends AdminServlet {
             impl = getExtendedPluginInfo(p_processor);
         } else if (implType.equals(Constants.PR_EXT_PLUGIN_IMPLTYPE_MAPPER)) {
             IPublisherProcessor p_processor = mProcessor;
-            Plugin plugin = (Plugin) p_processor.getMapperPlugins().get(implName
+            Plugin plugin = p_processor.getMapperPlugins().get(implName
                     );
 
             impl = getClassByNameAsExtendedPluginInfo(plugin.getClassPath());
 
         } else if (implType.equals(Constants.PR_EXT_PLUGIN_IMPLTYPE_PUBLISHER)) {
             IPublisherProcessor p_processor = mProcessor;
-            Plugin plugin = (Plugin) p_processor.getPublisherPlugins().get(implName);
+            Plugin plugin = p_processor.getPublisherPlugins().get(implName);
 
             impl = getClassByNameAsExtendedPluginInfo(plugin.getClassPath());
         }
@@ -1018,7 +1018,7 @@ public class PublisherAdminServlet extends AdminServlet {
         }
 
         // is the manager id unique?
-        if (mProcessor.getMapperPlugins().containsKey((Object) id)) {
+        if (mProcessor.getMapperPlugins().containsKey(id)) {
             sendResponse(ERROR,
                     new ELdapException(CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_PLUGIN_ID", id))
                             .toString(),
@@ -1119,7 +1119,7 @@ public class PublisherAdminServlet extends AdminServlet {
             return;
         }
 
-        if (mProcessor.getMapperInsts().containsKey((Object) id)) {
+        if (mProcessor.getMapperInsts().containsKey(id)) {
             sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_INST_ID", id),
                     null, resp);
             return;
@@ -1136,8 +1136,8 @@ public class PublisherAdminServlet extends AdminServlet {
 
         // check if implementation exists.
         MapperPlugin plugin =
-                (MapperPlugin) mProcessor.getMapperPlugins().get(
-                        implname);
+                mProcessor.getMapperPlugins().get(
+                implname);
 
         if (plugin == null) {
             sendResponse(
@@ -1156,7 +1156,7 @@ public class PublisherAdminServlet extends AdminServlet {
 
         if (configParams != null) {
             for (int i = 0; i < configParams.size(); i++) {
-                String kv = (String) configParams.elementAt(i);
+                String kv = configParams.elementAt(i);
                 int index = kv.indexOf('=');
                 String val = req.getParameter(kv.substring(0, index));
 
@@ -1248,8 +1248,7 @@ public class PublisherAdminServlet extends AdminServlet {
 
         while (e.hasMoreElements()) {
             String name = e.nextElement();
-            MapperPlugin value = (MapperPlugin)
-                    mProcessor.getMapperPlugins().get(name);
+            MapperPlugin value = mProcessor.getMapperPlugins().get(name);
             // get Description
             String c = value.getClassPath();
             String desc = "unknown";
@@ -1372,7 +1371,7 @@ public class PublisherAdminServlet extends AdminServlet {
         // first check if any instances from this mapper
         // DON'T remove mapper if any instance
         for (Enumeration<String> e = mProcessor.getMapperInsts().keys(); e.hasMoreElements();) {
-            String name = (String) e.nextElement();
+            String name = e.nextElement();
             ILdapMapper mapper = mProcessor.getMapperInstance(name);
 
             if (id.equals(getMapperPluginName(mapper))) {
@@ -1382,7 +1381,7 @@ public class PublisherAdminServlet extends AdminServlet {
         }
 
         // then delete this mapper
-        mProcessor.getMapperPlugins().remove((Object) id);
+        mProcessor.getMapperPlugins().remove(id);
 
         IConfigStore destStore =
                 mConfig.getSubStore(
@@ -1459,8 +1458,7 @@ public class PublisherAdminServlet extends AdminServlet {
             return;
         }
 
-        ILdapMapper mapperInst = (ILdapMapper)
-                mProcessor.getMapperInstance(id);
+        ILdapMapper mapperInst = mProcessor.getMapperInstance(id);
         Vector<String> configParams = mapperInst.getInstanceParams();
         NameValuePairs params = new NameValuePairs();
 
@@ -1496,7 +1494,7 @@ public class PublisherAdminServlet extends AdminServlet {
         }
 
         // Does the manager instance exist?
-        if (!mProcessor.getMapperInsts().containsKey((Object) id)) {
+        if (!mProcessor.getMapperInsts().containsKey(id)) {
             sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_INST_ID", id),
                     null, resp);
             return;
@@ -1511,7 +1509,7 @@ public class PublisherAdminServlet extends AdminServlet {
         }
         // get plugin for implementation
         MapperPlugin plugin =
-                (MapperPlugin) mProcessor.getMapperPlugins().get(implname);
+                mProcessor.getMapperPlugins().get(implname);
 
         if (plugin == null) {
             sendResponse(
@@ -1525,7 +1523,7 @@ public class PublisherAdminServlet extends AdminServlet {
         // save old instance substore params in case new one fails.
 
         ILdapMapper oldinst =
-                (ILdapMapper) mProcessor.getMapperInstance(id);
+                mProcessor.getMapperInstance(id);
         Vector<String> oldConfigParms = oldinst.getInstanceParams();
         NameValuePairs saveParams = new NameValuePairs();
 
@@ -1659,7 +1657,7 @@ public class PublisherAdminServlet extends AdminServlet {
         }
 
         // is the rule id unique?
-        if (mProcessor.getRulePlugins().containsKey((Object) id)) {
+        if (mProcessor.getRulePlugins().containsKey(id)) {
             sendResponse(
                     ERROR,
                     new ELdapException(CMS.getUserMessage("CMS_LDAP_SRVLT_ILL_PLUGIN_ID", id)).toString(getLocale(req)),
@@ -1750,7 +1748,7 @@ public class PublisherAdminServlet extends AdminServlet {
             return;
         }
 
-        if (mProcessor.getRuleInsts().containsKey((Object) id)) {
+        if (mProcessor.getRuleInsts().containsKey(id)) {
             sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_INST_ID", id),
                     null, resp);
             return;
@@ -1767,8 +1765,7 @@ public class PublisherAdminServlet extends AdminServlet {
 
         // check if implementation exists.
         RulePlugin plugin =
-                (RulePlugin) mProcessor.getRulePlugins().get(
-                        implname);
+                mProcessor.getRulePlugins().get(implname);
 
         if (plugin == null) {
             sendResponse(
@@ -1884,8 +1881,7 @@ public class PublisherAdminServlet extends AdminServlet {
 
         while (e.hasMoreElements()) {
             String name = e.nextElement();
-            RulePlugin value = (RulePlugin)
-                    mProcessor.getRulePlugins().get(name);
+            RulePlugin value = mProcessor.getRulePlugins().get(name);
             // get Description
             String c = value.getClassPath();
             String desc = "unknown";
@@ -1911,8 +1907,7 @@ public class PublisherAdminServlet extends AdminServlet {
 
         for (; e.hasMoreElements();) {
             String name = e.nextElement();
-            ILdapRule value = (ILdapRule)
-                    mProcessor.getRuleInsts().get((Object) name);
+            ILdapRule value = mProcessor.getRuleInsts().get(name);
             String enabled = value.enabled() ? "enabled" : "disabled";
 
             params.put(name, value.getInstanceName() + ";visible;" + enabled);
@@ -1966,7 +1961,7 @@ public class PublisherAdminServlet extends AdminServlet {
         }
 
         // then delete this rule
-        mProcessor.getRulePlugins().remove((Object) id);
+        mProcessor.getRulePlugins().remove(id);
 
         IConfigStore destStore =
                 mConfig.getSubStore(
@@ -2058,7 +2053,7 @@ public class PublisherAdminServlet extends AdminServlet {
         params.put(Constants.PR_RULE_IMPL_NAME, "");
         if (configParams != null) {
             for (int i = 0; i < configParams.size(); i++) {
-                String kv = (String) configParams.elementAt(i);
+                String kv = configParams.elementAt(i);
                 int index = kv.indexOf('=');
 
                 params.put(kv.substring(0, index),
@@ -2090,8 +2085,7 @@ public class PublisherAdminServlet extends AdminServlet {
             return;
         }
 
-        ILdapRule ruleInst = (ILdapRule)
-                mProcessor.getRuleInsts().get(id);
+        ILdapRule ruleInst = mProcessor.getRuleInsts().get(id);
         Vector<String> configParams = ruleInst.getInstanceParams();
         NameValuePairs params = new NameValuePairs();
 
@@ -2100,7 +2094,7 @@ public class PublisherAdminServlet extends AdminServlet {
         // implName is always required so always send it.
         if (configParams != null) {
             for (int i = 0; i < configParams.size(); i++) {
-                String kv = (String) configParams.elementAt(i);
+                String kv = configParams.elementAt(i);
                 int index = kv.indexOf('=');
 
                 params.put(kv.substring(0, index),
@@ -2126,7 +2120,7 @@ public class PublisherAdminServlet extends AdminServlet {
         }
 
         // Does the manager instance exist?
-        if (!mProcessor.getRuleInsts().containsKey((Object) id)) {
+        if (!mProcessor.getRuleInsts().containsKey(id)) {
             sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_INST_ID", id),
                     null, resp);
             return;
@@ -2142,7 +2136,7 @@ public class PublisherAdminServlet extends AdminServlet {
 
         // get plugin for implementation
         RulePlugin plugin =
-                (RulePlugin) mProcessor.getRulePlugins().get(implname);
+                mProcessor.getRulePlugins().get(implname);
 
         if (plugin == null) {
             sendResponse(ERROR,
@@ -2155,7 +2149,7 @@ public class PublisherAdminServlet extends AdminServlet {
         // save old instance substore params in case new one fails.
 
         ILdapRule oldinst =
-                (ILdapRule) mProcessor.getRuleInsts().get((Object) id);
+                mProcessor.getRuleInsts().get(id);
         Vector<String> oldConfigParms = oldinst.getInstanceParams();
         NameValuePairs saveParams = new NameValuePairs();
 
@@ -2293,7 +2287,7 @@ public class PublisherAdminServlet extends AdminServlet {
         }
 
         // is the manager id unique?
-        if (mProcessor.getPublisherPlugins().containsKey((Object) id)) {
+        if (mProcessor.getPublisherPlugins().containsKey(id)) {
             sendResponse(ERROR,
                     new ELdapException(CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_PLUGIN_ID", id))
                             .toString(),
@@ -2386,7 +2380,7 @@ public class PublisherAdminServlet extends AdminServlet {
             return;
         }
 
-        if (mProcessor.getPublisherInsts().containsKey((Object) id)) {
+        if (mProcessor.getPublisherInsts().containsKey(id)) {
             sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_INST_ID", id),
                     null, resp);
             return;
@@ -2403,8 +2397,7 @@ public class PublisherAdminServlet extends AdminServlet {
 
         // check if implementation exists.
         PublisherPlugin plugin =
-                (PublisherPlugin) mProcessor.getPublisherPlugins().get(
-                        implname);
+                mProcessor.getPublisherPlugins().get(implname);
 
         if (plugin == null) {
             sendResponse(
@@ -2530,8 +2523,7 @@ public class PublisherAdminServlet extends AdminServlet {
 
         while (e.hasMoreElements()) {
             String name = e.nextElement();
-            PublisherPlugin value = (PublisherPlugin)
-                    mProcessor.getPublisherPlugins().get(name);
+            PublisherPlugin value = mProcessor.getPublisherPlugins().get(name);
             // get Description
             String c = value.getClassPath();
             String desc = "unknown";
@@ -2617,7 +2609,7 @@ public class PublisherAdminServlet extends AdminServlet {
         }
 
         // then delete this publisher
-        mProcessor.getPublisherPlugins().remove((Object) id);
+        mProcessor.getPublisherPlugins().remove(id);
 
         IConfigStore destStore =
                 mConfig.getSubStore(mAuth.getId() + ".publish.publisher");
@@ -2719,7 +2711,7 @@ public class PublisherAdminServlet extends AdminServlet {
         params.put(Constants.PR_PUBLISHER_IMPL_NAME, "");
         if (configParams != null) {
             for (int i = 0; i < configParams.size(); i++) {
-                String kv = (String) configParams.elementAt(i);
+                String kv = configParams.elementAt(i);
                 int index = kv.indexOf('=');
 
                 if (index == -1) {
@@ -2757,8 +2749,7 @@ public class PublisherAdminServlet extends AdminServlet {
             return;
         }
 
-        ILdapPublisher publisherInst = (ILdapPublisher)
-                mProcessor.getPublisherInstance(id);
+        ILdapPublisher publisherInst = mProcessor.getPublisherInstance(id);
         Vector<String> configParams = publisherInst.getInstanceParams();
         NameValuePairs params = new NameValuePairs();
 
@@ -2767,7 +2758,7 @@ public class PublisherAdminServlet extends AdminServlet {
         // implName is always required so always send it.
         if (configParams != null) {
             for (int i = 0; i < configParams.size(); i++) {
-                String kv = (String) configParams.elementAt(i);
+                String kv = configParams.elementAt(i);
                 int index = kv.indexOf('=');
 
                 params.put(kv.substring(0, index),
@@ -2804,7 +2795,7 @@ public class PublisherAdminServlet extends AdminServlet {
         }
 
         // Does the manager instance exist?
-        if (!mProcessor.getPublisherInsts().containsKey((Object) id)) {
+        if (!mProcessor.getPublisherInsts().containsKey(id)) {
             sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_ILL_INST_ID", id),
                     null, resp);
             return;
@@ -2820,7 +2811,7 @@ public class PublisherAdminServlet extends AdminServlet {
 
         // get plugin for implementation
         PublisherPlugin plugin =
-                (PublisherPlugin) mProcessor.getPublisherPlugins().get(implname);
+                mProcessor.getPublisherPlugins().get(implname);
 
         if (plugin == null) {
             sendResponse(
@@ -2842,7 +2833,7 @@ public class PublisherAdminServlet extends AdminServlet {
         saveParams.put("pluginName", implname);
         if (oldConfigParms != null) {
             for (int i = 0; i < oldConfigParms.size(); i++) {
-                String kv = (String) oldConfigParms.elementAt(i);
+                String kv = oldConfigParms.elementAt(i);
                 int index = kv.indexOf('=');
                 if (index > -1) {
                     if (kv.substring(0, index).equalsIgnoreCase("caObjectClass")) {
@@ -2885,7 +2876,7 @@ public class PublisherAdminServlet extends AdminServlet {
         substore.put("pluginName", implname);
         if (configParams != null) {
             for (int i = 0; i < configParams.size(); i++) {
-                String kv = (String) configParams.elementAt(i);
+                String kv = configParams.elementAt(i);
                 int index = kv.indexOf('=');
                 String key = kv.substring(0, index);
                 String val = req.getParameter(key);
@@ -2995,7 +2986,7 @@ public class PublisherAdminServlet extends AdminServlet {
                 extras.add(list1[i].trim());
         }
 
-        return (String[]) extras.toArray(new String[extras.size()]);
+        return extras.toArray(new String[extras.size()]);
     }
 
     // convenience function - takes list1, list2.  Concatenates the two
@@ -3018,7 +3009,7 @@ public class PublisherAdminServlet extends AdminServlet {
                 sum.add(list2[i].trim());
         }
 
-        return (String[]) sum.toArray(new String[sum.size()]);
+        return sum.toArray(new String[sum.size()]);
     }
 
     // convenience funtion. Takes a string array and delimiter
diff --git a/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java
index 4f5afbb20..487fd9f2e 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java
@@ -277,7 +277,7 @@ public class RegistryAdminServlet extends AdminServlet {
                 Enumeration<String> impls = mRegistry.getIds("constraintPolicy");
 
                 while (impls.hasMoreElements()) {
-                    String constraintID = (String) impls.nextElement();
+                    String constraintID = impls.nextElement();
                     IPluginInfo constraintInfo = mRegistry.getPluginInfo(
                             "constraintPolicy", constraintID);
                     IPolicyConstraint policyConstraintClass = (IPolicyConstraint)
diff --git a/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java
index 90dc92221..2cd337123 100644
--- a/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java
@@ -506,7 +506,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
         }
 
         X509Certificate[] certs =
-                (X509Certificate[]) user.getX509Certificates();
+                user.getX509Certificates();
 
         if (certs != null) {
             for (int i = 0; i < certs.length; i++) {
@@ -1548,7 +1548,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
             }
 
             while (e.hasMoreElements()) {
-                IGroup group = (IGroup) e.nextElement();
+                IGroup group = e.nextElement();
 
                 if (group.isMember(id) == true) {
                     if (mustDelete) {
@@ -1697,9 +1697,9 @@ public class UsrGrpAdminServlet extends AdminServlet {
                     Constants.PR_GROUP_DESC);
 
             if (desc != null) {
-                group.set("description", (Object) desc);
+                group.set("description", desc);
             } else {
-                group.set("description", (Object) "");
+                group.set("description", "");
             }
 
             if (members != null) {
@@ -1941,7 +1941,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
                     Constants.PR_GROUP_DESC);
 
             if (desc != null) {
-                group.set("description", (Object) desc);
+                group.set("description", desc);
             }
 
             String members = super.getParameter(req, Constants.PR_GROUP_USER);