Author: markt
Date: Fri Oct 9 19:24:31 2015
New Revision: 1707798
URL: http://svn.apache.org/viewvc?rev=1707798&view=rev
Log:
Take advantage of GenericFilter
Modified:
tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java
tomcat/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
Modified: tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java?rev=1707798&r1=1707797&r2=1707798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java Fri
Oct 9 19:24:31 2015
@@ -21,9 +21,8 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Enumeration;
-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;
@@ -48,7 +47,9 @@ import org.apache.juli.logging.LogFactor
*
* @author Craig R. McClanahan
*/
-public class RequestDumperFilter implements Filter {
+public class RequestDumperFilter extends GenericFilter {
+
+ private static final long serialVersionUID = 1L;
private static final String NON_HTTP_REQ_MSG =
"Not available. Non-http request.";
@@ -264,16 +265,6 @@ public class RequestDumperFilter impleme
return ts.dateString;
}
- @Override
- public void init(FilterConfig filterConfig) throws ServletException {
- // NOOP
- }
-
- @Override
- public void destroy() {
- // NOOP
- }
-
private static final class Timestamp {
private final Date date = new Date(0);
private final SimpleDateFormat format =
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java?rev=1707798&r1=1707797&r2=1707798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java Fri Oct 9
19:24:31 2015
@@ -28,9 +28,8 @@ import java.io.Reader;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-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;
@@ -45,8 +44,8 @@ import org.apache.catalina.Globals;
* @author David Becker
* @see org.apache.catalina.ssi.SSIServlet
*/
-public class SSIFilter implements Filter {
- protected FilterConfig config = null;
+public class SSIFilter extends GenericFilter {
+ private static final long serialVersionUID = 1L;
/** Debug level for this servlet. */
protected int debug = 0;
/** Expiration time in seconds for the doc. */
@@ -62,37 +61,27 @@ public class SSIFilter implements Filter
protected boolean allowExec = false;
- //----------------- Public methods.
- /**
- * Initialize this servlet.
- *
- * @exception ServletException
- * if an error occurs
- */
@Override
- public void init(FilterConfig config) throws ServletException {
- this.config = config;
-
- if (config.getInitParameter("debug") != null) {
- debug = Integer.parseInt(config.getInitParameter("debug"));
+ public void init() throws ServletException {
+ if (getInitParameter("debug") != null) {
+ debug = Integer.parseInt(getInitParameter("debug"));
}
- if (config.getInitParameter("contentType") != null) {
- contentTypeRegEx =
Pattern.compile(config.getInitParameter("contentType"));
+ if (getInitParameter("contentType") != null) {
+ contentTypeRegEx =
Pattern.compile(getInitParameter("contentType"));
} else {
contentTypeRegEx = shtmlRegEx;
}
- isVirtualWebappRelative =
-
Boolean.parseBoolean(config.getInitParameter("isVirtualWebappRelative"));
+ isVirtualWebappRelative =
Boolean.parseBoolean(getInitParameter("isVirtualWebappRelative"));
- if (config.getInitParameter("expires") != null)
- expires = Long.valueOf(config.getInitParameter("expires"));
+ if (getInitParameter("expires") != null)
+ expires = Long.valueOf(getInitParameter("expires"));
- allowExec = Boolean.parseBoolean(config.getInitParameter("allowExec"));
+ allowExec = Boolean.parseBoolean(getInitParameter("allowExec"));
if (debug > 0)
- config.getServletContext().log(
+ getServletContext().log(
"SSIFilter.init() SSI invoker started with 'debug'=" +
debug);
}
@@ -109,7 +98,7 @@ public class SSIFilter implements Filter
// setup to capture output
ByteArrayServletOutputStream basos = new
ByteArrayServletOutputStream();
ResponseIncludeWrapper responseIncludeWrapper =
- new ResponseIncludeWrapper(config.getServletContext(),req, res,
basos);
+ new ResponseIncludeWrapper(getServletContext(),req, res,
basos);
// process remainder of filter chain
chain.doFilter(req, responseIncludeWrapper);
@@ -127,7 +116,7 @@ public class SSIFilter implements Filter
// set up SSI processing
SSIExternalResolver ssiExternalResolver =
- new SSIServletExternalResolver(config.getServletContext(), req,
+ new SSIServletExternalResolver(getServletContext(), req,
res, isVirtualWebappRelative, debug, encoding);
SSIProcessor ssiProcessor = new SSIProcessor(ssiExternalResolver,
debug, allowExec);
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java?rev=1707798&r1=1707797&r2=1707798&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
Fri Oct 9 19:24:31 2015
@@ -20,9 +20,8 @@ package 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;
@@ -43,10 +42,10 @@ import javax.servlet.ServletResponse;
*
* @author Craig McClanahan
*/
-public final class ExampleFilter implements Filter {
+public final class ExampleFilter extends GenericFilter {
- // ----------------------------------------------------- Instance Variables
+ private static final long serialVersionUID = 1L;
/**
@@ -56,28 +55,6 @@ public final class ExampleFilter impleme
/**
- * The filter configuration object we are associated with. If this value
- * is null, this filter instance is not currently configured.
- */
- private FilterConfig filterConfig = null;
-
-
- // --------------------------------------------------------- Public Methods
-
-
- /**
- * Take this filter out of service.
- */
- @Override
- public void destroy() {
-
- this.attribute = null;
- this.filterConfig = null;
-
- }
-
-
- /**
* Time the processing that is performed by all subsequent filters in the
* current filter stack, including the ultimately invoked servlet.
*
@@ -89,9 +66,8 @@ public final class ExampleFilter impleme
* @exception ServletException if a servlet error occurs
*/
@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 {
// Store ourselves as a request attribute (if requested)
if (attribute != null)
@@ -101,24 +77,14 @@ public final class ExampleFilter impleme
long startTime = System.currentTimeMillis();
chain.doFilter(request, response);
long stopTime = System.currentTimeMillis();
- filterConfig.getServletContext().log
- (this.toString() + ": " + (stopTime - startTime) +
+ getServletContext().log(this.toString() + ": " + (stopTime -
startTime) +
" milliseconds");
-
}
- /**
- * Place this filter into service.
- *
- * @param fConfig The filter configuration object
- */
@Override
- public void init(FilterConfig fConfig) throws ServletException {
-
- this.filterConfig = fConfig;
- this.attribute = fConfig.getInitParameter("attribute");
-
+ public void init() throws ServletException {
+ this.attribute = getInitParameter("attribute");
}
@@ -127,16 +93,10 @@ public final class ExampleFilter impleme
*/
@Override
public String toString() {
-
- if (filterConfig == null)
- return ("TimingFilter()");
StringBuilder sb = new StringBuilder("TimingFilter(");
- sb.append(filterConfig);
+ sb.append(getFilterConfig());
sb.append(")");
return (sb.toString());
-
}
-
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
