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/modules/blueprints | |
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/modules/blueprints')
2 files changed, 4 insertions, 4 deletions
diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/service/BluePrintRuntimeService.kt b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/service/BluePrintRuntimeService.kt index d68d680dd..53af9f7cb 100644 --- a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/service/BluePrintRuntimeService.kt +++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/service/BluePrintRuntimeService.kt @@ -786,7 +786,7 @@ open class DefaultBluePrintRuntimeService(private var id: String, private var bl val key = it.replace(path, "") if (keys.contains(key)) { val value = store[it] as JsonNode - jsonNode.set(key, value) + jsonNode.set<JsonNode>(key, value) } } return jsonNode diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/JacksonUtils.kt b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/JacksonUtils.kt index 089a610c9..3db1f84cd 100644 --- a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/JacksonUtils.kt +++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/JacksonUtils.kt @@ -282,7 +282,7 @@ class JacksonUtils { fun populatePrimitiveDefaultValues(key: String, primitiveType: String, objectNode: ObjectNode) { val defaultValue = getDefaultValueOfPrimitiveAsJsonNode(primitiveType) ?: throw BluePrintException("populatePrimitiveDefaultValues expected only primitive values! Received type ($primitiveType)") - objectNode.set(key, defaultValue) + objectNode.set<JsonNode>(key, defaultValue) } fun populatePrimitiveDefaultValuesForArrayNode(primitiveType: String, arrayNode: ArrayNode) { @@ -304,11 +304,11 @@ class JacksonUtils { fun populateJsonNodeValues(key: String, nodeValue: JsonNode?, type: String, objectNode: ObjectNode) { if (nodeValue == null || nodeValue is NullNode) { - objectNode.set(key, nodeValue) + objectNode.set<JsonNode>(key, nodeValue) } else if (BluePrintTypes.validPrimitiveTypes().contains(type)) { populatePrimitiveValues(key, nodeValue, type, objectNode) } else { - objectNode.set(key, nodeValue) + objectNode.set<JsonNode>(key, nodeValue) } } |