From 3446c97675b7338b794a474c815223ffb53091e8 Mon Sep 17 00:00:00 2001 From: lbt05 Date: Tue, 9 Aug 2016 11:49:28 +0800 Subject: [PATCH 1/2] change JSON parse configure in AVObject --- .../java/com/avos/avoscloud/AVObject.java | 34 ++++++++++++++----- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/avos/avoscloud/AVObject.java b/src/main/java/com/avos/avoscloud/AVObject.java index cc730b0..afc8e45 100644 --- a/src/main/java/com/avos/avoscloud/AVObject.java +++ b/src/main/java/com/avos/avoscloud/AVObject.java @@ -1,10 +1,30 @@ package com.avos.avoscloud; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.locks.ReadWriteLock; +import java.util.concurrent.locks.ReentrantReadWriteLock; + +import org.json.JSONArray; +import org.json.JSONObject; + import android.os.Parcel; import android.os.Parcelable; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson.parser.ParserConfig; +import com.alibaba.fastjson.serializer.SerializeConfig; import com.alibaba.fastjson.serializer.SerializerFeature; import com.avos.avoscloud.ops.AVOp; import com.avos.avoscloud.ops.AddOp; @@ -18,15 +38,6 @@ import com.avos.avoscloud.ops.RemoveRelationOp; import com.avos.avoscloud.ops.SetOp; -import org.json.JSONArray; -import org.json.JSONObject; - -import java.util.*; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.locks.ReadWriteLock; -import java.util.concurrent.locks.ReentrantReadWriteLock; - /** *

* The AVObject is a local representation of data that can be saved and retrieved from the AVOSCloud @@ -51,6 +62,11 @@ public class AVObject implements Parcelable { static { JSON.DEFFAULT_DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"; + ParserConfig.getGlobalInstance().putDeserializer(AVObject.class, AVObjectDeserializer.instance); + ParserConfig.getGlobalInstance().putDeserializer(AVUser.class, AVObjectDeserializer.instance); + + SerializeConfig.getGlobalInstance().put(AVObject.class, AVObjectSerializer.instance); + SerializeConfig.getGlobalInstance().put(AVUser.class, AVObjectSerializer.instance); } private static final String LOGTAG = AVObject.class.getName(); From 83991704b5d83bceb06c5499bb2a6d8fbd184682 Mon Sep 17 00:00:00 2001 From: lbt05 Date: Tue, 9 Aug 2016 11:51:27 +0800 Subject: [PATCH 2/2] change method visibility --- src/main/java/com/avos/avoscloud/PaasClient.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/avos/avoscloud/PaasClient.java b/src/main/java/com/avos/avoscloud/PaasClient.java index f5ca50b..685ee8b 100644 --- a/src/main/java/com/avos/avoscloud/PaasClient.java +++ b/src/main/java/com/avos/avoscloud/PaasClient.java @@ -82,7 +82,6 @@ void setProduction(boolean production) { } protected static PaasClient sharedInstance(AVOSServices service) { - String host = InternalConfigurationController.globalInstance().getAppConfiguration() .getService(service.toString()); @@ -266,7 +265,7 @@ public String getApiVersion() { return apiVersion; } - public void setBaseUrl(final String url) { + protected void setBaseUrl(final String url) { this.baseUrl = url; }