Loaders and cursors for DBFlow

dbflow-kotlinextensions/src/main/java/com/raizlabs/android/dbflow/kotlinextensions/PropertyExtensions.kt

@@ -2,7 +2,6 @@ package com.raizlabs.android.dbflow.kotlinextensions
 
 import com.raizlabs.android.dbflow.sql.language.property.*
 import com.raizlabs.android.dbflow.sql.queriable.ModelQueriable
-import com.raizlabs.android.dbflow.structure.Model
 
 /**
  * Description: Provides some very nice Property class extensions.
@@ -35,6 +34,6 @@ val <T : Any> T.property: Property<T>
 val <T : Any> ModelQueriable<T>.property: Property<T>
     get() = PropertyFactory.from(this)
 
-inline fun <reified T : Any> T.propertyString(stringRepresentation: String?): Property<T> {
-    return PropertyFactory.from(T::class.java, stringRepresentation)
+inline fun <reified TModel : Any> TModel.propertyString(stringRepresentation: String?): Property<TModel> {
+    return PropertyFactory.from(TModel::class.java, stringRepresentation)
 }

dbflow-kotlinextensions/src/main/java/com/raizlabs/android/dbflow/kotlinextensions/PropertyMethodExtensions.kt

@@ -9,7 +9,6 @@ import com.raizlabs.android.dbflow.structure.Model
 /**
  * Description: Provides property methods in via infix functions.
  */
-
 infix fun <T : Any> Property<T>.eq(value: T) = this.eq(value)
 
 infix fun <T : Any> Property<T>.`is`(value: T) = this.`is`(value)

dbflow-kotlinextensions/src/main/java/com/raizlabs/android/dbflow/kotlinextensions/QueryExtensions.kt

@@ -131,7 +131,6 @@ fun <T : Any> update(modelClass: KClass<T>): Update<T> = SQLite.update(modelClas
 
 infix fun <T : Any> Update<T>.set(sqlCondition: SQLCondition) = set(sqlCondition)
 
-
 // delete
 
 inline fun <reified T : Any> delete() = SQLite.delete(T::class.java)

dbflow-processor/build.gradle

@@ -13,7 +13,6 @@ dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
     testCompile 'junit:junit:4.12'
-
 }
 
 apply from: '../java-artifacts.gradle'

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

