Add method to escape json strings

[appc.git] / appc-config / appc-config-generator / provider / src / main / java / org / onap / sdnc / config / generator / convert / ConvertNode.java

diff --git a/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/convert/ConvertNode.java b/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/convert/ConvertNode.java
index 69c5dff..f9f00e4 100644 (file)
--- a/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/convert/ConvertNode.java
+++ b/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/convert/ConvertNode.java
@@ -60,6 +60,12 @@ public class ConvertNode implements SvcLogicJavaPlugin {
             if (StringUtils.isNotBlank(jsonData)) {
                 if (StringUtils.isNotBlank(isEscaped) && "Y".equalsIgnoreCase(isEscaped)) {
                     jsonData = StringEscapeUtils.unescapeJavaScript(jsonData);
+                    //We need to re-escape any json data that might be contained in Strings
+                    try {
+                        jsonData = JSONTool.escapeInternalJson(jsonData);
+                    } catch (Exception e) {
+                        log.error("Exception during JSONTool.escapeInternalJson",e);
+                    }
                 }
 
                 List<String> blockKeys = new ArrayList<>();