Table generator

build.gradle

@@ -3,7 +3,7 @@ import org.gradle.internal.jvm.Jvm
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.1.3-2'
+    ext.kotlin_version = '1.1.51'
     repositories {
         jcenter()
     }

storio-basic-sample-app/src/main/java/com/pushtorefresh/storio2/basic_sample/DbOpenHelper.java

@@ -13,11 +13,11 @@ public DbOpenHelper(@NonNull Context context) {
 
     @Override
     public void onCreate(@NonNull SQLiteDatabase db) {
-        db.execSQL(TweetsTable.getCreateTableQuery());
+        TweetTable.createTable(db);
     }
 
     @Override
     public void onUpgrade(@NonNull SQLiteDatabase db, int oldVersion, int newVersion) {
-        // no impl
+        TweetTable.updateTable(db, oldVersion);
     }
 }

storio-basic-sample-app/src/main/java/com/pushtorefresh/storio2/basic_sample/MainActivity.java

@@ -67,7 +67,7 @@ void addTweets() {
             List<Tweet> receivedTweets = storIOSQLite
                 .get()
                 .listOfObjects(Tweet.class)
-                .withQuery(TweetsTable.QUERY_ALL)
+                .withQuery(TweetQueries.QUERY_ALL)
                 .prepare()
                 .executeAsBlocking();
 

storio-basic-sample-app/src/main/java/com/pushtorefresh/storio2/basic_sample/Tweet.java

@@ -12,22 +12,22 @@
 // This annotation will trigger annotation processor
 // Which will generate type mapping code in compile time,
 // You just need to link it in your code.
-@StorIOSQLiteType(table = TweetsTable.TABLE)
+@StorIOSQLiteType(table = "tweets")
 public class Tweet {
 
     /**
      * If object was not inserted into db, id will be null
      */
     @Nullable
-    @StorIOSQLiteColumn(name = TweetsTable.COLUMN_ID, key = true)
+    @StorIOSQLiteColumn(name = "_id", key = true)
     Long id;
 
     @NonNull
-    @StorIOSQLiteColumn(name = TweetsTable.COLUMN_AUTHOR)
+    @StorIOSQLiteColumn(name = "author")
     String author;
 
     @NonNull
-    @StorIOSQLiteColumn(name = TweetsTable.COLUMN_CONTENT)
+    @StorIOSQLiteColumn(name = "content")
     String content;
 
     // leave default constructor for AutoGenerated code!

storio-basic-sample-app/src/main/java/com/pushtorefresh/storio2/basic_sample/TweetQueries.java

@@ -0,0 +1,21 @@
+package com.pushtorefresh.storio2.basic_sample;
+
+import android.support.annotation.NonNull;
+
+import com.pushtorefresh.storio2.sqlite.queries.Query;
+
+// We suggest to store table meta such as table name, columns names, queries, etc in separate class
+// Because it makes code of the Entity itself cleaner and easier to read/understand/support
+public class TweetQueries {
+
+    // This is just class with Meta Data, we don't need instances
+    private TweetQueries() {
+        throw new IllegalStateException("No instances please");
+    }
+
+    // Yep, with StorIO you can safely store queries as objects and reuse them, they are immutable
+    @NonNull
+    public static final Query QUERY_ALL = Query.builder()
+            .table(TweetTable.NAME)
+            .build();
+}

storio-common-annotations-processor/src/main/kotlin/com/pushtorefresh/storio2/common/annotations/processor/Extensions.kt

@@ -2,3 +2,17 @@ package com.pushtorefresh.storio2.common.annotations.processor
 
 fun String.startsWithIs(): Boolean = this.startsWith("is") && this.length > 2
         && Character.isUpperCase(this[2])
+
+fun String.toUpperSnakeCase(): String {
+    val builder = StringBuilder()
+
+    this.forEachIndexed { index, char ->
+        when {
+            char.isDigit() -> builder.append("_$char")
+            char.isUpperCase() -> if (index == 0) builder.append(char) else builder.append("_$char")
+            char.isLowerCase() -> builder.append(char.toUpperCase())
+        }
+    }
+
+    return builder.toString()
+}

storio-common-annotations-processor/src/main/kotlin/com/pushtorefresh/storio2/common/annotations/processor/StorIOAnnotationsProcessor.kt

@@ -221,12 +221,14 @@ abstract class StorIOAnnotationsProcessor<TypeMeta : StorIOTypeMeta<*, *>, out C
             val getResolverGenerator = createGetResolver()
             val deleteResolverGenerator = createDeleteResolver()
             val mappingGenerator = createMapping()
+            val tableGenerator = createTableGenerator()
 
             annotatedClasses.values.forEach {
                 putResolverGenerator.generateJavaFile(it).writeTo(filer)
                 getResolverGenerator.generateJavaFile(it).writeTo(filer)
                 deleteResolverGenerator.generateJavaFile(it).writeTo(filer)
                 mappingGenerator.generateJavaFile(it).writeTo(filer)
+                if (it.generateTableClass) tableGenerator?.generateJavaFile(it)?.writeTo(filer)
             }
         } catch (e: ProcessingException) {
             messager.printMessage(ERROR, e.message, e.element)
@@ -290,4 +292,6 @@ abstract class StorIOAnnotationsProcessor<TypeMeta : StorIOTypeMeta<*, *>, out C
     protected abstract fun createDeleteResolver(): Generator<TypeMeta>
 
     protected abstract fun createMapping(): Generator<TypeMeta>
+
+    protected abstract fun createTableGenerator(): Generator<TypeMeta>?
 }

storio-common-annotations-processor/src/main/kotlin/com/pushtorefresh/storio2/common/annotations/processor/introspection/JavaType.kt

@@ -51,4 +51,22 @@ enum class JavaType {
             }
         }
     }
