Add Blueprint File utils

Change-Id: I9896d934684343358d1c0c7e321725511430c7e6
Issue-ID: CCSDK-783
Signed-off-by: Muthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>

diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/BluePrintEnhancerService.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/BluePrintEnhancerService.java
index ef3b4a4..7ea81da 100644 (file)
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/BluePrintEnhancerService.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/BluePrintEnhancerService.java
@@ -17,6 +17,8 @@
 \r
 package org.onap.ccsdk.apps.controllerblueprints.service;\r
 \r
+import com.att.eelf.configuration.EELFLogger;\r
+import com.att.eelf.configuration.EELFManager;\r
 import com.fasterxml.jackson.databind.JsonNode;\r
 import com.google.common.base.Preconditions;\r
 import org.apache.commons.collections.MapUtils;\r
@@ -25,13 +27,14 @@ import org.jetbrains.annotations.NotNull;
 import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException;\r
 import org.onap.ccsdk.apps.controllerblueprints.core.ConfigModelConstant;\r
 import org.onap.ccsdk.apps.controllerblueprints.core.data.*;\r
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.service.ResourceDefinitionRepoService;\r
-import org.onap.ccsdk.apps.controllerblueprints.service.enhancer.BluePrintEnhancerDefaultService;\r
 import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils;\r
 import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment;\r
-import com.att.eelf.configuration.EELFLogger;\r
-import com.att.eelf.configuration.EELFManager;\r
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.service.ResourceDefinitionRepoService;\r
+import org.onap.ccsdk.apps.controllerblueprints.service.enhancer.BluePrintEnhancerDefaultService;\r
 import org.onap.ccsdk.apps.controllerblueprints.service.enhancer.ResourceAssignmentEnhancerService;\r
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;\r
+import org.springframework.context.annotation.Scope;\r
+import org.springframework.context.annotation.ScopedProxyMode;\r
 import org.springframework.stereotype.Service;\r
 \r
 import java.util.HashMap;\r
@@ -45,6 +48,7 @@ import java.util.Map;
  */\r
 \r
 @Service\r
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE, proxyMode = ScopedProxyMode.TARGET_CLASS)\r
 public class BluePrintEnhancerService extends BluePrintEnhancerDefaultService {\r
 \r
     private static EELFLogger log = EELFManager.getInstance().getLogger(BluePrintEnhancerService.class);\r

diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/ConfigModelValidatorService.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/ConfigModelValidatorService.java
index 21b00f8..3abdc04 100644 (file)
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/ConfigModelValidatorService.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/ConfigModelValidatorService.java
@@ -30,7 +30,7 @@ import org.springframework.stereotype.Service;
  * @author Brinda Santh\r
  * @version 1.0\r
  */\r
-\r
+@Deprecated\r
 @Service\r
 public class ConfigModelValidatorService {\r
 \r

diff --git a/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/BluePrintEnhancerService.kt b/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/BluePrintEnhancerService.kt
index 46709c5..2c13d86 100644 (file)
--- a/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/BluePrintEnhancerService.kt
+++ b/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/BluePrintEnhancerService.kt
@@ -17,14 +17,16 @@
 \r
 package org.onap.ccsdk.apps.controllerblueprints.service.enhancer\r
 \r
+import com.att.eelf.configuration.EELFLogger\r
+import com.att.eelf.configuration.EELFManager\r
 import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException\r
 import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintTypes\r
 import org.onap.ccsdk.apps.controllerblueprints.core.data.*\r
 import org.onap.ccsdk.apps.controllerblueprints.core.format\r
-import com.att.eelf.configuration.EELFLogger\r
-import com.att.eelf.configuration.EELFManager\r
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintContext\r
 import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRepoService\r
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonReactorUtils\r
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.BluePrintFileUtils\r
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.BluePrintMetadataUtils\r
 import java.io.Serializable\r
 \r
 /**\r
@@ -35,13 +37,13 @@ import java.io.Serializable
 interface BluePrintEnhancerService : Serializable {\r
 \r
     @Throws(BluePrintException::class)\r
-    fun enhance(content: String): ServiceTemplate\r
+    fun enhance(basePath: String, enrichedBasePath: String): BluePrintContext\r
 \r
     /**\r
-     * Read Blueprint from CSAR structure Directory\r
+     * Read Blueprint from CBA structure Directory\r
      */\r
     @Throws(BluePrintException::class)\r
-    fun enhance(fileName: String, basePath: String): ServiceTemplate\r
+    fun enhance(basePath: String): BluePrintContext\r
 \r
     @Throws(BluePrintException::class)\r
     fun enhance(serviceTemplate: ServiceTemplate): ServiceTemplate\r
@@ -62,16 +64,19 @@ open class BluePrintEnhancerDefaultService(val bluePrintRepoService: BluePrintRe
 \r
     lateinit var serviceTemplate: ServiceTemplate\r
 \r
-    @Throws(BluePrintException::class)\r
-    override fun enhance(content: String): ServiceTemplate {\r
-        return JacksonReactorUtils.readValueFromFile(content, ServiceTemplate::class.java).map { serviceTemplate ->\r
-            enhance(serviceTemplate!!)\r
-        }.block()!!\r
+    override fun enhance(basePath: String, enrichedBasePath: String): BluePrintContext {\r
+        BluePrintFileUtils.copyBluePrint(basePath, enrichedBasePath)\r
+        BluePrintFileUtils.deleteBluePrintTypes(enrichedBasePath)\r
+        val enhancedBluePrintContext = enhance(enrichedBasePath)\r
+        BluePrintFileUtils.writeBluePrintTypes(enhancedBluePrintContext)\r
+        return enhancedBluePrintContext\r
     }\r
 \r
     @Throws(BluePrintException::class)\r
-    override fun enhance(fileName: String, basePath: String): ServiceTemplate {\r
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.\r
+    override fun enhance(basePath: String): BluePrintContext {\r
+        val bluePrintContext = BluePrintMetadataUtils.getBluePrintContext(basePath)\r
+        enhance(bluePrintContext.serviceTemplate)\r
+        return bluePrintContext\r
     }\r
 \r
     @Throws(BluePrintException::class)\r
@@ -88,10 +93,12 @@ open class BluePrintEnhancerDefaultService(val bluePrintRepoService: BluePrintRe
         serviceTemplate.artifactTypes?.clear()\r
         serviceTemplate.nodeTypes?.clear()\r
         serviceTemplate.dataTypes?.clear()\r
+        serviceTemplate.policyTypes?.clear()\r
 \r
-        serviceTemplate.artifactTypes = HashMap()\r
-        serviceTemplate.nodeTypes = HashMap()\r
-        serviceTemplate.dataTypes = HashMap()\r
+        serviceTemplate.artifactTypes = mutableMapOf()\r
+        serviceTemplate.nodeTypes = mutableMapOf()\r
+        serviceTemplate.dataTypes = mutableMapOf()\r
+        serviceTemplate.policyTypes = mutableMapOf()\r
 \r
     }\r
 \r