FREEMARKER-55: simplify builder constructor
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/c0bb4903 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/c0bb4903 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/c0bb4903 Branch: refs/heads/3 Commit: c0bb4903c6494c873c97d9a0190de68288e4a1bb Parents: dcbebe9 Author: Woonsan Ko <woon...@apache.org> Authored: Wed Jul 5 16:37:32 2017 -0400 Committer: Woonsan Ko <woon...@apache.org> Committed: Wed Jul 5 16:37:32 2017 -0400 ---------------------------------------------------------------------- .../freemarker/servlet/FreemarkerServlet.java | 4 +- .../freemarker/servlet/jsp/TaglibFactory.java | 46 ++++++++++++++++++-- .../spring/web/view/FreemarkerViewResolver.java | 5 ++- .../spring/web/view/FreemarkerViewTest.java | 5 ++- 4 files changed, 54 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/c0bb4903/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/FreemarkerServlet.java ---------------------------------------------------------------------- diff --git a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/FreemarkerServlet.java b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/FreemarkerServlet.java index c56f6d7..aad3d55 100644 --- a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/FreemarkerServlet.java +++ b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/FreemarkerServlet.java @@ -1027,7 +1027,9 @@ public class FreemarkerServlet extends HttpServlet { "Failed to parse system property \"" + SYSTEM_PROPERTY_CLASSPATH_TLDS + "\"", e); } - return new TaglibFactory.Builder(servletContext, objectWrapper) + return new TaglibFactory.Builder() + .servletContext(servletContext) + .objectWrapper(objectWrapper) .addAllMetaInfTldSources(metaInfTldSources) .addAllMetaInfTldSources(metaInfTldSourcesFromSysProp) .addAllJettyMetaInfTldJarPatterns(jettyTaglibJarPatterns) http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/c0bb4903/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/TaglibFactory.java ---------------------------------------------------------------------- diff --git a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/TaglibFactory.java b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/TaglibFactory.java index 9da15e4..4679e27 100644 --- a/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/TaglibFactory.java +++ b/freemarker-servlet/src/main/java/org/apache/freemarker/servlet/jsp/TaglibFactory.java @@ -1998,12 +1998,12 @@ public class TaglibFactory implements TemplateHashModel { /** * Servlet context. */ - private final ServletContext servletContext; + private ServletContext servletContext; /** * Object wrapper to be used in model building. */ - private final ObjectWrapper objectWrapper; + private ObjectWrapper objectWrapper; /** * TLD locations to look for when finding available JSP tag libraries. @@ -2015,11 +2015,51 @@ public class TaglibFactory implements TemplateHashModel { */ private List<String> classPathTlds = new ArrayList<>(); - public Builder(ServletContext servletContext, ObjectWrapper objectWrapper) { + public Builder() { + } + + public ServletContext getServletContext() { + return servletContext; + } + + public void setServletContext(ServletContext servletContext) { this.servletContext = servletContext; + } + + public Builder servletContext(ServletContext servletContext) { + setServletContext(servletContext); + return this; + } + + public ObjectWrapper getObjectWrapper() { + return objectWrapper; + } + + public void setObjectWrapper(ObjectWrapper objectWrapper) { this.objectWrapper = objectWrapper; } + public Builder objectWrapper(ObjectWrapper objectWrapper) { + setObjectWrapper(objectWrapper); + return this; + } + + public List<MetaInfTldSource> getMetaInfTldSources() { + return metaInfTldSources; + } + + public void setMetaInfTldSources(List<MetaInfTldSource> metaInfTldSources) { + this.metaInfTldSources = metaInfTldSources; + } + + public List<String> getClassPathTlds() { + return classPathTlds; + } + + public void setClassPathTlds(List<String> classPathTlds) { + this.classPathTlds = classPathTlds; + } + public Builder addMetaInfTldSource(MetaInfTldSource metaInfTldSource) { metaInfTldSources.add(metaInfTldSource); return this; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/c0bb4903/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/FreemarkerViewResolver.java ---------------------------------------------------------------------- diff --git a/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/FreemarkerViewResolver.java b/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/FreemarkerViewResolver.java index 7969b56..fa4b226 100644 --- a/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/FreemarkerViewResolver.java +++ b/freemarker-spring/src/main/java/org/apache/freemarker/spring/web/view/FreemarkerViewResolver.java @@ -127,7 +127,10 @@ public class FreemarkerViewResolver extends AbstractTemplateViewResolver impleme servletContextModel = new ServletContextHashModel(pageContextServlet, objectWrapper); - taglibFactory = new TaglibFactory.Builder(getServletContext(), objectWrapper).build(); + taglibFactory = new TaglibFactory.Builder() + .servletContext(getServletContext()) + .objectWrapper(objectWrapper) + .build(); } @Override http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/c0bb4903/freemarker-spring/src/test/java/org/apache/freemarker/spring/web/view/FreemarkerViewTest.java ---------------------------------------------------------------------- diff --git a/freemarker-spring/src/test/java/org/apache/freemarker/spring/web/view/FreemarkerViewTest.java b/freemarker-spring/src/test/java/org/apache/freemarker/spring/web/view/FreemarkerViewTest.java index 1ed2831..8036f30 100644 --- a/freemarker-spring/src/test/java/org/apache/freemarker/spring/web/view/FreemarkerViewTest.java +++ b/freemarker-spring/src/test/java/org/apache/freemarker/spring/web/view/FreemarkerViewTest.java @@ -72,7 +72,10 @@ public class FreemarkerViewTest { pageContextServlet = new PageContextServlet(); pageContextServlet.init(new PageContextServletConfig(servletContext, PageContextServlet.class.getSimpleName())); - taglibFactory = new TaglibFactory.Builder(servletContext, objectWrapper).build(); + taglibFactory = new TaglibFactory.Builder() + .servletContext(servletContext) + .objectWrapper(objectWrapper) + .build(); viewResolver = new FreemarkerViewResolver(); viewResolver.setServletContext(servletContext);