+
+    val sqliteType: String
+        get() = when (this) {
+            BOOLEAN,
+            BOOLEAN_OBJECT,
+            SHORT,
+            SHORT_OBJECT,
+            INTEGER,
+            INTEGER_OBJECT,
+            LONG,
+            LONG_OBJECT -> "INTEGER"
+            FLOAT,
+            FLOAT_OBJECT,
+            DOUBLE,
+            DOUBLE_OBJECT -> "REAL"
+            STRING -> "TEXT"
+            BYTE_ARRAY -> "BLOB"
+        }
 }

storio-common-annotations-processor/src/main/kotlin/com/pushtorefresh/storio2/common/annotations/processor/introspection/StorIOTypeMeta.kt

@@ -2,7 +2,7 @@ package com.pushtorefresh.storio2.common.annotations.processor.introspection
 
 import javax.lang.model.element.ExecutableElement
 
-open class StorIOTypeMeta<out TypeAnnotation : Annotation, ColumnMeta : StorIOColumnMeta<*>>
+abstract class StorIOTypeMeta<out TypeAnnotation : Annotation, ColumnMeta : StorIOColumnMeta<*>>
 @JvmOverloads constructor(
         val simpleName: String,
         val packageName: String,
@@ -22,7 +22,7 @@ open class StorIOTypeMeta<out TypeAnnotation : Annotation, ColumnMeta : StorIOCo
                     it.parameters.mapTo(params) { it.simpleName.toString() }
                 }
                 val orderedColumns = mutableListOf<ColumnMeta?>().apply {
-                    (0..columns.size - 1).forEach { add(null) }
+                    (0 until columns.size).forEach { add(null) }
                 }
                 columns.values.forEach { orderedColumns[params.indexOf(it.realElementName)] = it }
                 orderedColumns.map { it as ColumnMeta }
@@ -44,6 +44,8 @@ open class StorIOTypeMeta<out TypeAnnotation : Annotation, ColumnMeta : StorIOCo
         return true
     }
 
+    abstract val generateTableClass: Boolean
+
     override fun hashCode(): Int {
         var result = simpleName.hashCode()
         result = 31 * result + packageName.hashCode()

storio-common-annotations-processor/src/test/kotlin/com/pushtorefresh/storio2/common/annotations/processor/introspection/StorIOTypeMetaTest.kt

@@ -74,4 +74,8 @@ class StorIOTestTypeMeta(simpleName: String,
         simpleName,
         packageName,
         storIOType,
-        needCreator)
+        needCreator) {
+
+    override val generateTableClass: Boolean
+        get() = false
+}

storio-content-resolver-annotations-processor/src/main/kotlin/com/pushtorefresh/storio2/contentresolver/annotations/processor/StorIOContentResolverProcessor.kt

@@ -259,4 +259,6 @@ open class StorIOContentResolverProcessor : StorIOAnnotationsProcessor<StorIOCon
     override fun createDeleteResolver(): Generator<StorIOContentResolverTypeMeta> = DeleteResolverGenerator
 
     override fun createMapping(): Generator<StorIOContentResolverTypeMeta> = MappingGenerator
+
+    override fun createTableGenerator(): Generator<StorIOContentResolverTypeMeta>? = null
 }

