Revert "Renaming Files having BluePrint to have Blueprint"1.1.5

The renaming in CCSDK-3098 caused breaking changes to the grpc api and
compile issues for kotlin scripts.

Issue-ID: CCSDK-3385
Change-Id: I0d745cb858371678eabcb2284671c1fd76a1ab6d
Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>

8 files changed, 65 insertions, 65 deletions

diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/BlueprintManagementGRPCHandlerTest.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/BluePrintManagementGRPCHandlerTest.kt
index ed60f721a..a2f208367 100644
--- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/BlueprintManagementGRPCHandlerTest.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/BluePrintManagementGRPCHandlerTest.kt
@@ -30,15 +30,15 @@ import org.onap.ccsdk.cds.blueprintsprocessor.grpc.service.TokenAuthGrpcClientSe
 import org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers
 import org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader
 import org.onap.ccsdk.cds.controllerblueprints.common.api.EventType
-import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintConstants
+import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants
 import org.onap.ccsdk.cds.controllerblueprints.core.compress
 import org.onap.ccsdk.cds.controllerblueprints.core.deleteDir
 import org.onap.ccsdk.cds.controllerblueprints.core.normalizedFile
-import org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintBootstrapInput
-import org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintDownloadInput
-import org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintManagementServiceGrpc
-import org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintRemoveInput
-import org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintUploadInput
+import org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintBootstrapInput
+import org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintDownloadInput
+import org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintManagementServiceGrpc
+import org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintRemoveInput
+import org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintUploadInput
 import org.onap.ccsdk.cds.controllerblueprints.management.api.DownloadAction
 import org.onap.ccsdk.cds.controllerblueprints.management.api.FileChunk
 import org.onap.ccsdk.cds.controllerblueprints.management.api.RemoveAction
@@ -58,13 +58,13 @@ import kotlin.test.assertTrue
     classes = [DesignerApiTestConfiguration::class, ErrorCatalogTestConfiguration::class]
 )
 @TestPropertySource(locations = ["classpath:application-test.properties"])
