From 5ad79d63fd3f692a6a412dc15ec7be8d805cb942 Mon Sep 17 00:00:00 2001
From: Jozsef Csongvai <jozsef.csongvai@bell.ca>
Date: Wed, 8 Apr 2020 14:45:22 -0400
Subject: Fix parsing error for RestResourceSource

Issue-ID: CCSDK-2310
Change-Id: I3587187b115797ce00ffd8c9125d9ee5035e25be
Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>
(cherry picked from commit dd54f3f3976cdb90c3c04be01880c37fb753d51b)
---
 .../functions/resource/resolution/ResourceSourceProperties.kt          | 2 ++
 .../resource/resolution/processor/RestResourceResolutionProcessor.kt   | 3 +--
 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/ResourceSourceProperties.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceSourceProperties.kt
index 636e81dda..7a7edc92b 100644
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceSourceProperties.kt
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/ResourceSourceProperties.kt
@@ -51,6 +51,8 @@ open class RestResourceSource : ResourceSourceProperties() {
     lateinit var verb: String
     @get:JsonProperty("payload")
     var payload: String? = null
+    @get:JsonProperty("resolved-payload")
+    var resolvedPayload: String? = null
     lateinit var type: String
     @get:JsonProperty("endpoint-selector")
     var endpointSelector: String? = null
diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/RestResourceResolutionProcessor.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/RestResourceResolutionProcessor.kt
index 8f933c1cb..7596d7d8c 100644
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/RestResourceResolutionProcessor.kt
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/RestResourceResolutionProcessor.kt
@@ -78,8 +78,7 @@ open class RestResourceResolutionProcessor(private val blueprintRestLibPropertyS
                     checkNotNull(sourceProperties.inputKeyMapping) { "failed to get input-key-mappings for $dName under $dSource properties" }
                 val resolvedInputKeyMapping = resolveInputKeyMappingVariables(inputKeyMapping).toMutableMap()
 
-                sourceProperties.inputKeyMapping
-                        ?.mapValues { raRuntimeService.getDictionaryStore(it.value) }
+                inputKeyMapping?.mapValues { raRuntimeService.getDictionaryStore(it.value) }
                         ?.map { KeyIdentifier(it.key, it.value) }
                         ?.let { resourceAssignment.keyIdentifiers.addAll(it) }
 
-- 
cgit 1.2.3-korg