upgrade java-json-api to v2.0.0, add WritableJSONArray/Object.

Author: webee

README.md

@@ -14,6 +14,6 @@ To install the library add:
         maven { url "https://jitpack.io" }
    }
    dependencies {
-         compile 'com.github.webee:fastjson-json-api-android:v1.4.0'
+         compile 'com.github.webee:fastjson-json-api-android:v2.0.0'
    }
    ```

app/build.gradle

@@ -20,10 +20,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile fileTree(include: ['*.jar'], dir: 'libs')
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     compile 'com.android.support:appcompat-v7:24.2.1'
     testCompile 'junit:junit:4.12'
+    compile project(':fastjson-json-api-android')
 }

app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.github.webee.fastjson">
+    package="com.github.webee.fastjson.test">
 
     <application
         android:allowBackup="true"

app/src/main/java/com/github/webee/fastjson/MainActivity.java renamed to app/src/main/java/com/github/webee/fastjson/test/MainActivity.java

@@ -1,7 +1,9 @@
-package com.github.webee.fastjson;
+package com.github.webee.fastjson.test;
 
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+
+import com.github.webee.fastjson.R;
 
 public class MainActivity extends AppCompatActivity {
 

app/src/main/res/layout/activity_main.xml

@@ -8,7 +8,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="com.github.webee.fastjson.MainActivity">
+    tools:context="com.github.webee.fastjson.test.MainActivity">
 
     <TextView
         android:layout_width="wrap_content"

fastjson-json-api-android/build.gradle

@@ -32,7 +32,7 @@ dependencies {
     })
     compile 'com.android.support:appcompat-v7:24.2.1'
     compile 'com.alibaba:fastjson:1.1.55.android'
-    compile 'com.github.webee:java-json-api:v1.4.0'
+    compile 'com.github.webee:java-json-api:v2.0.0'
     testCompile 'junit:junit:4.12'
 }
 

fastjson-json-api-android/src/main/java/com/github/webee/fastjson/JSONArray.java

@@ -90,21 +90,6 @@ public com.github.webee.json.JSONObject getObject(int index) {
         return new JSONObject(jsonArray.getJSONObject(index));
     }
 
-    @Override
-    public boolean push(Object value) {
-        return jsonArray.add(Utils.resolveValue(value));
-    }
-
-    @Override
-    public Object set(int index, Object value) {
-        return jsonArray.set(index, Utils.resolveValue(value));
-    }
-
-    @Override
-    public Object remove(int index) {
-        return jsonArray.remove(index);
-    }
-
     @Override
     public String toJSONString() {
         return jsonArray.toJSONString();

fastjson-json-api-android/src/main/java/com/github/webee/fastjson/JSONObject.java

@@ -19,18 +19,22 @@ public JSONObject(com.alibaba.fastjson.JSONObject jsonObject) {
         this.jsonObject = jsonObject;
     }
 
+    @Override
     public Set<String> keySet() {
         return jsonObject.keySet();
     }
 
+    @Override
     public boolean hasKey(String key) {
         return jsonObject.containsKey(key);
     }
 
+    @Override
     public JSONType getType(String key) {
         return Commons.getType(jsonObject.get(key));
     }
 
+    @Override
     public boolean isNull(String key) {
         return jsonObject.get(key) == null;
     }
@@ -74,26 +78,21 @@ public Double getDouble(String key) {
         return jsonObject.getDouble(key);
     }
 
+    @Override
     public String getString(String key) {
         return jsonObject.getString(key);
     }
 
+    @Override
     public com.github.webee.json.JSONArray getArray(String key) {
         return new JSONArray(jsonObject.getJSONArray(key));
     }
 
+    @Override
     public com.github.webee.json.JSONObject getObject(String key) {
         return new JSONObject(jsonObject.getJSONObject(key));
     }
 
-    public Object set(String key, Object value) {
-        return jsonObject.put(key, Utils.resolveValue(value));
-    }
-
-    public Object remove(String key) {
-        return jsonObject.remove(key);
-    }
-
     @Override
     public String toJSONString() {
         return jsonObject.toJSONString();

fastjson-json-api-android/src/main/java/com/github/webee/fastjson/WritableJSONArray.java

@@ -0,0 +1,28 @@
+package com.github.webee.fastjson;
+
+import com.github.webee.json.Utils;
+
+/**
+ * Created by webee on 16/12/16.
+ */
+
+public class WritableJSONArray extends JSONArray implements com.github.webee.json.WritableJSONArray {
+    public WritableJSONArray(com.alibaba.fastjson.JSONArray jsonArray) {
+        super(jsonArray);
+    }
+
+    @Override
+    public boolean push(Object value) {
+        return jsonArray.add(Utils.resolveValue(value));
+    }
+
+    @Override
+    public Object set(int index, Object value) {
+        return jsonArray.set(index, Utils.resolveValue(value));
+    }
+
+    @Override
+    public Object remove(int index) {
+        return jsonArray.remove(index);
+    }
+}

fastjson-json-api-android/src/main/java/com/github/webee/fastjson/WritableJSONObject.java

@@ -0,0 +1,23 @@
+package com.github.webee.fastjson;
+
+import com.github.webee.json.Utils;
+
+/**
+ * Created by webee on 16/12/16.
+ */
+
+public class WritableJSONObject extends JSONObject implements com.github.webee.json.WritableJSONObject {
+    public WritableJSONObject(com.alibaba.fastjson.JSONObject jsonObject) {
+        super(jsonObject);
+    }
+
+    @Override
+    public Object set(String key, Object value) {
+        return jsonObject.put(key, Utils.resolveValue(value));
+    }
+
+    @Override
+    public Object remove(String key) {
+        return jsonObject.remove(key);
+    }
+}