Fixed bug with type serializer #7

ImangazalievM · Feb 2, 2018 · c7f8801 · c7f8801
1 parent 540af7f
commit c7f8801
Show file tree

Hide file tree

Showing 23 changed files with 317 additions and 199 deletions.
diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ In the plans:
 Add this to your app **build.gradle**:
 
 ```gradle
-compile 'com.reactiveandroid:reactiveandroid:1.3.1'
+compile 'com.reactiveandroid:reactiveandroid:1.3.2'
 ```
 
 ## Initial setup

diff --git a/reactiveandroid.gradle b/reactiveandroid.gradle
@@ -1,6 +1,6 @@
 ext.reactiveandroid = [
-        libraryVersion          : '1.3.1',
-        libraryVersionCode      : 7,
+        libraryVersion          : '1.3.2',
+        libraryVersionCode      : 8,
         group                   : 'com.reactiveandroid',
 
         minSdk                  : 14,

diff --git a/reactiveandroid/src/main/java/com/reactiveandroid/ReActiveAndroid.java b/reactiveandroid/src/main/java/com/reactiveandroid/ReActiveAndroid.java
@@ -168,13 +168,13 @@ public static TableInfo getTableInfo(Class<?> table) {
     }
 
     /**
-     * @param table Table class
+     * @param modelClass Model class
      * @param type  Deserialized type class
      * @return {@link TypeSerializer} for specified type
      */
     @Nullable
-    public static TypeSerializer getSerializerForType(Class<?> table, Class<?> type) {
-        return getDatabaseForTable(table).getTypeSerializer(type);
+    public static TypeSerializer getSerializerForType(Class<?> modelClass, Class<?> type) {
+        return getDatabaseForTable(modelClass).getTypeSerializer(type);
     }
 
     /**

diff --git a/reactiveandroid/src/main/java/com/reactiveandroid/internal/database/DatabaseInfo.java b/reactiveandroid/src/main/java/com/reactiveandroid/internal/database/DatabaseInfo.java
@@ -42,8 +42,8 @@ public class DatabaseInfo {
     }};
 
     public DatabaseInfo(Context context, @NonNull DatabaseConfig databaseConfig) {
-        loadModels(context, databaseConfig);
         loadTypeSerializers(databaseConfig);
+        loadModels(context, databaseConfig);
 
         this.reActiveOpenHelper = new ReActiveOpenHelper(context, databaseConfig, tableInfos.values());
 
@@ -132,18 +132,20 @@ private void loadModels(Context context, DatabaseConfig databaseConfig) {
     }
 
     private void loadTypeSerializers(DatabaseConfig databaseConfig) {
-        List<Class<? extends TypeSerializer>> customTypeSerializers = databaseConfig.typeSerializers;
-        if (customTypeSerializers != null) {
-            for (Class<? extends TypeSerializer> typeSerializer : customTypeSerializers) {
-                try {
-                    TypeSerializer instance = typeSerializer.newInstance();
-                    typeSerializers.put(instance.getDeserializedType(), instance);
-                } catch (InstantiationException e) {
-                    ReActiveLog.e(LogLevel.BASIC, "Couldn't instantiate TypeSerializer.", e);
-                } catch (IllegalAccessException e) {
-                    ReActiveLog.e(LogLevel.BASIC, "IllegalAccessException while instantiating "
-                            + typeSerializer.getClass().getCanonicalName(), e);
+        for (Class<? extends TypeSerializer> typeSerializer : databaseConfig.typeSerializers) {
+            try {
+                TypeSerializer instance = typeSerializer.newInstance();
+                typeSerializers.put(instance.getDeserializedType(), instance);
+            } catch (Exception e) {
+                if (e instanceof InstantiationException | e instanceof IllegalAccessException) {
+                    ReActiveLog.e(LogLevel.BASIC, "Couldn't instantiate type " +
+                            "serializer " + typeSerializer.getCanonicalName() +
+                            "Please provide default constructor with public modifier", e);
+                } else  {
+                    ReActiveLog.e(LogLevel.BASIC, "Unknown error while instantiating "
+                             + typeSerializer.getCanonicalName(), e);
                 }
+                throw new RuntimeException(e);
             }
         }
     }

diff --git a/...tiveandroid/src/main/java/com/reactiveandroid/internal/database/table/QueryModelInfo.java b/...tiveandroid/src/main/java/com/reactiveandroid/internal/database/table/QueryModelInfo.java
@@ -9,6 +9,7 @@
 import com.reactiveandroid.annotation.QueryModel;
 import com.reactiveandroid.internal.serializer.TypeSerializer;
 import com.reactiveandroid.internal.utils.ReflectionUtils;
+import com.reactiveandroid.internal.utils.SQLiteUtils;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -67,28 +68,10 @@ public ColumnInfo getColumnInfo(Field field) {
     private ColumnInfo createColumnInfo(Field field, Map<Class<?>, TypeSerializer> typeSerializers) {
         QueryColumn columnAnnotation = field.getAnnotation(QueryColumn.class);
         String columnName = !TextUtils.isEmpty(columnAnnotation.name()) ? columnAnnotation.name() : field.getName();
-        SQLiteType sqliteType = getFieldSQLiteType(field, typeSerializers);
+        SQLiteType sqliteType = SQLiteUtils.getFieldSQLiteType(field, typeSerializers);
         return new ColumnInfo(columnName, sqliteType, false);
     }
 
-    private SQLiteType getFieldSQLiteType(Field field, Map<Class<?>, TypeSerializer> typeSerializers) {
-        SQLiteType sqliteType = null;
-        Class<?> fieldType = field.getType();
-
-        TypeSerializer typeSerializer = typeSerializers.get(field.getType());
-        if (typeSerializer != null) {
-            fieldType = typeSerializer.getSerializedType();
-        }
-
-        if (SQLiteType.containsType(fieldType)) {
-            sqliteType = SQLiteType.getSQLiteTypeForClass(fieldType);
-        } else if (ReflectionUtils.isModel(fieldType)) {
-            sqliteType = SQLiteType.INTEGER;
-        }
-
-        return sqliteType;
-    }
-
     private List<Field> filterQueryColumnFields(List<Field> modelDeclaredFields) {
         List<Field> modelColumnFields = new ArrayList<>();
         for (Field field : modelDeclaredFields) {

diff --git a/reactiveandroid/src/main/java/com/reactiveandroid/internal/database/table/TableInfo.java b/reactiveandroid/src/main/java/com/reactiveandroid/internal/database/table/TableInfo.java
@@ -13,6 +13,7 @@
 import com.reactiveandroid.annotation.UniqueGroup;
 import com.reactiveandroid.internal.serializer.TypeSerializer;
 import com.reactiveandroid.internal.utils.ReflectionUtils;
+import com.reactiveandroid.internal.utils.SQLiteUtils;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -192,7 +193,7 @@ private Field findPrimaryKeyField(Class<?> modelClass) {
     private ColumnInfo createColumnInfo(Field field, Map<Class<?>, TypeSerializer> typeSerializers) {
         Column columnAnnotation = field.getAnnotation(Column.class);
         String columnName = !TextUtils.isEmpty(columnAnnotation.name()) ? columnAnnotation.name() : field.getName();
-        SQLiteType sqliteType = getFieldSQLiteType(field, typeSerializers);
+        SQLiteType sqliteType = SQLiteUtils.getFieldSQLiteType(field, typeSerializers);
         boolean notNull = columnAnnotation.notNull();
         return new ColumnInfo(columnName, sqliteType, notNull);
     }
@@ -231,22 +232,4 @@ private void createColumnIndex(Field field, ColumnInfo columnInfo) {
         }
     }
 
-    private SQLiteType getFieldSQLiteType(Field field, Map<Class<?>, TypeSerializer> typeSerializers) {
-        SQLiteType sqliteType = null;
-        Class<?> fieldType = field.getType();
-
-        TypeSerializer typeSerializer = typeSerializers.get(field.getType());
-        if (typeSerializer != null) {
-            fieldType = typeSerializer.getSerializedType();
-        }
-
-        if (SQLiteType.containsType(fieldType)) {
-            sqliteType = SQLiteType.getSQLiteTypeForClass(fieldType);
-        } else if (ReflectionUtils.isModel(fieldType)) {
-            sqliteType = SQLiteType.INTEGER;
-        }
-
-        return sqliteType;
-    }
-
 }
diff --git a/...veandroid/src/main/java/com/reactiveandroid/internal/serializer/BigDecimalSerializer.java b/...veandroid/src/main/java/com/reactiveandroid/internal/serializer/BigDecimalSerializer.java
@@ -1,19 +1,20 @@
 package com.reactiveandroid.internal.serializer;
 
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
 import java.math.BigDecimal;
 
 public final class BigDecimalSerializer extends TypeSerializer<BigDecimal, String> {
 
     @Nullable
-    public String serialize(@NonNull BigDecimal data) {
+    public String serialize(@Nullable BigDecimal data) {
+        if (data == null) return null;
         return data.toString();
     }
 
     @Nullable
-    public BigDecimal deserialize(@NonNull String data) {
+    public BigDecimal deserialize(@Nullable String data) {
+        if (data == null) return null;
         return new BigDecimal(data);
     }
 

diff --git a/...tiveandroid/src/main/java/com/reactiveandroid/internal/serializer/CalendarSerializer.java b/...tiveandroid/src/main/java/com/reactiveandroid/internal/serializer/CalendarSerializer.java
@@ -1,19 +1,21 @@
 package com.reactiveandroid.internal.serializer;
 
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
 import java.util.Calendar;
 
 public final class CalendarSerializer extends TypeSerializer<Calendar, Long> {
 
 	@Nullable
-    public Long serialize(@NonNull Calendar data) {
+    public Long serialize(@Nullable Calendar data) {
+		if (data == null) return null;
 		return data.getTimeInMillis();
 	}
 
 	@Nullable
-	public Calendar deserialize(@NonNull Long data) {
+	public Calendar deserialize(@Nullable Long data) {
+		if (data == null) return null;
+
 		Calendar calendar = Calendar.getInstance();
 		calendar.setTimeInMillis(data);
 		return calendar;

diff --git a/reactiveandroid/src/main/java/com/reactiveandroid/internal/serializer/FileSerializer.java b/reactiveandroid/src/main/java/com/reactiveandroid/internal/serializer/FileSerializer.java
@@ -1,19 +1,20 @@
 package com.reactiveandroid.internal.serializer;
 
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
 import java.io.File;
 
 public final class FileSerializer extends TypeSerializer<File, String> {
 
     @Nullable
-    public String serialize(@NonNull File data) {
+    public String serialize(@Nullable File data) {
+        if (data == null) return null;
         return data.toString();
     }
 
     @Nullable
-    public File deserialize(@NonNull String data) {
+    public File deserialize(@Nullable String data) {
+        if (data == null) return null;
         return new File(data);
     }
 

diff --git a/reactiveandroid/src/main/java/com/reactiveandroid/internal/serializer/SqlDateSerializer.java b/reactiveandroid/src/main/java/com/reactiveandroid/internal/serializer/SqlDateSerializer.java
@@ -1,19 +1,20 @@
 package com.reactiveandroid.internal.serializer;
 
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
 import java.sql.Date;
 
 public final class SqlDateSerializer extends TypeSerializer<Date, Long> {
 
     @Nullable
-    public Long serialize(@NonNull Date data) {
+    public Long serialize(@Nullable Date data) {
+        if (data == null) return null;
         return data.getTime();
     }
 
     @Nullable
-    public Date deserialize(@NonNull Long data) {
+    public Date deserialize(@Nullable Long data) {
+        if (data == null) return null;
         return new Date(data);
     }
 

diff --git a/reactiveandroid/src/main/java/com/reactiveandroid/internal/serializer/TypeSerializer.java b/reactiveandroid/src/main/java/com/reactiveandroid/internal/serializer/TypeSerializer.java
@@ -37,9 +37,9 @@ public Class<SerializedType> getSerializedType() {
     }
 
     @Nullable
-    public abstract SerializedType serialize(@NonNull DeserializedType data);
+    public abstract SerializedType serialize(@Nullable DeserializedType data);
 
     @Nullable
-    public abstract DeserializedType deserialize(@NonNull SerializedType data);
+    public abstract DeserializedType deserialize(@Nullable SerializedType data);
 
 }
diff --git a/reactiveandroid/src/main/java/com/reactiveandroid/internal/serializer/UUIDSerializer.java b/reactiveandroid/src/main/java/com/reactiveandroid/internal/serializer/UUIDSerializer.java
@@ -1,19 +1,20 @@
 package com.reactiveandroid.internal.serializer;
 
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
 import java.util.UUID;
 
 public final class UUIDSerializer extends TypeSerializer<UUID, String> {
 
     @Nullable
-    public String serialize(@NonNull UUID data) {
+    public String serialize(@Nullable UUID data) {
+        if (data == null) return null;
         return data.toString();
     }
 
     @Nullable
-    public UUID deserialize(@NonNull String data) {
+    public UUID deserialize(@Nullable String data) {
+        if (data == null) return null;
         return UUID.fromString(data);
     }
 

diff --git a/...tiveandroid/src/main/java/com/reactiveandroid/internal/serializer/UtilDateSerializer.java b/...tiveandroid/src/main/java/com/reactiveandroid/internal/serializer/UtilDateSerializer.java
@@ -1,19 +1,20 @@
 package com.reactiveandroid.internal.serializer;
 
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
 import java.util.Date;
 
 public final class UtilDateSerializer extends TypeSerializer<Date, Long> {
 
 	@Nullable
-    public Long serialize(@NonNull Date data) {
+    public Long serialize(@Nullable Date data) {
+		if (data == null) return null;
 		return data.getTime();
 	}
 
 	@Nullable
-	public Date deserialize(@NonNull Long data) {
+	public Date deserialize(@Nullable Long data) {
+		if (data == null) return null;
 		return new Date(data);
 	}
 

diff --git a/reactiveandroid/src/main/java/com/reactiveandroid/internal/utils/SQLiteUtils.java b/reactiveandroid/src/main/java/com/reactiveandroid/internal/utils/SQLiteUtils.java
@@ -27,6 +27,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 public final class SQLiteUtils {
 
@@ -172,6 +173,27 @@ public static List<String> createIndexDefinition(TableInfo tableInfo) {
         return definitions;
     }
 
+    public static SQLiteType getFieldSQLiteType(Field field, Map<Class<?>, TypeSerializer> typeSerializers) {
+        SQLiteType sqliteType;
+        Class<?> fieldType = field.getType();
+
+        TypeSerializer typeSerializer = typeSerializers.get(field.getType());
+        if (typeSerializer != null) {
+            fieldType = typeSerializer.getSerializedType();
+        }
+
+        if (SQLiteType.containsType(fieldType)) {
+            sqliteType = SQLiteType.getSQLiteTypeForClass(fieldType);
+        } else if (ReflectionUtils.isModel(fieldType)) {
+            sqliteType = SQLiteType.INTEGER;
+        } else {
+            throw new IllegalStateException("Type serializer for type " + fieldType.getCanonicalName() + " not found");
+        }
+
+        return sqliteType;
+    }
+
+
     public static void fillContentValuesForUpdate(Object model,
                                                   ModelAdapter modelAdapter,
                                                   ContentValues contentValues) {