Removed unnecessary type casts.

Unnecessary type casts have been removed using Eclipse Quick Fix.

Ticket #134

4 files changed, 14 insertions, 16 deletions

diff --git a/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java b/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java
index b2043238b..1733998aa 100644
--- a/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java
+++ b/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java
@@ -148,7 +148,7 @@ public class CertReqParser extends ReqParser {
                     if (certType != null) {
                         arg.addStringValue(IRequest.CERT_TYPE, certType);
                     }
-                    String presenceServerExt = (String) http_params.get("PresenceServerExtension");
+                    String presenceServerExt = http_params.get("PresenceServerExtension");
 
                     if (presenceServerExt != null) {
                         arg.addStringValue("PresenceServerExtension", presenceServerExt);
@@ -616,8 +616,7 @@ public class CertReqParser extends ReqParser {
 
     public String getRequestorDN(IRequest request) {
         try {
-            X509CertInfo info = (X509CertInfo)
-                    request.getExtDataInCertInfo(IEnrollProfile.REQUEST_CERTINFO);
+            X509CertInfo info = request.getExtDataInCertInfo(IEnrollProfile.REQUEST_CERTINFO);
             // retrieve the subject name
             CertificateSubjectName sn = (CertificateSubjectName)
                     info.get(X509CertInfo.SUBJECT);
@@ -688,7 +687,7 @@ public class CertReqParser extends ReqParser {
             prefix = "header.";
 
         while (enum1.hasMoreElements()) {
-            String name = (String) enum1.nextElement();
+            String name = enum1.nextElement();
 
             if (mDetails) {
                 // show all http parameters stored in request.
@@ -708,7 +707,7 @@ public class CertReqParser extends ReqParser {
                         String parami =
                                 IRequest.HTTP_PARAMS + LB + String.valueOf(counter++) + RB;
                         // hack
-                        String n = (String) elms.nextElement();
+                        String n = elms.nextElement();
                         String rawJS = "new Object;\n\r" +
                                 prefix + parami + ".name=\"" +
                                 CMSTemplate.escapeJavaScriptString(n) + "\";\n\r" +
@@ -748,7 +747,7 @@ public class CertReqParser extends ReqParser {
                         String parami =
                                 IRequest.AUTH_TOKEN + LB + String.valueOf(counter++) + RB;
                         // hack
-                        String n = (String) elms.nextElement();
+                        String n = elms.nextElement();
                         String v =
                                 expandValue(prefix + parami + ".value",
                                         auth_token.getInString(n));
@@ -833,7 +832,7 @@ public class CertReqParser extends ReqParser {
 
                             if (crlExtensions != null) {
                                 for (int k = 0; k < crlExtensions.size(); k++) {
-                                    Extension ext = (Extension) crlExtensions.elementAt(k);
+                                    Extension ext = crlExtensions.elementAt(k);
 
                                     if (ext instanceof CRLReasonExtension) {
                                         rarg.addStringValue("reason",
@@ -874,7 +873,7 @@ public class CertReqParser extends ReqParser {
                 //X509CertImpl oldCert[] =
                 //	(X509CertImpl[])req.get(IRequest.OLD_CERTS);
                 Certificate oldCert[] =
-                        (Certificate[]) req.getExtDataInCertArray(IRequest.OLD_CERTS);
+                        req.getExtDataInCertArray(IRequest.OLD_CERTS);
 
                 if (oldCert != null && oldCert.length > 0) {
                     if (oldCert[0] instanceof X509CertImpl) {
@@ -906,7 +905,7 @@ public class CertReqParser extends ReqParser {
                     CRLExtensions crlExtensions = revokedCert[0].getExtensions();
 
                     for (int k = 0; k < crlExtensions.size(); k++) {
-                        Extension ext = (Extension) crlExtensions.elementAt(k);
+                        Extension ext = crlExtensions.elementAt(k);
 
                         if (ext instanceof CRLReasonExtension) {
                             arg.addStringValue("reason",
diff --git a/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java b/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java
index 43b6d8901..41e6523a5 100644
--- a/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java
+++ b/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java
@@ -21,7 +21,6 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
-import java.io.OutputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.X509Certificate;
@@ -419,7 +418,7 @@ public class CheckRequest extends CMSServlet {
                                     StringBuffer res = new StringBuffer();
 
                                     while (tokenizer.hasMoreTokens()) {
-                                        String elem = (String) tokenizer.nextToken();
+                                        String elem = tokenizer.nextToken();
 
                                         res.append(elem);
                                     }
@@ -528,7 +527,7 @@ public class CheckRequest extends CMSServlet {
                                             digestAlg = DigestAlgorithm.SHA1;
                                             ByteArrayOutputStream ostream = new ByteArrayOutputStream();
 
-                                            rb.encode((OutputStream) ostream);
+                                            rb.encode(ostream);
                                             digest = SHADigest.digest(ostream.toByteArray());
                                         } catch (NoSuchAlgorithmException ex) {
                                             //log("digest fail");
@@ -575,7 +574,7 @@ public class CheckRequest extends CMSServlet {
                                         ByteArrayOutputStream ostream = new
                                                 ByteArrayOutputStream();
 
-                                        fullResponse.encode((OutputStream) ostream);
+                                        fullResponse.encode(ostream);
                                         byte[] fr = ostream.toByteArray();
 
                                         header.addStringValue(FULL_RESPONSE, CMS.BtoA(fr));
diff --git a/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java b/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java
index 6c863733f..9e1247520 100644
--- a/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java
+++ b/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java
@@ -71,7 +71,7 @@ public class KeyReqParser extends ReqParser {
             arg.addStringValue(OUTPUT_SERIALNO, kid.toString());
 
             // for async recovery
-            String agents = (String) req.getExtDataInString("approvingAgents");
+            String agents = req.getExtDataInString("approvingAgents");
             arg.addStringValue("approvingAgents", agents);
         } else {
             System.out.println("Bad Request " + type);
diff --git a/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java b/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java
index b9fa461fd..02dac53f9 100644
--- a/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java
+++ b/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java
@@ -99,7 +99,7 @@ public class SearchReqs extends CMSServlet {
         mTemplates.remove(CMSRequest.SUCCESS);
 
         if (mAuthority instanceof ISubsystem) {
-            ISubsystem sub = (ISubsystem) mAuthority;
+            ISubsystem sub = mAuthority;
             IConfigStore authConfig = sub.getConfigStore();
 
             if (authConfig != null) {
@@ -293,7 +293,7 @@ public class SearchReqs extends CMSServlet {
             int count = 0;
 
             while (list != null && list.hasMoreElements()) {
-                IRequest request = (IRequest) list.nextRequestObject();
+                IRequest request = list.nextRequestObject();
 
                 if (request != null) {
                     count++;