remove all classes referencing to com.google.gson.internal.*

Author: jwfing

core/src/main/java/cn/leancloud/gson/BaseOperationAdapter.java

@@ -10,7 +10,6 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.TypeAdapter;
-import com.google.gson.internal.bind.TypeAdapters;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 
@@ -36,11 +35,13 @@ public void write(JsonWriter writer, BaseOperation op) throws IOException {
       List<ObjectFieldOperation> subOps = ((CompoundOperation)op).getSubOperations();
       jsonObject.add(ATTR_SUBOPS, GsonWrapper.toJsonElement(subOps));
     }
-    TypeAdapters.JSON_ELEMENT.write(writer, jsonObject);
+    TypeAdapter<JsonElement> elementAdapter = GsonWrapper.getAdapter(JsonElement.class);
+    elementAdapter.write(writer, jsonObject);
   }
 
   public BaseOperation read(JsonReader reader) throws IOException {
-    JsonElement elem = TypeAdapters.JSON_ELEMENT.read(reader);
+    TypeAdapter<JsonElement> elementAdapter = GsonWrapper.getAdapter(JsonElement.class);
+    JsonElement elem = elementAdapter.read(reader);
     if (elem.isJsonObject()) {
       JsonObject jsonObject = elem.getAsJsonObject();
       return parseJSONObject(new GsonObject(jsonObject));

core/src/main/java/cn/leancloud/gson/GsonWrapper.java

@@ -7,8 +7,8 @@
 import cn.leancloud.sms.LCCaptchaDigest;
 import cn.leancloud.sms.LCCaptchaValidateResult;
 import cn.leancloud.upload.FileUploadToken;
+import cn.leancloud.utils.LCUtils;
 import com.google.gson.*;
-import com.google.gson.internal.Primitives;
 import com.google.gson.reflect.TypeToken;
 
 import java.lang.reflect.Modifier;
@@ -77,6 +77,10 @@ public static String toJsonString(Map<String, Object> map) {
     return gson.toJson(map);
   }
 
+  public static <T> TypeAdapter<T> getAdapter(Class<T> clazz) {
+    return gson.getAdapter(clazz);
+  }
+
   public static JsonElement toJsonElement(Object object) {
     if (null == object) {
       return null;
@@ -126,7 +130,7 @@ public static <T> T parseObject(String jsonString, Class<T> clazz) {
   }
 
   public static <T> T parseObject(String jsonString, Type typeOfT) {
-    if (Primitives.isPrimitive(typeOfT)
+    if (LCUtils.isPrimitive(typeOfT)
             || (typeOfT instanceof Class && String.class.isAssignableFrom((Class)typeOfT))) {
       JsonElement element = gson.toJsonTree(jsonString, typeOfT);
       return gson.fromJson(element, typeOfT);

core/src/main/java/cn/leancloud/gson/JSONArrayAdapter.java

@@ -4,7 +4,6 @@
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.TypeAdapter;
-import com.google.gson.internal.bind.TypeAdapters;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 
@@ -13,14 +12,16 @@
 public class JSONArrayAdapter extends TypeAdapter<JSONArray> {
   public void write(JsonWriter writer, JSONArray array) throws IOException {
     if (array instanceof GsonArray) {
-      TypeAdapters.JSON_ELEMENT.write(writer, ((GsonArray)array).getRawObject());
+      TypeAdapter<JsonElement> elementAdapter = GsonWrapper.getAdapter(JsonElement.class);
+      elementAdapter.write(writer,((GsonArray)array).getRawObject());
     } else {
       writer.nullValue();
     }
   }
 
   public JSONArray read(JsonReader reader) throws IOException {
-    JsonElement jsonObject = TypeAdapters.JSON_ELEMENT.read(reader);
+    TypeAdapter<JsonElement> elementAdapter = GsonWrapper.getAdapter(JsonElement.class);
+    JsonElement jsonObject = elementAdapter.read(reader);
     return new GsonArray((JsonArray) jsonObject);
   }
 }

core/src/main/java/cn/leancloud/gson/JSONObjectAdapter.java

@@ -4,7 +4,6 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.TypeAdapter;
-import com.google.gson.internal.bind.TypeAdapters;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 
@@ -16,12 +15,14 @@ public void write(JsonWriter writer, JSONObject object) throws IOException {
     if (!(object instanceof GsonObject)) {
       writer.nullValue();
     } else {
-      TypeAdapters.JSON_ELEMENT.write(writer, ((GsonObject) object).getRawObject());
+      TypeAdapter<JsonElement> elementAdapter = GsonWrapper.getAdapter(JsonElement.class);
+      elementAdapter.write(writer, ((GsonObject) object).getRawObject());
     }
   }
 
   public JSONObject read(JsonReader reader) throws IOException {
-    JsonElement jsonObject = TypeAdapters.JSON_ELEMENT.read(reader);
+    TypeAdapter<JsonElement> elementAdapter = GsonWrapper.getAdapter(JsonElement.class);
+    JsonElement jsonObject = elementAdapter.read(reader);
     return new GsonObject((JsonObject) jsonObject);
   }
 }

core/src/main/java/cn/leancloud/gson/MapDeserializerDoubleAsIntFix.java

@@ -1,7 +1,6 @@
 package cn.leancloud.gson;
 
 import com.google.gson.*;
-//import com.google.gson.internal.LinkedTreeMap;
 
 import java.lang.reflect.Type;
 import java.util.*;

core/src/main/java/cn/leancloud/utils/LCUtils.java

@@ -4,6 +4,7 @@
 import cn.leancloud.json.JSON;
 import cn.leancloud.json.JSONObject;
 
+import java.lang.reflect.Type;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.ConcurrentMap;
@@ -109,6 +110,10 @@ public static void mergeConcurrentMap(ConcurrentMap<String, Object> left, Map<St
     }
   }
 
+  public static boolean isPrimitive(Type type) {
+    return type instanceof Class && ((Class)type).isPrimitive();
+  }
+
   public static void putAllWithNullFilter(Map<String, Object> source, Map<String, Object> dest) {
     if (null == source || null == dest) {
       return;