Enable versioned resource resolution by using occurrence

[ccsdk/cds.git] / ms / blueprintsprocessor / functions / resource-resolution / src / main / kotlin / org / onap / ccsdk / cds / blueprintsprocessor / functions / resource / resolution / ResourceResolutionComponent.kt

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 e060cdc..d46f75e 100644 (file)
--- 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
@@ -109,9 +109,13 @@ open class ResourceResolutionComponent(private val resourceResolutionService: Re
 
         val artifactPrefixNamesNode = getOperationInput(ResourceResolutionConstants.INPUT_ARTIFACT_PREFIX_NAMES)
         val artifactPrefixNames = JacksonUtils.getListFromJsonNode(artifactPrefixNamesNode, String::class.java)
+        val alwaysPerformNewResolution = occurrence <= 0
+        val resolutionsToPerform: Int = if (alwaysPerformNewResolution) 1 else occurrence
+        for (j in 1..resolutionsToPerform) {
 
-        for (j in 1..occurrence) {
-            properties[ResourceResolutionConstants.RESOURCE_RESOLUTION_INPUT_OCCURRENCE] = j
+            if (!alwaysPerformNewResolution) {
+                properties[ResourceResolutionConstants.RESOURCE_RESOLUTION_INPUT_OCCURRENCE] = j
+            }
 
             val result = resourceResolutionService.resolveResources(
                 bluePrintRuntimeService,
@@ -121,8 +125,8 @@ open class ResourceResolutionComponent(private val resourceResolutionService: Re
                 stepName
             )
 
-            // provide indexed result in output if we have multiple resolution
-            if (occurrence != 1) {
+            // provide indexed result in output if we have multiple resolution.
+            if (resolutionsToPerform != 1) {
                 jsonResponse.set<JsonNode>(j.toString(), result.templateMap.asJsonNode())
                 assignmentMap.set<JsonNode>(j.toString(), result.assignmentMap.asJsonNode())
             } else {