Refactor handlers, services to designer api.

Change-Id: I3bc56e14fca332c0c0b661bb7e8a501a2dadbe91
Issue-ID: CCSDK-1663
Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>

7 files changed, 0 insertions, 554 deletions

diff --git a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/ModelTypeServiceTest.kt b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/ModelTypeServiceTest.kt
deleted file mode 100644
index e55f2a511..000000000
--- a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/ModelTypeServiceTest.kt
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- *  Copyright © 2019 IBM.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.onap.ccsdk.cds.controllerblueprints.service
-
-import kotlinx.coroutines.runBlocking
-import org.junit.Assert
-import org.junit.FixMethodOrder
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.MethodSorters
-import org.onap.ccsdk.cds.controllerblueprints.TestApplication
-import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants
-import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils
-import org.onap.ccsdk.cds.controllerblueprints.service.domain.ModelType
-import org.onap.ccsdk.cds.controllerblueprints.service.handler.ModelTypeHandler
-import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest
-import org.springframework.test.annotation.Commit
-import org.springframework.test.context.ContextConfiguration
-import org.springframework.test.context.junit4.SpringRunner
-import org.springframework.transaction.annotation.Propagation
-import org.springframework.transaction.annotation.Transactional
-
-
-@RunWith(SpringRunner::class)
-@DataJpaTest
-@Transactional(propagation = Propagation.NOT_SUPPORTED)
-@ContextConfiguration(classes = [TestApplication::class])
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-class ModelTypeServiceTest {
-    @Autowired
-    private val modelTypeHandler: ModelTypeHandler? = null
-
-    internal var modelName = "test-datatype"
-
-    private val log = LoggerFactory.getLogger(ModelTypeServiceTest::class.java)
-
-    @Test
-    @Commit
-    @Throws(Exception::class)
-    fun test01SaveModelType() {
-        runBlocking {
-            log.info("**************** test01SaveModelType  ********************")
-
-            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.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)
-            modelType.updatedBy = "xxxxxx@xxx.com"
-            modelType = modelTypeHandler!!.saveModel(modelType)
-            log.info("Saved Mode {}", modelType.toString())
-            Assert.assertNotNull("Failed to get Saved ModelType", modelType)
-            Assert.assertNotNull("Failed to get Saved ModelType, Id", modelType.modelName)
-
-            val dbModelType = modelTypeHandler.getModelTypeByName(modelType.modelName)
-            Assert.assertNotNull("Failed to query ResourceMapping for ID (" + dbModelType!!.modelName + ")",
-                    dbModelType)
-
-            // Model Update
-            modelType.updatedBy = "bs2796@xxx.com"
-            modelType = modelTypeHandler.saveModel(modelType)
-            Assert.assertNotNull("Failed to get Saved ModelType", modelType)
-            Assert.assertEquals("Failed to get Saved getUpdatedBy ", "bs2796@xxx.com", modelType.updatedBy)
-        }
-
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun test02SearchModelTypes() {
-        runBlocking {
-            log.info("*********************** test02SearchModelTypes  ***************************")
-
-            val tags = "test-datatype"
-
-            val dbModelTypes = modelTypeHandler!!.searchModelTypes(tags)
-            Assert.assertNotNull("Failed to search ResourceMapping by tags", dbModelTypes)
-            Assert.assertTrue("Failed to search ResourceMapping by tags count", dbModelTypes.size > 0)
-        }
-
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun test03GetModelType() {
-        runBlocking {
-            log.info("************************* test03GetModelType  *********************************")
-            val dbModelType = modelTypeHandler!!.getModelTypeByName(modelName)
-            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)
-            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)
-            Assert.assertNotNull("Failed to find getModelTypeByDerivedFrom by tags", dbModelTypeByDerivedFroms)
-            Assert.assertTrue("Failed to find getModelTypeByDerivedFrom by count", dbModelTypeByDerivedFroms.size > 0)
-        }
-
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun test04DeleteModelType() {
-        runBlocking {
-            log.info(
-                    "************************ test03DeleteModelType  ***********************")
-            val dbResourceMapping = modelTypeHandler!!.getModelTypeByName(modelName)
-            Assert.assertNotNull("Failed to get response for api call getModelByName ", dbResourceMapping)
-            Assert.assertNotNull("Failed to get Id for api call  getModelByName ", dbResourceMapping!!.modelName)
-
-            modelTypeHandler.deleteByModelName(dbResourceMapping.modelName)
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/controller/ModelTypeControllerTest.kt b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/controller/ModelTypeControllerTest.kt
deleted file mode 100644
index 4af8851a5..000000000
--- a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/controller/ModelTypeControllerTest.kt
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- *  Copyright © 2019 IBM.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.onap.ccsdk.cds.controllerblueprints.service.controller
-
-import org.junit.Assert
-import org.junit.FixMethodOrder
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.MethodSorters
-import org.onap.ccsdk.cds.controllerblueprints.TestApplication
-import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants
-import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils
-import org.onap.ccsdk.cds.controllerblueprints.service.domain.ModelType
-import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest
-import org.springframework.test.annotation.Commit
-import org.springframework.test.context.ContextConfiguration
-import org.springframework.test.context.junit4.SpringRunner
-
-@RunWith(SpringRunner::class)
-@DataJpaTest
-@ContextConfiguration(classes = [TestApplication::class])
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-class ModelTypeControllerTest {
-
-    private val log = LoggerFactory.getLogger(ModelTypeControllerTest::class.java)!!
-
-    @Autowired
-    internal var modelTypeController: ModelTypeController? = null
-
-    private var modelName = "test-datatype"
-
-    @Test
-    @Commit
-    @Throws(Exception::class)
-    fun test01SaveModelType() {
-        log.info("**************** test01SaveModelType  ********************")
-
-        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.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)
-        modelType.updatedBy = "xxxxxx@xxx.com"
-        modelType = modelTypeController!!.saveModelType(modelType)
-        log.info("Saved Mode {}", modelType.toString())
-        Assert.assertNotNull("Failed to get Saved ModelType", modelType)
-        Assert.assertNotNull("Failed to get Saved ModelType, Id", modelType.modelName)
-
-        val dbModelType = modelTypeController!!.getModelTypeByName(modelType.modelName)
-        Assert.assertNotNull("Failed to query ResourceMapping for ID (" + dbModelType!!.modelName + ")",
-                dbModelType)
-
-        // Model Update
-        modelType.updatedBy = "bs2796@xxx.com"
-        modelType = modelTypeController!!.saveModelType(modelType)
-        Assert.assertNotNull("Failed to get Saved ModelType", modelType)
-        Assert.assertEquals("Failed to get Saved getUpdatedBy ", "bs2796@xxx.com", modelType.updatedBy)
-
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun test02SearchModelTypes() {
-        log.info("*********************** test02SearchModelTypes  ***************************")
-
-        val tags = "test-datatype"
-
-        val dbModelTypes = modelTypeController!!.searchModelTypes(tags)
-        Assert.assertNotNull("Failed to search ResourceMapping by tags", dbModelTypes)
-        Assert.assertTrue("Failed to search ResourceMapping by tags count", dbModelTypes.isNotEmpty())
-
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun test03GetModelType() {
-        log.info("************************* test03GetModelType  *********************************")
-        val dbModelType = modelTypeController!!.getModelTypeByName(modelName)
-        Assert.assertNotNull("Failed to get response for api call getModelByName $modelName", dbModelType)
-        Assert.assertNotNull("Failed to get Id for api call  getModelByName ", dbModelType!!.modelName)
-
-        val dbDatatypeModelTypes = 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())
-    }
-
-    @Test
-    @Commit
-    @Throws(Exception::class)
-    fun test04DeleteModelType() {
-        log.info(
-                "************************ test03DeleteModelType  ***********************")
-        val dbResourceMapping = modelTypeController!!.getModelTypeByName(modelName)
-        Assert.assertNotNull("Failed to get response for api call getModelByName ", dbResourceMapping)
-        Assert.assertNotNull("Failed to get Id for api call  getModelByName ", dbResourceMapping!!.modelName)
-
-        modelTypeController!!.deleteModelTypeByName(dbResourceMapping.modelName)
-    }
-}
diff --git a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/controller/ResourceDictionaryControllerTest.kt b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/controller/ResourceDictionaryControllerTest.kt
deleted file mode 100644
index cf139ec00..000000000
--- a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/controller/ResourceDictionaryControllerTest.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Copyright © 2019 IBM.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.onap.ccsdk.cds.controllerblueprints.service.controller
-
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.onap.ccsdk.cds.controllerblueprints.TestApplication
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.context.annotation.ComponentScan
-import org.springframework.test.context.ContextConfiguration
-import org.springframework.test.context.junit4.SpringRunner
-import kotlin.test.assertNotNull
-
-@RunWith(SpringRunner::class)
-@ContextConfiguration(classes = [TestApplication::class])
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ComponentScan(basePackages = ["org.onap.ccsdk.cds.controllerblueprints"])
-class ResourceDictionaryControllerTest {
-
-    @Autowired
-    lateinit var resourceDictionaryController: ResourceDictionaryController
-
-    @Test
-    fun testResourceDictionaryControllerPresence() {
-        assertNotNull(resourceDictionaryController, "failed to initialise ResourceDictionaryController")
-    }
-
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/controller/mock/MockFilePart.kt b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/controller/mock/MockFilePart.kt
deleted file mode 100644
index 2fb2129ae..000000000
--- a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/controller/mock/MockFilePart.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  Copyright © 2019 IBM.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.onap.ccsdk.cds.controllerblueprints.service.controller.mock
-
-import org.apache.commons.io.FilenameUtils
-import org.slf4j.LoggerFactory
-import org.springframework.core.io.buffer.DataBuffer
-import org.springframework.http.HttpHeaders
-import org.springframework.http.codec.multipart.FilePart
-import org.springframework.util.FileCopyUtils
-import reactor.core.publisher.Flux
-import reactor.core.publisher.Mono
-import java.io.File
-import java.nio.file.Path
-
-class MockFilePart(private val fileName: String) : FilePart {
-    val log = LoggerFactory.getLogger(MockFilePart::class.java)!!
-    override fun content(): Flux<DataBuffer> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-    }
-
-    override fun headers(): HttpHeaders {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-    }
-
-    override fun filename(): String {
-        return FilenameUtils.getName(fileName)
-    }
-
-    override fun name(): String {
-        return FilenameUtils.getBaseName(fileName)
-    }
-
-    override fun transferTo(path: Path): Mono<Void> {
-        log.info("Copying file($fileName to ${path}")
-        FileCopyUtils.copy(File(fileName), path.toFile())
-        return Mono.empty()
-    }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/repository/ResourceDictionaryRepositoryTest.kt b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/repository/ResourceDictionaryRepositoryTest.kt
deleted file mode 100644
index 3f52d9183..000000000
--- a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/repository/ResourceDictionaryRepositoryTest.kt
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- *  Copyright © 2019 IBM.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.onap.ccsdk.cds.controllerblueprints.service.repository
-
-import kotlinx.coroutines.runBlocking
-import org.junit.Assert
-import org.junit.FixMethodOrder
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.MethodSorters
-import org.onap.ccsdk.cds.controllerblueprints.TestApplication
-import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils
-import org.onap.ccsdk.cds.controllerblueprints.resource.dict.ResourceDefinition
-import org.onap.ccsdk.cds.controllerblueprints.service.domain.ResourceDictionary
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest
-import org.springframework.test.annotation.Commit
-import org.springframework.test.context.ContextConfiguration
-import org.springframework.test.context.junit4.SpringRunner
-
-@RunWith(SpringRunner::class)
-@DataJpaTest
-@ContextConfiguration(classes = [TestApplication::class])
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-class ResourceDictionaryReactRepositoryTest {
-
-    private val sourceName = "test-source"
-
-    @Autowired
-    lateinit var resourceDictionaryRepository: ResourceDictionaryRepository
-
-    @Test
-    @Commit
-    fun test01Save() {
-        val resourceDefinition = JacksonUtils.readValueFromFile("./../../../../components/model-catalog/resource-dictionary/starter-dictionary/sample-db-source.json", ResourceDefinition::class.java)
-        Assert.assertNotNull("Failed to get resourceDefinition from content", resourceDefinition)
-        resourceDefinition!!.name = sourceName
-
-        val resourceDictionary = transformResourceDictionary(resourceDefinition)
-        val dbResourceDictionary = resourceDictionaryRepository.save(resourceDictionary)
-        Assert.assertNotNull("Failed to save ResourceDictionary", dbResourceDictionary)
-    }
-
-    @Test
-    fun test02FindByNameReact() {
-        val dbResourceDictionary = resourceDictionaryRepository.findByName(sourceName)
-        Assert.assertNotNull("Failed to query React Resource Dictionary by Name", dbResourceDictionary)
-    }
-
-    @Test
-    fun test03FindByNameInReact() {
-        val dbResourceDictionaries = resourceDictionaryRepository.findByNameIn(arrayListOf(sourceName))
-        Assert.assertNotNull("Failed to query React Resource Dictionary by Names", dbResourceDictionaries)
-    }
-
-    @Test
-    fun test04FindByTagsContainingIgnoreCaseReact() {
-        val dbTagsResourceDictionaries = resourceDictionaryRepository.findByTagsContainingIgnoreCase(sourceName)
-        Assert.assertNotNull("Failed to query React Resource Dictionary by Tags", dbTagsResourceDictionaries)
-    }
-
-    @Test
-    @Commit
-    fun test05Delete() {
-        runBlocking {
-            resourceDictionaryRepository.deleteByName(sourceName)
-        }
-    }
-
-    private fun transformResourceDictionary(resourceDefinition: ResourceDefinition): ResourceDictionary {
-        val resourceDictionary = ResourceDictionary()
-        resourceDictionary.name = resourceDefinition.name
-        resourceDictionary.dataType = resourceDefinition.property.type
-        resourceDictionary.description = resourceDefinition.property.description
-        resourceDictionary.tags = resourceDefinition.tags
-        resourceDictionary.updatedBy = resourceDefinition.updatedBy
-        resourceDictionary.definition = resourceDefinition
-        return resourceDictionary
-    }
-}
diff --git a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/utils/BluePrintEnhancerUtilsTest.kt b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/utils/BluePrintEnhancerUtilsTest.kt
deleted file mode 100644
index 100c3adeb..000000000
--- a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/utils/BluePrintEnhancerUtilsTest.kt
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *  Copyright © 2019 IBM.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.onap.ccsdk.cds.controllerblueprints.service.utils
-
-import kotlinx.coroutines.runBlocking
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.onap.ccsdk.cds.controllerblueprints.core.*
-import org.onap.ccsdk.cds.controllerblueprints.service.controller.mock.MockFilePart
-import java.nio.file.Paths
-import java.util.*
-import kotlin.test.assertTrue
-
-class BluePrintEnhancerUtilsTest {
-
-    private val blueprintDir = "./../../../../components/model-catalog/blueprint-model/test-blueprint/baseconfiguration"
-    private val blueprintArchivePath: String = "./target/blueprints/archive"
-    private val blueprintEnrichmentPath: String = "./target/blueprints/enrichment"
-    private var zipBlueprintFileName =  normalizedPathName(blueprintArchivePath, "test.zip")
-
-    @Before
-    fun setUp() {
-        val archiveDir = normalizedFile(blueprintArchivePath).reCreateDirs()
-        assertTrue(archiveDir.exists(), "failed to create archiveDir(${archiveDir.absolutePath}")
-        val enhancerDir = normalizedFile(blueprintEnrichmentPath).reCreateDirs()
-        assertTrue(enhancerDir.exists(), "failed to create enhancerDir(${enhancerDir.absolutePath}")
-        val blueprintFile = Paths.get(blueprintDir).toFile().normalize()
-        val testZipFile = blueprintFile.compress(zipBlueprintFileName)
-        assertTrue(testZipFile.exists(), "Failed to create blueprint test zip(${testZipFile.absolutePath}")
-    }
-
-    @After
-    fun tearDown() {
-        deleteDir(blueprintArchivePath)
-        deleteDir(blueprintEnrichmentPath)
-    }
-
-    @Test
-    fun testFilePartCompressionNDeCompression() {
-        val filePart = MockFilePart(zipBlueprintFileName)
-
-        runBlocking {
-            val enhanceId = UUID.randomUUID().toString()
-            val blueprintArchiveLocation = normalizedPathName(blueprintArchivePath, enhanceId)
-            val blueprintEnrichmentLocation = normalizedPathName(blueprintEnrichmentPath, enhanceId)
-            BluePrintEnhancerUtils.decompressFilePart(filePart, blueprintArchiveLocation, blueprintEnrichmentLocation)
-            BluePrintEnhancerUtils.compressToFilePart(blueprintEnrichmentLocation, blueprintArchiveLocation)
-        }
-    }
-}
-
diff --git a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/validator/ModelTypeValidatorTest.kt b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/validator/ModelTypeValidatorTest.kt
deleted file mode 100644
index 728f431a7..000000000
--- a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/validator/ModelTypeValidatorTest.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onap.ccsdk.cds.controllerblueprints.service.validator
-
-import com.fasterxml.jackson.databind.JsonNode
-import org.junit.Test
-import org.onap.ccsdk.cds.controllerblueprints.service.domain.ModelType
-
-class ModelTypeValidatorTest {
-
-    @Test(expected = IllegalStateException::class)
-    @Throws(Exception::class)
-    fun testvalidateModelType() {
-        val modelType = ModelType()
-        modelType.definitionType = ""
-        modelType.derivedFrom = ""
-        modelType.description = ""
-        val definitionContent: JsonNode? = null
-        modelType.definition = definitionContent
-        modelType.modelName = ""
-        modelType.version = ""
-        modelType.tags = ""
-        modelType.updatedBy = ""
-        ModelTypeValidator.validateModelType(modelType)
-    }
-}