-class BlueprintManagementGRPCHandlerTest {
+class BluePrintManagementGRPCHandlerTest {
 
     @get:Rule
     val grpcServerRule = GrpcServerRule().directExecutor()
 
     @Autowired
-    lateinit var bluePrintManagementGRPCHandler: BlueprintManagementGRPCHandler
+    lateinit var bluePrintManagementGRPCHandler: BluePrintManagementGRPCHandler
 
     @BeforeTest
     fun init() {
@@ -86,13 +86,13 @@ class BlueprintManagementGRPCHandlerTest {
 
     @Test
     fun testBootstrap() {
-        val blockingStub = BlueprintManagementServiceGrpc.newBlockingStub(grpcServerRule.channel)
+        val blockingStub = BluePrintManagementServiceGrpc.newBlockingStub(grpcServerRule.channel)
         val id = "123_Bootstrap"
         val req = createBootstrapInputRequest(id)
         val bootstrapOutput = blockingStub.bootstrapBlueprint(req)
         assertEquals(200, bootstrapOutput.status.code)
         assertTrue(
-            bootstrapOutput.status.message!!.contentEquals(BlueprintConstants.STATUS_SUCCESS),
+            bootstrapOutput.status.message!!.contentEquals(BluePrintConstants.STATUS_SUCCESS),
             "failed to get success status"
         )
         assertEquals(EventType.EVENT_COMPONENT_EXECUTED, bootstrapOutput.status.eventType)
@@ -101,14 +101,14 @@ class BlueprintManagementGRPCHandlerTest {
 
     @Test
     fun `test upload and download blueprint`() {
-        val blockingStub = BlueprintManagementServiceGrpc.newBlockingStub(grpcServerRule.channel)
+        val blockingStub = BluePrintManagementServiceGrpc.newBlockingStub(grpcServerRule.channel)
         val id = "123_upload"
         val req = createUploadInputRequest(id, UploadAction.PUBLISH.toString())
         val output = blockingStub.uploadBlueprint(req)
 
         assertEquals(200, output.status.code)
         assertTrue(
-            output.status.message!!.contentEquals(BlueprintConstants.STATUS_SUCCESS),
+            output.status.message!!.contentEquals(BluePrintConstants.STATUS_SUCCESS),
             "failed to get success status"
         )
         assertEquals(EventType.EVENT_COMPONENT_EXECUTED, output.status.eventType)
@@ -120,7 +120,7 @@ class BlueprintManagementGRPCHandlerTest {
         val downloadOutput = blockingStub.downloadBlueprint(downloadReq)
         assertEquals(200, downloadOutput.status.code)
         assertTrue(
-            downloadOutput.status.message!!.contentEquals(BlueprintConstants.STATUS_SUCCESS),
+            downloadOutput.status.message!!.contentEquals(BluePrintConstants.STATUS_SUCCESS),
             "failed to get success status"
         )
         assertEquals(EventType.EVENT_COMPONENT_EXECUTED, downloadOutput.status.eventType)
@@ -130,14 +130,14 @@ class BlueprintManagementGRPCHandlerTest {
 
     @Test
     fun `test delete blueprint`() {
-        val blockingStub = BlueprintManagementServiceGrpc.newBlockingStub(grpcServerRule.channel)
+        val blockingStub = BluePrintManagementServiceGrpc.newBlockingStub(grpcServerRule.channel)
         val id = "123_delete"
         val req = createUploadInputRequest(id, UploadAction.DRAFT.toString())
 
         var output = blockingStub.uploadBlueprint(req)
         assertEquals(200, output.status.code)
         assertTrue(
-            output.status.message!!.contentEquals(BlueprintConstants.STATUS_SUCCESS),
+            output.status.message!!.contentEquals(BluePrintConstants.STATUS_SUCCESS),
             "failed to get success status"
         )
         assertEquals(id, output.commonHeader.requestId)
@@ -160,7 +160,7 @@ class BlueprintManagementGRPCHandlerTest {
             val basicAuthGrpcClientService = TokenAuthGrpcClientService(tokenAuthGrpcClientProperties)
             val channel = basicAuthGrpcClientService.channel()
 
-            val blockingStub = BlueprintManagementServiceGrpc.newBlockingStub(channel)
+            val blockingStub = BluePrintManagementServiceGrpc.newBlockingStub(channel)
 
             val bluePrintUploadInput = createUploadInputRequest("12345", UploadAction.DRAFT.toString())
 
@@ -169,7 +169,7 @@ class BlueprintManagementGRPCHandlerTest {
         }
     }
 
-    private fun createBootstrapInputRequest(id: String): BlueprintBootstrapInput {
+    private fun createBootstrapInputRequest(id: String): BluePrintBootstrapInput {
         val commonHeader = CommonHeader
             .newBuilder()
             .setTimestamp("2012-04-23T18:25:43.511Z")
@@ -177,7 +177,7 @@ class BlueprintManagementGRPCHandlerTest {
             .setRequestId(id)
             .setSubRequestId("1234-56").build()
 
-        return BlueprintBootstrapInput.newBuilder()
+        return BluePrintBootstrapInput.newBuilder()
             .setCommonHeader(commonHeader)
             .setLoadModelType(false)
             .setLoadResourceDictionary(false)
@@ -185,7 +185,7 @@ class BlueprintManagementGRPCHandlerTest {
             .build()
     }
 
-    private fun createUploadInputRequest(id: String, action: String): BlueprintUploadInput {
+    private fun createUploadInputRequest(id: String, action: String): BluePrintUploadInput {
         val file = normalizedFile("./target/blueprints/generated-cba.zip")
         assertTrue(file.exists(), "couldnt get file ${file.absolutePath}")
 
@@ -205,14 +205,14 @@ class BlueprintManagementGRPCHandlerTest {
         val fileChunk = FileChunk.newBuilder().setChunk(ByteString.copyFrom(file.inputStream().readBytes()))
             .build()
 
-        return BlueprintUploadInput.newBuilder()
+        return BluePrintUploadInput.newBuilder()
             .setCommonHeader(commonHeader)
             .setActionIdentifiers(actionIdentifier)
             .setFileChunk(fileChunk)
             .build()
     }
 
-    private fun createDownloadInputRequest(id: String, action: String): BlueprintDownloadInput {
+    private fun createDownloadInputRequest(id: String, action: String): BluePrintDownloadInput {
         val commonHeader = CommonHeader
             .newBuilder()
             .setTimestamp("2012-04-23T18:25:43.511Z")
@@ -220,7 +220,7 @@ class BlueprintManagementGRPCHandlerTest {
             .setRequestId(id)
             .setSubRequestId("1234-56").build()
 
-        return BlueprintDownloadInput.newBuilder()
+        return BluePrintDownloadInput.newBuilder()
             .setCommonHeader(commonHeader)
             .setActionIdentifiers(
                 ActionIdentifiers.newBuilder()
@@ -231,7 +231,7 @@ class BlueprintManagementGRPCHandlerTest {
             .build()
     }
 
-    private fun createRemoveInputRequest(id: String): BlueprintRemoveInput {
+    private fun createRemoveInputRequest(id: String): BluePrintRemoveInput {
         val commonHeader = CommonHeader
             .newBuilder()
             .setTimestamp("2012-04-23T18:25:43.511Z")
@@ -239,7 +239,7 @@ class BlueprintManagementGRPCHandlerTest {
             .setRequestId(id)
             .setSubRequestId("1234-56").build()
 
-        return BlueprintRemoveInput.newBuilder()
+        return BluePrintRemoveInput.newBuilder()
             .setCommonHeader(commonHeader)
             .setActionIdentifiers(
                 ActionIdentifiers.newBuilder()
diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/BlueprintModelControllerTest.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/BlueprintModelControllerTest.kt
index 92f369b01..a42ac05e7 100644
--- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/BlueprintModelControllerTest.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/BlueprintModelControllerTest.kt
@@ -28,7 +28,7 @@ import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
 import org.onap.ccsdk.cds.blueprintsprocessor.db.primary.domain.BlueprintModelSearch
 import org.onap.ccsdk.cds.controllerblueprints.core.compress
-import org.onap.ccsdk.cds.controllerblueprints.core.config.BlueprintLoadConfiguration
+import org.onap.ccsdk.cds.controllerblueprints.core.config.BluePrintLoadConfiguration
 import org.onap.ccsdk.cds.controllerblueprints.core.deleteDir
 import org.onap.ccsdk.cds.controllerblueprints.core.logger
 import org.onap.ccsdk.cds.controllerblueprints.core.normalizedFile
@@ -79,7 +79,7 @@ class BlueprintModelControllerTest {
     @Autowired
     lateinit var webTestClient: WebTestClient
 
-    private var bluePrintLoadConfiguration: BlueprintLoadConfiguration? = null
+    private var bluePrintLoadConfiguration: BluePrintLoadConfiguration? = null
 
     private val blueprintDir = "./../../../../../components/model-catalog/blueprint-model/test-blueprint/baseconfiguration"
     private var zipBlueprintFileName: String? = null
@@ -90,7 +90,7 @@ class BlueprintModelControllerTest {
     fun setUp() {
         assertNotNull(webTestClient, " Failed to create WebTestClient")
 
-        bluePrintLoadConfiguration = BlueprintLoadConfiguration().apply {
+        bluePrintLoadConfiguration = BluePrintLoadConfiguration().apply {
             blueprintArchivePath = "./target/blueprints/archive"
             blueprintWorkingPath = "./target/blueprints/work"
             blueprintDeployPath = "./target/blueprints/deploy"
@@ -113,7 +113,7 @@ class BlueprintModelControllerTest {
     }
 
     @Test
-    fun test01_saveBlueprint() {
+    fun test01_saveBluePrint() {
         bp = runBlocking {
             val body = MultipartBodyBuilder().apply {
                 part(
@@ -146,7 +146,7 @@ class BlueprintModelControllerTest {
 
     @Test
     @Throws(JSONException::class)
-    fun test02_getBlueprintByNameAndVersion() {
+    fun test02_getBluePrintByNameAndVersion() {
         webTestClient(
             HttpMethod.GET, null,
             "/api/v1/blueprint-model/by-name/${bp!!.artifactName}/version/${bp!!.artifactVersion}",
@@ -172,7 +172,7 @@ class BlueprintModelControllerTest {
 
     @Test
     @Throws(JSONException::class)
-    fun test05_downloadBlueprint() {
+    fun test05_downloadBluePrint() {
         webTestClient(
             HttpMethod.GET, null,
             "/api/v1/blueprint-model/download/${bp!!.id}",
@@ -237,7 +237,7 @@ class BlueprintModelControllerTest {
     }
 
     @Test
-    fun test10_deleteBlueprint() {
+    fun test10_deleteBluePrint() {
         //        webTestClient.delete().uri("/api/v1/blueprint-model/${bp!!.id}")
         //                .header("Authorization", "Basic " + Base64Utils
         //                        .encodeToString(("ccsdkapps" + ":" + "ccsdkapps").toByteArray(UTF_8)))
diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/ModelTypeControllerTest.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/ModelTypeControllerTest.kt
index bcce13e4c..8226aaad0 100644
--- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/ModelTypeControllerTest.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/ModelTypeControllerTest.kt
@@ -23,7 +23,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
 import org.onap.ccsdk.cds.blueprintsprocessor.designer.api.domain.ModelType
-import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintConstants
+import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants
 import org.onap.ccsdk.cds.controllerblueprints.core.logger
 import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils
 import org.springframework.beans.factory.annotation.Autowired
@@ -56,15 +56,15 @@ class ModelTypeControllerTest {
 
             val content = JacksonUtils.getClassPathFileContent("model_type/data_type/datatype-property.json")
             var modelType = ModelType()
-            modelType.definitionType = BlueprintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE
-            modelType.derivedFrom = BlueprintConstants.MODEL_TYPE_DATATYPES_ROOT
+            modelType.definitionType = BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE
+            modelType.derivedFrom = BluePrintConstants.MODEL_TYPE_DATATYPES_ROOT
             modelType.description = "Definition for Sample Datatype "
             modelType.definition = JacksonUtils.jsonNode(content)
             modelType.modelName = modelName
             modelType.version = "1.0.0"
             modelType.tags = (
-                "test-datatype ," + BlueprintConstants.MODEL_TYPE_DATATYPES_ROOT + "," +
-                    BlueprintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE
+                "test-datatype ," + BluePrintConstants.MODEL_TYPE_DATATYPES_ROOT + "," +
+                    BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE
                 )
             modelType.updatedBy = "xxxxxx@xxx.com"
             modelType = modelTypeController.saveModelType(modelType)
@@ -108,7 +108,7 @@ class ModelTypeControllerTest {
             Assert.assertNotNull("Failed to get Id for api call  getModelByName ", dbModelType!!.modelName)
 
             val dbDatatypeModelTypes =
-                modelTypeController.getModelTypeByDefinitionType(BlueprintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE)
+                modelTypeController.getModelTypeByDefinitionType(BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE)
             Assert.assertNotNull("Failed to find getModelTypeByDefinitionType by tags", dbDatatypeModelTypes)
             Assert.assertTrue("Failed to find getModelTypeByDefinitionType by count", dbDatatypeModelTypes.isNotEmpty())
         }
diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/TestDatabaseConfiguration.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/TestDatabaseConfiguration.kt
index 7fcea4dcc..6808a2717 100644
--- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/TestDatabaseConfiguration.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/TestDatabaseConfiguration.kt
@@ -16,7 +16,7 @@
 
 package org.onap.ccsdk.cds.blueprintsprocessor.designer.api
 
-import org.onap.ccsdk.cds.blueprintsprocessor.db.BlueprintDBLibConfiguration
+import org.onap.ccsdk.cds.blueprintsprocessor.db.BluePrintDBLibConfiguration
 import org.onap.ccsdk.cds.blueprintsprocessor.db.PrimaryDataSourceProperties
 import org.onap.ccsdk.cds.blueprintsprocessor.db.primary.PrimaryDatabaseConfiguration
 import org.springframework.context.annotation.Bean
@@ -29,7 +29,7 @@ import org.springframework.transaction.PlatformTransactionManager
 import javax.sql.DataSource
 
 @Configuration
-@Import(BlueprintDBLibConfiguration::class)
+@Import(BluePrintDBLibConfiguration::class)
 @EnableJpaRepositories(
     basePackages = [
         "org.onap.ccsdk.cds.blueprintsprocessor.db.primary",
diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/enhancer/BlueprintEnhancerServiceImplTest.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/enhancer/BluePrintEnhancerServiceImplTest.kt
index 8bdfbbb22..a866dcad3 100644
--- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/enhancer/BlueprintEnhancerServiceImplTest.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/enhancer/BluePrintEnhancerServiceImplTest.kt
@@ -25,8 +25,8 @@ import org.onap.ccsdk.cds.blueprintsprocessor.designer.api.DesignerApiTestConfig
 import org.onap.ccsdk.cds.blueprintsprocessor.designer.api.load.ModelTypeLoadService
 import org.onap.ccsdk.cds.blueprintsprocessor.designer.api.load.ResourceDictionaryLoadService
 import org.onap.ccsdk.cds.controllerblueprints.core.deleteDir
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BlueprintEnhancerService
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BlueprintValidatorService
+import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintEnhancerService
+import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintValidatorService
 import org.onap.ccsdk.cds.controllerblueprints.core.normalizedPathName
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.test.context.ContextConfiguration
@@ -38,7 +38,7 @@ import org.springframework.test.context.junit4.SpringRunner
     classes = [DesignerApiTestConfiguration::class]
 )
 @TestPropertySource(locations = ["classpath:application-test.properties"])
-class BlueprintEnhancerServiceImplTest {
+class BluePrintEnhancerServiceImplTest {
 
     @Autowired
     lateinit var modelTypeLoadService: ModelTypeLoadService
@@ -47,10 +47,10 @@ class BlueprintEnhancerServiceImplTest {
     lateinit var resourceDictionaryLoadService: ResourceDictionaryLoadService
 
     @Autowired
-    lateinit var bluePrintEnhancerService: BlueprintEnhancerService
+    lateinit var bluePrintEnhancerService: BluePrintEnhancerService
 
     @Autowired
-    lateinit var bluePrintValidatorService: BlueprintValidatorService
+    lateinit var bluePrintValidatorService: BluePrintValidatorService
 
     @Test
     @Throws(Exception::class)
@@ -100,8 +100,8 @@ class BlueprintEnhancerServiceImplTest {
             val bluePrintContext = bluePrintEnhancerService.enhance(basePath, targetPath)
             Assert.assertNotNull("failed to get blueprintContext ", bluePrintContext)
 
-            // Validate the Generated Blueprints
-            val valid = bluePrintValidatorService.validateBlueprints(targetPath)
+            // Validate the Generated BluePrints
+            val valid = bluePrintValidatorService.validateBluePrints(targetPath)
             Assert.assertTrue("blueprint($basePath) validation failed ", valid)
 
             // Enable this to get the enhanced zip file
diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/handler/ModelTypeServiceTest.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/handler/ModelTypeServiceTest.kt
index 3112bfb66..8ee2eb3a2 100644
--- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/handler/ModelTypeServiceTest.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/handler/ModelTypeServiceTest.kt
@@ -24,7 +24,7 @@ import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
 import org.onap.ccsdk.cds.blueprintsprocessor.designer.api.DesignerApiTestConfiguration
 import org.onap.ccsdk.cds.blueprintsprocessor.designer.api.domain.ModelType
-import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintConstants
+import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants
 import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
@@ -57,15 +57,15 @@ class ModelTypeServiceTest {
 
             val content = JacksonUtils.getClassPathFileContent("model_type/data_type/datatype-property.json")
             var modelType = ModelType()
-            modelType.definitionType = BlueprintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE
-            modelType.derivedFrom = BlueprintConstants.MODEL_TYPE_DATATYPES_ROOT
+            modelType.definitionType = BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE
+            modelType.derivedFrom = BluePrintConstants.MODEL_TYPE_DATATYPES_ROOT
             modelType.description = "Definition for Sample Datatype "
             modelType.definition = JacksonUtils.jsonNode(content)
             modelType.modelName = modelName
             modelType.version = "1.0.0"
             modelType.tags = (
-                "test-datatype ," + BlueprintConstants.MODEL_TYPE_DATATYPES_ROOT + "," +
-                    BlueprintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE
+                "test-datatype ," + BluePrintConstants.MODEL_TYPE_DATATYPES_ROOT + "," +
+                    BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE
                 )
             modelType.updatedBy = "xxxxxx@xxx.com"
             modelType = modelTypeHandler!!.saveModel(modelType)
@@ -110,11 +110,11 @@ class ModelTypeServiceTest {
             Assert.assertNotNull("Failed to get response for api call getModelByName ", dbModelType)
             Assert.assertNotNull("Failed to get Id for api call  getModelByName ", dbModelType!!.modelName)
 
-            val dbDatatypeModelTypes = modelTypeHandler.getModelTypeByDefinitionType(BlueprintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE)
+            val dbDatatypeModelTypes = modelTypeHandler.getModelTypeByDefinitionType(BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE)
             Assert.assertNotNull("Failed to find getModelTypeByDefinitionType by tags", dbDatatypeModelTypes)
             Assert.assertTrue("Failed to find getModelTypeByDefinitionType by count", dbDatatypeModelTypes.size > 0)
 
-            val dbModelTypeByDerivedFroms = modelTypeHandler.getModelTypeByDerivedFrom(BlueprintConstants.MODEL_TYPE_DATATYPES_ROOT)
+            val dbModelTypeByDerivedFroms = modelTypeHandler.getModelTypeByDerivedFrom(BluePrintConstants.MODEL_TYPE_DATATYPES_ROOT)
             Assert.assertNotNull("Failed to find getModelTypeByDerivedFrom by tags", dbModelTypeByDerivedFroms)
             Assert.assertTrue("Failed to find getModelTypeByDerivedFrom by count", dbModelTypeByDerivedFroms.size > 0)
         }
diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/repository/ModelTypeReactRepositoryTest.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/repository/ModelTypeReactRepositoryTest.kt
index 9bc8c6291..ca85ed22f 100644
--- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/repository/ModelTypeReactRepositoryTest.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/repository/ModelTypeReactRepositoryTest.kt
@@ -23,7 +23,7 @@ import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
 import org.onap.ccsdk.cds.blueprintsprocessor.designer.api.DesignerApiTestConfiguration
 import org.onap.ccsdk.cds.blueprintsprocessor.designer.api.domain.ModelType
-import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintConstants
+import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants
 import org.onap.ccsdk.cds.controllerblueprints.core.normalizedFile
 import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils
 import org.springframework.beans.factory.annotation.Autowired
@@ -59,15 +59,15 @@ class ModelTypeReactRepositoryTest {
         val content = normalizedFile("./src/test/resources/model_type/data_type/datatype-property.json")
             .readText(Charset.defaultCharset())
         val modelType = ModelType()
-        modelType.definitionType = BlueprintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE
-        modelType.derivedFrom = BlueprintConstants.MODEL_TYPE_DATATYPES_ROOT
+        modelType.definitionType = BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE
+        modelType.derivedFrom = BluePrintConstants.MODEL_TYPE_DATATYPES_ROOT
         modelType.description = "Definition for Sample Datatype "
         modelType.definition = JacksonUtils.jsonNode(content)
         modelType.modelName = modelName
         modelType.version = "1.0.0"
         modelType.tags = (
-            "test-datatype ," + BlueprintConstants.MODEL_TYPE_DATATYPES_ROOT + "," +
-                BlueprintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE
+            "test-datatype ," + BluePrintConstants.MODEL_TYPE_DATATYPES_ROOT + "," +
+                BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE
             )
         modelType.updatedBy = "xxxxxx@xxx.com"
 
@@ -81,11 +81,11 @@ class ModelTypeReactRepositoryTest {
         Assert.assertNotNull("Failed to findByModelName ", dbFindByModelName)
 
         val dbFindByDefinitionType =
-            modelTypeReactRepository.findByDefinitionType(BlueprintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE).collectList().block()
+            modelTypeReactRepository.findByDefinitionType(BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE).collectList().block()
         Assert.assertNotNull("Failed to findByDefinitionType ", dbFindByDefinitionType)
         Assert.assertTrue("Failed to findByDefinitionType count", dbFindByDefinitionType!!.size > 0)
 
-        val dbFindByDerivedFrom = modelTypeReactRepository.findByDerivedFrom(BlueprintConstants.MODEL_TYPE_DATATYPES_ROOT).collectList().block()
+        val dbFindByDerivedFrom = modelTypeReactRepository.findByDerivedFrom(BluePrintConstants.MODEL_TYPE_DATATYPES_ROOT).collectList().block()
         Assert.assertNotNull("Failed to find findByDerivedFrom", dbFindByDerivedFrom)
         Assert.assertTrue("Failed to find findByDerivedFrom by count", dbFindByDerivedFrom!!.size > 0)
 
@@ -94,12 +94,12 @@ class ModelTypeReactRepositoryTest {
         Assert.assertTrue("Failed to findByModelNameIn by count", dbFindByModelNameIn!!.size > 0)
 
         val dbFindByDefinitionTypeIn =
-            modelTypeReactRepository.findByDefinitionTypeIn(Arrays.asList(BlueprintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE)).collectList().block()
+            modelTypeReactRepository.findByDefinitionTypeIn(Arrays.asList(BluePrintConstants.MODEL_DEFINITION_TYPE_DATA_TYPE)).collectList().block()
         Assert.assertNotNull("Failed to findByDefinitionTypeIn", dbFindByDefinitionTypeIn)
         Assert.assertTrue("Failed to findByDefinitionTypeIn by count", dbFindByDefinitionTypeIn!!.size > 0)
 
         val dbFindByDerivedFromIn =
-            modelTypeReactRepository.findByDerivedFromIn(Arrays.asList(BlueprintConstants.MODEL_TYPE_DATATYPES_ROOT)).collectList().block()
+            modelTypeReactRepository.findByDerivedFromIn(Arrays.asList(BluePrintConstants.MODEL_TYPE_DATATYPES_ROOT)).collectList().block()
         Assert.assertNotNull("Failed to find findByDerivedFromIn", dbFindByDerivedFromIn)
         Assert.assertTrue("Failed to find findByDerivedFromIn by count", dbFindByDerivedFromIn!!.size > 0)
     }
diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/utils/BlueprintEnhancerUtilsTest.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/utils/BluePrintEnhancerUtilsTest.kt
index 461af84c4..c644aeedd 100644
--- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/utils/BlueprintEnhancerUtilsTest.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/utils/BluePrintEnhancerUtilsTest.kt
@@ -29,7 +29,7 @@ import org.onap.ccsdk.cds.controllerblueprints.core.reCreateDirs
 import java.util.UUID
 import kotlin.test.assertTrue
 
-class BlueprintEnhancerUtilsTest {
+class BluePrintEnhancerUtilsTest {
 
     private val blueprintDir = "./../../../../../components/model-catalog/blueprint-model/test-blueprint/baseconfiguration"
     private val blueprintArchivePath: String = "./target/blueprints/archive"
@@ -61,8 +61,8 @@ class BlueprintEnhancerUtilsTest {
             val enhanceId = UUID.randomUUID().toString()
             val blueprintArchiveLocation = normalizedPathName(blueprintArchivePath, enhanceId)
             val blueprintEnrichmentLocation = normalizedPathName(blueprintEnrichmentPath, enhanceId)
-            BlueprintEnhancerUtils.copyFilePartToEnhanceDir(filePart, blueprintArchiveLocation, blueprintEnrichmentLocation)
-            BlueprintEnhancerUtils.compressEnhanceDirAndReturnFilePart(blueprintEnrichmentLocation, blueprintArchiveLocation)
+            BluePrintEnhancerUtils.copyFilePartToEnhanceDir(filePart, blueprintArchiveLocation, blueprintEnrichmentLocation)
+            BluePrintEnhancerUtils.compressEnhanceDirAndReturnFilePart(blueprintEnrichmentLocation, blueprintArchiveLocation)
         }
     }
 }