From 8ba1014d06f1b56edfb76b8793666d56a3ab7b51 Mon Sep 17 00:00:00 2001
From: Jozsef Csongvai <jozsef.csongvai@bell.ca>
Date: Tue, 31 Mar 2020 16:34:43 -0400
Subject: Fix ResolutionSummary - return empty string instead of null

Issue-ID: CCSDK-2246
Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>
Change-Id: I894bf605ee7f5b094d015fd637979ce055da5081
---
 .../resolution/utils/ResourceAssignmentUtils.kt    | 32 ++++++++++++++++++----
 1 file changed, 27 insertions(+), 5 deletions(-)

(limited to 'ms/blueprintsprocessor/functions/resource-resolution/src/main')

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 7bb757b8e..bfa23ccc2 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
@@ -203,18 +203,40 @@ class ResourceAssignmentUtils {
             resourceAssignments: List<ResourceAssignment>,
             resourceDefinitions: Map<String, ResourceDefinition>
         ): String {
+            val emptyTextNode = TextNode.valueOf("")
             val resolutionSummaryList = resourceAssignments.map {
                 val definition = resourceDefinitions[it.name]
-                val payload = definition?.sources?.get(it.dictionarySource)
+                val description = definition?.property?.description ?: ""
+                val value = it.property?.value
+                        ?.let { v -> if (v.isNullOrMissing()) emptyTextNode else v }
+                        ?: emptyTextNode
+
+                var payload: JsonNode = definition?.sources?.get(it.dictionarySource)
                         ?.properties?.get("resolved-payload")
+                        ?.let { p -> if (p.isNullOrMissing()) emptyTextNode else p }
+                        ?: emptyTextNode
+
                 val metadata = definition?.property?.metadata
                         ?.map { e -> DictionaryMetadataEntry(e.key, e.value) }
                         ?.toMutableList() ?: mutableListOf()
-                val description = definition?.property?.description
+
+                val keyIdentifiers: MutableList<KeyIdentifier> = it.keyIdentifiers.map { k ->
+                    if (k.value.isNullOrMissing()) KeyIdentifier(k.name, emptyTextNode) else k
+                }.toMutableList()
+
                 ResolutionSummary(
-                        it.name, it.property?.value, it.property?.required, it.property?.type,
-                        it.keyIdentifiers, description, metadata, it.dictionaryName,
-                        it.dictionarySource, payload, it.status, it.message
+                        it.name,
+                        value,
+                        it.property?.required ?: false,
+                        it.property?.type ?: "",
+                        keyIdentifiers,
+                        description,
+                        metadata,
+                        it.dictionaryName ?: "",
+                        it.dictionarySource ?: "",
+                        payload,
+                        it.status ?: "",
+                        it.message ?: ""
                 )
             }
             // Wrapper needed for integration with SDNC
-- 
cgit 1.2.3-korg