diff options
author | 2021-11-19 15:33:12 -0500 | |
---|---|---|
committer | 2021-11-19 22:40:05 +0000 | |
commit | 10f73445a2ea8e9829f829c1bb3bd39463c74f58 (patch) | |
tree | b87b80c68aa2d801f0ecad77b5ac7f003829be9c /plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlJsonUtil.java | |
parent | aae8c37cf2f530abf2979cd00722f7dcacde097d (diff) |
Restapi-call-node: Support for "" values in JSONhonolulu
Issue-ID: CCSDK-3529
Signed-off-by: Stan Bonev (sb5356) <sb5356@att.com>
Change-Id: I30e903a4b7028c707f73f3516ef11eecf032c5c2
(cherry picked from commit d4c076118ff231d9ab5165a873185515896380eb)
Diffstat (limited to 'plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlJsonUtil.java')
-rw-r--r-- | plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlJsonUtil.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlJsonUtil.java b/plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlJsonUtil.java index 9870221d7..d6ef7463a 100644 --- a/plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlJsonUtil.java +++ b/plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlJsonUtil.java @@ -51,6 +51,12 @@ public final class XmlJsonUtil { } public static String getJson(Map<String, String> varmap, String var) { + boolean keepEmpty = false; + if (var.startsWith("~")) { + var = var.substring(1); + keepEmpty = true; + } + boolean escape = true; if (var.startsWith("'")) { var = var.substring(1); @@ -64,7 +70,7 @@ public final class XmlJsonUtil { } Object o = createStructure(varmap, var); - return generateJson(o, escape, quotes); + return generateJson(o, escape, quotes, keepEmpty); } private static Object createStructure(Map<String, String> flatmap, String var) { @@ -286,11 +292,11 @@ public final class XmlJsonUtil { return null; } - private static String generateJson(Object o, boolean escape, boolean quotes) { + private static String generateJson(Object o, boolean escape, boolean quotes, boolean keepEmpty) { if (o == null) { return null; } - if (o instanceof String && ((String) o).length() == 0) { + if (o instanceof String && ((String) o).length() == 0 && !keepEmpty) { return null; } |