From 6b5dd86a3557e8eed2c4584f5d16df5654cbc57b Mon Sep 17 00:00:00 2001 From: Eylon Malin Date: Wed, 8 Jan 2020 16:03:08 +0200 Subject: Fix the format of supplementary file and user params for aLaCarte requests supplementary file shall be in format [{"name": "fieldName", "value" : "xyz"}] Also this is the format of each param in user params for aLaCarte requests and old macros Issue-ID: VID-743 Change-Id: I579298ce3f0b789a7a69e6af5a85bfbd50ae9fc0 Signed-off-by: Eylon Malin --- vid-app-common/src/main/java/org/onap/vid/utils/Logging.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'vid-app-common/src/main/java/org/onap/vid/utils') diff --git a/vid-app-common/src/main/java/org/onap/vid/utils/Logging.java b/vid-app-common/src/main/java/org/onap/vid/utils/Logging.java index 43f059d54..f9894d1aa 100644 --- a/vid-app-common/src/main/java/org/onap/vid/utils/Logging.java +++ b/vid-app-common/src/main/java/org/onap/vid/utils/Logging.java @@ -20,6 +20,7 @@ package org.onap.vid.utils; +import static java.util.Collections.emptyMap; import static org.apache.commons.lang3.ObjectUtils.defaultIfNull; import static org.apache.commons.lang3.exception.ExceptionUtils.getRootCause; import static org.apache.commons.lang3.exception.ExceptionUtils.getThrowableList; @@ -220,7 +221,7 @@ public class Logging { T withMDCInternal(Map copyOfParentMDC, UncheckedThrowingSupplier supplier) { try { - MDC.setContextMap(copyOfParentMDC); + MDC.setContextMap(defaultIfNull(copyOfParentMDC, emptyMap())); return supplier.get(); } finally { MDC.clear(); -- cgit 1.2.3-korg