Formatting Code base with ktlint

[ccsdk/cds.git] / ms / controllerblueprints / modules / blueprint-core / src / main / kotlin / org / onap / ccsdk / cds / controllerblueprints / core / service / BluePrintVelocityTemplateService.kt

diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/service/BluePrintVelocityTemplateService.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/service/BluePrintVelocityTemplateService.kt
index 43e6d22..43e27d0 100644 (file)
--- a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/service/BluePrintVelocityTemplateService.kt
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/service/BluePrintVelocityTemplateService.kt
@@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import org.apache.commons.lang3.BooleanUtils
 import org.apache.commons.lang3.StringUtils
 import org.apache.velocity.VelocityContext
-import org.apache.velocity.app.Velocity
+import org.apache.velocity.app.VelocityEngine
 import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintProcessorException
 import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintJsonNodeFactory
 import org.onap.ccsdk.cds.controllerblueprints.core.removeNullNode
@@ -34,8 +34,12 @@ object BluePrintVelocityTemplateService {
     /**
      * Generate Content from Velocity Template and JSON Content with injected API
      */
-    fun generateContent(template: String, json: String, ignoreJsonNull: Boolean = false,
-                        additionalContext: MutableMap<String, Any> = mutableMapOf()): String {
+    fun generateContent(
+        template: String,
+        json: String,
+        ignoreJsonNull: Boolean = false,
+        additionalContext: MutableMap<String, Any> = mutableMapOf()
+    ): String {
 
         // Customized Object Mapper to remove String double quotes
         val mapper = ObjectMapper()
@@ -44,7 +48,7 @@ object BluePrintVelocityTemplateService {
 
         val jsonNode: JsonNode? = if (json.isNotEmpty()) {
             mapper.readValue(json, JsonNode::class.java)
-                    ?: throw BluePrintProcessorException("couldn't get json node from json")
+                ?: throw BluePrintProcessorException("couldn't get json node from json")
         } else {
             null
         }
@@ -54,10 +58,22 @@ object BluePrintVelocityTemplateService {
     /**
      * Generate Content from Velocity Template and JSON Node with injected API
      */
-    fun generateContent(template: String, jsonNode: JsonNode?, ignoreJsonNull: Boolean = false,
-                        additionalContext: MutableMap<String, Any> = mutableMapOf()): String {
+    fun generateContent(
+        template: String,
+        jsonNode: JsonNode?,
+        ignoreJsonNull: Boolean = false,
+        additionalContext: MutableMap<String, Any> = mutableMapOf()
+    ): String {
 
-        Velocity.init()
+        /*
+         *  create a new instance of the velocity engine
+         */
+        val velocity = VelocityEngine()
+
+        /*
+         *  initialize the engine
+         */
+        velocity.init()
 
         val velocityContext = VelocityContext()
         velocityContext.put("StringUtils", StringUtils::class.java)
@@ -76,9 +92,8 @@ object BluePrintVelocityTemplateService {
         }
 
         val stringWriter = StringWriter()
-        Velocity.evaluate(velocityContext, stringWriter, "TemplateData", template)
+        velocity.evaluate(velocityContext, stringWriter, "TemplateData", template)
         stringWriter.flush()
         return stringWriter.toString()
-
     }
 }