From 11523d454db4134f74725de15580a1ea8d0ec4e2 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Mon, 7 Oct 2013 13:56:00 -0500 Subject: [PATCH] Remove unused DAOs --- .../todoroo/astrid/sync/NewSyncTestCase.java | 3 -- .../astrid/dao/DaoReflectionHelpers.java | 36 ------------------ .../com/todoroo/astrid/dao/HistoryDao.java | 38 ------------------- .../todoroo/astrid/dao/TagOutstandingDao.java | 11 ------ .../dao/TaskAttachmentOutstandingDao.java | 12 ------ .../dao/TaskListMetadataOutstandingDao.java | 12 ------ .../com/todoroo/astrid/dao/UpdateDao.java | 31 --------------- .../dao/UserActivityOutstandingDao.java | 11 ------ .../service/AstridDependencyInjector.java | 12 ------ 9 files changed, 166 deletions(-) delete mode 100644 astrid/src/main/java/com/todoroo/astrid/dao/DaoReflectionHelpers.java delete mode 100644 astrid/src/main/java/com/todoroo/astrid/dao/HistoryDao.java delete mode 100644 astrid/src/main/java/com/todoroo/astrid/dao/TagOutstandingDao.java delete mode 100644 astrid/src/main/java/com/todoroo/astrid/dao/TaskAttachmentOutstandingDao.java delete mode 100644 astrid/src/main/java/com/todoroo/astrid/dao/TaskListMetadataOutstandingDao.java delete mode 100644 astrid/src/main/java/com/todoroo/astrid/dao/UpdateDao.java delete mode 100644 astrid/src/main/java/com/todoroo/astrid/dao/UserActivityOutstandingDao.java diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/sync/NewSyncTestCase.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/sync/NewSyncTestCase.java index 9527509ec..11179c7d0 100644 --- a/astrid/src/instrumentTest/java/com/todoroo/astrid/sync/NewSyncTestCase.java +++ b/astrid/src/instrumentTest/java/com/todoroo/astrid/sync/NewSyncTestCase.java @@ -4,7 +4,6 @@ import com.todoroo.andlib.service.Autowired; import com.todoroo.astrid.dao.MetadataDao; import com.todoroo.astrid.dao.RemoteModelDao; import com.todoroo.astrid.dao.TagDataDao; -import com.todoroo.astrid.dao.TagOutstandingDao; import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskOutstandingDao; import com.todoroo.astrid.data.SyncFlags; @@ -20,8 +19,6 @@ public class NewSyncTestCase extends DatabaseTestCase { @Autowired protected TaskOutstandingDao taskOutstandingDao; - @Autowired - protected TagOutstandingDao tagOutstandingDao; @Autowired protected MetadataDao metadataDao; diff --git a/astrid/src/main/java/com/todoroo/astrid/dao/DaoReflectionHelpers.java b/astrid/src/main/java/com/todoroo/astrid/dao/DaoReflectionHelpers.java deleted file mode 100644 index 6eaa762c2..000000000 --- a/astrid/src/main/java/com/todoroo/astrid/dao/DaoReflectionHelpers.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.todoroo.astrid.dao; - -import java.lang.reflect.Field; - -import com.todoroo.andlib.data.AbstractModel; -import com.todoroo.andlib.data.Property; -import com.todoroo.astrid.data.RemoteModel; - -public class DaoReflectionHelpers { - - public static T getStaticFieldByReflection(Class cls, Class cast, String fieldName) { - try { - Field field = cls.getField(fieldName); - Object obj = field.get(null); - if (obj == null) { - throw new RuntimeException(fieldName + " field for class " + cls.getName() + " is null"); - } - return cast.cast(obj); - } catch (NoSuchFieldException e) { - throw new RuntimeException("Class " + cls.getName() + " does not declare field " + fieldName); - } catch (IllegalAccessException e2) { - throw new RuntimeException(fieldName + " field for class " + cls.getName() + " is not accessible"); - } catch (ClassCastException e3) { - throw new RuntimeException(fieldName + " field for class " + cls.getName() + " cannot be cast to type " + cast.getName()); - } - } - - public static Property[] getModelProperties(Class model) { - return getStaticFieldByReflection(model, Property[].class, "PROPERTIES"); - } - - public static Class getOutstandingClass(Class model) { - return DaoReflectionHelpers.getStaticFieldByReflection(model, Class.class, "OUTSTANDING_MODEL"); - } - -} diff --git a/astrid/src/main/java/com/todoroo/astrid/dao/HistoryDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/HistoryDao.java deleted file mode 100644 index 1575b5a06..000000000 --- a/astrid/src/main/java/com/todoroo/astrid/dao/HistoryDao.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.todoroo.astrid.dao; - -import android.content.ContentValues; - -import com.todoroo.andlib.data.DatabaseDao; -import com.todoroo.andlib.service.Autowired; -import com.todoroo.andlib.service.DependencyInjectionService; -import com.todoroo.andlib.utility.DateUtilities; -import com.todoroo.astrid.data.History; - -public class HistoryDao extends DatabaseDao { - - @Autowired - private Database database; - - public HistoryDao() { - super(History.class); - DependencyInjectionService.getInstance().inject(this); - setDatabase(database); - } - - @Override - public boolean createNew(History item) { - if (!item.containsValue(History.CREATED_AT)) { - item.setValue(History.CREATED_AT, DateUtilities.now()); - } - return super.createNew(item); - } - - @Override - public boolean saveExisting(History item) { - ContentValues values = item.getSetValues(); - if(values == null || values.size() == 0) { - return false; - } - return super.saveExisting(item); - } -} diff --git a/astrid/src/main/java/com/todoroo/astrid/dao/TagOutstandingDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/TagOutstandingDao.java deleted file mode 100644 index d9d6c579d..000000000 --- a/astrid/src/main/java/com/todoroo/astrid/dao/TagOutstandingDao.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.todoroo.astrid.dao; - -import com.todoroo.astrid.data.TagOutstanding; - -public class TagOutstandingDao extends OutstandingEntryDao { - - public TagOutstandingDao() { - super(TagOutstanding.class); - } - -} diff --git a/astrid/src/main/java/com/todoroo/astrid/dao/TaskAttachmentOutstandingDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/TaskAttachmentOutstandingDao.java deleted file mode 100644 index c2dc328ae..000000000 --- a/astrid/src/main/java/com/todoroo/astrid/dao/TaskAttachmentOutstandingDao.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.todoroo.astrid.dao; - -import com.todoroo.astrid.data.TaskAttachmentOutstanding; - - -public class TaskAttachmentOutstandingDao extends OutstandingEntryDao { - - public TaskAttachmentOutstandingDao() { - super(TaskAttachmentOutstanding.class); - } - -} diff --git a/astrid/src/main/java/com/todoroo/astrid/dao/TaskListMetadataOutstandingDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/TaskListMetadataOutstandingDao.java deleted file mode 100644 index 67a2f012f..000000000 --- a/astrid/src/main/java/com/todoroo/astrid/dao/TaskListMetadataOutstandingDao.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.todoroo.astrid.dao; - -import com.todoroo.astrid.data.TaskListMetadataOutstanding; - - -public class TaskListMetadataOutstandingDao extends OutstandingEntryDao { - - public TaskListMetadataOutstandingDao() { - super(TaskListMetadataOutstanding.class); - } - -} diff --git a/astrid/src/main/java/com/todoroo/astrid/dao/UpdateDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/UpdateDao.java deleted file mode 100644 index 1560c232c..000000000 --- a/astrid/src/main/java/com/todoroo/astrid/dao/UpdateDao.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - * Copyright (c) 2012 Todoroo Inc - * - * See the file "LICENSE" for the full license governing this code. - */ -package com.todoroo.astrid.dao; - -import com.todoroo.andlib.service.Autowired; -import com.todoroo.andlib.service.DependencyInjectionService; -import com.todoroo.astrid.data.Update; - - -/** - * Data Access layer for {@link Update}-related operations. - * - * @author Tim Su - * - */ -@Deprecated -public class UpdateDao extends RemoteModelDao { - - @Autowired Database database; - - public UpdateDao() { - super(Update.class); - DependencyInjectionService.getInstance().inject(this); - setDatabase(database); - } - -} - diff --git a/astrid/src/main/java/com/todoroo/astrid/dao/UserActivityOutstandingDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/UserActivityOutstandingDao.java deleted file mode 100644 index 3ef99cf52..000000000 --- a/astrid/src/main/java/com/todoroo/astrid/dao/UserActivityOutstandingDao.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.todoroo.astrid.dao; - -import com.todoroo.astrid.data.UserActivityOutstanding; - -public class UserActivityOutstandingDao extends OutstandingEntryDao { - - public UserActivityOutstandingDao() { - super(UserActivityOutstanding.class); - } - -} diff --git a/astrid/src/main/java/com/todoroo/astrid/service/AstridDependencyInjector.java b/astrid/src/main/java/com/todoroo/astrid/service/AstridDependencyInjector.java index 4a0039e4a..aa938377c 100644 --- a/astrid/src/main/java/com/todoroo/astrid/service/AstridDependencyInjector.java +++ b/astrid/src/main/java/com/todoroo/astrid/service/AstridDependencyInjector.java @@ -11,21 +11,15 @@ import com.todoroo.andlib.service.ExceptionService.AndroidLogReporter; import com.todoroo.andlib.service.ExceptionService.ErrorReporter; import com.todoroo.andlib.service.HttpRestClient; import com.todoroo.astrid.dao.Database; -import com.todoroo.astrid.dao.HistoryDao; import com.todoroo.astrid.dao.MetadataDao; import com.todoroo.astrid.dao.StoreObjectDao; import com.todoroo.astrid.dao.TagDataDao; import com.todoroo.astrid.dao.TagMetadataDao; -import com.todoroo.astrid.dao.TagOutstandingDao; import com.todoroo.astrid.dao.TaskAttachmentDao; -import com.todoroo.astrid.dao.TaskAttachmentOutstandingDao; import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskListMetadataDao; -import com.todoroo.astrid.dao.TaskListMetadataOutstandingDao; import com.todoroo.astrid.dao.TaskOutstandingDao; -import com.todoroo.astrid.dao.UpdateDao; import com.todoroo.astrid.dao.UserActivityDao; -import com.todoroo.astrid.dao.UserActivityOutstandingDao; import com.todoroo.astrid.dao.UserDao; import com.todoroo.astrid.gtasks.GtasksListService; import com.todoroo.astrid.gtasks.GtasksMetadataService; @@ -71,17 +65,11 @@ public class AstridDependencyInjector extends AbstractDependencyInjector { injectables.put("tagMetadataDao", TagMetadataDao.class); injectables.put("tagDataDao", TagDataDao.class); injectables.put("storeObjectDao", StoreObjectDao.class); - injectables.put("updateDao", UpdateDao.class); injectables.put("userActivityDao", UserActivityDao.class); injectables.put("userDao", UserDao.class); injectables.put("taskOutstandingDao", TaskOutstandingDao.class); - injectables.put("tagOutstandingDao", TagOutstandingDao.class); - injectables.put("userActivityOutstandingDao", UserActivityOutstandingDao.class); - injectables.put("historyDao", HistoryDao.class); injectables.put("taskAttachmentDao", TaskAttachmentDao.class); - injectables.put("taskAttachmentOutstandingDao", TaskAttachmentOutstandingDao.class); injectables.put("taskListMetadataDao", TaskListMetadataDao.class); - injectables.put("taskListMetadataOutstandingDao", TaskListMetadataOutstandingDao.class); // com.todoroo.astrid.service injectables.put("taskService", TaskService.class);