From 22ef1e24becf1f837e6ac38eeca776f1275a3fbb Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Tue, 15 Jul 2014 12:05:35 -0500
Subject: [PATCH] Remove cursor constructor usage from database dao

---
 .../main/java/com/todoroo/andlib/data/DatabaseDao.java   | 9 ++-------
 .../main/java/com/todoroo/astrid/data/StoreObject.java   | 6 ------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/api/src/main/java/com/todoroo/andlib/data/DatabaseDao.java b/api/src/main/java/com/todoroo/andlib/data/DatabaseDao.java
index f9a798b0d..eb5bad5e9 100644
--- a/api/src/main/java/com/todoroo/andlib/data/DatabaseDao.java
+++ b/api/src/main/java/com/todoroo/andlib/data/DatabaseDao.java
@@ -14,8 +14,6 @@ import com.todoroo.andlib.sql.Query;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -33,7 +31,6 @@ public class DatabaseDao<TYPE extends AbstractModel> {
     private static final Logger log = LoggerFactory.getLogger(DatabaseDao.class);
 
     private final Class<TYPE> modelClass;
-    private final Constructor<TYPE> cursorConstructor;
 
     private Table table;
 
@@ -42,7 +39,7 @@ public class DatabaseDao<TYPE extends AbstractModel> {
     public DatabaseDao(Class<TYPE> modelClass) {
         this.modelClass = modelClass;
         try {
-            this.cursorConstructor = modelClass.getConstructor(TodorooCursor.class);
+            modelClass.getConstructor(); // check for default constructor
         } catch (NoSuchMethodException e) {
             throw new RuntimeException(e);
         }
@@ -156,9 +153,7 @@ public class DatabaseDao<TYPE extends AbstractModel> {
             if (cursor.getCount() == 0) {
                 return null;
             }
-            return cursorConstructor.newInstance(cursor);
-        } catch (InvocationTargetException | InstantiationException | IllegalAccessException e) {
-            throw new RuntimeException(e);
+            return fromCursor(cursor);
         } finally {
             cursor.close();
         }
diff --git a/api/src/main/java/com/todoroo/astrid/data/StoreObject.java b/api/src/main/java/com/todoroo/astrid/data/StoreObject.java
index 15f034e38..c7850bce0 100644
--- a/api/src/main/java/com/todoroo/astrid/data/StoreObject.java
+++ b/api/src/main/java/com/todoroo/astrid/data/StoreObject.java
@@ -14,7 +14,6 @@ import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.data.Property.LongProperty;
 import com.todoroo.andlib.data.Property.StringProperty;
 import com.todoroo.andlib.data.Table;
-import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.astrid.api.AstridApiConstants;
 
 /**
@@ -79,11 +78,6 @@ public class StoreObject extends AbstractModel {
         super();
     }
 
-    @Deprecated
-    public StoreObject(TodorooCursor<StoreObject> cursor) {
-        super(cursor);
-    }
-
     @Override
     public long getId() {
         return getIdHelper(ID);