Author: markt
Date: Fri Oct 9 21:51:37 2015
New Revision: 1707821
URL: http://svn.apache.org/viewvc?rev=1707821&view=rev
Log:
Move HttpFilter to the correct package.
Re-order some methods to simplify checking against the RI using javap.
Added:
tomcat/trunk/java/javax/servlet/http/HttpFilter.java
- copied, changed from r1707817,
tomcat/trunk/java/javax/servlet/HttpFilter.java
Removed:
tomcat/trunk/java/javax/servlet/HttpFilter.java
Modified:
tomcat/trunk/java/javax/servlet/Filter.java
tomcat/trunk/java/javax/servlet/GenericFilter.java
tomcat/trunk/java/javax/servlet/ServletRegistration.java
Modified: tomcat/trunk/java/javax/servlet/Filter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/Filter.java?rev=1707821&r1=1707820&r2=1707821&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/Filter.java (original)
+++ tomcat/trunk/java/javax/servlet/Filter.java Fri Oct 9 21:51:37 2015
@@ -58,13 +58,14 @@ public interface Filter {
* <li>Does not return within a time period defined by the web
* container</li>
* </ul>
+ * The default implementation is a NO-OP.
*
* @param filterConfig The configuration information associated with the
* filter instance being initialised
*
* @throws ServletException if the initialisation fails
*/
- public void init(FilterConfig filterConfig) throws ServletException;
+ public default void init(FilterConfig filterConfig) throws
ServletException {}
/**
* The <code>doFilter</code> method of the Filter is called by the
container
@@ -112,7 +113,8 @@ public interface Filter {
* that are being held (for example, memory, file handles, threads) and
make
* sure that any persistent state is synchronized with the filter's current
* state in memory.
+ *
+ * The default implementation is a NO-OP.
*/
- public void destroy();
-
+ public default void destroy() {}
}
Modified: tomcat/trunk/java/javax/servlet/GenericFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/GenericFilter.java?rev=1707821&r1=1707820&r2=1707821&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/GenericFilter.java (original)
+++ tomcat/trunk/java/javax/servlet/GenericFilter.java Fri Oct 9 21:51:37 2015
@@ -16,6 +16,7 @@
*/
package javax.servlet;
+import java.io.IOException;
import java.io.Serializable;
import java.util.Enumeration;
@@ -26,15 +27,14 @@ public abstract class GenericFilter impl
private volatile FilterConfig filterConfig;
+ /**
+ * {@inheritDoc}
+ *
+ * Default NO-OP implementation.
+ */
@Override
- public String getFilterName() {
- return getFilterConfig().getFilterName();
- }
-
-
- @Override
- public ServletContext getServletContext() {
- return getFilterConfig().getServletContext();
+ public void destroy() {
+ // NO-OP
}
@@ -50,13 +50,6 @@ public abstract class GenericFilter impl
}
- @Override
- public void init(FilterConfig filterConfig) throws ServletException {
- this.filterConfig = filterConfig;
- init();
- }
-
-
/**
* Obtain the FilterConfig used to initialise this Filter instance.
*
@@ -68,6 +61,19 @@ public abstract class GenericFilter impl
}
+ @Override
+ public ServletContext getServletContext() {
+ return getFilterConfig().getServletContext();
+ }
+
+
+ @Override
+ public void init(FilterConfig filterConfig) throws ServletException {
+ this.filterConfig = filterConfig;
+ init();
+ }
+
+
/**
* Convenience method for sub-classes to save them having to call
* <code>super.init(config)</code>. This is a NO-OP by default.
@@ -80,13 +86,13 @@ public abstract class GenericFilter impl
}
- /**
- * {@inheritDoc}
- *
- * Default NO-OP implementation.
- */
@Override
- public void destroy() {
- // NO-OP
+ public abstract void doFilter(ServletRequest request, ServletResponse
response,
+ FilterChain chain) throws IOException, ServletException;
+
+
+ @Override
+ public String getFilterName() {
+ return getFilterConfig().getFilterName();
}
}
Modified: tomcat/trunk/java/javax/servlet/ServletRegistration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletRegistration.java?rev=1707821&r1=1707820&r2=1707821&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletRegistration.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletRegistration.java Fri Oct 9
21:51:37 2015
@@ -42,8 +42,8 @@ public interface ServletRegistration ext
public static interface Dynamic
extends ServletRegistration, Registration.Dynamic {
public void setLoadOnStartup(int loadOnStartup);
+ public Set<String> setServletSecurity(ServletSecurityElement
constraint);
public void setMultipartConfig(MultipartConfigElement multipartConfig);
public void setRunAsRole(String roleName);
- public Set<String> setServletSecurity(ServletSecurityElement
constraint);
}
}
Copied: tomcat/trunk/java/javax/servlet/http/HttpFilter.java (from r1707817,
tomcat/trunk/java/javax/servlet/HttpFilter.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpFilter.java?p2=tomcat/trunk/java/javax/servlet/http/HttpFilter.java&p1=tomcat/trunk/java/javax/servlet/HttpFilter.java&r1=1707817&r2=1707821&rev=1707821&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/HttpFilter.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpFilter.java Fri Oct 9 21:51:37
2015
@@ -14,12 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.servlet;
+package javax.servlet.http;
import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import javax.servlet.FilterChain;
+import javax.servlet.GenericFilter;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
public abstract class HttpFilter extends GenericFilter {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
