Removed deprecated class. The correct implementation is

in the class BlueprintProcessorCatalogServiceImpl.

Issue-ID: CCSDK-1924
Signed-off-by: Sebastien Premont-Tendland <sebastien.premont@bell.ca>
Change-Id: I0d4ccfb69979ec3be35a46f154cd20586175d671

diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/service/ControllerBlueprintCatalogServiceImpl.kt b/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/service/ControllerBlueprintCatalogServiceImpl.kt
deleted file mode 100755 (executable)
index 5b1d6c3..0000000
--- a/ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/primary/service/ControllerBlueprintCatalogServiceImpl.kt
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- * Modifications Copyright © 2019 Bell Canada.
- * Modifications 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.blueprintsprocessor.db.primary.service
-
-import org.onap.ccsdk.cds.blueprintsprocessor.db.primary.domain.BlueprintModel
-import org.onap.ccsdk.cds.blueprintsprocessor.db.primary.domain.BlueprintModelContent
-import org.onap.ccsdk.cds.blueprintsprocessor.db.primary.repository.BlueprintModelRepository
-import org.onap.ccsdk.cds.controllerblueprints.core.*
-import org.onap.ccsdk.cds.controllerblueprints.core.common.ApplicationConstants
-import org.onap.ccsdk.cds.controllerblueprints.core.config.BluePrintLoadConfiguration
-import org.onap.ccsdk.cds.controllerblueprints.core.data.ErrorCode
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintValidatorService
-import org.onap.ccsdk.cds.controllerblueprints.core.scripts.BluePrintCompileCache
-import org.onap.ccsdk.cds.controllerblueprints.core.utils.BluePrintFileUtils
-import org.slf4j.LoggerFactory
-import org.springframework.dao.DataIntegrityViolationException
-import org.springframework.stereotype.Service
-import java.io.File
-import java.nio.file.Files
-import java.nio.file.Path
-import java.util.*
-
-//TODO("Duplicate : Merge BlueprintProcessorCatalogServiceImpl and ControllerBlueprintCatalogServiceImpl")
-/**
- * Similar implementation in [org.onap.ccsdk.cds.blueprintsprocessor.db.BlueprintProcessorCatalogServiceImpl]
- */
-@Service("controllerBlueprintsCatalogService")
-class ControllerBlueprintCatalogServiceImpl(bluePrintDesignTimeValidatorService: BluePrintValidatorService,
-                                            private val bluePrintLoadConfiguration: BluePrintLoadConfiguration,
-                                            private val blueprintModelRepository: BlueprintModelRepository)
-    : BlueprintCatalogServiceImpl(bluePrintLoadConfiguration, bluePrintDesignTimeValidatorService) {
-
-
-    private val log = LoggerFactory.getLogger(ControllerBlueprintCatalogServiceImpl::class.toString())
-
-    init {
-        log.info("BlueprintProcessorCatalogServiceImpl initialized")
-    }
-
-    override suspend fun delete(name: String, version: String) {
-        // Cleaning Deployed Blueprint
-        deleteDir(bluePrintLoadConfiguration.blueprintDeployPath, name, version)
-        // Cleaning Data Base
-        blueprintModelRepository.deleteByArtifactNameAndArtifactVersion(name, version)
-    }
-
-    override suspend fun get(name: String, version: String, extract: Boolean): Path? {
-        val path = if (extract) {
-            normalizedPath(bluePrintLoadConfiguration.blueprintDeployPath, name, version)
-        } else {
-            normalizedPath(bluePrintLoadConfiguration.blueprintArchivePath, UUID.randomUUID().toString(), "cba.zip")
-        }
-        blueprintModelRepository.findByArtifactNameAndArtifactVersion(name, version)?.also {
-            it.blueprintModelContent.run {
-                path.toFile().writeBytes(this!!.content!!).let {
-                    return path
-                }
-            }
-        }
-        return null
-    }
-
-    override suspend fun save(metadata: MutableMap<String, String>, archiveFile: File) {
-
-        val artifactName = metadata[BluePrintConstants.METADATA_TEMPLATE_NAME]
-        val artifactVersion = metadata[BluePrintConstants.METADATA_TEMPLATE_VERSION]
-
-        check(archiveFile.isFile && !archiveFile.isDirectory) {
-            throw BluePrintException("Not a valid Archive file(${archiveFile.absolutePath})")
-        }
-
-        // cleanup up deploy folder for the Blueprint
-        val blueprintDeploy = normalizedPathName(bluePrintLoadConfiguration.blueprintDeployPath,
-                                    artifactName, artifactVersion)
-        val cacheKey = BluePrintFileUtils.compileCacheKey(blueprintDeploy)
-        BluePrintCompileCache.cleanClassLoader(cacheKey)
-
-        blueprintModelRepository.findByArtifactNameAndArtifactVersion(artifactName!!, artifactVersion!!)?.let {
-            log.info("Overwriting blueprint model :$artifactName::$artifactVersion")
-            blueprintModelRepository.deleteByArtifactNameAndArtifactVersion(artifactName, artifactVersion)
-        }
-
-        val blueprintModel = BlueprintModel()
-        blueprintModel.id = metadata[BluePrintConstants.PROPERTY_BLUEPRINT_PROCESS_ID]
-        blueprintModel.artifactType = ApplicationConstants.ASDC_ARTIFACT_TYPE_SDNC_MODEL
-        blueprintModel.published = metadata[BluePrintConstants.PROPERTY_BLUEPRINT_VALID]
-                ?: BluePrintConstants.FLAG_N
-        blueprintModel.artifactName = artifactName
-        blueprintModel.artifactVersion = artifactVersion
-        blueprintModel.updatedBy = metadata[BluePrintConstants.METADATA_TEMPLATE_AUTHOR]!!
-        blueprintModel.tags = metadata[BluePrintConstants.METADATA_TEMPLATE_TAGS]!!
-        blueprintModel.artifactDescription = "Controller Blueprint for $artifactName:$artifactVersion"
-
-        val blueprintModelContent = BlueprintModelContent()
-        blueprintModelContent.id = metadata[BluePrintConstants.PROPERTY_BLUEPRINT_PROCESS_ID]
-        blueprintModelContent.contentType = "CBA_ZIP"
-        blueprintModelContent.name = "$artifactName:$artifactVersion"
-        blueprintModelContent.description = "$artifactName:$artifactVersion CBA Zip Content"
-        blueprintModelContent.content = Files.readAllBytes(archiveFile.toPath())
-        blueprintModelContent.blueprintModel = blueprintModel
-        // Set the Blueprint Model Content into blueprintModel
-        blueprintModel.blueprintModelContent = blueprintModelContent
-
-        try {
-            blueprintModelRepository.saveAndFlush(blueprintModel)
-        } catch (ex: DataIntegrityViolationException) {
-            throw BluePrintException(ErrorCode.CONFLICT_ADDING_RESOURCE.value, "The blueprint entry " +
-                    "is already exist in database: ${ex.message}", ex)
-        }
-    }
-}
\ No newline at end of file