Repository: incubator-freemarker-online-tester Updated Branches: refs/heads/master 4ddb62e11 -> 397f9af54
Added FreeMarker configuration to Dropwizard Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/commit/397f9af5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/tree/397f9af5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/diff/397f9af5 Branch: refs/heads/master Commit: 397f9af54c00d73c9bb8f1176a1d06cd343ddac3 Parents: 4ddb62e Author: ddekany <ddek...@apache.org> Authored: Tue Nov 7 23:14:37 2017 +0100 Committer: ddekany <ddek...@apache.org> Committed: Tue Nov 7 23:14:37 2017 +0100 ---------------------------------------------------------------------- .../dropwizard/FreeMarkerOnlineTester.java | 9 ++++++++- .../FreeMarkerOnlineTesterConfiguration.java | 16 ++++++++++++++++ src/main/resources/freemarker-online.yml | 6 ++++++ 3 files changed, 30 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/397f9af5/src/main/java/org/apache/freemarker/onlinetester/dropwizard/FreeMarkerOnlineTester.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/onlinetester/dropwizard/FreeMarkerOnlineTester.java b/src/main/java/org/apache/freemarker/onlinetester/dropwizard/FreeMarkerOnlineTester.java index 0ea5035..a9ddc91 100644 --- a/src/main/java/org/apache/freemarker/onlinetester/dropwizard/FreeMarkerOnlineTester.java +++ b/src/main/java/org/apache/freemarker/onlinetester/dropwizard/FreeMarkerOnlineTester.java @@ -1,6 +1,8 @@ package org.apache.freemarker.onlinetester.dropwizard; +import java.util.Map; + import org.apache.freemarker.onlinetester.healthchecks.FreeMarkerOnlineTesterOverallHealthCheck; import org.apache.freemarker.onlinetester.resources.ExecuteApiResource; import org.apache.freemarker.onlinetester.resources.WebPageResource; @@ -35,7 +37,12 @@ public class FreeMarkerOnlineTester extends Application<FreeMarkerOnlineTesterCo @Override public void initialize(Bootstrap<FreeMarkerOnlineTesterConfiguration> bootstrap) { - bootstrap.addBundle(new ViewBundle<>()); + bootstrap.addBundle(new ViewBundle<FreeMarkerOnlineTesterConfiguration>() { + @Override + public Map<String, Map<String, String>> getViewConfiguration(FreeMarkerOnlineTesterConfiguration config) { + return config.getViewRendererConfiguration(); + } + }); bootstrap.addBundle(new AssetsBundle()); bootstrap.addBundle(new RedirectBundle( new UriRedirect( http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/397f9af5/src/main/java/org/apache/freemarker/onlinetester/dropwizard/FreeMarkerOnlineTesterConfiguration.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/onlinetester/dropwizard/FreeMarkerOnlineTesterConfiguration.java b/src/main/java/org/apache/freemarker/onlinetester/dropwizard/FreeMarkerOnlineTesterConfiguration.java index 355192c..f7eae4c 100644 --- a/src/main/java/org/apache/freemarker/onlinetester/dropwizard/FreeMarkerOnlineTesterConfiguration.java +++ b/src/main/java/org/apache/freemarker/onlinetester/dropwizard/FreeMarkerOnlineTesterConfiguration.java @@ -1,8 +1,24 @@ package org.apache.freemarker.onlinetester.dropwizard; +import java.util.Map; + +import com.fasterxml.jackson.annotation.JsonProperty; + import io.dropwizard.Configuration; public class FreeMarkerOnlineTesterConfiguration extends Configuration { + private Map<String, Map<String, String>> viewRendererConfiguration; + + @JsonProperty("viewRendererConfiguration") + public Map<String, Map<String, String>> getViewRendererConfiguration() { + return viewRendererConfiguration; + } + + @JsonProperty("viewRendererConfiguration") + public void setViewRendererConfiguration(Map<String, Map<String, String>> viewRendererConfiguration) { + this.viewRendererConfiguration = viewRendererConfiguration; + } + } http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/blob/397f9af5/src/main/resources/freemarker-online.yml ---------------------------------------------------------------------- diff --git a/src/main/resources/freemarker-online.yml b/src/main/resources/freemarker-online.yml index eac938b..a582b87 100644 --- a/src/main/resources/freemarker-online.yml +++ b/src/main/resources/freemarker-online.yml @@ -34,3 +34,9 @@ logging: server: requestLog: appenders: [] +viewRendererConfiguration: + .ftl: + incompatibleImprovements: 2.3.27 + locale: en_US + timeZone: UTC + outputEncoding: UTF-8 \ No newline at end of file