From 79d6af1baefdafd0cef5d32aa87b509b76070ebc Mon Sep 17 00:00:00 2001 From: Jozsef Csongvai Date: Tue, 19 May 2020 13:33:49 -0400 Subject: Improve logging for ResourceAssingmentUtils Sort keys for generated resource param data logging Issue-ID: CCSDK-2381 Signed-off-by: Jozsef Csongvai Change-Id: Iea0a88fbe915e41e399ced45d842a8ef14d052c1 --- .../functions/resource/resolution/utils/ResourceAssignmentUtils.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (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 497b26803..1be9649b9 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 @@ -19,6 +19,7 @@ package org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.uti import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.ObjectMapper +import com.fasterxml.jackson.databind.SerializationFeature import com.fasterxml.jackson.databind.node.ArrayNode import com.fasterxml.jackson.databind.node.NullNode import com.fasterxml.jackson.databind.node.ObjectNode @@ -181,6 +182,7 @@ class ResourceAssignmentUtils { val result: String try { val mapper = ObjectMapper() + mapper.configure(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS, true) val root: ObjectNode = mapper.createObjectNode() var containsLogProtected = false @@ -196,7 +198,8 @@ class ResourceAssignmentUtils { root.set(rName, value) } } - result = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(root) + result = mapper.writerWithDefaultPrettyPrinter() + .writeValueAsString(mapper.treeToValue(root, Object::class.java)) if (!containsLogProtected) { logger.info("Generated Resource Param Data ($result)") -- cgit 1.2.3-korg