Add ignoreNull property

pushtorefresh · Jul 21, 2016 · 7d6aa12 · 7d6aa12
1 parent dffc45d
commit 7d6aa12
Show file tree

Hide file tree

Showing 7 changed files with 633 additions and 307 deletions.
diff --git a/...com/pushtorefresh/storio/common/annotations/processor/introspection/StorIOColumnMeta.java b/...com/pushtorefresh/storio/common/annotations/processor/introspection/StorIOColumnMeta.java
@@ -27,7 +27,8 @@ public StorIOColumnMeta(
             @NotNull Element enclosingElement,
             @NotNull Element element,
             @NotNull String fieldName,
-            @NotNull JavaType javaType, @NotNull ColumnAnnotation storIOColumn) {
+            @NotNull JavaType javaType,
+            @NotNull ColumnAnnotation storIOColumn) {
         this.enclosingElement = enclosingElement;
         this.element = element;
         this.fieldName = fieldName;

diff --git a/...torefresh/storio/contentresolver/annotations/processor/generate/PutResolverGenerator.java b/...torefresh/storio/contentresolver/annotations/processor/generate/PutResolverGenerator.java
@@ -19,7 +19,7 @@
 import static javax.lang.model.element.Modifier.PROTECTED;
 import static javax.lang.model.element.Modifier.PUBLIC;
 
-public class PutResolverGenerator  implements Generator<StorIOContentResolverTypeMeta> {
+public class PutResolverGenerator implements Generator<StorIOContentResolverTypeMeta> {
 
     private static final String SUFFIX = "StorIOContentResolverPutResolver";
 
@@ -115,11 +115,20 @@ private MethodSpec createMapToContentValuesMethodSpec(@NotNull final StorIOConte
                 .addCode("\n");
 
         for (final StorIOContentResolverColumnMeta columnMeta : storIOContentResolverTypeMeta.columns.values()) {
+            final boolean primitive = columnMeta.element.asType().getKind().isPrimitive();
+            final boolean needIgnoreNull = columnMeta.storIOColumn.ignoreNull();
+            final boolean ignoreNull = !primitive && needIgnoreNull;    // do not check primitive
+            if (ignoreNull) {
+                builder.beginControlFlow("if($L != null)", "object." + columnMeta.fieldName);
+            }
             builder.addStatement(
                     "contentValues.put($S, $L)",
                     columnMeta.storIOColumn.name(),
                     "object." + columnMeta.fieldName
             );
+            if (ignoreNull) {
+                builder.endControlFlow();
+            }
         }
 
         return builder

diff --git a/...fresh/storio/contentresolver/annotations/processor/generate/PutResolverGeneratorTest.java b/...fresh/storio/contentresolver/annotations/processor/generate/PutResolverGeneratorTest.java
diff --git a/...ava/com/pushtorefresh/storio/contentresolver/annotations/StorIOContentResolverColumn.java b/...ava/com/pushtorefresh/storio/contentresolver/annotations/StorIOContentResolverColumn.java
@@ -23,4 +23,11 @@
      * @return true if column is key, false otherwise
      */
     boolean key() default false;
+
+    /**
+     * Optional: indicates that field should not be serialized when it hasn't value
+     *
+     * @return true if column with {@code null} value should be ignored, false otherwise
+     */
+    boolean ignoreNull() default false;
 }
diff --git a/.../com/pushtorefresh/storio/sqlite/annotations/processor/generate/PutResolverGenerator.java b/.../com/pushtorefresh/storio/sqlite/annotations/processor/generate/PutResolverGenerator.java
@@ -104,11 +104,20 @@ private MethodSpec createMapToContentValuesMethodSpec(@NotNull StorIOSQLiteTypeM
                 .addCode("\n");
 
         for (StorIOSQLiteColumnMeta columnMeta : storIOSQLiteTypeMeta.columns.values()) {
+            final boolean primitive = columnMeta.element.asType().getKind().isPrimitive();
+            final boolean needIgnoreNull = columnMeta.storIOColumn.ignoreNull();
+            final boolean ignoreNull = !primitive && needIgnoreNull;    // do not check primitive
+            if (ignoreNull) {
+                builder.beginControlFlow("if($L != null)", "object." + columnMeta.fieldName);
+            }
             builder.addStatement(
                     "contentValues.put($S, $L)",
                     columnMeta.storIOColumn.name(),
                     "object." + columnMeta.fieldName
             );
+            if (ignoreNull) {
+                builder.endControlFlow();
+            }
         }
 
         return builder