From 0aa220d048e03fea673d17e15423ffac60078b38 Mon Sep 17 00:00:00 2001 From: "Smokowski, Kevin (ks6305)" Date: Fri, 4 Jan 2019 15:03:29 +0000 Subject: [PATCH] TemplateNode update push parameter values into velocity context to simplify how parameters are used in templates Change-Id: Ic8b4c56ef303ed9447bb1a62300c04c4accb2d6a Issue-ID: CCSDK-911 Signed-off-by: Smokowski, Kevin (ks6305) --- .../java/org/onap/ccsdk/sli/plugins/template/TemplateNode.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/template-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/template/TemplateNode.java b/template-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/template/TemplateNode.java index 0b5850a0..7310b3fb 100644 --- a/template-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/template/TemplateNode.java +++ b/template-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/template/TemplateNode.java @@ -25,6 +25,7 @@ package org.onap.ccsdk.sli.plugins.template; import java.io.FileInputStream; import java.io.StringWriter; import java.util.Map; +import java.util.Map.Entry; import java.util.Properties; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; @@ -97,6 +98,10 @@ public class TemplateNode implements SvcLogicJavaPlugin { VelocityContext context = new VelocityContext(); context.put("ctx", ctx); context.put("params", params); + //Adding these values directly to context makes working with the values cleaner + for (Entry entry : params.entrySet()) { + context.put(entry.getKey(), entry.getValue()); + } StringWriter sw = new StringWriter(); template.merge(context, sw); ctx.setAttribute(outputPath, sw.toString()); @@ -106,4 +111,4 @@ public class TemplateNode implements SvcLogicJavaPlugin { } } -} \ No newline at end of file +} -- 2.16.6