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)

2 files changed, 11 insertions, 4 deletions

diff --git a/plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RestapiCallNode.java b/plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RestapiCallNode.java
index e42dfa484..1f38b7f0f 100755
--- a/plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RestapiCallNode.java
+++ b/plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RestapiCallNode.java
@@ -605,8 +605,9 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
             }
 
             String var1 = template.substring(i1 + 2, i2);
+            boolean keepEmpty = var1.startsWith("~");
             String value1 = format == Format.XML ? XmlJsonUtil.getXml(mm, var1) : XmlJsonUtil.getJson(mm, var1);
-            if (value1 == null || value1.trim().length() == 0) {
+            if (value1 == null || (value1.trim().length() == 0 && !keepEmpty)) {
                 // delete the whole element (line)
                 int i3 = template.lastIndexOf('\n', i1);
                 if (i3 < 0) {
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;
         }