@@ -0,0 +1,117 @@
+package com.raizlabs.android.dbflow.processor;
+
+import com.raizlabs.android.dbflow.annotation.ConflictAction;
+import com.squareup.javapoet.ClassName;
+
+/**
+ * Description: The static FQCN string file to assist in providing class names for imports and more in the Compiler
+ */
+public class ClassNames {
+
+
+    public static final String BASE_PACKAGE = "com.raizlabs.android.dbflow";
+    public static final String FLOW_MANAGER_PACKAGE = BASE_PACKAGE + ".config";
+    public static final String DATABASE_HOLDER_STATIC_CLASS_NAME = "GeneratedDatabaseHolder";
+    public static final String CONVERTER = BASE_PACKAGE + ".converter";
+    public static final String STRUCTURE = BASE_PACKAGE + ".structure";
+    public static final String DATABASE = STRUCTURE + ".database";
+    public static final String CONTAINER = STRUCTURE + ".container";
+    public static final String SQL = BASE_PACKAGE + ".sql";
+    public static final String LANGUAGE = SQL + ".language";
+    public static final String QUERIABLE = SQL + ".queriable";
+    public static final String PROPERTY_PACKAGE = LANGUAGE + ".property";
+    public static final String CONFIG = BASE_PACKAGE + ".config";
+    public static final String BUILDER = SQL + ".builder";
+    public static final String MIGRATION_PACKAGE = SQL + ".migration";
+    public static final String LISTENER = STRUCTURE + ".listener";
+    public static final String RUNTIME = BASE_PACKAGE + ".runtime";
+    public static final String TRANSACTION = RUNTIME + ".transaction";
+    public static final String DATABASE_TRANSACTION = DATABASE + ".transaction";
+    public static final String PROCESS = TRANSACTION + ".process";
+    public static final String SAVEABLE = SQL + ".saveable";
+
+    public static final ClassName DATABASE_HOLDER = ClassName.get(CONFIG, "DatabaseHolder");
+    public static final ClassName FLOW_MANAGER = ClassName.get(CONFIG, "FlowManager");
+    public static final ClassName BASE_DATABASE_DEFINITION_CLASSNAME = ClassName.get(CONFIG, "DatabaseDefinition");
+
+    public static final ClassName URI = ClassName.get("android.net", "Uri");
+    public static final ClassName URI_MATCHER = ClassName.get("android.content", "UriMatcher");
+    public static final ClassName CURSOR = ClassName.get("android.database", "Cursor");
+    public static final ClassName DATABASE_UTILS = ClassName.get("android.database", "DatabaseUtils");
+    public static final ClassName CONTENT_VALUES = ClassName.get("android.content", "ContentValues");
+    public static final ClassName CONTENT_URIS = ClassName.get("android.content", "ContentUris");
+
+    public static final ClassName MODEL_ADAPTER = ClassName.get(STRUCTURE, "ModelAdapter");
+    public static final ClassName QUERY_MODEL_ADAPTER = ClassName.get(STRUCTURE, "QueryModelAdapter");
+    public static final ClassName MODEL = ClassName.get(STRUCTURE, "Model");
+    public static final ClassName MODEL_VIEW_ADAPTER = ClassName.get(STRUCTURE, "ModelViewAdapter");
+    public static final ClassName MODEL_VIEW = ClassName.get(STRUCTURE, "BaseModelView");
+
+    public static final ClassName FLOW_SQLITE_OPEN_HELPER = ClassName.get(DATABASE, "FlowSQLiteOpenHelper");
+    public static final ClassName DATABASE_STATEMENT = ClassName.get(DATABASE, "DatabaseStatement");
+    public static final ClassName OPEN_HELPER = ClassName.get(DATABASE, "OpenHelper");
+
+    public static final ClassName CONDITION_QUERY_BUILDER = ClassName.get(BUILDER, "ConditionQueryBuilder");
+    public static final ClassName CONDITION = ClassName.get(BUILDER, "Condition");
+
+    public static final ClassName SQL_UTILS = ClassName.get(SQL, "SqlUtils");
+    public static final ClassName QUERY = ClassName.get(SQL, "Query");
+
+    public static final ClassName TYPE_CONVERTER = ClassName.get(CONVERTER, "TypeConverter");
+    public static final ClassName PROCESS_MODEL_INFO = ClassName.get(PROCESS, "ProcessModelInfo");
+
+    public static final ClassName FLOW_MANAGER_STATIC_INTERFACE = ClassName.get(FLOW_MANAGER_PACKAGE, "DatabaseHolder");
+
+    public static final ClassName MIGRATION = ClassName.get(MIGRATION_PACKAGE, "Migration");
+
+    public static final ClassName CONFLICT_ACTION = ClassName.get(ConflictAction.class);
+
+    public static final ClassName CONTENT_VALUES_LISTENER = ClassName.get(LISTENER, "ContentValuesListener");
+    public static final ClassName LOAD_FROM_CURSOR_LISTENER = ClassName.get(LISTENER, "LoadFromCursorListener");
+    public static final ClassName SQLITE_STATEMENT_LISTENER = ClassName.get(LISTENER, "SQLiteStatementListener");
+
+
+    public static final ClassName DELETE_MODEL_LIST_TRANSACTION = ClassName.get(PROCESS, "DeleteModelListTransaction");
+    public static final ClassName SAVE_MODEL_LIST_TRANSACTION = ClassName.get(PROCESS, "SaveModelTransaction");
+    public static final ClassName UPDATE_MODEL_LIST_TRANSACTION = ClassName.get(PROCESS, "UpdateModelListTransaction");
+    public static final ClassName INSERT_MODEL_LIST_TRANSACTION = ClassName.get(PROCESS, "InsertModelTransaction");
+
+    public static final ClassName PROPERTY = ClassName.get(PROPERTY_PACKAGE, "Property");
+    public static final ClassName IPROPERTY = ClassName.get(PROPERTY_PACKAGE, "IProperty");
+    public static final ClassName BASE_PROPERTY = ClassName.get(PROPERTY_PACKAGE, "BaseProperty");
+    public static final ClassName INDEX_PROPERTY = ClassName.get(PROPERTY_PACKAGE, "IndexProperty");
+    public static final ClassName CONDITION_GROUP = ClassName.get(LANGUAGE, "ConditionGroup");
+    public static final ClassName SELECT = ClassName.get(LANGUAGE, "Select");
+    public static final ClassName UPDATE = ClassName.get(LANGUAGE, "Update");
+    public static final ClassName DELETE = ClassName.get(LANGUAGE, "Delete");
+    public static final ClassName METHOD = ClassName.get(LANGUAGE, "Method");
+
+    public static final ClassName BASE_CONTENT_PROVIDER = ClassName.get(RUNTIME, "BaseContentProvider");
+    public static final ClassName PROPERTY_CONVERTER = ClassName.get(RUNTIME + ".BaseContentProvider", "PropertyConverter");
+
+    public static final ClassName MODEL_CONTAINER_UTILS = ClassName.get(CONTAINER, "ModelContainerUtils");
+    public static final ClassName MODEL_CONTAINER = ClassName.get(CONTAINER, "ModelContainer");
+    public static final ClassName MODEL_CONTAINER_ADAPTER = ClassName.get(CONTAINER, "ModelContainerAdapter");
+    public static final ClassName FOREIGN_KEY_CONTAINER = ClassName.get(CONTAINER, "ForeignKeyContainer");
+    public static final ClassName EXTERNAL_FOREIGN_KEY_CONTAINER = ClassName.get(CONTAINER, "ExternalForeignKeyContainer");
+    public static final ClassName BASE_MODEL = ClassName.get(STRUCTURE, "BaseModel");
+    public static final ClassName MODEL_CACHE = ClassName.get(STRUCTURE + ".cache", "ModelCache");
+    public static final ClassName MULTI_KEY_CACHE_CONVERTER = ClassName.get(STRUCTURE + ".cache", "IMultiKeyCacheConverter");
+
+    public static final ClassName CACHEABLE_MODEL_LOADER = ClassName.get(QUERIABLE, "CacheableModelLoader");
+    public static final ClassName SINGLE_MODEL_LOADER = ClassName.get(QUERIABLE, "SingleModelLoader");
+    public static final ClassName CACHEABLE_LIST_MODEL_LOADER = ClassName.get(QUERIABLE, "CacheableListModelLoader");
+    public static final ClassName LIST_MODEL_LOADER = ClassName.get(QUERIABLE, "ListModelLoader");
+
+    public static final ClassName DATABASE_WRAPPER = ClassName.get(DATABASE, "DatabaseWrapper");
+
+    public static final ClassName ORDER_BY = ClassName.get(LANGUAGE, "OrderBy");
+    public static final ClassName SQLITE = ClassName.get(LANGUAGE, "SQLite");
+
+    public static final ClassName UNSAFE_STRING_CONDITION = ClassName.get(LANGUAGE, "UnSafeStringCondition");
+
+    public static final ClassName CACHEABLE_LIST_MODEL_SAVER = ClassName.get(SAVEABLE, "CacheableListModelSaver");
+
+    public static final ClassName SINGLE_KEY_CACHEABLE_MODEL_LOADER = ClassName.get(QUERIABLE, "SingleKeyCacheableModelLoader");
+    public static final ClassName SINGLE_KEY_CACHEABLE_LIST_MODEL_LOADER = ClassName.get(QUERIABLE, "SingleKeyCacheableListModelLoader");
+}

