Fix for error when Elemental's JSON boxes null/undefined values.

Elemental wraps java values into js Object for Dev Mode to work.
I simplified code and added checks for null/undefined values
that should not be wrapped.

Bug: issue 8306
Change-Id: I085466780c2fd9182197c4a050a044e1d6468775
diff --git a/elemental/src/elemental/js/json/JsJsonArray.java b/elemental/src/elemental/js/json/JsJsonArray.java
index 2f388ad..a366614 100644
--- a/elemental/src/elemental/js/json/JsJsonArray.java
+++ b/elemental/src/elemental/js/json/JsJsonArray.java
@@ -16,8 +16,6 @@
 package elemental.js.json;
 
 import com.google.gwt.core.client.JavaScriptObject;
-import com.google.gwt.core.client.JsArrayNumber;
-import com.google.gwt.core.client.JsArrayString;
 
 import elemental.js.util.JsArrayOf;
 import elemental.json.JsonArray;
@@ -41,7 +39,7 @@
   }
 
   public final native JsonValue get(int index) /*-{
-    return this[index];
+    return @elemental.js.json.JsJsonValue::box(Lelemental/json/JsonValue;)(this[index]);
   }-*/;
 
   public JsonArray getArray(int index) {
@@ -75,22 +73,18 @@
   }
 
   public native void set(int index, JsonValue value) /*-{
-       this[index] = value;
+    this[index] = value;
   }-*/;
   
   public void set(int index, String string) {
-    asJsStringArray().set(index, string);
+    set(index, JsJsonString.create(string));
   }
 
-  public native void set(int index, double number) /*-{
-    this[index] = Object(number);
-  }-*/;
+  public void set(int index, double number) {
+    set(index, JsJsonNumber.create(number));
+  }
 
-  public native void set(int index, boolean bool) /*-{
-    this[index] = Object(bool);
-  }-*/;
-
-  private JsArrayString asJsStringArray() {
-    return this.cast();
+  public void set(int index, boolean bool) {
+    set(index, JsJsonBoolean.create(bool));
   }
 }
diff --git a/elemental/src/elemental/js/json/JsJsonFactory.java b/elemental/src/elemental/js/json/JsJsonFactory.java
index dd75751..32e4754 100644
--- a/elemental/src/elemental/js/json/JsJsonFactory.java
+++ b/elemental/src/elemental/js/json/JsJsonFactory.java
@@ -28,6 +28,12 @@
  */
 public class JsJsonFactory implements JsonFactory {
 
+  private static native <T extends JsonValue> T parse0(String jsonString) /*-{
+    // assume Chrome, safe and non-broken JSON.parse impl
+    var value = $wnd.JSON.parse(jsonString);
+    return @elemental.js.json.JsJsonValue::box(Lelemental/json/JsonValue;)(value);
+  }-*/;
+
   public JsonString create(String string) {
     return JsJsonString.create(string);
   }
@@ -48,11 +54,10 @@
     return JsJsonNull.create();
   }
 
-  public native JsonObject createObject() /*-{
-    return Object.create(null);
-  }-*/;
+  public JsonObject createObject() {
+    return JsJsonObject.create();
+  }
 
-  @SuppressWarnings({"unchecked"})
   public <T extends JsonValue> T parse(String jsonString) throws JsonException {
     try {
       return parse0(jsonString);
@@ -60,14 +65,4 @@
       throw new JsonException("Can't parse " + jsonString);
     }
   }
-
-  private native <T extends JsonValue> T parse0(String jsonString) /*-{
-    // assume Chrome, safe and non-broken JSON.parse impl
-    return $wnd.JSON.parse(jsonString, function(key, value) {
-      if (typeof value === 'object') {
-        return value;
-      }
-      return Object(value);
-    });
-  }-*/;
 }
diff --git a/elemental/src/elemental/js/json/JsJsonObject.java b/elemental/src/elemental/js/json/JsJsonObject.java
index 926b1e5..41f3d76 100644
--- a/elemental/src/elemental/js/json/JsJsonObject.java
+++ b/elemental/src/elemental/js/json/JsJsonObject.java
@@ -39,9 +39,7 @@
   }
 
   public final native JsonValue get(String key) /*-{
-    return @com.google.gwt.core.client.GWT::isScript()() ?
-            @elemental.js.json.JsJsonValue::box(Lelemental/json/JsonValue;)(this[key]) :
-            this[key] != null ? Object(this[key]) : null;
+    return @elemental.js.json.JsJsonValue::box(Lelemental/json/JsonValue;)(this[key]);
   }-*/;
 
   public JsonArray getArray(String key) {
@@ -52,7 +50,6 @@
     return ((JsonBoolean) get(key)).getBoolean();
   }
 
