Repository: struts Updated Branches: refs/heads/master 8bb225c04 -> 6651089e8
Extracts creating new instances into dedicated methods to allow override them Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/6651089e Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/6651089e Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/6651089e Branch: refs/heads/master Commit: 6651089e823d2d2934f0597ab690ea9322f584e3 Parents: 8bb225c Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Sun Nov 27 12:45:36 2016 +0100 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Sun Nov 27 12:45:36 2016 +0100 ---------------------------------------------------------------------- .../filter/StrutsPrepareAndExecuteFilter.java | 36 ++++++++++++++++++-- 1 file changed, 33 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/6651089e/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareAndExecuteFilter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareAndExecuteFilter.java b/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareAndExecuteFilter.java index 429e47f..c4bcbba 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareAndExecuteFilter.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareAndExecuteFilter.java @@ -55,7 +55,7 @@ public class StrutsPrepareAndExecuteFilter implements StrutsStatics, Filter { protected List<Pattern> excludedPatterns = null; public void init(FilterConfig filterConfig) throws ServletException { - InitOperations init = new InitOperations(); + InitOperations init = createInitOperations(); Dispatcher dispatcher = null; try { FilterHostConfig config = new FilterHostConfig(filterConfig); @@ -63,8 +63,8 @@ public class StrutsPrepareAndExecuteFilter implements StrutsStatics, Filter { dispatcher = init.initDispatcher(config); init.initStaticContentLoader(config, dispatcher); - prepare = new PrepareOperations(dispatcher); - execute = new ExecuteOperations(dispatcher); + prepare = createPrepareOperations(dispatcher); + execute = createExecuteOperations(dispatcher); this.excludedPatterns = init.buildExcludedPatternsList(dispatcher); postInit(dispatcher, filterConfig); @@ -77,6 +77,36 @@ public class StrutsPrepareAndExecuteFilter implements StrutsStatics, Filter { } /** + * Creates a new instance of {@link InitOperations} to be used during + * initialising {@link Dispatcher} + * + * @return instance of {@link InitOperations} + */ + protected InitOperations createInitOperations() { + return new InitOperations(); + } + + /** + * Creates a new instance of {@link PrepareOperations} to be used during + * initialising {@link Dispatcher} + * + * @return instance of {@link PrepareOperations} + */ + protected PrepareOperations createPrepareOperations(Dispatcher dispatcher) { + return new PrepareOperations(dispatcher); + } + + /** + * Creates a new instance of {@link ExecuteOperations} to be used during + * initialising {@link Dispatcher} + * + * @return instance of {@link ExecuteOperations} + */ + protected ExecuteOperations createExecuteOperations(Dispatcher dispatcher) { + return new ExecuteOperations(dispatcher); + } + + /** * Callback for post initialization * * @param dispatcher the dispatcher
