diff options
| author |   Brinda Santh <brindasanth@in.ibm.com> | 2019-08-29 22:40:48 -0400 |
|---|---|---|
| committer | Brinda Santh <brindasanth@in.ibm.com> | 2019-08-29 22:40:48 -0400 |
| commit | 0fbfc6eab2d42c8ee2f8601db43813a4e33ffc4d (patch) | |
| tree | 240a92c46f7bc1a46605c6aa895c0ec6c56e936e /ms/controllerblueprints/modules/db-resources | |
| parent | b12d13b0b78b7e87912c07a7c946cbbfcee41d47 (diff) | |
Resolve duplicate application property values
Change-Id: I0813ff96388bce77eba9fbc9eff0eccf59a6be6a
Issue-ID: CCSDK-1663
Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
Diffstat (limited to 'ms/controllerblueprints/modules/db-resources')
| -rw-r--r-- | ms/controllerblueprints/modules/db-resources/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/db/resources/BlueprintCatalogServiceImpl.kt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ms/controllerblueprints/modules/db-resources/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/db/resources/BlueprintCatalogServiceImpl.kt b/ms/controllerblueprints/modules/db-resources/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/db/resources/BlueprintCatalogServiceImpl.kt index b3436a991..7244e00e5 100644 --- a/ms/controllerblueprints/modules/db-resources/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/db/resources/BlueprintCatalogServiceImpl.kt +++ b/ms/controllerblueprints/modules/db-resources/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/db/resources/BlueprintCatalogServiceImpl.kt @@ -19,7 +19,7 @@ package org.onap.ccsdk.cds.controllerblueprints.db.resources import org.onap.ccsdk.cds.controllerblueprints.core.* -import org.onap.ccsdk.cds.controllerblueprints.core.config.BluePrintPathConfiguration +import org.onap.ccsdk.cds.controllerblueprints.core.config.BluePrintLoadConfiguration import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintCatalogService import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintValidatorService import org.onap.ccsdk.cds.controllerblueprints.core.utils.BluePrintArchiveUtils @@ -31,7 +31,7 @@ import javax.persistence.MappedSuperclass @MappedSuperclass abstract class BlueprintCatalogServiceImpl( - private val bluePrintPathConfiguration: BluePrintPathConfiguration, + private val bluePrintLoadConfiguration: BluePrintLoadConfiguration, private val blueprintValidator: BluePrintValidatorService) : BluePrintCatalogService { private val log = LoggerFactory.getLogger(BlueprintCatalogServiceImpl::class.java)!! @@ -44,7 +44,7 @@ abstract class BlueprintCatalogServiceImpl( if (blueprintFile.isDirectory) { log.info("Save processing($processingId) Working Dir(${blueprintFile.absolutePath})") workingDir = blueprintFile.absolutePath - archiveFile = normalizedFile(bluePrintPathConfiguration.blueprintArchivePath, processingId, "cba.zip") + archiveFile = normalizedFile(bluePrintLoadConfiguration.blueprintArchivePath, processingId, "cba.zip") if (!BluePrintArchiveUtils.compress(blueprintFile, archiveFile)) { throw BluePrintException("Fail to compress blueprint") @@ -52,7 +52,7 @@ abstract class BlueprintCatalogServiceImpl( } else { // Compressed File log.info("Save processing($processingId) CBA(${blueprintFile.absolutePath})") - workingDir = normalizedPathName(bluePrintPathConfiguration.blueprintWorkingPath, processingId) + workingDir = normalizedPathName(bluePrintLoadConfiguration.blueprintWorkingPath, processingId) archiveFile = blueprintFile // Decompress the CBA file to working Directory blueprintFile.deCompress(workingDir) |