diff options
| author |   Brinda Santh <bs2796@att.com> | 2020-01-31 14:41:41 -0500 |
|---|---|---|
| committer | Brinda Santh <bs2796@att.com> | 2020-01-31 14:41:41 -0500 |
| commit | 5c094c6adc53d958b2079de67d9d26242e10d7ef (patch) | |
| tree | 0185fdf0018c47fa63ff4a1f83eee135e82e1de3 /ms/blueprintsprocessor/functions/resource-resolution/src/main | |
| parent | 23f898a96f7e8b3ecb0817abc61612bdc3d2e9aa (diff) | |
Spring boot, Kotlin version upgrades
Dependent Patch : https://gerrit.onap.org/r/c/ccsdk/parent/+/100990
Fixed Jackson set method according to latest version.
Fixed Security properties issues for failed JUnit test cases.
Reused maven properties from parent for Spring boot, Nats, Kafka, etc
Issue-ID: CCSDK-1737
Signed-off-by: Brinda Santh <bs2796@att.com>
Change-Id: I04bb0e535161e05897f587a0f08a2689e10c5f41
Diffstat (limited to 'ms/blueprintsprocessor/functions/resource-resolution/src/main')
2 files changed, 3 insertions, 2 deletions
diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionComponent.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionComponent.kt index 293f29cfc..db0a6f0ed 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionComponent.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceResolutionComponent.kt @@ -17,6 +17,7 @@ package org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution +import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.node.JsonNodeFactory import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.ExecutionServiceInput import org.onap.ccsdk.cds.blueprintsprocessor.services.execution.AbstractComponentFunction @@ -107,7 +108,7 @@ open class ResourceResolutionComponent(private val resourceResolutionService: Re // provide indexed result in output if we have multiple resolution if (occurrence != 1) { - jsonResponse.set(Integer.toString(j), response.asJsonNode()) + jsonResponse.set<JsonNode>(Integer.toString(j), response.asJsonNode()) } else { jsonResponse.setAll(response.asObjectNode()) } diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtils.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtils.kt index a813c00ca..7ffc6db39 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtils.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtils.kt @@ -163,7 +163,7 @@ class ResourceAssignmentUtils { val valueToPrint = getValueToLog(metadata, value) containsLogProtected = hasLogProtect(metadata) logger.trace("Generating Resource name ($rName), type ($type), value ($valueToPrint)") - root.set(rName, value) + root.set<JsonNode>(rName, value) } } result = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(root) |