Skip to content

Commit 84aa04a

Browse files
fix bug when bundle don't contain the key
1 parent 88f59b1 commit 84aa04a

4 files changed

Lines changed: 11 additions & 13 deletions

File tree

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ Then, apply the 'android-apt' plugin in your module-level build.gradle and add t
5959
}
6060

6161
dependencies {
62-
compile 'com.thirtydegreesray:dataautoaccess:1.2.5'
63-
apt 'com.thirtydegreesray:dataautoaccess-compiler:1.2.5'
62+
compile 'com.thirtydegreesray:dataautoaccess:1.2.6'
63+
apt 'com.thirtydegreesray:dataautoaccess-compiler:1.2.6'
6464
}
6565

6666
##Proguard

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,19 @@ String brewJava() {
6565
}
6666

6767
private void generateGetDataCode(StringBuilder java){
68-
java.append("@Override ").append("public void getData(T target, Bundle dataStore){\n");
68+
java.append("\t@Override ").append("public void getData(T target, Bundle dataStore){\n");
6969
for(FieldAutoAccess field : fields){
70-
java.append("\t").append("target.").append(field.getFieldName())
70+
java.append("\t\t").append("if(dataStore.containsKey(\"").append(field.getFiledKey()).append("\"))\n");
71+
java.append("\t\t\t").append("target.").append(field.getFieldName())
7172
.append(" = ")
7273
.append("DataAutoAccess.getCastData(").append("\"").append(field.getFiledKey()).append("\"")
7374
.append(", ").append("dataStore").append(");\n");
7475
}
75-
java.append("}\n");
76+
java.append("\t}\n");
7677
}
7778

7879
private void generateSaveDataCode(StringBuilder java){
79-
java.append("@Override ").append("public void saveData(T target, Bundle dataStore){\n");
80+
java.append("\t@Override ").append("public void saveData(T target, Bundle dataStore){\n");
8081
for(FieldAutoAccess field : fields){
8182
String putPreCode = DataAutoAccessProcessor.PUT_DATA_PRE_CODE_MAP.get(field.getFieldType());
8283
//type ArrayList
@@ -86,12 +87,12 @@ private void generateSaveDataCode(StringBuilder java){
8687
// .append("target.").append(field.getFieldName()).append(", ")
8788
// .append("dataStore").append(");\n");
8889
// }else{
89-
java.append("\t").append("dataStore.").append(putPreCode)
90+
java.append("\t\t").append("dataStore.").append(putPreCode)
9091
.append("(").append("\"").append(field.getFiledKey()).append("\"").append(", ")
9192
.append("target.").append(field.getFieldName()).append(");\n");
9293
// }
9394
}
94-
java.append("}\n");
95+
java.append("\t}\n");
9596
}
9697

9798
}

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,6 @@ public interface DataAccessor<T> {
129129
* Exposed for generated code.
130130
*/
131131
public static <T extends Object> T getCastData(String key, Bundle dataStore) {
132-
if (!dataStore.containsKey(key)) {
133-
return null;
134-
}
135132
return (T) dataStore.get(key);
136133
}
137134

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ org.gradle.jvmargs=-Xmx1536m
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1818
# org.gradle.parallel=true
1919

20-
VERSION_NAME = 1.2.5
21-
VERSION_CODE = 15
20+
VERSION_NAME = 1.2.6
21+
VERSION_CODE = 16
2222

0 commit comments

Comments
 (0)