diff options
Diffstat (limited to 'ms/blueprintsprocessor/functions')
4 files changed, 22 insertions, 21 deletions
diff --git a/ms/blueprintsprocessor/functions/ansible-awx-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/ansible/executor/ComponentRemoteAnsibleExecutor.kt b/ms/blueprintsprocessor/functions/ansible-awx-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/ansible/executor/ComponentRemoteAnsibleExecutor.kt index 9ea6034a8..6f994edab 100644 --- a/ms/blueprintsprocessor/functions/ansible-awx-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/ansible/executor/ComponentRemoteAnsibleExecutor.kt +++ b/ms/blueprintsprocessor/functions/ansible-awx-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/ansible/executor/ComponentRemoteAnsibleExecutor.kt @@ -318,14 +318,14 @@ open class ComponentRemoteAnsibleExecutor( val askLimitOnLaunch = jtLaunchReqs.at("/ask_limit_on_launch").asBoolean() if (askLimitOnLaunch && !limitProp.isNullOrMissing()) { - payload.set(INPUT_LIMIT_TO_HOST, limitProp) + payload.set<JsonNode>(INPUT_LIMIT_TO_HOST, limitProp) } val askTagsOnLaunch = jtLaunchReqs.at("/ask_tags_on_launch").asBoolean() if (askTagsOnLaunch && !tagsProp.isNullOrMissing()) { - payload.set(INPUT_TAGS, tagsProp) + payload.set<JsonNode>(INPUT_TAGS, tagsProp) } if (askTagsOnLaunch && !skipTagsProp.isNullOrMissing()) { - payload.set("skip_tags", skipTagsProp) + payload.set<JsonNode>("skip_tags", skipTagsProp) } } @@ -336,10 +336,10 @@ open class ComponentRemoteAnsibleExecutor( } else { inventoryProp } - payload.set(INPUT_INVENTORY, inventoryKeyId) + payload.set<JsonNode>(INPUT_INVENTORY, inventoryKeyId) } - payload.set("extra_vars", extraArgs) + payload.set<JsonNode>("extra_vars", extraArgs) return payload.asJsonString(false) } 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) diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtilsTest.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtilsTest.kt index 3c0af04ff..3251dcacb 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtilsTest.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/utils/ResourceAssignmentUtilsTest.kt @@ -278,7 +278,7 @@ class ResourceAssignmentUtilsTest { val arrayNodeForList1 = JacksonUtils.objectMapper.createArrayNode() listOfIps.forEach { val arrayChildNode = JacksonUtils.objectMapper.createObjectNode() - arrayChildNode.set("value", it.asJsonPrimitive()) + arrayChildNode.set<JsonNode>("value", it.asJsonPrimitive()) arrayNodeForList1.add(arrayChildNode) } inputMapToTestCollectionOfPrimitiveType = arrayNodeForList1 @@ -295,23 +295,23 @@ class ResourceAssignmentUtilsTest { val arrayNodeForList2 = JacksonUtils.objectMapper.createArrayNode() listOfIpAddresses.forEach { val arrayChildNode = JacksonUtils.objectMapper.createObjectNode() - arrayChildNode.set("value", it.asJsonType()) + arrayChildNode.set<JsonNode>("value", it.asJsonType()) arrayNodeForList2.add(arrayChildNode) } inputMapToTestCollectionOfComplexTypeWithOneOutputKeyMapping = arrayNodeForList2 val arrayNodeForList3 = JacksonUtils.objectMapper.createArrayNode() var childNode = JacksonUtils.objectMapper.createObjectNode() - childNode.set("port", "1111".asJsonPrimitive()) - childNode.set("ip", "1.2.3.1".asJsonPrimitive()) + childNode.set<JsonNode>("port", "1111".asJsonPrimitive()) + childNode.set<JsonNode>("ip", "1.2.3.1".asJsonPrimitive()) arrayNodeForList3.add(childNode) childNode = JacksonUtils.objectMapper.createObjectNode() - childNode.set("port", "2222".asJsonPrimitive()) - childNode.set("ip", "1.2.3.2".asJsonPrimitive()) + childNode.set<JsonNode>("port", "2222".asJsonPrimitive()) + childNode.set<JsonNode>("ip", "1.2.3.2".asJsonPrimitive()) arrayNodeForList3.add(childNode) childNode = JacksonUtils.objectMapper.createObjectNode() - childNode.set("port", "3333".asJsonPrimitive()) - childNode.set("ip", "1.2.3.3".asJsonPrimitive()) + childNode.set<JsonNode>("port", "3333".asJsonPrimitive()) + childNode.set<JsonNode>("ip", "1.2.3.3".asJsonPrimitive()) arrayNodeForList3.add(childNode) inputMapToTestCollectionOfComplexTypeWithAllOutputKeyMapping = arrayNodeForList3 @@ -340,15 +340,15 @@ class ResourceAssignmentUtilsTest { objectNode.set("host", Host("my-ipAddress", IpAddress("1111", "1.2.3.1")).asJsonType()) val childNode1 = JacksonUtils.objectMapper.createObjectNode() - childNode1.set("name", "my-ipAddress".asJsonPrimitive()) - childNode1.set("ipAddress", IpAddress("1111", "1.2.3.1").asJsonType()) - childNode1.set("port", "8888".asJsonType()) - childNode1.set("something", IpAddress("2222", "1.2.3.1").asJsonType()) + childNode1.set<JsonNode>("name", "my-ipAddress".asJsonPrimitive()) + childNode1.set<JsonNode>("ipAddress", IpAddress("1111", "1.2.3.1").asJsonType()) + childNode1.set<JsonNode>("port", "8888".asJsonType()) + childNode1.set<JsonNode>("something", IpAddress("2222", "1.2.3.1").asJsonType()) inputMapToTestComplexTypeWithAllOutputKeyMapping = childNode1 val childNode2 = JacksonUtils.objectMapper.createObjectNode() - childNode2.set("name", "my-ipAddress".asJsonPrimitive()) - childNode2.set("ipAddress", IpAddress("1111", "1.2.3.1").asJsonType()) + childNode2.set<JsonNode>("name", "my-ipAddress".asJsonPrimitive()) + childNode2.set<JsonNode>("ipAddress", IpAddress("1111", "1.2.3.1").asJsonType()) expectedValueToTestComplexTypeWithAllOutputKeyMapping = childNode2 } |