adds codeblock cdata autowrap on any json to xml transform

Author: Raphael Gachuhi

src/main/java/edu/cmu/oli/content/resource/builders/Json2Xml.java

@@ -6,6 +6,8 @@
 import edu.cmu.oli.content.AppUtils;
 import org.apache.commons.text.StringEscapeUtils;
 import org.jdom2.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -17,6 +19,8 @@
  */
 public class Json2Xml {
 
+    private Logger log = LoggerFactory.getLogger(Json2Xml.class);
+
     public Document jsonToXml(JsonObject json, Map<String, Namespace> namespaceMap) {
         Document document = new Document();
 
@@ -118,9 +122,13 @@ private void doJsonToXml(String key, JsonElement jsonTree, Content xmlParent, Ma
             } else if (key.equalsIgnoreCase("#cdata")) {
                 ((Element) xmlParent).addContent(new CDATA(jsonTree.getAsString()));
             } else {
-
-                String s = StringEscapeUtils.escapeXml10(jsonTree.getAsString());
-                ((Element) xmlParent).addContent(s);
+                // Wraps with cdata any codeblock content not already wrapped in cdata
+                if (((Element)xmlParent).getName().equalsIgnoreCase("codeblock")) {
+                    ((Element) xmlParent).addContent(new CDATA(jsonTree.getAsString()));
+                }else {
+                    String s = StringEscapeUtils.escapeXml10(jsonTree.getAsString());
+                    ((Element) xmlParent).addContent(s);
+                }
 
             }
         } else if (jsonTree.isJsonNull()) {