fix bug when save array list, add test activity.

Author: ThirtyDegreesRay

README.md

@@ -40,7 +40,9 @@ intent.putExtra("description", "Android bundle data auto access.");
 startActivity(intent);
 ```    
 经过以上配置之后，DataAutoAccess会自动从intent中取出数据，给name和description变量赋值，而且当activity由于系统内存不足将要被杀死时，也会自动保存变量值，在onCreate时取出进行赋值。
-
+###Supported field type
+All type which bundle supported:
+String, int, boolean, double, float, long, byte, char, short, Parcelable, Serializable, Bundle, CharSequence,ArrayList<String>, ArrayList<Integer>, ArrayList<Parcelable>, ArrayList<CharSequence>, String[], int[], boolean[], double[], float[], long[], byte[], char[], short[], ParcelableBean[], CharSequenceBean[].
 
 ##Download
 Configure your project-level build.gradle to include the 'android-apt' plugin:
@@ -63,8 +65,8 @@ Then, apply the 'android-apt' plugin in your module-level build.gradle and add t
     }
 
     dependencies {
-        compile 'com.thirtydegreesray:dataautoaccess:1.2.2'
-        apt 'com.thirtydegreesray:dataautoaccess-compiler:1.2.2'
+        compile 'com.thirtydegreesray:dataautoaccess:1.2.3'
+        apt 'com.thirtydegreesray:dataautoaccess-compiler:1.2.3'
     }
 
 ##Proguard

dataautoaccess-compiler/src/main/java/com/thirtydegreesray/dataautoaccess/compiler/AutoAccessClass.java

@@ -80,16 +80,16 @@ private void generateSaveDataCode(StringBuilder java){
         for(FieldAutoAccess field : fields){
             String putPreCode = DataAutoAccessProcessor.PUT_DATA_PRE_CODE_MAP.get(field.getFieldType());
             //type ArrayList
-            if(putPreCode.equals("")){
-                java.append("\t").append("DataAutoAccess.saveArrayList(")
-                        .append("\"").append(field.getFiledKey()).append("\"").append(", ")
-                        .append("target.").append(field.getFieldName()).append(", ")
-                        .append("dataStore").append(");\n");
-            }else{
+//            if(putPreCode.equals("")){
+//                java.append("\t").append("DataAutoAccess.saveArrayList(")
+//                        .append("\"").append(field.getFiledKey()).append("\"").append(", ")
+//                        .append("target.").append(field.getFieldName()).append(", ")
+//                        .append("dataStore").append(");\n");
+//            }else{
                 java.append("\t").append("dataStore.").append(putPreCode)
                         .append("(").append("\"").append(field.getFiledKey()).append("\"").append(", ")
                         .append("target.").append(field.getFieldName()).append(");\n");
-            }
+//            }
         }
         java.append("}\n");
     }

dataautoaccess-compiler/src/main/java/com/thirtydegreesray/dataautoaccess/compiler/DataAutoAccessProcessor.java

@@ -59,7 +59,7 @@ public class DataAutoAccessProcessor extends AbstractProcessor {
     static final List<String> PUT_DATA_PRE_CODE = Arrays.asList(
             "putString", "putInt", "putBoolean", "putDouble", "putFloat", "putLong",
             "putByte", "putChar", "putShort", "putParcelable", "putSerializable", "putBundle", "putCharSequence",
-            "",
+            "putSerializable",
             "putStringArray", "putIntArray", "putBooleanArray", "putDoubleArray", "putFloatArray", "putLongArray",
             "putByteArray", "putCharArray", "putShortArray", "putParcelableArray", "putCharSequenceArray"
     );

dataautoaccess/src/main/java/com/thirtydegreesray/dataautoaccess/DataAutoAccess.java

@@ -11,7 +11,7 @@
 /**
  * Data auto access<br>
  * Android bundle data auto access.<br>
- *USE<br>
+ * USE<br>
  * <pre><code>
  *       public class ExampleActivity extends Activity {
  *          {@literal @}AutoAccess String name;
@@ -39,14 +39,14 @@
  *           }
  *      }
  * </code></pre>
- *
+ * <p>
  * <pre><code>
  *      Intent intent = new Intent(this, ExampleActivity.class);
  *      intent.putExtra("name", "DataAutoAccess");
  *      intent.putExtra("description", "Android bundle data auto access.");
  *      startActivity(intent);
  * </code></pre>
- *
+ * <p>
  * Created by ThirtyDegreesRay on 2016/9/6 09:35
  */
 public class DataAutoAccess {
@@ -57,50 +57,52 @@ public class DataAutoAccess {
 
     /**
      * get data from bundle
+     *
      * @param targetObject the object need to save data
-     * @param dataStore the bundle to get data
+     * @param dataStore    the bundle to get data
      */
-    public static void getData(Object targetObject, Bundle dataStore){
-        if(targetObject == null || dataStore == null){
+    public static void getData(Object targetObject, Bundle dataStore) {
+        if (targetObject == null || dataStore == null) {
             return;
         }
 
         DataAccessor<Object> dataAccessor = getDataAccessor(targetObject, dataStore);
-        if(dataAccessor != null) {
+        if (dataAccessor != null) {
             dataAccessor.getData(targetObject, dataStore);
         }
     }
 
     /**
      * save data to bundle
+     *
      * @param targetObject the object need to save data
-     * @param dataStore the bundle to save data
+     * @param dataStore    the bundle to save data
      */
-    public static void saveData(Object targetObject, Bundle dataStore){
-        if(targetObject == null || dataStore == null){
+    public static void saveData(Object targetObject, Bundle dataStore) {
+        if (targetObject == null || dataStore == null) {
             return;
         }
 
         DataAccessor<Object> dataAccessor = getDataAccessor(targetObject, dataStore);
-        if(dataAccessor != null) {
+        if (dataAccessor != null) {
             dataAccessor.saveData(targetObject, dataStore);
         }
     }
 
-    private static DataAccessor<Object> getDataAccessor(Object targetObject, Bundle dataStore){
+    private static DataAccessor<Object> getDataAccessor(Object targetObject, Bundle dataStore) {
         Class<?> targetClass = targetObject.getClass();
         String className = targetClass.getName() + SUFFIX;
         return getDataAccessor(className);
     }
 
-    private static DataAccessor<Object> getDataAccessor(String className){
-        if(!dataAccessorMap.containsKey(className)){
+    private static DataAccessor<Object> getDataAccessor(String className) {
+        if (!dataAccessorMap.containsKey(className)) {
             try {
                 Class<?> dataAccessorClass = Class.forName(className);
                 DataAccessor<Object> dataAccessor = (DataAccessor<Object>) dataAccessorClass.newInstance();
                 dataAccessorMap.put(className, dataAccessor);
             } catch (ClassNotFoundException e) {
-                e.printStackTrace();
+//                e.printStackTrace();
             } catch (InstantiationException e) {
                 e.printStackTrace();
             } catch (IllegalAccessException e) {
@@ -110,33 +112,45 @@ private static DataAccessor<Object> getDataAccessor(String className){
         return dataAccessorMap.get(className);
     }
 
-    /** DO NOT USE: Exposed for generated code. */
+    /**
+     * DO NOT USE: Exposed for generated code.
+     */
     public interface DataAccessor<T> {
         void getData(T target, Bundle dataStore);
+
         void saveData(T target, Bundle dataStore);
     }
 
-    /** Exposed for generated code. */
-    public static <T extends Object> T getCastData(String key, Bundle dataStore){
+    /**
+     * Exposed for generated code.
+     */
+    public static <T extends Object> T getCastData(String key, Bundle dataStore) {
+        if (!dataStore.containsKey(key)) {
+            return null;
+        }
         return (T) dataStore.get(key);
     }
 
-    /** Exposed for generated code. */
-    public static void saveArrayList(String key, ArrayList list, Bundle dataStore){
-        if(list == null){
-            return ;
+    /**
+     * Exposed for generated code.
+     */
+    public static void saveArrayList(String key, ArrayList list, Bundle dataStore) {
+        if (list == null) {
+            return;
         }
         Object[] listArray = list.toArray();
-        if(listArray instanceof String[]){
+        if (listArray instanceof String[]) {
             dataStore.putStringArrayList(key, list);
-        }else if(listArray instanceof Integer[]){
+        } else if (listArray instanceof Integer[]) {
             dataStore.putIntegerArrayList(key, list);
-        }else if(listArray instanceof Parcelable[]){
+        } else if (listArray instanceof Parcelable[]) {
             dataStore.putParcelableArrayList(key, list);
-        }else if(listArray instanceof CharSequence[]){
+        } else if (listArray instanceof CharSequence[]) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.FROYO) {
                 dataStore.putCharSequenceArrayList(key, list);
             }
+        } else {
+            throw new NullPointerException("");
         }
     }
 

gradle.properties

@@ -16,6 +16,6 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-VERSION_NAME = 1.2.2
-VERSION_CODE = 12
+VERSION_NAME = 1.2.3
+VERSION_CODE = 13
 

sample/src/main/AndroidManifest.xml

@@ -12,6 +12,7 @@
             </intent-filter>
         </activity>
         <activity android:name=".ExampleActivity" />
+        <activity android:name=".test.TestActivity"/>
     </application>
 
 </manifest>

sample/src/main/java/com/thirtydegreesray/dataautoaccess/sample/ExampleActivity.java

@@ -25,7 +25,7 @@ public class ExampleActivity extends BaseActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_test);
+        setContentView(R.layout.activity_example);
 
         tvName = (TextView) findViewById(R.id.tv_name);
         tvDescription = (TextView) findViewById(R.id.tv_description);

sample/src/main/java/com/thirtydegreesray/dataautoaccess/sample/MainActivity.java

@@ -4,6 +4,8 @@
 import android.os.Bundle;
 import android.view.View;
 
+import com.thirtydegreesray.dataautoaccess.sample.test.TestActivity;
+
 /**
  * Created by ThirtyDegreesRay on 2016/9/1 09:58
  */
@@ -21,4 +23,9 @@ public void onDataAutoAccessClick(View view){
         intent.putExtra("description", "Android bundle data auto access.");
         startActivity(intent);
     }
+
+    public void onTestClick(View view){
+        Intent intent = new Intent(this, TestActivity.class);
+        startActivity(intent);
+    }
 }

sample/src/main/java/com/thirtydegreesray/dataautoaccess/sample/TestClass.java

@@ -0,0 +1,64 @@
+package com.thirtydegreesray.dataautoaccess.sample.test;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ * Created by ThirtyDegreesRay on 2016/9/12 11:04
+ */
+
+public class ParcelableBean implements Parcelable{
+
+    int size ;
+    String name ;
+
+    protected ParcelableBean(Parcel in) {
+        size = in.readInt();
+        name = in.readString();
+    }
+
+    public ParcelableBean(){
+
+    }
+
+    public ParcelableBean initData(){
+        size = 2;
+        name = "ParcelableClass";
+        return this;
+    }
+
+    public static final Creator<ParcelableBean> CREATOR = new Creator<ParcelableBean>() {
+        @Override
+        public ParcelableBean createFromParcel(Parcel in) {
+            return new ParcelableBean(in);
+        }
+
+        @Override
+        public ParcelableBean[] newArray(int size) {
+            return new ParcelableBean[size];
+        }
+    };
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeInt(size);
+        dest.writeString(name);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if(!(obj instanceof ParcelableBean)){
+            return false;
+        }
+        ParcelableBean parcelableBean = (ParcelableBean) obj;
+        if(size != parcelableBean.size){
+            return false;
+        }
+        return name.equals(parcelableBean.name);
+    }
+}