Generics for o.a.c.valves

Fix a couple of other Eclipse warnings as well

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@722589 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/valves/AccessLogValve.java b/java/org/apache/catalina/valves/AccessLogValve.java
index 9deaa8e..0b7a2fc 100644 (file)
--- a/java/org/apache/catalina/valves/AccessLogValve.java
+++ b/java/org/apache/catalina/valves/AccessLogValve.java
@@ -1412,7 +1412,7 @@ public class AccessLogValve
         if (buf.length() > 0) {
             list.add(new StringElement(buf.toString()));
         }
-        return (AccessLogElement[]) list.toArray(new AccessLogElement[0]);
+        return list.toArray(new AccessLogElement[0]);
     }
 
     /**

diff --git a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
index 065e27c..0a1d97d 100644 (file)
--- a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
+++ b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
@@ -571,7 +571,7 @@ public class ExtendedAccessLogValve
             if (log.isDebugEnabled()) {
                 log.debug("finished decoding with element size of: " + list.size());
             }
-            return (AccessLogElement[]) list.toArray(new AccessLogElement[0]);
+            return list.toArray(new AccessLogElement[0]);
         } catch (IOException e) {
             log.error("parse error", e);
             return null;

diff --git a/java/org/apache/catalina/valves/JDBCAccessLogValve.java b/java/org/apache/catalina/valves/JDBCAccessLogValve.java
index d69bf16..61037b0 100644 (file)
--- a/java/org/apache/catalina/valves/JDBCAccessLogValve.java
+++ b/java/org/apache/catalina/valves/JDBCAccessLogValve.java
@@ -579,7 +579,7 @@ public final class JDBCAccessLogValve
         // Instantiate our database driver if necessary
         if (driver == null) {
             try {
-                Class clazz = Class.forName(driverName);
+                Class<?> clazz = Class.forName(driverName);
                 driver = (Driver) clazz.newInstance();
             } catch (Throwable e) {
                 throw new SQLException(e.getMessage());
@@ -627,7 +627,7 @@ public final class JDBCAccessLogValve
         try {
             ps.close();
         } catch (Throwable f) {
-            ;
+            // Ignore
         }
         this.ps = null;
 

diff --git a/java/org/apache/catalina/valves/RequestDumperValve.java b/java/org/apache/catalina/valves/RequestDumperValve.java
index ad8c50b..2500fa3 100644 (file)
--- a/java/org/apache/catalina/valves/RequestDumperValve.java
+++ b/java/org/apache/catalina/valves/RequestDumperValve.java
@@ -109,20 +109,20 @@ public class RequestDumperValve
                 log.info("            cookie=" + cookies[i].getName() + "=" +
                     cookies[i].getValue());
         }
-        Enumeration hnames = request.getHeaderNames();
+        Enumeration<String> hnames = request.getHeaderNames();
         while (hnames.hasMoreElements()) {
-            String hname = (String) hnames.nextElement();
-            Enumeration hvalues = request.getHeaders(hname);
+            String hname = hnames.nextElement();
+            Enumeration<String> hvalues = request.getHeaders(hname);
             while (hvalues.hasMoreElements()) {
-                String hvalue = (String) hvalues.nextElement();
+                String hvalue = hvalues.nextElement();
                 log.info("            header=" + hname + "=" + hvalue);
             }
         }
         log.info("            locale=" + request.getLocale());
         log.info("            method=" + request.getMethod());
-        Enumeration pnames = request.getParameterNames();
+        Enumeration<String> pnames = request.getParameterNames();
         while (pnames.hasMoreElements()) {
-            String pname = (String) pnames.nextElement();
+            String pname = pnames.nextElement();
             String pvalues[] = request.getParameterValues(pname);
             StringBuffer result = new StringBuffer(pname);
             result.append('=');

diff --git a/java/org/apache/catalina/valves/RequestFilterValve.java b/java/org/apache/catalina/valves/RequestFilterValve.java
index 9d8c12c..cc22520 100644 (file)
--- a/java/org/apache/catalina/valves/RequestFilterValve.java
+++ b/java/org/apache/catalina/valves/RequestFilterValve.java
@@ -217,7 +217,7 @@ public abstract class RequestFilterValve
             return (new Pattern[0]);
         list += ",";
 
-        ArrayList reList = new ArrayList();
+        ArrayList<Pattern> reList = new ArrayList<Pattern>();
         while (list.length() > 0) {
             int comma = list.indexOf(',');
             if (comma < 0)
@@ -235,7 +235,7 @@ public abstract class RequestFilterValve
         }
 
         Pattern reArray[] = new Pattern[reList.size()];
-        return ((Pattern[]) reList.toArray(reArray));
+        return reList.toArray(reArray);
 
     }
 

diff --git a/java/org/apache/catalina/valves/SSLValve.java b/java/org/apache/catalina/valves/SSLValve.java
index 7d227b6..7c4c5ed 100644 (file)
--- a/java/org/apache/catalina/valves/SSLValve.java
+++ b/java/org/apache/catalina/valves/SSLValve.java
@@ -28,7 +28,6 @@ import javax.servlet.ServletException;
 import org.apache.catalina.valves.ValveBase;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
-import org.apache.catalina.util.StringManager;
 
 /*
  * Valve to fill the SSL informations in the request
@@ -48,22 +47,7 @@ import org.apache.catalina.util.StringManager;
 
 public class SSLValve
     extends ValveBase {
-/*
-    private static final String info =
-        "SSLValve/1.0";
-    protected static StringManager sm =
-        StringManager.getManager(Constants.Package);
-    public String getInfo() {
-        return (info);
-    }
-    public String toString() {
-        StringBuffer sb = new StringBuffer("SSLValve[");
-                if (container != null)
-            sb.append(container.getName());
-        sb.append("]");
-        return (sb.toString());
-    }
- */
+
     public String mygetHeader(Request request, String header) {
         String strcert0 = request.getHeader(header);
         if (strcert0 == null)