svn commit: r1707797 - in /tomcat/trunk/java/org/apache: catalina/filters/WebdavFixFilter.java tomcat/websocket/server/WsFilter.java

[markt]

Author: markt
Date: Fri Oct  9 19:15:25 2015
New Revision: 1707797

URL: http://svn.apache.org/viewvc?rev=1707797&view=rev
Log:
Take advantage of GenericFilter

Modified:
    tomcat/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java
    tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFilter.java

Modified: tomcat/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java?rev=1707797&r1=1707796&r2=1707797&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java Fri Oct  
9 19:15:25 2015
@@ -18,9 +18,8 @@ package org.apache.catalina.filters;
 
 import java.io.IOException;
 
-import javax.servlet.Filter;
 import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
+import javax.servlet.GenericFilter;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
@@ -57,7 +56,9 @@ import javax.servlet.http.HttpServletRes
  *   <li>Unknown issue means it doesn't work</li>
  * </ul>
  */
-public class WebdavFixFilter implements Filter {
+public class WebdavFixFilter extends GenericFilter {
+
+    private static final long serialVersionUID = 1L;
 
     private static final String LOG_MESSAGE_PREAMBLE =
         "WebdavFixFilter: Detected client problem: ";
@@ -73,16 +74,6 @@ public class WebdavFixFilter implements
     private static final String UA_MINIDIR_5_2_3790 =
         "Microsoft-WebDAV-MiniRedir/5.2.3790";
 
-    @Override
-    public void init(FilterConfig filterConfig) throws ServletException {
-        // NOOP
-    }
-
-    @Override
-    public void destroy() {
-        // NOOP
-    }
-
     /**
      * Check for the broken MS WebDAV client and if detected issue a re-direct
      * that hopefully will cause the non-broken client to be used.
@@ -110,12 +101,11 @@ public class WebdavFixFilter implements
         } else if (ua.startsWith(UA_MINIDIR_5_2_3790)) {
             // XP 64-bit SP2
             if (!"".equals(httpRequest.getContextPath())) {
-                log(request,
-                        "XP-x64-SP2 clients only work with the root context");
+                log("XP-x64-SP2 clients only work with the root context");
             }
             // Namespace issue maybe
             // see http://greenbytes.de/tech/webdav/webdav-redirector-list.html
-            log(request, "XP-x64-SP2 is known not to work with WebDAV 
Servlet");
+            log("XP-x64-SP2 is known not to work with WebDAV Servlet");
 
             chain.doFilter(request, response);
         } else {
@@ -141,9 +131,9 @@ public class WebdavFixFilter implements
         return location.toString();
     }
 
-    private void log(ServletRequest request, String msg) {
+    private void log(String msg) {
         StringBuilder builder = new StringBuilder(LOG_MESSAGE_PREAMBLE);
         builder.append(msg);
-        request.getServletContext().log(builder.toString());
+        getServletContext().log(builder.toString());
     }
 }

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFilter.java?rev=1707797&r1=1707796&r2=1707797&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFilter.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFilter.java Fri Oct  
9 19:15:25 2015
@@ -18,9 +18,8 @@ package org.apache.tomcat.websocket.serv
 
 import java.io.IOException;
 
-import javax.servlet.Filter;
 import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
+import javax.servlet.GenericFilter;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
@@ -30,14 +29,16 @@ import javax.servlet.http.HttpServletRes
 /**
  * Handles the initial HTTP connection for WebSocket connections.
  */
-public class WsFilter implements Filter {
+public class WsFilter extends GenericFilter {
+
+    private static final long serialVersionUID = 1L;
 
     private WsServerContainer sc;
 
 
     @Override
-    public void init(FilterConfig filterConfig) throws ServletException {
-        sc = (WsServerContainer) filterConfig.getServletContext().getAttribute(
+    public void init() throws ServletException {
+        sc = (WsServerContainer) getServletContext().getAttribute(
                 Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);
     }
 
@@ -77,12 +78,4 @@ public class WsFilter implements Filter
         UpgradeUtil.doUpgrade(sc, req, resp, mappingResult.getConfig(),
                 mappingResult.getPathParams());
     }
-
-
-    @Override
-    public void destroy() {
-        // NO-OP
-    }
-
-
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org