Merge pull request #1325 from Raizlabs/develop

4.0.4

README.md

@@ -41,7 +41,7 @@ Add the library to the project-level build.gradle, using the apt plugin to enabl
 
 ```groovy
 
-  def dbflow_version = "4.0.3"
+  def dbflow_version = "4.0.4"
   // or dbflow_version = "develop-SNAPSHOT" for grabbing latest dependency in your project on the develop branch
   // or 10-digit short-hash of a specific commit. (Useful for bugs fixed in develop, but not in a release yet)
 

dbflow-core/src/main/java/com/raizlabs/android/dbflow/annotation/ColumnIgnore.java

@@ -8,7 +8,7 @@
 /**
  * Description: An annotation used to ignore a column in the {@link Table#allFields()} instance.
  */
-@Retention(RetentionPolicy.SOURCE)
+@Retention(RetentionPolicy.CLASS)
 @Target(ElementType.FIELD)
 public @interface ColumnIgnore {
 }

dbflow-core/src/main/java/com/raizlabs/android/dbflow/converter/BigIntegerConverter.java

@@ -0,0 +1,18 @@
+package com.raizlabs.android.dbflow.converter;
+
+import java.math.BigInteger;
+
+/**
+ * Description: Defines how we store and retrieve a {@link java.math.BigInteger}
+ */
+public class BigIntegerConverter extends TypeConverter<String, BigInteger> {
+    @Override
+    public String getDBValue(BigInteger model) {
+        return model == null ? null : model.toString();
+    }
+
+    @Override
+    public BigInteger getModelValue(String data) {
+        return data == null ? null : new BigInteger(data);
+    }
+}

dbflow-processor/src/main/java/com/raizlabs/android/dbflow/processor/ClassNames.kt

@@ -90,4 +90,6 @@ object ClassNames {
 
     val SINGLE_KEY_CACHEABLE_MODEL_LOADER = ClassName.get(QUERIABLE, "SingleKeyCacheableModelLoader")
     val SINGLE_KEY_CACHEABLE_LIST_MODEL_LOADER = ClassName.get(QUERIABLE, "SingleKeyCacheableListModelLoader")
+
+    val NON_NULL = ClassName.get("android.support.annotation", "NonNull")
 }

dbflow-processor/src/main/java/com/raizlabs/android/dbflow/processor/Handlers.kt

@@ -143,8 +143,8 @@ class TypeConverterHandler : BaseContainerHandler<TypeConverter>() {
                     // Check here if user already placed definition of same type, since default converters
                     // are added last.
                     if (processorManager.typeConverters
-                            .filter { it.value.modelTypeName == converterDefinition.modelTypeName }
-                            .isEmpty()) {
+                        .filter { it.value.modelTypeName == converterDefinition.modelTypeName }
+                        .isEmpty()) {
                         processorManager.addTypeConverterDefinition(converterDefinition)
                     }
                 }
@@ -155,10 +155,10 @@ class TypeConverterHandler : BaseContainerHandler<TypeConverter>() {
     companion object {
         private val VALIDATOR = TypeConverterValidator()
         private val DEFAULT_TYPE_CONVERTERS = arrayOf<Class<*>>(CalendarConverter::class.java,
-                BigDecimalConverter::class.java,
-                DateConverter::class.java, SqlDateConverter::class.java,
-                BooleanConverter::class.java, UUIDConverter::class.java,
-                CharConverter::class.java)
+            BigDecimalConverter::class.java, BigIntegerConverter::class.java,
+            DateConverter::class.java, SqlDateConverter::class.java,
+            BooleanConverter::class.java, UUIDConverter::class.java,
+            CharConverter::class.java)
     }
 }