Author: markt
Date: Fri Oct 9 19:34:08 2015
New Revision: 1707801
URL: http://svn.apache.org/viewvc?rev=1707801&view=rev
Log:
Take advantage of GenericFilter
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
tomcat/trunk/test/org/apache/catalina/startup/ParamFilter.java
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java?rev=1707801&r1=1707800&r2=1707801&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java Fri Oct
9 19:34:08 2015
@@ -23,9 +23,8 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
-import javax.servlet.Filter;
import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
+import javax.servlet.GenericFilter;
import javax.servlet.HttpConstraintElement;
import javax.servlet.HttpMethodConstraintElement;
import javax.servlet.MultipartConfigElement;
@@ -161,12 +160,9 @@ public class TestStandardContext extends
}
}
- public static final class Bug46243Filter implements Filter {
+ public static final class Bug46243Filter extends GenericFilter {
- @Override
- public void destroy() {
- // NOOP
- }
+ private static final long serialVersionUID = 1L;
@Override
public void doFilter(ServletRequest request, ServletResponse response,
@@ -177,14 +173,12 @@ public class TestStandardContext extends
}
@Override
- public void init(FilterConfig filterConfig) throws ServletException {
- boolean fail =
filterConfig.getInitParameter("fail").equals("true");
+ public void init() throws ServletException {
+ boolean fail = getInitParameter("fail").equals("true");
if (fail) {
- throw new ServletException("Init fail (test)",
- new ClassNotFoundException());
+ throw new ServletException("Init fail (test)", new
ClassNotFoundException());
}
}
-
}
@Test
@@ -336,12 +330,9 @@ public class TestStandardContext extends
}
- public static final class Bug49922Filter implements Filter {
+ public static final class Bug49922Filter extends GenericFilter {
- @Override
- public void destroy() {
- // NOOP
- }
+ private static final long serialVersionUID = 1L;
@Override
public void doFilter(ServletRequest request, ServletResponse response,
@@ -350,11 +341,6 @@ public class TestStandardContext extends
response.getWriter().print("Filter");
chain.doFilter(request, response);
}
-
- @Override
- public void init(FilterConfig filterConfig) throws ServletException {
- // NOOP
- }
}
public static final class Bug49922ForwardServlet extends HttpServlet {
Modified: tomcat/trunk/test/org/apache/catalina/startup/ParamFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/ParamFilter.java?rev=1707801&r1=1707800&r2=1707801&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/ParamFilter.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/ParamFilter.java Fri Oct 9
19:34:08 2015
@@ -20,9 +20,8 @@ import java.io.IOException;
import java.io.PrintWriter;
import javax.servlet.DispatcherType;
-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;
@@ -33,27 +32,18 @@ import javax.servlet.annotation.WebInitP
* Test Mock to check Filter Annotations
* @author Peter Rossbach
*/
-@WebFilter(value = "/param", filterName = "paramFilter", dispatcherTypes = {
- DispatcherType.ERROR, DispatcherType.ASYNC }, initParams = {
@WebInitParam(name = "message", value = "Servlet says: ") })
-public class ParamFilter implements Filter {
+@WebFilter(value = "/param", filterName = "paramFilter",
+ dispatcherTypes = { DispatcherType.ERROR, DispatcherType.ASYNC },
+ initParams = { @WebInitParam(name = "message", value = "Servlet says:
") })
+public class ParamFilter extends GenericFilter {
- private FilterConfig _filterConfig;
-
- @Override
- public void init(FilterConfig filterConfig) throws ServletException {
- _filterConfig = filterConfig;
- }
+ private static final long serialVersionUID = 1L;
@Override
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws ServletException, IOException {
PrintWriter out = res.getWriter();
- out.print(_filterConfig.getInitParameter("message"));
+ out.print(getInitParameter("message"));
chain.doFilter(req, res);
}
-
- @Override
- public void destroy() {
- // destroy
- }
}
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java?rev=1707801&r1=1707800&r2=1707801&view=diff
==============================================================================
---
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
(original)
+++
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
Fri Oct 9 19:34:08 2015
@@ -23,9 +23,8 @@ import java.util.Enumeration;
import java.util.List;
import java.util.StringTokenizer;
-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;
@@ -39,13 +38,9 @@ import javax.servlet.http.HttpServletRes
* @author Amy Roh
* @author Dmitri Valdin
*/
-public class CompressionFilter implements Filter {
+public class CompressionFilter extends GenericFilter {
- /**
- * The filter configuration object we are associated with. If this value
- * is null, this filter instance is not currently configured.
- */
- private FilterConfig config = null;
+ private static final long serialVersionUID = 1L;
/**
* Minimal reasonable threshold.
@@ -77,81 +72,61 @@ public class CompressionFilter implement
*/
private int debug = 0;
- /**
- * Place this filter into service.
- *
- * @param filterConfig The filter configuration object
- */
@Override
- public void init(FilterConfig filterConfig) {
-
- config = filterConfig;
- if (filterConfig != null) {
- String value = filterConfig.getInitParameter("debug");
- if (value!=null) {
- debug = Integer.parseInt(value);
- }
+ public void init() {
+ String str = getInitParameter("debug");
+ if (str != null) {
+ debug = Integer.parseInt(str);
+ }
- String str = filterConfig.getInitParameter("compressionThreshold");
- if (str!=null) {
- compressionThreshold = Integer.parseInt(str);
- if (compressionThreshold != 0 && compressionThreshold <
minThreshold) {
- if (debug > 0) {
- System.out.println("compressionThreshold should be
either 0 - no compression or >= " + minThreshold);
- System.out.println("compressionThreshold set to " +
minThreshold);
- }
- compressionThreshold = minThreshold;
+ str = getInitParameter("compressionThreshold");
+ if (str != null) {
+ compressionThreshold = Integer.parseInt(str);
+ if (compressionThreshold != 0 && compressionThreshold <
minThreshold) {
+ if (debug > 0) {
+ System.out.println("compressionThreshold should be either
0 - no compression or >= " + minThreshold);
+ System.out.println("compressionThreshold set to " +
minThreshold);
}
+ compressionThreshold = minThreshold;
}
+ }
- str = filterConfig.getInitParameter("compressionBuffer");
- if (str!=null) {
- compressionBuffer = Integer.parseInt(str);
- if (compressionBuffer < minBuffer) {
- if (debug > 0) {
- System.out.println("compressionBuffer should be >= " +
minBuffer);
- System.out.println("compressionBuffer set to " +
minBuffer);
- }
- compressionBuffer = minBuffer;
+ str = getInitParameter("compressionBuffer");
+ if (str != null) {
+ compressionBuffer = Integer.parseInt(str);
+ if (compressionBuffer < minBuffer) {
+ if (debug > 0) {
+ System.out.println("compressionBuffer should be >= " +
minBuffer);
+ System.out.println("compressionBuffer set to " +
minBuffer);
}
+ compressionBuffer = minBuffer;
}
+ }
- str = filterConfig.getInitParameter("compressionMimeTypes");
- if (str!=null) {
- List<String> values = new ArrayList<>();
- StringTokenizer st = new StringTokenizer(str, ",");
-
- while (st.hasMoreTokens()) {
- String token = st.nextToken().trim();
- if (token.length() > 0) {
- values.add(token);
- }
+ str = getInitParameter("compressionMimeTypes");
+ if (str != null) {
+ List<String> values = new ArrayList<>();
+ StringTokenizer st = new StringTokenizer(str, ",");
+
+ while (st.hasMoreTokens()) {
+ String token = st.nextToken().trim();
+ if (token.length() > 0) {
+ values.add(token);
}
+ }
- if (values.size() > 0) {
- compressionMimeTypes = values.toArray(
- new String[values.size()]);
- } else {
- compressionMimeTypes = null;
- }
+ if (values.size() > 0) {
+ compressionMimeTypes = values.toArray(
+ new String[values.size()]);
+ } else {
+ compressionMimeTypes = null;
+ }
- if (debug > 0) {
- System.out.println("compressionMimeTypes set to " +
- Arrays.toString(compressionMimeTypes));
- }
+ if (debug > 0) {
+ System.out.println("compressionMimeTypes set to " +
+ Arrays.toString(compressionMimeTypes));
}
}
-
- }
-
- /**
- * Take this filter out of service.
- */
- @Override
- public void destroy() {
-
- this.config = null;
-
}
/**
@@ -171,8 +146,8 @@ public class CompressionFilter implement
* (<code>chain.doFilter()</code>), <br>
**/
@Override
- public void doFilter ( ServletRequest request, ServletResponse response,
- FilterChain chain ) throws IOException,
ServletException {
+ public void doFilter (ServletRequest request, ServletResponse response,
FilterChain chain )
+ throws IOException, ServletException {
if (debug > 0) {
System.out.println("@doFilter");
@@ -245,24 +220,5 @@ public class CompressionFilter implement
return;
}
}
-
- /**
- * Set filter config
- * This function is equivalent to init. Required by Weblogic 6.1
- *
- * @param filterConfig The filter configuration object
- */
- public void setFilterConfig(FilterConfig filterConfig) {
- init(filterConfig);
- }
-
- /**
- * Required by Weblogic 6.1
- *
- * @return the FilterConfig that was used to initialise this filter.
- */
- public FilterConfig getFilterConfig() {
- return config;
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