-
   public double getNumber(String key) {
     return ((JsonNumber) get(key)).getNumber();
   }
@@ -84,25 +81,29 @@
     return keys;
   }-*/;
 
-  public void put(String key, JsonValue value) {
-    put0(key, value);
+  public native void put(String key, JsonValue value) /*-{
+    this[key] = value;
+  }-*/;
+
+  public void put(String key, String value) {
+    put(key, JsJsonString.create(value));
   }
 
-  public native void put(String key, String value)  /*-{
-    this[key] = value;
-  }-*/;
+  public void put(String key, double value) {
+    put(key, JsJsonNumber.create(value));
+  }
 
-  public native void put(String key, double value) /*-{
-    this[key] = Object(value);
-  }-*/;
+  public void put(String key, boolean value) {
+    put(key, JsJsonBoolean.create(value));
+  }
 
-  public native void put(String key, boolean value) /*-{
-    this[key] = Object(value);
-  }-*/;
-
-  public native void put0(String key, JsonValue value)  /*-{
-    this[key] = value;
-  }-*/;
+  /**
+   * @deprecated use {@link #put(String, elemental.json.JsonValue)} instead.
+   */
+  @Deprecated
+  public void put0(String key, JsonValue value) {
+      put(key, value);
+  }
 
   public native void remove(String key) /*-{
     delete this[key];
diff --git a/elemental/src/elemental/js/json/JsJsonString.java b/elemental/src/elemental/js/json/JsJsonString.java
index 2db459b..c20ff91 100644
--- a/elemental/src/elemental/js/json/JsJsonString.java
+++ b/elemental/src/elemental/js/json/JsJsonString.java
@@ -16,7 +16,6 @@
 package elemental.js.json;
 
 import elemental.json.JsonString;
-import elemental.json.JsonValue;
 
 /**
  * Client-side 'zero overhead' JSO implementation using extension method
@@ -29,10 +28,6 @@
     return createProd(string);
   }
 
-  static native String getString(JsonValue value) /*-{
-    return @elemental.js.json.JsJsonValue::debox(Lelemental/json/JsonValue;)(value);
-  }-*/;
-
   /*
    * MAGIC: String cast to object interface.
    */
diff --git a/elemental/src/elemental/js/json/JsJsonValue.java b/elemental/src/elemental/js/json/JsJsonValue.java
index 8575d32..5698016 100644
--- a/elemental/src/elemental/js/json/JsJsonValue.java
+++ b/elemental/src/elemental/js/json/JsJsonValue.java
@@ -27,7 +27,7 @@
 
   static native JsonValue box(JsonValue value) /*-{
     // box for DevMode, not ProdMode
-    return @com.google.gwt.core.client.GWT::isScript()() ? value : Object(value);
+    return @com.google.gwt.core.client.GWT::isScript()() || value == null ? value : Object(value);
   }-*/;
 
   static native JsonValue debox(JsonValue value) /*-{
@@ -54,23 +54,26 @@
 
   @Override
   final public native boolean asBoolean() /*-{
-     return @com.google.gwt.core.client.GWT::isScript()() ?
+     return @com.google.gwt.core.client.GWT::isScript()() || this == null ?
         !!@elemental.js.json.JsJsonValue::debox(Lelemental/json/JsonValue;)(this) :
         (!!@elemental.js.json.JsJsonValue::debox(Lelemental/json/JsonValue;)(this)).valueOf();
   }-*/;
 
   @Override
   final public native double asNumber() /*-{
+    if (this == null) {
+      return 0;
+    }
     return @com.google.gwt.core.client.GWT::isScript()() ?
         +@elemental.js.json.JsJsonValue::debox(Lelemental/json/JsonValue;)(this) :
         (+@elemental.js.json.JsJsonValue::debox(Lelemental/json/JsonValue;)(this)).valueOf();
-
   }-*/;
 
   @Override
   // avoid casts, as compiler will throw CCE trying to cast a raw JS String to an interface
   final public native String asString() /*-{
-    return "" + @elemental.js.json.JsJsonValue::debox(Lelemental/json/JsonValue;)(this);
+    return this == null ? null :
+        ("" + @elemental.js.json.JsJsonValue::debox(Lelemental/json/JsonValue;)(this));
   }-*/;
 
   final public JsonType getType() {