storio-content-resolver-annotations-processor/src/main/kotlin/com/pushtorefresh/storio2/contentresolver/annotations/processor/introspection/StorIOContentResolverTypeMeta.kt

@@ -12,4 +12,8 @@ class StorIOContentResolverTypeMeta(
         simpleName,
         packageName,
         storIOType,
-        needsCreator)
+        needsCreator) {
+
+    override val generateTableClass: Boolean
+        get() = false
+}

storio-sample-app/src/main/java/com/pushtorefresh/storio2/sample/db/DbOpenHelper.java

@@ -23,8 +23,8 @@ public void onCreate(@NonNull SQLiteDatabase db) {
         db.execSQL(TweetsTable.getCreateTableQuery());
         db.execSQL(UsersTable.getCreateTableQuery());
 
-        db.execSQL(CarTable.getCreateTableQuery());
-        db.execSQL(PersonTable.getCreateTableQuery());
+        CarTable.createTable(db);
+        PersonTable.createTable(db);
         db.execSQL(PersonCarRelationTable.getCreateTableQuery());
 
         db.execSQL(Customer.CREATE_TABLE);

storio-sample-app/src/main/java/com/pushtorefresh/storio2/sample/db/entities/Tweet.java

@@ -16,7 +16,7 @@
 // This annotation will trigger annotation processor
 // Which will generate type mapping code in compile time,
 // You just need to link it in your code.
-@StorIOSQLiteType(table = TweetsTable.TABLE)
+@StorIOSQLiteType(table = TweetsTable.TABLE, generateTableClass = false)
 @StorIOContentResolverType(uri = TweetMeta.URI_STRING)
 public class Tweet {
 

storio-sample-app/src/main/java/com/pushtorefresh/storio2/sample/db/entities/User.java

@@ -10,7 +10,7 @@
 // This annotation will trigger annotation processor
 // Which will generate type mapping code in compile time,
 // You just need to link it in your code.
-@StorIOSQLiteType(table = UsersTable.TABLE)
+@StorIOSQLiteType(table = UsersTable.TABLE, generateTableClass = false)
 public class User {
 
     /**

storio-sample-app/src/main/java/com/pushtorefresh/storio2/sample/many_to_many_sample/ManyToManyActivity.java

@@ -83,8 +83,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
     @NonNull
     Subscription subscribeToPersonsAndCars() {
         Set<String> tables = new HashSet<String>(3);
-        tables.add(PersonTable.TABLE);
-        tables.add(CarTable.TABLE);
+        tables.add(PersonTable.NAME);
+        tables.add(CarTable.NAME);
         tables.add(PersonCarRelationTable.TABLE);
         return Observable.merge(
                 storIOSQLite.observeChangesInTables(tables),
@@ -95,7 +95,7 @@ Subscription subscribeToPersonsAndCars() {
                     public List<Person> call(Changes changes) {
                         return storIOSQLite.get()
                                 .listOfObjects(Person.class)
-                                .withQuery(Query.builder().table(PersonTable.TABLE).build())
+                                .withQuery(Query.builder().table(PersonTable.NAME).build())
                                 .prepare()
                                 .executeAsBlocking();
                     }

storio-sample-app/src/main/java/com/pushtorefresh/storio2/sample/many_to_many_sample/entities/Car.java

@@ -8,14 +8,14 @@
 
 import java.util.List;
 
-@StorIOSQLiteType(table = CarTable.TABLE)
+@StorIOSQLiteType(table = "cars")
 public class Car {
 
-    @StorIOSQLiteColumn(key = true, name = CarTable.COLUMN_ID)
+    @StorIOSQLiteColumn(key = true, name = "_car_id")
     @Nullable
     Long id;
 
-    @StorIOSQLiteColumn(name = CarTable.COLUMN_MODEL)
+    @StorIOSQLiteColumn(name = "model")
     @NonNull
     String model;
 

storio-sample-app/src/main/java/com/pushtorefresh/storio2/sample/many_to_many_sample/entities/Person.java

@@ -8,14 +8,14 @@
 
 import java.util.List;
 
-@StorIOSQLiteType(table = PersonTable.TABLE)
+@StorIOSQLiteType(table = "persons")
 public class Person {
 
-    @StorIOSQLiteColumn(key = true, name = PersonTable.COLUMN_ID)
+    @StorIOSQLiteColumn(key = true, name = "_person_id")
     @Nullable
     Long id;
 
-    @StorIOSQLiteColumn(name = PersonTable.COLUMN_NAME)
+    @StorIOSQLiteColumn(name = "name")
     @NonNull
     String name;