changed how json wrapper serializes objects

Author: Raphael Gachuhi

src/main/java/edu/cmu/oli/content/models/persistance/JsonWrapper.java

@@ -34,9 +34,7 @@ public JsonElement getJsonObject() {
     }
 
     public JsonElement serializeJson() {
-        JsonObject jsonObject = new JsonObject();
-        jsonObject.add("jsonObject", jp.parse(jsonString));
-        return jsonObject;
+        return jp.parse(jsonString);
     }
 
     public void setJsonObject(JsonElement jsonObject) {

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

@@ -1,19 +1,18 @@
 package edu.cmu.oli.content.resource.builders;
 
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonNull;
-import com.google.gson.JsonObject;
+import com.google.gson.*;
 import org.jdom2.Element;
 import org.jdom2.Namespace;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Methods for generating preference service XML.
  *
  * @author Raphael Gachuhi
  */
 public final class OptionsWriter {
-
+    static final Logger log = LoggerFactory.getLogger(OptionsWriter.class);
     private static final String _PUBLIC_ID = "-//Carnegie Mellon University//DTD Preferences 1.0//EN";
     private static final String _SYSTEM_ID = "http://oli.cmu.edu/dtd/oli_preferences_1_0.dtd";
 
@@ -49,6 +48,11 @@ public static Element preferenceSetToElement(JsonElement prefSeti, Namespace nsi
 
         final Namespace ns = nsi;
         JsonObject prefSet = (JsonObject) prefSeti;
+        if(prefSet.has("jsonObject")){
+            prefSet = prefSet.getAsJsonObject("jsonObject");
+        }
+
+        log.info("Preference set info: " + new Gson().toJson(prefSet));
         // Preference set
         Element setElmnt = new Element("preferences", ns);