diff options
| author |   Brinda Santh Muthuramalingam <brindasanth@in.ibm.com> | 2020-03-19 12:51:30 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-03-19 12:51:30 +0000 |
| commit | fa12b4f311e77612e4e856b209a8c81c71f0b29d (patch) | |
| tree | 0811c8b874e97a60213ab18d208b779a146f0ca3 /ms/blueprintsprocessor/modules | |
| parent | 114c5c16fe51231af038f30ed7ffaee2b22a3431 (diff) | |
| parent | 8865ccde1a486e203a3812813f5350ddb726265f (diff) | |
Merge "Fix GroupId and package name in Error Catalog"
Diffstat (limited to 'ms/blueprintsprocessor/modules')
2 files changed, 6 insertions, 5 deletions
diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintProcessorException.kt b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintProcessorException.kt index 50b6614ad..acb158d89 100644 --- a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintProcessorException.kt +++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintProcessorException.kt @@ -17,9 +17,9 @@ package org.onap.ccsdk.cds.controllerblueprints.core -import org.onap.ccsdk.error.catalog.core.ErrorCatalogException -import org.onap.ccsdk.error.catalog.core.ErrorCatalogExceptionFluent -import org.onap.ccsdk.error.catalog.core.ErrorMessage +import org.onap.ccsdk.cds.error.catalog.core.ErrorCatalogException +import org.onap.ccsdk.cds.error.catalog.core.ErrorCatalogExceptionFluent +import org.onap.ccsdk.cds.error.catalog.core.ErrorMessage /** * @@ -134,5 +134,6 @@ private fun BluePrintProcessorException.addDomainAndErrorMessage( message: String, cause: Throwable = Throwable() ): BluePrintProcessorException { - return this.addSubError(ErrorMessage(domain, message, cause.message ?: "")).domain(domain) + return this.addSubError(ErrorMessage(domain, message, cause.message + ?: "")).domain(domain) } diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceController.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceController.kt index 908c04607..e5daecede 100644 --- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceController.kt +++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceController.kt @@ -29,7 +29,7 @@ import org.onap.ccsdk.cds.blueprintsprocessor.selfservice.api.utils.determineHtt import org.onap.ccsdk.cds.controllerblueprints.core.asJsonPrimitive import org.onap.ccsdk.cds.controllerblueprints.core.httpProcessorException import org.onap.ccsdk.cds.controllerblueprints.core.logger -import org.onap.ccsdk.error.catalog.core.ErrorCatalogCodes +import org.onap.ccsdk.cds.error.catalog.core.ErrorCatalogCodes import org.springframework.beans.factory.annotation.Autowired import org.springframework.http.MediaType import org.springframework.http.ResponseEntity |