import com.fasterxml.jackson.databind.ObjectMapper
import com.hubspot.jinjava.Jinjava
import com.hubspot.jinjava.JinjavaConfig
+import com.hubspot.jinjava.interpret.Context
+import com.hubspot.jinjava.interpret.InterpreterFactory
import com.hubspot.jinjava.interpret.JinjavaInterpreter
import com.hubspot.jinjava.loader.ResourceLocator
import com.hubspot.jinjava.loader.ResourceNotFoundException
+import com.hubspot.jinjava.objects.serialization.PyishObjectMapper
import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintProcessorException
import org.onap.ccsdk.cds.controllerblueprints.core.config.BluePrintLoadConfiguration
import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintJsonNodeFactory
import java.nio.charset.Charset
import java.nio.file.Files.readAllBytes
import java.nio.file.Paths
+import java.util.Objects
object BluePrintJinjaTemplateService {
additionalContext: MutableMap<String, Any>,
resourceLocator: ResourceLocator? = null
): String {
- val jinJava = Jinjava(JinjavaConfig())
- if (resourceLocator != null) {
- jinJava.resourceLocator = resourceLocator
- }
-
- val mapper = ObjectMapper()
- val nodeFactory = BluePrintJsonNodeFactory()
- mapper.nodeFactory = nodeFactory
-
// Add the JSON Data to the context
if (json.isNotEmpty()) {
- val jsonNode = mapper.readValue<JsonNode>(json, JsonNode::class.java)
+ val mapper = ObjectMapper().setNodeFactory(BluePrintJsonNodeFactory())
+ val jsonNode = mapper.readValue(json, JsonNode::class.java)
?: throw BluePrintProcessorException("couldn't get json node from json")
if (ignoreJsonNull) {
jsonNode.removeNullNode()
}
+ additionalContext.putAll(mapper.readValue(json, object : TypeReference<Map<String, Any>>() {}))
+ }
+
+ val jinjava = Jinjava(
+ JinjavaConfig(object : InterpreterFactory {
+ override fun newInstance(interpreter: JinjavaInterpreter): JinjavaInterpreter {
+ return CustomJinjavaInterpreter(interpreter)
+ }
- val jsonMap: Map<String, Any> = mapper.readValue(json, object : TypeReference<Map<String, Any>>() {})
- additionalContext.putAll(jsonMap)
+ override fun newInstance(jinjava: Jinjava, context: Context, config: JinjavaConfig): JinjavaInterpreter {
+ return CustomJinjavaInterpreter(jinjava, context, config)
+ }
+ })
+ )
+
+ if (resourceLocator != null) {
+ jinjava.resourceLocator = resourceLocator
}
- return jinJava.render(template, additionalContext)
+ return jinjava.render(template, additionalContext)
+ }
+
+ class CustomJinjavaInterpreter : JinjavaInterpreter {
+ constructor(interpreter: JinjavaInterpreter) : super(interpreter)
+ constructor(jinjava: Jinjava, context: Context, config: JinjavaConfig) : super(jinjava, context, config)
+
+ // Overriding actual getAsString method to return `context.currentNode.master.image` instead of empty string
+ override fun getAsString(`object`: Any?): String {
+ return if (config.legacyOverrides.isUsePyishObjectMapper)
+ PyishObjectMapper.getAsUnquotedPyishString(`object`)
+ else
+ Objects.toString(`object`, context.currentNode.master.image)
+ }
}
}
)
val content = BluePrintJinjaTemplateService.generateContent(template, json, false, element)
- assertNotNull(content, "failed to generate content for velocity template")
+ assertNotNull(content, "failed to generate content for jinja template")
}
}
@Test
- fun `no value variable should evaluate to default value - standalone template mesh test`() {
+ fun `Unresolved variable should be kept as-is - standalone velocity template mesh test`() {
runBlocking {
val template =
JacksonUtils.getClassPathFileContent("templates/default-variable-value-velocity-template.vtl")
val json = JacksonUtils.getClassPathFileContent("templates/default-variable-value-data.json")
val content = BluePrintVelocityTemplateService.generateContent(template, json)
- // first line represents a variable whose value was successfully retrieved, second line contains a variable
- // whose value could not be evaluated
- val expected = "sample-hostname\n\${node0_backup_router_address}"
+ // first line represents a variable whose value was successfully retrieved,
+ // second line contains a variable whose value could not be evaluated
+ val expected = "sample-node0_hostname\n\${node0_backup_router_address}"
assertEquals(expected, content, "No value variable should use default value")
}
}
+
+ @Test
+ fun `Unresolved variable should be kept as-is - standalone jinja template mesh test`() {
+ runBlocking {
+ val context = JacksonUtils.getClassPathFileContent("templates/default-variable-value-data.json")
+ val jinjaTemplate =
+ JacksonUtils.getClassPathFileContent("templates/default-variable-jinja-template.jinja")
+ val renderedContent =
+ BluePrintJinjaTemplateService.generateContent(jinjaTemplate, context, false, mutableMapOf())
+ val expectedContent =
+ JacksonUtils.getClassPathFileContent("templates/default-variable-jinja-template-resolved.jinja")
+ assertEquals(expectedContent, renderedContent, "No value variable should use default value")
+ }
+ }
}
Code Review / ccsdk / cds.git / commitdiff