FREEMARKER-55: set defaults in builder level
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/73a53e70 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/73a53e70 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/73a53e70 Branch: refs/heads/3 Commit: 73a53e70a5c838af451605380fc446e55b75762c Parents: 36e04df Author: Woonsan Ko <woon...@apache.org> Authored: Thu Jul 13 17:37:17 2017 -0400 Committer: Woonsan Ko <woon...@apache.org> Committed: Thu Jul 13 17:37:17 2017 -0400 ---------------------------------------------------------------------- .../org/apache/freemarker/servlet/jsp/TaglibFactory.java | 10 +++++----- .../spring/web/view/FreemarkerViewResolver.java | 5 +---- 2 files changed, 6 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/73a53e70/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 ef5d9df..cacb22b 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 @@ -123,8 +123,8 @@ public class TaglibFactory implements TemplateHashModel { private final ServletContext servletContext; private ObjectWrapper objectWrapper; - private List<? extends MetaInfTldSource> metaInfTldSources = DEFAULT_META_INF_TLD_SOURCES; - private List<String> classpathTlds = DEFAULT_CLASSPATH_TLDS; + private List<? extends MetaInfTldSource> metaInfTldSources; + private List<String> classpathTlds; boolean test_emulateNoUrlToFileConversions = false; boolean test_emulateNoJarURLConnections = false; @@ -2077,12 +2077,12 @@ public class TaglibFactory implements TemplateHashModel { /** * TLD locations to look for when finding available JSP tag libraries. */ - private List<MetaInfTldSource> metaInfTldSources; + private List<? extends MetaInfTldSource> metaInfTldSources = DEFAULT_META_INF_TLD_SOURCES; /** * TLD classpath locations to look for when finding available JSP tag libraries. */ - private List<String> classpathTlds; + private List<String> classpathTlds = DEFAULT_CLASSPATH_TLDS; private boolean alreadyBuilt; @@ -2118,7 +2118,7 @@ public class TaglibFactory implements TemplateHashModel { /** * Getter pair of {@link #setClasspathTlds(List)} */ - public List<MetaInfTldSource> getMetaInfTldSources() { + public List<? extends MetaInfTldSource> getMetaInfTldSources() { return (metaInfTldSources != null) ? metaInfTldSources : Collections.<MetaInfTldSource> emptyList(); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/73a53e70/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 67b4643..7969b56 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,10 +127,7 @@ public class FreemarkerViewResolver extends AbstractTemplateViewResolver impleme servletContextModel = new ServletContextHashModel(pageContextServlet, objectWrapper); - taglibFactory = new TaglibFactory.Builder(getServletContext(), objectWrapper) - .metaInfTldSources(TaglibFactory.DEFAULT_META_INF_TLD_SOURCES) - .classpathTlds(TaglibFactory.DEFAULT_CLASSPATH_TLDS) - .build(); + taglibFactory = new TaglibFactory.Builder(getServletContext(), objectWrapper).build(); } @Override
