WW-4749 Uses writeIfCompleted to keep backward compatibility
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/38a2ebb7 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/38a2ebb7 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/38a2ebb7 Branch: refs/heads/master Commit: 38a2ebb72abd90c74bd52d6a81e3a0d967965c7b Parents: 3034b3a Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Fri Apr 28 13:14:30 2017 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Fri Apr 28 13:14:30 2017 +0200 ---------------------------------------------------------------------- .../struts2/views/freemarker/FreemarkerResult.java | 16 ++++++++-------- .../views/freemarker/FreeMarkerResultTest.java | 14 +------------- 2 files changed, 9 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/38a2ebb7/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java index b083796..da631d9 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java @@ -60,7 +60,7 @@ public class FreemarkerResult extends StrutsResultSupport { protected ObjectWrapper wrapper; protected FreemarkerManager freemarkerManager; private Writer writer; - private Boolean useBufferedWriter = null; + private Boolean writeIfCompleted = null; /* * Struts results are constructed for each result execution @@ -145,8 +145,8 @@ public class FreemarkerResult extends StrutsResultSupport { if (preTemplateProcess(template, model)) { try { final boolean willUseBufferedWriter; - if (useBufferedWriter != null) { - willUseBufferedWriter = isUseBufferedWriter(); + if (writeIfCompleted != null) { + willUseBufferedWriter = isWriteIfCompleted(); } else { willUseBufferedWriter = template.getTemplateExceptionHandler() == TemplateExceptionHandler.RETHROW_HANDLER; } @@ -356,14 +356,14 @@ public class FreemarkerResult extends StrutsResultSupport { return (Boolean) ObjectUtils.defaultIfNull(attribute, Boolean.FALSE); } - public boolean isUseBufferedWriter() { - return useBufferedWriter != null && useBufferedWriter; + public boolean isWriteIfCompleted() { + return writeIfCompleted != null && writeIfCompleted; } /** - * @param useBufferedWriter template is processed and flushed according to freemarker library policies + * @param writeIfCompleted template is processed and flushed according to freemarker library policies */ - public void setUseBufferedWriter(Boolean useBufferedWriter) { - this.useBufferedWriter = useBufferedWriter; + public void setWriteIfCompleted(Boolean writeIfCompleted) { + this.writeIfCompleted = writeIfCompleted; } } http://git-wip-us.apache.org/repos/asf/struts/blob/38a2ebb7/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java b/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java index ec8ec05..1d8cb8f 100644 --- a/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java +++ b/core/src/test/java/org/apache/struts2/views/freemarker/FreeMarkerResultTest.java @@ -22,32 +22,20 @@ package org.apache.struts2.views.freemarker; import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionProxy; import com.opensymphony.xwork2.mock.MockActionInvocation; import com.opensymphony.xwork2.mock.MockActionProxy; -import com.opensymphony.xwork2.util.ClassLoaderUtil; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.fs.DefaultFileManagerFactory; -import freemarker.template.Configuration; -import freemarker.template.TemplateExceptionHandler; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsInternalTestCase; import org.apache.struts2.StrutsStatics; -import org.apache.struts2.dispatcher.Dispatcher; -import org.apache.struts2.dispatcher.mapper.ActionMapper; -import org.apache.struts2.dispatcher.mapper.ActionMapping; import org.apache.struts2.views.jsp.StrutsMockHttpServletResponse; import org.apache.struts2.views.jsp.StrutsMockServletContext; -import org.easymock.EasyMock; import org.springframework.mock.web.MockHttpServletRequest; -import javax.servlet.ServletContext; import java.io.File; import java.io.PrintWriter; import java.io.StringWriter; -import java.net.MalformedURLException; -import java.net.URISyntaxException; -import java.util.HashMap; import static org.apache.struts2.views.jsp.AbstractUITagTest.normalize; @@ -70,7 +58,7 @@ public class FreeMarkerResultTest extends StrutsInternalTestCase { FreemarkerResult result = new FreemarkerResult(); result.setLocation("someFreeMarkerFile.ftl"); result.setFreemarkerManager(mgr); - result.setUseBufferedWriter(true); + result.setWriteIfCompleted(true); try { result.execute(invocation);
