Deprecates constructors based on ServletContext and introduces new one instead
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/8746fd1f Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/8746fd1f Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/8746fd1f Branch: refs/heads/feature/WW-4292-dont-use-servletcontext Commit: 8746fd1f1cc2d4998663687115f5d04629f5786d Parents: 01d401e Author: Lukasz Lenart <[email protected]> Authored: Mon Feb 17 09:31:56 2014 +0100 Committer: Lukasz Lenart <[email protected]> Committed: Mon Feb 17 09:31:56 2014 +0100 ---------------------------------------------------------------------- .../apache/struts2/dispatcher/ng/ExecuteOperations.java | 10 +++++++--- .../apache/struts2/dispatcher/ng/PrepareOperations.java | 11 +++++++---- 2 files changed, 14 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/8746fd1f/core/src/main/java/org/apache/struts2/dispatcher/ng/ExecuteOperations.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ng/ExecuteOperations.java b/core/src/main/java/org/apache/struts2/dispatcher/ng/ExecuteOperations.java index 7ca3d6a..0c94249 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/ng/ExecuteOperations.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/ng/ExecuteOperations.java @@ -35,12 +35,16 @@ import java.io.IOException; * Contains execution operations for filters */ public class ExecuteOperations { - private ServletContext servletContext; + private Dispatcher dispatcher; + @Deprecated public ExecuteOperations(ServletContext servletContext, Dispatcher dispatcher) { this.dispatcher = dispatcher; - this.servletContext = servletContext; + } + + public ExecuteOperations(Dispatcher dispatcher) { + this.dispatcher = dispatcher; } /** @@ -74,6 +78,6 @@ public class ExecuteOperations { * @throws ServletException */ public void executeAction(HttpServletRequest request, HttpServletResponse response, ActionMapping mapping) throws ServletException { - dispatcher.serviceAction(request, response, servletContext, mapping); + dispatcher.serviceAction(request, response, mapping); } } http://git-wip-us.apache.org/repos/asf/struts/blob/8746fd1f/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java b/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java index a26a8b2..ccf21c7 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java @@ -47,15 +47,18 @@ public class PrepareOperations { private static final Logger LOG = LoggerFactory.getLogger(PrepareOperations.class); - private ServletContext servletContext; private Dispatcher dispatcher; private static final String STRUTS_ACTION_MAPPING_KEY = "struts.actionMapping"; public static final String CLEANUP_RECURSION_COUNTER = "__cleanup_recursion_counter"; private Logger log = LoggerFactory.getLogger(PrepareOperations.class); + @Deprecated public PrepareOperations(ServletContext servletContext, Dispatcher dispatcher) { this.dispatcher = dispatcher; - this.servletContext = servletContext; + } + + public PrepareOperations(Dispatcher dispatcher) { + this.dispatcher = dispatcher; } /** @@ -75,7 +78,7 @@ public class PrepareOperations { ctx = new ActionContext(new HashMap<String, Object>(oldContext.getContextMap())); } else { ValueStack stack = dispatcher.getContainer().getInstance(ValueStackFactory.class).createValueStack(); - stack.getContext().putAll(dispatcher.createContextMap(request, response, null, servletContext)); + stack.getContext().putAll(dispatcher.createContextMap(request, response, null)); ctx = new ActionContext(stack.getContext()); } request.setAttribute(CLEANUP_RECURSION_COUNTER, counter); @@ -131,7 +134,7 @@ public class PrepareOperations { try { // Wrap request first, just in case it is multipart/form-data // parameters might not be accessible through before encoding (ww-1278) - request = dispatcher.wrapRequest(request, servletContext); + request = dispatcher.wrapRequest(request); } catch (IOException e) { throw new ServletException("Could not wrap servlet request with MultipartRequestWrapper!", e); }
