Revision: 1db3e7924216
Author: Sam Berlin <[email protected]>
Date: Sun May 27 10:43:31 2012
Log: Follow-up cleanup CL, removing an unnecessary parameter and
strengthening typing.
Revision created by MOE tool push_codebase.
MOE_MIGRATION=4879
http://code.google.com/p/google-guice/source/detail?r=1db3e7924216
Modified:
/extensions/servlet/src/com/google/inject/servlet/FilterChainInvocation.java
/extensions/servlet/src/com/google/inject/servlet/FilterDefinition.java
/extensions/servlet/test/com/google/inject/servlet/FilterDefinitionTest.java
=======================================
---
/extensions/servlet/src/com/google/inject/servlet/FilterChainInvocation.java
Sun May 27 10:42:56 2012
+++
/extensions/servlet/src/com/google/inject/servlet/FilterChainInvocation.java
Sun May 27 10:43:31 2012
@@ -74,7 +74,7 @@
= (previous != null) ? previous.getOriginalRequest() : request;
GuiceFilter.localContext.set(new GuiceFilter.Context(originalRequest,
request, response));
try {
- Filter filter = findNextFilter(servletRequest, servletResponse);
+ Filter filter = findNextFilter(request);
if (filter != null) {
// call to the filter, which can either consume the request or
// recurse back into this method. (in which case we will go to
find the next filter,
@@ -109,9 +109,9 @@
* Iterates over the remaining filter definitions.
* Returns the first applicable filter, or null if none apply.
*/
- private Filter findNextFilter(ServletRequest servletRequest,
ServletResponse servletResponse) {
+ private Filter findNextFilter(HttpServletRequest request) {
while (++index < filterDefinitions.length) {
- Filter filter =
filterDefinitions[index].getFilterIfMatching(servletRequest,
servletResponse);
+ Filter filter =
filterDefinitions[index].getFilterIfMatching(request);
if (filter != null) {
return filter;
}
=======================================
--- /extensions/servlet/src/com/google/inject/servlet/FilterDefinition.java
Sun May 27 10:42:56 2012
+++ /extensions/servlet/src/com/google/inject/servlet/FilterDefinition.java
Sun May 27 10:43:31 2012
@@ -34,8 +34,6 @@
import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
/**
@@ -152,10 +150,8 @@
}
}
- public Filter getFilterIfMatching(ServletRequest servletRequest,
- ServletResponse servletResponse) {
-
- final HttpServletRequest request = (HttpServletRequest) servletRequest;
+ public Filter getFilterIfMatching(HttpServletRequest request) {
+
final String path =
request.getRequestURI().substring(request.getContextPath().length());
if (shouldFilter(path)) {
=======================================
---
/extensions/servlet/test/com/google/inject/servlet/FilterDefinitionTest.java
Sun May 27 10:42:56 2012
+++
/extensions/servlet/test/com/google/inject/servlet/FilterDefinitionTest.java
Sun May 27 10:43:31 2012
@@ -128,7 +128,7 @@
assertTrue("Init did not fire", mockFilter.isInit());
- Filter matchingFilter = filterDef.getFilterIfMatching(request, null);
+ Filter matchingFilter = filterDef.getFilterIfMatching(request);
assertSame(mockFilter, matchingFilter);
final boolean proceed[] = new boolean[1];
@@ -191,7 +191,7 @@
assertTrue("init did not fire", mockFilter.isInit());
- Filter matchingFilter = filterDef.getFilterIfMatching(request, null);
+ Filter matchingFilter = filterDef.getFilterIfMatching(request);
assertSame(mockFilter, matchingFilter);
final boolean proceed[] = new boolean[1];
--
You received this message because you are subscribed to the Google Groups
"google-guice-dev" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/google-guice-dev?hl=en.
