Merge pull request #237 from jwfing/master

fixed #236

Author: jwfing

CHANGELOG.md

@@ -5,6 +5,18 @@ Following is change logs for recently release versions, you can refer to [releas
 > Warning:
 > DONOT upgrade java-websocket to 1.15.0(or above), bcz it doesn't work on Android 5.1 or earlier version.
 
+## 8.2.19 release
+
+#### Break changes
+- None
+
+#### New features
+- None
+
+#### Optimization and fixed bugs
+- fixed: correct json parser for LCFile#save with prefix path(GameSave doesn't work in version 8.2.16-18).
+
+
 ## 8.2.18 release
 
 #### Break changes
@@ -16,6 +28,7 @@ Following is change logs for recently release versions, you can refer to [releas
 #### Optimization and fixed bugs
 - fixed: correct json field name for captcha validation result.
 
+
 ## 8.2.17 release
 
 #### Break changes
@@ -27,6 +40,7 @@ Following is change logs for recently release versions, you can refer to [releas
 #### Optimization and fixed bugs
 - fixed: let query callback run in main thread for CACHE_THEN_NETWORK policy.
 
+
 ## 8.2.16 release
 
 #### Break changes
@@ -40,6 +54,7 @@ Following is change logs for recently release versions, you can refer to [releas
 - change Gson type adapter for some classes, avoid to use internal tools;
 - other optimizations.
 
+
 ## 8.2.15 release
 
 #### Break changes

android-sdk/build.gradle

@@ -32,7 +32,7 @@ allprojects {
 }
 
 ext {
-    sdkVersion = "8.2.18"
+    sdkVersion = "8.2.19"
     supportLibVersion = "26.1.0"
     converterVersion = "2.1.0"
     rxandroidVersion = "2.1.1"

android-sdk/gradle.properties

@@ -15,7 +15,7 @@ org.gradle.jvmargs=-Xmx1536m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-VERSION_NAME=8.2.18
+VERSION_NAME=8.2.19
 VERSION_CODE=2695
 GROUP=cn.leancloud
 

core/src/main/java/cn/leancloud/annotation/JsonField.java

@@ -0,0 +1,12 @@
+package cn.leancloud.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD})
+public @interface JsonField {
+  String value();
+}

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/FileUploadTokenAdapter.java

@@ -7,7 +7,7 @@
 import com.google.gson.stream.JsonWriter;
 
 import java.io.IOException;
-
+@Deprecated
 public class FileUploadTokenAdapter extends TypeAdapter<FileUploadToken> {
   private static final String FIELD_BUCKET = "bucket";
   private static final String FIELD_OBJECTID = "objectId";

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

@@ -5,7 +5,6 @@
 import cn.leancloud.json.JSONParser;
 import cn.leancloud.json.TypeReference;
 import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -11,6 +11,12 @@
 import java.lang.reflect.Type;
 import java.util.*;
 
+/**
+ * deprecated since 8.2.19.
+ * @param <T> generic type.
+ */
+
+@Deprecated
 public class GeneralFieldMappingObjectAdapter<T> extends TypeAdapter<T> {
   private Class targetClazz;
   private Map<String, Type> displayFields;
@@ -90,6 +96,7 @@ public T read(JsonReader jsonReader) throws IOException {
         try {
           Field field = result.getClass().getDeclaredField(identifyFieldName);
           if (null == valueType || null == field) {
+            jsonReader.skipValue();
             continue;
           }
           field.setAccessible(true);

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

@@ -0,0 +1,130 @@
+package cn.leancloud.gson;
+
+import cn.leancloud.annotation.JsonField;
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.JsonWriter;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.Map;
+
+public class GeneralSimpleObjectAdapter<T> extends TypeAdapter<T> {
+  private Class targetClazz;
+  private Map<String, Field> displayFields = new HashMap<>();
+
+  public GeneralSimpleObjectAdapter(Class clazz) {
+    this.targetClazz = clazz;
+    Field[] fields = clazz.getDeclaredFields();
+    for (Field field: fields) {
+      String fieldName = field.getName();
+      JsonField annotation = field.getAnnotation(JsonField.class);
+      if (null != annotation) {
+        fieldName = annotation.value();
+      }
+      displayFields.put(fieldName, field);
+    }
+  }
+  @Override
+  public void write(JsonWriter jsonWriter, T t) throws IOException {
+    jsonWriter.beginObject();
+    Field[] fields = t.getClass().getDeclaredFields();
+    for(Field field : fields) {
+      field.setAccessible(true);
+      String canonicalName = field.getName();
+      String outputName = canonicalName;
+      JsonField jsonField = field.getAnnotation(JsonField.class);
+      if (null != jsonField) {
+        outputName = jsonField.value();
+      }
+      Type valueType = field.getType();
+      try {
+        if (valueType.equals(Character.class) || valueType.equals(char.class)) {
+          char value = field.getChar(t);
+          jsonWriter.name(outputName).value(value);
+        } else if (valueType.equals(Boolean.class) || valueType.equals(boolean.class)) {
+          boolean value = field.getBoolean(t);
+          jsonWriter.name(outputName).value(value);
+        } else if (valueType.equals(String.class)) {
+          String value = (String)field.get(t);
+          jsonWriter.name(outputName).value(value);
+        } else if (valueType.equals(Integer.class) || valueType.equals(int.class)) {
+          Integer value = (Integer) field.get(t);
+          jsonWriter.name(outputName).value(value);
+        } else if (valueType.equals(Long.class) || valueType.equals(long.class)) {
+          Long value = (Long) field.get(t);
+          jsonWriter.name(outputName).value(value);
+        } else if (valueType.equals(Float.class) || valueType.equals(float.class)) {
+          Float value = (Float) field.get(t);
+          jsonWriter.name(outputName).value(value);
+        } else if (valueType.equals(Double.class) || valueType.equals(double.class)) {
+          Double value = (Double) field.get(t);
+          jsonWriter.name(outputName).value(value);
+        }
+      } catch (Exception ex) {
+        ex.printStackTrace();
+      }
+    }
+    jsonWriter.endObject();
+    jsonWriter.flush();
+  }
+
+  @Override
+  public T read(JsonReader jsonReader) throws IOException {
+    try {
+      T result = (T)this.targetClazz.newInstance();
+      jsonReader.beginObject();
+      String jsonFieldName = null;
+      while(jsonReader.hasNext()) {
+        JsonToken token = jsonReader.peek();
+        if (token.equals(JsonToken.NAME)) {
+          // get current token.
+          jsonFieldName = jsonReader.nextName();
+        }
+        Field targetField = this.displayFields.get(jsonFieldName);
+        // move to next token
+        jsonReader.peek();
+        try {
+          if (null == targetField) {
+            jsonReader.skipValue();
+            continue;
+          }
+          targetField.setAccessible(true);
+          Object value = null;
+          Type valueType = targetField.getType();
+          if (valueType.equals(String.class)) {
+            value = jsonReader.nextString();
+          } else if (valueType.equals(Integer.class) || valueType.equals(int.class)) {
+            value = jsonReader.nextInt();
+          } else if (valueType.equals(Boolean.class) || valueType.equals(boolean.class)) {
+            value = jsonReader.nextBoolean();
+          } else if (valueType.equals(Character.class) || valueType.equals(char.class)) {
+            value = jsonReader.nextString();
+          } else if (valueType.equals(Long.class) || valueType.equals(long.class)) {
+            value = jsonReader.nextLong();
+          } else if (valueType.equals(Float.class) || valueType.equals(float.class)) {
+            value = jsonReader.nextDouble();
+          } else if (valueType.equals(Double.class) || valueType.equals(double.class)) {
+            value = jsonReader.nextDouble();
+          } else {
+            jsonReader.skipValue();
+          }
+          if (null != value) {
+            targetField.set(result, value);
+          }
+        } catch (Exception ex) {
+          ex.printStackTrace();
+        }
+      }
+      jsonReader.endObject();
+      return result;
+    } catch (InstantiationException e) {
+      throw new RuntimeException(e);
+    } catch (IllegalAccessException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}

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;
@@ -23,21 +23,6 @@ public class GsonWrapper {
   static final BaseOperationAdapter baseOperationAdapter = new BaseOperationAdapter();
   static final JSONObjectAdapter jsonObjectAdapter = new JSONObjectAdapter();
   static final JSONArrayAdapter jsonArrayAdapter = new JSONArrayAdapter();
-  static final Map<String, Type> appAccessEndpointFields = new HashMap<String, Type>() {{
-    put("ttl", Long.class);
-    put("stats_server", String.class);
-    put("push_server", String.class);
-    put("rtm_router_server", String.class);
-    put("api_server", String.class);
-    put("engine_server", String.class);
-  }};
-  static final Map<String, Type> captchaDigestFields = new HashMap<String, Type>() {{
-    put("captcha_token", String.class);
-    put("captcha_url", String.class);
-  }};
-  static final Map<String, Type> captchaValidateResultFields = new HashMap<String, Type>() {{
-    put("validate_token", String.class);
-  }};
 
   static final Gson gson = new GsonBuilder().serializeNulls()
           .excludeFieldsWithModifiers(Modifier.STATIC, Modifier.TRANSIENT, Modifier.VOLATILE)
@@ -68,16 +53,14 @@ public class GsonWrapper {
           .registerTypeAdapter(JSONObject.class, jsonObjectAdapter)
           .registerTypeAdapter(GsonArray.class, jsonArrayAdapter)
           .registerTypeAdapter(Date.class, new GsonUTCDateAdapter())
-          .registerTypeAdapter(FileUploadToken.class, new FileUploadTokenAdapter())
+          .registerTypeAdapter(FileUploadToken.class,
+                  new GeneralSimpleObjectAdapter<FileUploadToken>(FileUploadToken.class))
           .registerTypeAdapter(AppAccessEndpoint.class,
-                  new GeneralFieldMappingObjectAdapter<AppAccessEndpoint>(AppAccessEndpoint.class,
-                          appAccessEndpointFields, FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES ))
+                  new GeneralSimpleObjectAdapter<AppAccessEndpoint>(AppAccessEndpoint.class))
           .registerTypeAdapter(LCCaptchaDigest.class,
-                  new GeneralFieldMappingObjectAdapter<LCCaptchaDigest>(LCCaptchaDigest.class,
-                          captchaDigestFields, FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES))
+                  new GeneralSimpleObjectAdapter<LCCaptchaDigest>(LCCaptchaDigest.class))
           .registerTypeAdapter(LCCaptchaValidateResult.class,
-                  new GeneralFieldMappingObjectAdapter<LCCaptchaValidateResult>(LCCaptchaValidateResult.class,
-                          captchaValidateResultFields, FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES))
+                  new GeneralSimpleObjectAdapter<LCCaptchaValidateResult>(LCCaptchaValidateResult.class))
           .registerTypeAdapter(new TypeToken<Map<String, Object>>(){}.getType(),  new MapDeserializerDoubleAsIntFix())
           .registerTypeAdapter(Map.class,  new MapDeserializerDoubleAsIntFix())
           .setLenient()
@@ -94,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;
@@ -143,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);