Merge pull request #67 from Simon-Initiative/AUTHORING-2257-empty-preferences-bug

Authoring 2257 empty preferences bug

Author: ThinkThoughtThunk

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

@@ -6,14 +6,16 @@
 import com.google.gson.JsonObject;
 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 +51,12 @@ public static Element preferenceSetToElement(JsonElement prefSeti, Namespace nsi
 
         final Namespace ns = nsi;
         JsonObject prefSet = (JsonObject) prefSeti;
+        // Preferences
+        JsonArray preferences = prefSet.getAsJsonArray("preferences");
+        if (preferences == null) {
+            return null;
+        }
+
         // Preference set
         Element setElmnt = new Element("preferences", ns);
 
@@ -57,16 +65,12 @@ public static Element preferenceSetToElement(JsonElement prefSeti, Namespace nsi
             setElmnt.setAttribute("guid", prefSet.get("@guid").getAsString());
         }
 
-        // Preferences
-        JsonArray preferences = prefSet.getAsJsonArray("preferences");
-        if (preferences != null) {
-            preferences.forEach((val) -> {
-                Element element = preferenceToElement(val, ns);
-                if (element != null) {
-                    setElmnt.addContent(element);
-                }
-            });
-        }
+        preferences.forEach((val) -> {
+            Element element = preferenceToElement(val, ns);
+            if (element != null) {
+                setElmnt.addContent(element);
+            }
+        });
 
         return setElmnt;
     }