dbflow-processor/src/main/java/com/raizlabs/android/dbflow/processor/DBFlowProcessor.java

@@ -29,6 +29,14 @@ public class DBFlowProcessor extends AbstractProcessor {
 
     private ProcessorManager manager;
 
+    @Override
+    public Set<String> getSupportedOptions() {
+        Set <String> supportedOptions = new LinkedHashSet<>();
+        supportedOptions.add("targetModuleName");
+
+        return supportedOptions;
+    }
+
     /**
      * If the processor class is annotated with {@link
      * javax.annotation.processing.SupportedAnnotationTypes}, return an unmodifiable set with the

dbflow/build.gradle

@@ -26,8 +26,6 @@ android {
 dependencies {
     compile project("${dbflow_project_prefix}dbflow-core")
     compile "com.android.support:support-annotations:25.0.0"
-
-
 }
 
 apply from: '../android-artifacts.gradle'

dbflow/src/main/java/com/raizlabs/android/dbflow/list/FlowCursorAdapter.java

@@ -0,0 +1,39 @@
+package com.raizlabs.android.dbflow.list;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.database.Cursor;
+import android.widget.CursorAdapter;
+
+import com.raizlabs.android.dbflow.config.FlowManager;
+import com.raizlabs.android.dbflow.structure.Model;
+import com.raizlabs.android.dbflow.structure.ModelAdapter;
+
+/**
+ * Specialization of CursorAdapter for DBFLow models. The getItem() method
+ * returns a model element instead of a Cursor object.
+ *
+ * @param <TModel>
+ */
+public abstract class FlowCursorAdapter <TModel extends Model> extends CursorAdapter {
+    private final ModelAdapter<TModel> mModelAdapter;
+
+    public FlowCursorAdapter(Context context, Class<TModel> modelClass, Cursor c, boolean autoRequery) {
+        super(context, c, autoRequery);
+
+        this.mModelAdapter = FlowManager.getModelAdapter(modelClass);
+    }
+
+    @TargetApi(11)
+    public FlowCursorAdapter(Context context, Class<TModel> modelClass, Cursor c, int flags) {
+        super(context, c, flags);
+
+        this.mModelAdapter = FlowManager.getModelAdapter(modelClass);
+    }
+
+    @Override
+    public TModel getItem(int position) {
+        Cursor cursor = (Cursor) super.getItem(position);
+        return cursor != null ? this.mModelAdapter.loadFromCursor(cursor) : null;
+    }
+}