Skip to content

关于AVObject的JSON Parser配置，应该放在AVObject类中 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lbt05 merged 2 commits into from
Aug 9, 2016
Merged

关于AVObject的JSON Parser配置，应该放在AVObject类中 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3446c97
change JSON parse configure in AVObject
lbt05 Aug 9, 2016
8399170
change method visibility
lbt05 Aug 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 25 additions & 9 deletions src/main/java/com/avos/avoscloud/AVObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;

/**
* <p>
* The AVObject is a local representation of data that can be saved and retrieved from the AVOSCloud
Expand All @@ -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();
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/avos/avoscloud/PaasClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ void setProduction(boolean production) {
}

protected static PaasClient sharedInstance(AVOSServices service) {

String host =
InternalConfigurationController.globalInstance().getAppConfiguration()
.getService(service.toString());
Expand Down Expand Up @@ -266,7 +265,7 @@ public String getApiVersion() {
return apiVersion;
}

public void setBaseUrl(final String url) {
protected void setBaseUrl(final String url) {
this.baseUrl = url;
}

Expand Down