You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ge...@apache.org on 2018/02/26 09:05:41 UTC
[2/3] brooklyn-server git commit: Replace deprecated constant with
equivalent
Replace deprecated constant with equivalent
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/94898841
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/94898841
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/94898841
Branch: refs/heads/master
Commit: 948988418eef29ec7a7e33b90dc35be348ad2202
Parents: 52c23b4
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Thu Feb 22 16:45:13 2018 +0000
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Thu Feb 22 16:45:50 2018 +0000
----------------------------------------------------------------------
.../org/apache/brooklyn/util/core/text/TemplateProcessor.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/94898841/core/src/main/java/org/apache/brooklyn/util/core/text/TemplateProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/text/TemplateProcessor.java b/core/src/main/java/org/apache/brooklyn/util/core/text/TemplateProcessor.java
index c3b8246..0c78a7c 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/text/TemplateProcessor.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/text/TemplateProcessor.java
@@ -51,6 +51,8 @@ import com.google.common.io.Files;
import freemarker.cache.StringTemplateLoader;
import freemarker.template.Configuration;
+import freemarker.template.DefaultObjectWrapperBuilder;
+import freemarker.template.MapKeyValuePairIterator;
import freemarker.template.ObjectWrapper;
import freemarker.template.Template;
import freemarker.template.TemplateHashModel;
@@ -68,10 +70,12 @@ import freemarker.template.TemplateModelException;
public class TemplateProcessor {
private static final Logger log = LoggerFactory.getLogger(TemplateProcessor.class);
+ private static final ObjectWrapper WRAPPER =
+ new DefaultObjectWrapperBuilder(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS).build();
protected static TemplateModel wrapAsTemplateModel(Object o) throws TemplateModelException {
if (o instanceof Map) return new DotSplittingTemplateModel((Map<?,?>)o);
- return ObjectWrapper.DEFAULT_WRAPPER.wrap(o);
+ return WRAPPER.wrap(o);
}
/** As per {@link #processTemplateContents(String, Map)}, but taking a file. */