diff --git a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Category_Deleter.java b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Category_Deleter.java index 8a04bb60..f427e182 100644 --- a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Category_Deleter.java +++ b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Category_Deleter.java @@ -35,6 +35,56 @@ public Category_Schema getSchema() { return schema; } + @Deprecated + public Category_Deleter nameEq(@NonNull String name) { + return where(schema.name, "=", name); + } + + @Deprecated + public Category_Deleter nameNotEq(@NonNull String name) { + return where(schema.name, "<>", name); + } + + @Deprecated + public Category_Deleter nameIn(@NonNull Collection values) { + return in(false, schema.name, values); + } + + @Deprecated + public Category_Deleter nameNotIn(@NonNull Collection values) { + return in(true, schema.name, values); + } + + @Deprecated + public final Category_Deleter nameIn(@NonNull String... values) { + return nameIn(Arrays.asList(values)); + } + + @Deprecated + public final Category_Deleter nameNotIn(@NonNull String... values) { + return nameNotIn(Arrays.asList(values)); + } + + @Deprecated + public Category_Deleter nameLt(@NonNull String name) { + return where(schema.name, "<", name); + } + + @Deprecated + public Category_Deleter nameLe(@NonNull String name) { + return where(schema.name, "<=", name); + } + + @Deprecated + public Category_Deleter nameGt(@NonNull String name) { + return where(schema.name, ">", name); + } + + @Deprecated + public Category_Deleter nameGe(@NonNull String name) { + return where(schema.name, ">=", name); + } + public Category_Deleter idEq(long id) { return where(schema.id, "=", id); } diff --git a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Category_Relation.java b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Category_Relation.java index 6c857a2c..66ec4513 100644 --- a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Category_Relation.java +++ b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Category_Relation.java @@ -72,6 +72,56 @@ public Category_Deleter deleter() { return new Category_Deleter(this); } + @Deprecated + public Category_Relation nameEq(@NonNull String name) { + return where(schema.name, "=", name); + } + + @Deprecated + public Category_Relation nameNotEq(@NonNull String name) { + return where(schema.name, "<>", name); + } + + @Deprecated + public Category_Relation nameIn(@NonNull Collection values) { + return in(false, schema.name, values); + } + + @Deprecated + public Category_Relation nameNotIn(@NonNull Collection values) { + return in(true, schema.name, values); + } + + @Deprecated + public final Category_Relation nameIn(@NonNull String... values) { + return nameIn(Arrays.asList(values)); + } + + @Deprecated + public final Category_Relation nameNotIn(@NonNull String... values) { + return nameNotIn(Arrays.asList(values)); + } + + @Deprecated + public Category_Relation nameLt(@NonNull String name) { + return where(schema.name, "<", name); + } + + @Deprecated + public Category_Relation nameLe(@NonNull String name) { + return where(schema.name, "<=", name); + } + + @Deprecated + public Category_Relation nameGt(@NonNull String name) { + return where(schema.name, ">", name); + } + + @Deprecated + public Category_Relation nameGe(@NonNull String name) { + return where(schema.name, ">=", name); + } + public Category_Relation idEq(long id) { return where(schema.id, "=", id); } @@ -118,4 +168,24 @@ public Category_Relation idGe(long id) { public Category_Relation idBetween(long idA, long idB) { return whereBetween(schema.id, idA, idB); } + + @Deprecated + public Category_Relation orderByNameAsc() { + return orderBy(schema.name.orderInAscending()); + } + + @Deprecated + public Category_Relation orderByNameDesc() { + return orderBy(schema.name.orderInDescending()); + } + + @Deprecated + public Category_Relation orderByIdAsc() { + return orderBy(schema.id.orderInAscending()); + } + + @Deprecated + public Category_Relation orderByIdDesc() { + return orderBy(schema.id.orderInDescending()); + } } diff --git a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Category_Selector.java b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Category_Selector.java index 140f3bea..a90c498a 100644 --- a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Category_Selector.java +++ b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Category_Selector.java @@ -35,6 +35,56 @@ public Category_Schema getSchema() { return schema; } + @Deprecated + public Category_Selector nameEq(@NonNull String name) { + return where(schema.name, "=", name); + } + + @Deprecated + public Category_Selector nameNotEq(@NonNull String name) { + return where(schema.name, "<>", name); + } + + @Deprecated + public Category_Selector nameIn(@NonNull Collection values) { + return in(false, schema.name, values); + } + + @Deprecated + public Category_Selector nameNotIn(@NonNull Collection values) { + return in(true, schema.name, values); + } + + @Deprecated + public final Category_Selector nameIn(@NonNull String... values) { + return nameIn(Arrays.asList(values)); + } + + @Deprecated + public final Category_Selector nameNotIn(@NonNull String... values) { + return nameNotIn(Arrays.asList(values)); + } + + @Deprecated + public Category_Selector nameLt(@NonNull String name) { + return where(schema.name, "<", name); + } + + @Deprecated + public Category_Selector nameLe(@NonNull String name) { + return where(schema.name, "<=", name); + } + + @Deprecated + public Category_Selector nameGt(@NonNull String name) { + return where(schema.name, ">", name); + } + + @Deprecated + public Category_Selector nameGe(@NonNull String name) { + return where(schema.name, ">=", name); + } + public Category_Selector idEq(long id) { return where(schema.id, "=", id); } @@ -81,4 +131,24 @@ public Category_Selector idGe(long id) { public Category_Selector idBetween(long idA, long idB) { return whereBetween(schema.id, idA, idB); } + + @Deprecated + public Category_Selector orderByNameAsc() { + return orderBy(schema.name.orderInAscending()); + } + + @Deprecated + public Category_Selector orderByNameDesc() { + return orderBy(schema.name.orderInDescending()); + } + + @Deprecated + public Category_Selector orderByIdAsc() { + return orderBy(schema.id.orderInAscending()); + } + + @Deprecated + public Category_Selector orderByIdDesc() { + return orderBy(schema.id.orderInDescending()); + } } diff --git a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Category_Updater.java b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Category_Updater.java index 78a44ffb..df87d0e0 100644 --- a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Category_Updater.java +++ b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Category_Updater.java @@ -40,6 +40,56 @@ public Category_Updater name(@NonNull String name) { return this; } + @Deprecated + public Category_Updater nameEq(@NonNull String name) { + return where(schema.name, "=", name); + } + + @Deprecated + public Category_Updater nameNotEq(@NonNull String name) { + return where(schema.name, "<>", name); + } + + @Deprecated + public Category_Updater nameIn(@NonNull Collection values) { + return in(false, schema.name, values); + } + + @Deprecated + public Category_Updater nameNotIn(@NonNull Collection values) { + return in(true, schema.name, values); + } + + @Deprecated + public final Category_Updater nameIn(@NonNull String... values) { + return nameIn(Arrays.asList(values)); + } + + @Deprecated + public final Category_Updater nameNotIn(@NonNull String... values) { + return nameNotIn(Arrays.asList(values)); + } + + @Deprecated + public Category_Updater nameLt(@NonNull String name) { + return where(schema.name, "<", name); + } + + @Deprecated + public Category_Updater nameLe(@NonNull String name) { + return where(schema.name, "<=", name); + } + + @Deprecated + public Category_Updater nameGt(@NonNull String name) { + return where(schema.name, ">", name); + } + + @Deprecated + public Category_Updater nameGe(@NonNull String name) { + return where(schema.name, ">=", name); + } + public Category_Updater idEq(long id) { return where(schema.id, "=", id); } diff --git a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Entry_Deleter.java b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Entry_Deleter.java index 35b8dc0a..e2140fea 100644 --- a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Entry_Deleter.java +++ b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Entry_Deleter.java @@ -35,6 +35,114 @@ public Entry_Schema getSchema() { return schema; } + @Deprecated + public Entry_Deleter resourceTypeEq(@NonNull String resourceType) { + return where(schema.resourceType, "=", resourceType); + } + + @Deprecated + public Entry_Deleter resourceTypeNotEq(@NonNull String resourceType) { + return where(schema.resourceType, "<>", resourceType); + } + + @Deprecated + public Entry_Deleter resourceTypeIn(@NonNull Collection values) { + return in(false, schema.resourceType, values); + } + + @Deprecated + public Entry_Deleter resourceTypeNotIn(@NonNull Collection values) { + return in(true, schema.resourceType, values); + } + + @Deprecated + public final Entry_Deleter resourceTypeIn(@NonNull String... values) { + return resourceTypeIn(Arrays.asList(values)); + } + + @Deprecated + public final Entry_Deleter resourceTypeNotIn(@NonNull String... values) { + return resourceTypeNotIn(Arrays.asList(values)); + } + + @Deprecated + public Entry_Deleter resourceTypeLt(@NonNull String resourceType) { + return where(schema.resourceType, "<", resourceType); + } + + @Deprecated + public Entry_Deleter resourceTypeLe(@NonNull String resourceType) { + return where(schema.resourceType, "<=", resourceType); + } + + @Deprecated + public Entry_Deleter resourceTypeGt(@NonNull String resourceType) { + return where(schema.resourceType, ">", resourceType); + } + + @Deprecated + public Entry_Deleter resourceTypeGe(@NonNull String resourceType) { + return where(schema.resourceType, ">=", resourceType); + } + + @Deprecated + public Entry_Deleter resourceIdEq(long resourceId) { + return where(schema.resourceId, "=", resourceId); + } + + @Deprecated + public Entry_Deleter resourceIdNotEq(long resourceId) { + return where(schema.resourceId, "<>", resourceId); + } + + @Deprecated + public Entry_Deleter resourceIdIn(@NonNull Collection values) { + return in(false, schema.resourceId, values); + } + + @Deprecated + public Entry_Deleter resourceIdNotIn(@NonNull Collection values) { + return in(true, schema.resourceId, values); + } + + @Deprecated + public final Entry_Deleter resourceIdIn(@NonNull Long... values) { + return resourceIdIn(Arrays.asList(values)); + } + + @Deprecated + public final Entry_Deleter resourceIdNotIn(@NonNull Long... values) { + return resourceIdNotIn(Arrays.asList(values)); + } + + @Deprecated + public Entry_Deleter resourceIdLt(long resourceId) { + return where(schema.resourceId, "<", resourceId); + } + + @Deprecated + public Entry_Deleter resourceIdLe(long resourceId) { + return where(schema.resourceId, "<=", resourceId); + } + + @Deprecated + public Entry_Deleter resourceIdGt(long resourceId) { + return where(schema.resourceId, ">", resourceId); + } + + @Deprecated + public Entry_Deleter resourceIdGe(long resourceId) { + return where(schema.resourceId, ">=", resourceId); + } + + /** + * To build a condition resourceId BETWEEN a AND b, which is equivalent to a <= resourceId AND resourceId <= b. + */ + @Deprecated + public Entry_Deleter resourceIdBetween(long resourceIdA, long resourceIdB) { + return whereBetween(schema.resourceId, resourceIdA, resourceIdB); + } + public Entry_Deleter idEq(long id) { return where(schema.id, "=", id); } diff --git a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Entry_Relation.java b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Entry_Relation.java index 8967a3ac..a2c4c4d1 100644 --- a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Entry_Relation.java +++ b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Entry_Relation.java @@ -73,6 +73,114 @@ public Entry_Deleter deleter() { return new Entry_Deleter(this); } + @Deprecated + public Entry_Relation resourceTypeEq(@NonNull String resourceType) { + return where(schema.resourceType, "=", resourceType); + } + + @Deprecated + public Entry_Relation resourceTypeNotEq(@NonNull String resourceType) { + return where(schema.resourceType, "<>", resourceType); + } + + @Deprecated + public Entry_Relation resourceTypeIn(@NonNull Collection values) { + return in(false, schema.resourceType, values); + } + + @Deprecated + public Entry_Relation resourceTypeNotIn(@NonNull Collection values) { + return in(true, schema.resourceType, values); + } + + @Deprecated + public final Entry_Relation resourceTypeIn(@NonNull String... values) { + return resourceTypeIn(Arrays.asList(values)); + } + + @Deprecated + public final Entry_Relation resourceTypeNotIn(@NonNull String... values) { + return resourceTypeNotIn(Arrays.asList(values)); + } + + @Deprecated + public Entry_Relation resourceTypeLt(@NonNull String resourceType) { + return where(schema.resourceType, "<", resourceType); + } + + @Deprecated + public Entry_Relation resourceTypeLe(@NonNull String resourceType) { + return where(schema.resourceType, "<=", resourceType); + } + + @Deprecated + public Entry_Relation resourceTypeGt(@NonNull String resourceType) { + return where(schema.resourceType, ">", resourceType); + } + + @Deprecated + public Entry_Relation resourceTypeGe(@NonNull String resourceType) { + return where(schema.resourceType, ">=", resourceType); + } + + @Deprecated + public Entry_Relation resourceIdEq(long resourceId) { + return where(schema.resourceId, "=", resourceId); + } + + @Deprecated + public Entry_Relation resourceIdNotEq(long resourceId) { + return where(schema.resourceId, "<>", resourceId); + } + + @Deprecated + public Entry_Relation resourceIdIn(@NonNull Collection values) { + return in(false, schema.resourceId, values); + } + + @Deprecated + public Entry_Relation resourceIdNotIn(@NonNull Collection values) { + return in(true, schema.resourceId, values); + } + + @Deprecated + public final Entry_Relation resourceIdIn(@NonNull Long... values) { + return resourceIdIn(Arrays.asList(values)); + } + + @Deprecated + public final Entry_Relation resourceIdNotIn(@NonNull Long... values) { + return resourceIdNotIn(Arrays.asList(values)); + } + + @Deprecated + public Entry_Relation resourceIdLt(long resourceId) { + return where(schema.resourceId, "<", resourceId); + } + + @Deprecated + public Entry_Relation resourceIdLe(long resourceId) { + return where(schema.resourceId, "<=", resourceId); + } + + @Deprecated + public Entry_Relation resourceIdGt(long resourceId) { + return where(schema.resourceId, ">", resourceId); + } + + @Deprecated + public Entry_Relation resourceIdGe(long resourceId) { + return where(schema.resourceId, ">=", resourceId); + } + + /** + * To build a condition resourceId BETWEEN a AND b, which is equivalent to a <= resourceId AND resourceId <= b. + */ + @Deprecated + public Entry_Relation resourceIdBetween(long resourceIdA, long resourceIdB) { + return whereBetween(schema.resourceId, resourceIdA, resourceIdB); + } + public Entry_Relation idEq(long id) { return where(schema.id, "=", id); } @@ -124,6 +232,36 @@ public Entry_Relation resourceTypeAndResourceIdEq(@NonNull String resourceType, return where(schema.resourceType, "=", resourceType).where(schema.resourceId, "=", resourceId); } + @Deprecated + public Entry_Relation orderByResourceTypeAsc() { + return orderBy(schema.resourceType.orderInAscending()); + } + + @Deprecated + public Entry_Relation orderByResourceTypeDesc() { + return orderBy(schema.resourceType.orderInDescending()); + } + + @Deprecated + public Entry_Relation orderByResourceIdAsc() { + return orderBy(schema.resourceId.orderInAscending()); + } + + @Deprecated + public Entry_Relation orderByResourceIdDesc() { + return orderBy(schema.resourceId.orderInDescending()); + } + + @Deprecated + public Entry_Relation orderByIdAsc() { + return orderBy(schema.id.orderInAscending()); + } + + @Deprecated + public Entry_Relation orderByIdDesc() { + return orderBy(schema.id.orderInDescending()); + } + public Entry_Relation orderByresourceTypeAndResourceIdAsc() { return orderBy(schema.resourceType.orderInAscending()).orderBy(schema.resourceId.orderInAscending()); } diff --git a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Entry_Selector.java b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Entry_Selector.java index 101e3038..57bd0136 100644 --- a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Entry_Selector.java +++ b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Entry_Selector.java @@ -37,6 +37,114 @@ public Entry_Schema getSchema() { return schema; } + @Deprecated + public Entry_Selector resourceTypeEq(@NonNull String resourceType) { + return where(schema.resourceType, "=", resourceType); + } + + @Deprecated + public Entry_Selector resourceTypeNotEq(@NonNull String resourceType) { + return where(schema.resourceType, "<>", resourceType); + } + + @Deprecated + public Entry_Selector resourceTypeIn(@NonNull Collection values) { + return in(false, schema.resourceType, values); + } + + @Deprecated + public Entry_Selector resourceTypeNotIn(@NonNull Collection values) { + return in(true, schema.resourceType, values); + } + + @Deprecated + public final Entry_Selector resourceTypeIn(@NonNull String... values) { + return resourceTypeIn(Arrays.asList(values)); + } + + @Deprecated + public final Entry_Selector resourceTypeNotIn(@NonNull String... values) { + return resourceTypeNotIn(Arrays.asList(values)); + } + + @Deprecated + public Entry_Selector resourceTypeLt(@NonNull String resourceType) { + return where(schema.resourceType, "<", resourceType); + } + + @Deprecated + public Entry_Selector resourceTypeLe(@NonNull String resourceType) { + return where(schema.resourceType, "<=", resourceType); + } + + @Deprecated + public Entry_Selector resourceTypeGt(@NonNull String resourceType) { + return where(schema.resourceType, ">", resourceType); + } + + @Deprecated + public Entry_Selector resourceTypeGe(@NonNull String resourceType) { + return where(schema.resourceType, ">=", resourceType); + } + + @Deprecated + public Entry_Selector resourceIdEq(long resourceId) { + return where(schema.resourceId, "=", resourceId); + } + + @Deprecated + public Entry_Selector resourceIdNotEq(long resourceId) { + return where(schema.resourceId, "<>", resourceId); + } + + @Deprecated + public Entry_Selector resourceIdIn(@NonNull Collection values) { + return in(false, schema.resourceId, values); + } + + @Deprecated + public Entry_Selector resourceIdNotIn(@NonNull Collection values) { + return in(true, schema.resourceId, values); + } + + @Deprecated + public final Entry_Selector resourceIdIn(@NonNull Long... values) { + return resourceIdIn(Arrays.asList(values)); + } + + @Deprecated + public final Entry_Selector resourceIdNotIn(@NonNull Long... values) { + return resourceIdNotIn(Arrays.asList(values)); + } + + @Deprecated + public Entry_Selector resourceIdLt(long resourceId) { + return where(schema.resourceId, "<", resourceId); + } + + @Deprecated + public Entry_Selector resourceIdLe(long resourceId) { + return where(schema.resourceId, "<=", resourceId); + } + + @Deprecated + public Entry_Selector resourceIdGt(long resourceId) { + return where(schema.resourceId, ">", resourceId); + } + + @Deprecated + public Entry_Selector resourceIdGe(long resourceId) { + return where(schema.resourceId, ">=", resourceId); + } + + /** + * To build a condition resourceId BETWEEN a AND b, which is equivalent to a <= resourceId AND resourceId <= b. + */ + @Deprecated + public Entry_Selector resourceIdBetween(long resourceIdA, long resourceIdB) { + return whereBetween(schema.resourceId, resourceIdA, resourceIdB); + } + public Entry_Selector idEq(long id) { return where(schema.id, "=", id); } @@ -88,6 +196,36 @@ public Entry_Selector resourceTypeAndResourceIdEq(@NonNull String resourceType, return where(schema.resourceType, "=", resourceType).where(schema.resourceId, "=", resourceId); } + @Deprecated + public Entry_Selector orderByResourceTypeAsc() { + return orderBy(schema.resourceType.orderInAscending()); + } + + @Deprecated + public Entry_Selector orderByResourceTypeDesc() { + return orderBy(schema.resourceType.orderInDescending()); + } + + @Deprecated + public Entry_Selector orderByResourceIdAsc() { + return orderBy(schema.resourceId.orderInAscending()); + } + + @Deprecated + public Entry_Selector orderByResourceIdDesc() { + return orderBy(schema.resourceId.orderInDescending()); + } + + @Deprecated + public Entry_Selector orderByIdAsc() { + return orderBy(schema.id.orderInAscending()); + } + + @Deprecated + public Entry_Selector orderByIdDesc() { + return orderBy(schema.id.orderInDescending()); + } + public Entry_Selector orderByresourceTypeAndResourceIdAsc() { return orderBy(schema.resourceType.orderInAscending()).orderBy(schema.resourceId.orderInAscending()); } diff --git a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Entry_Updater.java b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Entry_Updater.java index e6a6e9e0..07898685 100644 --- a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Entry_Updater.java +++ b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Entry_Updater.java @@ -45,6 +45,114 @@ public Entry_Updater resourceId(long resourceId) { return this; } + @Deprecated + public Entry_Updater resourceTypeEq(@NonNull String resourceType) { + return where(schema.resourceType, "=", resourceType); + } + + @Deprecated + public Entry_Updater resourceTypeNotEq(@NonNull String resourceType) { + return where(schema.resourceType, "<>", resourceType); + } + + @Deprecated + public Entry_Updater resourceTypeIn(@NonNull Collection values) { + return in(false, schema.resourceType, values); + } + + @Deprecated + public Entry_Updater resourceTypeNotIn(@NonNull Collection values) { + return in(true, schema.resourceType, values); + } + + @Deprecated + public final Entry_Updater resourceTypeIn(@NonNull String... values) { + return resourceTypeIn(Arrays.asList(values)); + } + + @Deprecated + public final Entry_Updater resourceTypeNotIn(@NonNull String... values) { + return resourceTypeNotIn(Arrays.asList(values)); + } + + @Deprecated + public Entry_Updater resourceTypeLt(@NonNull String resourceType) { + return where(schema.resourceType, "<", resourceType); + } + + @Deprecated + public Entry_Updater resourceTypeLe(@NonNull String resourceType) { + return where(schema.resourceType, "<=", resourceType); + } + + @Deprecated + public Entry_Updater resourceTypeGt(@NonNull String resourceType) { + return where(schema.resourceType, ">", resourceType); + } + + @Deprecated + public Entry_Updater resourceTypeGe(@NonNull String resourceType) { + return where(schema.resourceType, ">=", resourceType); + } + + @Deprecated + public Entry_Updater resourceIdEq(long resourceId) { + return where(schema.resourceId, "=", resourceId); + } + + @Deprecated + public Entry_Updater resourceIdNotEq(long resourceId) { + return where(schema.resourceId, "<>", resourceId); + } + + @Deprecated + public Entry_Updater resourceIdIn(@NonNull Collection values) { + return in(false, schema.resourceId, values); + } + + @Deprecated + public Entry_Updater resourceIdNotIn(@NonNull Collection values) { + return in(true, schema.resourceId, values); + } + + @Deprecated + public final Entry_Updater resourceIdIn(@NonNull Long... values) { + return resourceIdIn(Arrays.asList(values)); + } + + @Deprecated + public final Entry_Updater resourceIdNotIn(@NonNull Long... values) { + return resourceIdNotIn(Arrays.asList(values)); + } + + @Deprecated + public Entry_Updater resourceIdLt(long resourceId) { + return where(schema.resourceId, "<", resourceId); + } + + @Deprecated + public Entry_Updater resourceIdLe(long resourceId) { + return where(schema.resourceId, "<=", resourceId); + } + + @Deprecated + public Entry_Updater resourceIdGt(long resourceId) { + return where(schema.resourceId, ">", resourceId); + } + + @Deprecated + public Entry_Updater resourceIdGe(long resourceId) { + return where(schema.resourceId, ">=", resourceId); + } + + /** + * To build a condition resourceId BETWEEN a AND b, which is equivalent to a <= resourceId AND resourceId <= b. + */ + @Deprecated + public Entry_Updater resourceIdBetween(long resourceIdA, long resourceIdB) { + return whereBetween(schema.resourceId, resourceIdA, resourceIdB); + } + public Entry_Updater idEq(long id) { return where(schema.id, "=", id); } diff --git a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Item2_Deleter.java b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Item2_Deleter.java index ec1354e4..d67d03d4 100644 --- a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Item2_Deleter.java +++ b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Item2_Deleter.java @@ -3,8 +3,12 @@ import android.support.annotation.NonNull; import com.github.gfx.android.orma.Deleter; import com.github.gfx.android.orma.OrmaConnection; +import com.github.gfx.android.orma.example.tool.TypeAdapters; +import com.github.gfx.android.orma.function.Function1; import java.util.Arrays; import java.util.Collection; +import org.threeten.bp.LocalDateTime; +import org.threeten.bp.ZonedDateTime; public class Item2_Deleter extends Deleter { final Item2_Schema schema; @@ -59,6 +63,126 @@ public Item2_Deleter category2Eq(long category2Id) { return where(schema.category2, "=", category2Id); } + @Deprecated + public Item2_Deleter zonedTimestampEq(@NonNull ZonedDateTime zonedTimestamp) { + return where(schema.zonedTimestamp, "=", TypeAdapters.serializeZonedDateTime(zonedTimestamp)); + } + + @Deprecated + public Item2_Deleter zonedTimestampNotEq(@NonNull ZonedDateTime zonedTimestamp) { + return where(schema.zonedTimestamp, "<>", TypeAdapters.serializeZonedDateTime(zonedTimestamp)); + } + + @Deprecated + public Item2_Deleter zonedTimestampIn(@NonNull Collection values) { + return in(false, schema.zonedTimestamp, values, new Function1() { + @Override + public String apply(ZonedDateTime value) { + return TypeAdapters.serializeZonedDateTime(value); + } + }); + } + + @Deprecated + public Item2_Deleter zonedTimestampNotIn(@NonNull Collection values) { + return in(true, schema.zonedTimestamp, values, new Function1() { + @Override + public String apply(ZonedDateTime value) { + return TypeAdapters.serializeZonedDateTime(value); + } + }); + } + + @Deprecated + public final Item2_Deleter zonedTimestampIn(@NonNull ZonedDateTime... values) { + return zonedTimestampIn(Arrays.asList(values)); + } + + @Deprecated + public final Item2_Deleter zonedTimestampNotIn(@NonNull ZonedDateTime... values) { + return zonedTimestampNotIn(Arrays.asList(values)); + } + + @Deprecated + public Item2_Deleter zonedTimestampLt(@NonNull ZonedDateTime zonedTimestamp) { + return where(schema.zonedTimestamp, "<", TypeAdapters.serializeZonedDateTime(zonedTimestamp)); + } + + @Deprecated + public Item2_Deleter zonedTimestampLe(@NonNull ZonedDateTime zonedTimestamp) { + return where(schema.zonedTimestamp, "<=", TypeAdapters.serializeZonedDateTime(zonedTimestamp)); + } + + @Deprecated + public Item2_Deleter zonedTimestampGt(@NonNull ZonedDateTime zonedTimestamp) { + return where(schema.zonedTimestamp, ">", TypeAdapters.serializeZonedDateTime(zonedTimestamp)); + } + + @Deprecated + public Item2_Deleter zonedTimestampGe(@NonNull ZonedDateTime zonedTimestamp) { + return where(schema.zonedTimestamp, ">=", TypeAdapters.serializeZonedDateTime(zonedTimestamp)); + } + + @Deprecated + public Item2_Deleter localDateTimeEq(@NonNull LocalDateTime localDateTime) { + return where(schema.localDateTime, "=", TypeAdapters.serializeLocalDateTime(localDateTime)); + } + + @Deprecated + public Item2_Deleter localDateTimeNotEq(@NonNull LocalDateTime localDateTime) { + return where(schema.localDateTime, "<>", TypeAdapters.serializeLocalDateTime(localDateTime)); + } + + @Deprecated + public Item2_Deleter localDateTimeIn(@NonNull Collection values) { + return in(false, schema.localDateTime, values, new Function1() { + @Override + public String apply(LocalDateTime value) { + return TypeAdapters.serializeLocalDateTime(value); + } + }); + } + + @Deprecated + public Item2_Deleter localDateTimeNotIn(@NonNull Collection values) { + return in(true, schema.localDateTime, values, new Function1() { + @Override + public String apply(LocalDateTime value) { + return TypeAdapters.serializeLocalDateTime(value); + } + }); + } + + @Deprecated + public final Item2_Deleter localDateTimeIn(@NonNull LocalDateTime... values) { + return localDateTimeIn(Arrays.asList(values)); + } + + @Deprecated + public final Item2_Deleter localDateTimeNotIn(@NonNull LocalDateTime... values) { + return localDateTimeNotIn(Arrays.asList(values)); + } + + @Deprecated + public Item2_Deleter localDateTimeLt(@NonNull LocalDateTime localDateTime) { + return where(schema.localDateTime, "<", TypeAdapters.serializeLocalDateTime(localDateTime)); + } + + @Deprecated + public Item2_Deleter localDateTimeLe(@NonNull LocalDateTime localDateTime) { + return where(schema.localDateTime, "<=", TypeAdapters.serializeLocalDateTime(localDateTime)); + } + + @Deprecated + public Item2_Deleter localDateTimeGt(@NonNull LocalDateTime localDateTime) { + return where(schema.localDateTime, ">", TypeAdapters.serializeLocalDateTime(localDateTime)); + } + + @Deprecated + public Item2_Deleter localDateTimeGe(@NonNull LocalDateTime localDateTime) { + return where(schema.localDateTime, ">=", TypeAdapters.serializeLocalDateTime(localDateTime)); + } + public Item2_Deleter nameEq(@NonNull String name) { return where(schema.name, "=", name); } diff --git a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Item2_Relation.java b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Item2_Relation.java index 2e680cc3..82c78a6d 100644 --- a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Item2_Relation.java +++ b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Item2_Relation.java @@ -7,8 +7,11 @@ import com.github.gfx.android.orma.Relation; import com.github.gfx.android.orma.annotation.OnConflict; import com.github.gfx.android.orma.example.tool.TypeAdapters; +import com.github.gfx.android.orma.function.Function1; import java.util.Arrays; import java.util.Collection; +import org.threeten.bp.LocalDateTime; +import org.threeten.bp.ZonedDateTime; public class Item2_Relation extends Relation { final Item2_Schema schema; @@ -99,6 +102,126 @@ public Item2_Relation category2Eq(long category2Id) { return where(schema.category2, "=", category2Id); } + @Deprecated + public Item2_Relation zonedTimestampEq(@NonNull ZonedDateTime zonedTimestamp) { + return where(schema.zonedTimestamp, "=", TypeAdapters.serializeZonedDateTime(zonedTimestamp)); + } + + @Deprecated + public Item2_Relation zonedTimestampNotEq(@NonNull ZonedDateTime zonedTimestamp) { + return where(schema.zonedTimestamp, "<>", TypeAdapters.serializeZonedDateTime(zonedTimestamp)); + } + + @Deprecated + public Item2_Relation zonedTimestampIn(@NonNull Collection values) { + return in(false, schema.zonedTimestamp, values, new Function1() { + @Override + public String apply(ZonedDateTime value) { + return TypeAdapters.serializeZonedDateTime(value); + } + }); + } + + @Deprecated + public Item2_Relation zonedTimestampNotIn(@NonNull Collection values) { + return in(true, schema.zonedTimestamp, values, new Function1() { + @Override + public String apply(ZonedDateTime value) { + return TypeAdapters.serializeZonedDateTime(value); + } + }); + } + + @Deprecated + public final Item2_Relation zonedTimestampIn(@NonNull ZonedDateTime... values) { + return zonedTimestampIn(Arrays.asList(values)); + } + + @Deprecated + public final Item2_Relation zonedTimestampNotIn(@NonNull ZonedDateTime... values) { + return zonedTimestampNotIn(Arrays.asList(values)); + } + + @Deprecated + public Item2_Relation zonedTimestampLt(@NonNull ZonedDateTime zonedTimestamp) { + return where(schema.zonedTimestamp, "<", TypeAdapters.serializeZonedDateTime(zonedTimestamp)); + } + + @Deprecated + public Item2_Relation zonedTimestampLe(@NonNull ZonedDateTime zonedTimestamp) { + return where(schema.zonedTimestamp, "<=", TypeAdapters.serializeZonedDateTime(zonedTimestamp)); + } + + @Deprecated + public Item2_Relation zonedTimestampGt(@NonNull ZonedDateTime zonedTimestamp) { + return where(schema.zonedTimestamp, ">", TypeAdapters.serializeZonedDateTime(zonedTimestamp)); + } + + @Deprecated + public Item2_Relation zonedTimestampGe(@NonNull ZonedDateTime zonedTimestamp) { + return where(schema.zonedTimestamp, ">=", TypeAdapters.serializeZonedDateTime(zonedTimestamp)); + } + + @Deprecated + public Item2_Relation localDateTimeEq(@NonNull LocalDateTime localDateTime) { + return where(schema.localDateTime, "=", TypeAdapters.serializeLocalDateTime(localDateTime)); + } + + @Deprecated + public Item2_Relation localDateTimeNotEq(@NonNull LocalDateTime localDateTime) { + return where(schema.localDateTime, "<>", TypeAdapters.serializeLocalDateTime(localDateTime)); + } + + @Deprecated + public Item2_Relation localDateTimeIn(@NonNull Collection values) { + return in(false, schema.localDateTime, values, new Function1() { + @Override + public String apply(LocalDateTime value) { + return TypeAdapters.serializeLocalDateTime(value); + } + }); + } + + @Deprecated + public Item2_Relation localDateTimeNotIn(@NonNull Collection values) { + return in(true, schema.localDateTime, values, new Function1() { + @Override + public String apply(LocalDateTime value) { + return TypeAdapters.serializeLocalDateTime(value); + } + }); + } + + @Deprecated + public final Item2_Relation localDateTimeIn(@NonNull LocalDateTime... values) { + return localDateTimeIn(Arrays.asList(values)); + } + + @Deprecated + public final Item2_Relation localDateTimeNotIn(@NonNull LocalDateTime... values) { + return localDateTimeNotIn(Arrays.asList(values)); + } + + @Deprecated + public Item2_Relation localDateTimeLt(@NonNull LocalDateTime localDateTime) { + return where(schema.localDateTime, "<", TypeAdapters.serializeLocalDateTime(localDateTime)); + } + + @Deprecated + public Item2_Relation localDateTimeLe(@NonNull LocalDateTime localDateTime) { + return where(schema.localDateTime, "<=", TypeAdapters.serializeLocalDateTime(localDateTime)); + } + + @Deprecated + public Item2_Relation localDateTimeGt(@NonNull LocalDateTime localDateTime) { + return where(schema.localDateTime, ">", TypeAdapters.serializeLocalDateTime(localDateTime)); + } + + @Deprecated + public Item2_Relation localDateTimeGe(@NonNull LocalDateTime localDateTime) { + return where(schema.localDateTime, ">=", TypeAdapters.serializeLocalDateTime(localDateTime)); + } + public Item2_Relation nameEq(@NonNull String name) { return where(schema.name, "=", name); } @@ -155,6 +278,26 @@ public Item2_Relation orderByCategory2Desc() { return orderBy(schema.category2.orderInDescending()); } + @Deprecated + public Item2_Relation orderByZonedTimestampAsc() { + return orderBy(schema.zonedTimestamp.orderInAscending()); + } + + @Deprecated + public Item2_Relation orderByZonedTimestampDesc() { + return orderBy(schema.zonedTimestamp.orderInDescending()); + } + + @Deprecated + public Item2_Relation orderByLocalDateTimeAsc() { + return orderBy(schema.localDateTime.orderInAscending()); + } + + @Deprecated + public Item2_Relation orderByLocalDateTimeDesc() { + return orderBy(schema.localDateTime.orderInDescending()); + } + public Item2_Relation orderByNameAsc() { return orderBy(schema.name.orderInAscending()); } diff --git a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Item2_Selector.java b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Item2_Selector.java index cd7a12d0..600d4247 100644 --- a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Item2_Selector.java +++ b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Item2_Selector.java @@ -3,8 +3,12 @@ import android.support.annotation.NonNull; import com.github.gfx.android.orma.OrmaConnection; import com.github.gfx.android.orma.Selector; +import com.github.gfx.android.orma.example.tool.TypeAdapters; +import com.github.gfx.android.orma.function.Function1; import java.util.Arrays; import java.util.Collection; +import org.threeten.bp.LocalDateTime; +import org.threeten.bp.ZonedDateTime; public class Item2_Selector extends Selector { final Item2_Schema schema; @@ -59,6 +63,126 @@ public Item2_Selector category2Eq(long category2Id) { return where(schema.category2, "=", category2Id); } + @Deprecated + public Item2_Selector zonedTimestampEq(@NonNull ZonedDateTime zonedTimestamp) { + return where(schema.zonedTimestamp, "=", TypeAdapters.serializeZonedDateTime(zonedTimestamp)); + } + + @Deprecated + public Item2_Selector zonedTimestampNotEq(@NonNull ZonedDateTime zonedTimestamp) { + return where(schema.zonedTimestamp, "<>", TypeAdapters.serializeZonedDateTime(zonedTimestamp)); + } + + @Deprecated + public Item2_Selector zonedTimestampIn(@NonNull Collection values) { + return in(false, schema.zonedTimestamp, values, new Function1() { + @Override + public String apply(ZonedDateTime value) { + return TypeAdapters.serializeZonedDateTime(value); + } + }); + } + + @Deprecated + public Item2_Selector zonedTimestampNotIn(@NonNull Collection values) { + return in(true, schema.zonedTimestamp, values, new Function1() { + @Override + public String apply(ZonedDateTime value) { + return TypeAdapters.serializeZonedDateTime(value); + } + }); + } + + @Deprecated + public final Item2_Selector zonedTimestampIn(@NonNull ZonedDateTime... values) { + return zonedTimestampIn(Arrays.asList(values)); + } + + @Deprecated + public final Item2_Selector zonedTimestampNotIn(@NonNull ZonedDateTime... values) { + return zonedTimestampNotIn(Arrays.asList(values)); + } + + @Deprecated + public Item2_Selector zonedTimestampLt(@NonNull ZonedDateTime zonedTimestamp) { + return where(schema.zonedTimestamp, "<", TypeAdapters.serializeZonedDateTime(zonedTimestamp)); + } + + @Deprecated + public Item2_Selector zonedTimestampLe(@NonNull ZonedDateTime zonedTimestamp) { + return where(schema.zonedTimestamp, "<=", TypeAdapters.serializeZonedDateTime(zonedTimestamp)); + } + + @Deprecated + public Item2_Selector zonedTimestampGt(@NonNull ZonedDateTime zonedTimestamp) { + return where(schema.zonedTimestamp, ">", TypeAdapters.serializeZonedDateTime(zonedTimestamp)); + } + + @Deprecated + public Item2_Selector zonedTimestampGe(@NonNull ZonedDateTime zonedTimestamp) { + return where(schema.zonedTimestamp, ">=", TypeAdapters.serializeZonedDateTime(zonedTimestamp)); + } + + @Deprecated + public Item2_Selector localDateTimeEq(@NonNull LocalDateTime localDateTime) { + return where(schema.localDateTime, "=", TypeAdapters.serializeLocalDateTime(localDateTime)); + } + + @Deprecated + public Item2_Selector localDateTimeNotEq(@NonNull LocalDateTime localDateTime) { + return where(schema.localDateTime, "<>", TypeAdapters.serializeLocalDateTime(localDateTime)); + } + + @Deprecated + public Item2_Selector localDateTimeIn(@NonNull Collection values) { + return in(false, schema.localDateTime, values, new Function1() { + @Override + public String apply(LocalDateTime value) { + return TypeAdapters.serializeLocalDateTime(value); + } + }); + } + + @Deprecated + public Item2_Selector localDateTimeNotIn(@NonNull Collection values) { + return in(true, schema.localDateTime, values, new Function1() { + @Override + public String apply(LocalDateTime value) { + return TypeAdapters.serializeLocalDateTime(value); + } + }); + } + + @Deprecated + public final Item2_Selector localDateTimeIn(@NonNull LocalDateTime... values) { + return localDateTimeIn(Arrays.asList(values)); + } + + @Deprecated + public final Item2_Selector localDateTimeNotIn(@NonNull LocalDateTime... values) { + return localDateTimeNotIn(Arrays.asList(values)); + } + + @Deprecated + public Item2_Selector localDateTimeLt(@NonNull LocalDateTime localDateTime) { + return where(schema.localDateTime, "<", TypeAdapters.serializeLocalDateTime(localDateTime)); + } + + @Deprecated + public Item2_Selector localDateTimeLe(@NonNull LocalDateTime localDateTime) { + return where(schema.localDateTime, "<=", TypeAdapters.serializeLocalDateTime(localDateTime)); + } + + @Deprecated + public Item2_Selector localDateTimeGt(@NonNull LocalDateTime localDateTime) { + return where(schema.localDateTime, ">", TypeAdapters.serializeLocalDateTime(localDateTime)); + } + + @Deprecated + public Item2_Selector localDateTimeGe(@NonNull LocalDateTime localDateTime) { + return where(schema.localDateTime, ">=", TypeAdapters.serializeLocalDateTime(localDateTime)); + } + public Item2_Selector nameEq(@NonNull String name) { return where(schema.name, "=", name); } @@ -115,6 +239,26 @@ public Item2_Selector orderByCategory2Desc() { return orderBy(schema.category2.orderInDescending()); } + @Deprecated + public Item2_Selector orderByZonedTimestampAsc() { + return orderBy(schema.zonedTimestamp.orderInAscending()); + } + + @Deprecated + public Item2_Selector orderByZonedTimestampDesc() { + return orderBy(schema.zonedTimestamp.orderInDescending()); + } + + @Deprecated + public Item2_Selector orderByLocalDateTimeAsc() { + return orderBy(schema.localDateTime.orderInAscending()); + } + + @Deprecated + public Item2_Selector orderByLocalDateTimeDesc() { + return orderBy(schema.localDateTime.orderInDescending()); + } + public Item2_Selector orderByNameAsc() { return orderBy(schema.name.orderInAscending()); } diff --git a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Item2_Updater.java b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Item2_Updater.java index c2d7ad9f..3f622623 100644 --- a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Item2_Updater.java +++ b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Item2_Updater.java @@ -5,6 +5,7 @@ import com.github.gfx.android.orma.OrmaConnection; import com.github.gfx.android.orma.Updater; import com.github.gfx.android.orma.example.tool.TypeAdapters; +import com.github.gfx.android.orma.function.Function1; import java.util.Arrays; import java.util.Collection; import org.threeten.bp.LocalDateTime; @@ -88,6 +89,126 @@ public Item2_Updater category2Eq(long category2Id) { return where(schema.category2, "=", category2Id); } + @Deprecated + public Item2_Updater zonedTimestampEq(@NonNull ZonedDateTime zonedTimestamp) { + return where(schema.zonedTimestamp, "=", TypeAdapters.serializeZonedDateTime(zonedTimestamp)); + } + + @Deprecated + public Item2_Updater zonedTimestampNotEq(@NonNull ZonedDateTime zonedTimestamp) { + return where(schema.zonedTimestamp, "<>", TypeAdapters.serializeZonedDateTime(zonedTimestamp)); + } + + @Deprecated + public Item2_Updater zonedTimestampIn(@NonNull Collection values) { + return in(false, schema.zonedTimestamp, values, new Function1() { + @Override + public String apply(ZonedDateTime value) { + return TypeAdapters.serializeZonedDateTime(value); + } + }); + } + + @Deprecated + public Item2_Updater zonedTimestampNotIn(@NonNull Collection values) { + return in(true, schema.zonedTimestamp, values, new Function1() { + @Override + public String apply(ZonedDateTime value) { + return TypeAdapters.serializeZonedDateTime(value); + } + }); + } + + @Deprecated + public final Item2_Updater zonedTimestampIn(@NonNull ZonedDateTime... values) { + return zonedTimestampIn(Arrays.asList(values)); + } + + @Deprecated + public final Item2_Updater zonedTimestampNotIn(@NonNull ZonedDateTime... values) { + return zonedTimestampNotIn(Arrays.asList(values)); + } + + @Deprecated + public Item2_Updater zonedTimestampLt(@NonNull ZonedDateTime zonedTimestamp) { + return where(schema.zonedTimestamp, "<", TypeAdapters.serializeZonedDateTime(zonedTimestamp)); + } + + @Deprecated + public Item2_Updater zonedTimestampLe(@NonNull ZonedDateTime zonedTimestamp) { + return where(schema.zonedTimestamp, "<=", TypeAdapters.serializeZonedDateTime(zonedTimestamp)); + } + + @Deprecated + public Item2_Updater zonedTimestampGt(@NonNull ZonedDateTime zonedTimestamp) { + return where(schema.zonedTimestamp, ">", TypeAdapters.serializeZonedDateTime(zonedTimestamp)); + } + + @Deprecated + public Item2_Updater zonedTimestampGe(@NonNull ZonedDateTime zonedTimestamp) { + return where(schema.zonedTimestamp, ">=", TypeAdapters.serializeZonedDateTime(zonedTimestamp)); + } + + @Deprecated + public Item2_Updater localDateTimeEq(@NonNull LocalDateTime localDateTime) { + return where(schema.localDateTime, "=", TypeAdapters.serializeLocalDateTime(localDateTime)); + } + + @Deprecated + public Item2_Updater localDateTimeNotEq(@NonNull LocalDateTime localDateTime) { + return where(schema.localDateTime, "<>", TypeAdapters.serializeLocalDateTime(localDateTime)); + } + + @Deprecated + public Item2_Updater localDateTimeIn(@NonNull Collection values) { + return in(false, schema.localDateTime, values, new Function1() { + @Override + public String apply(LocalDateTime value) { + return TypeAdapters.serializeLocalDateTime(value); + } + }); + } + + @Deprecated + public Item2_Updater localDateTimeNotIn(@NonNull Collection values) { + return in(true, schema.localDateTime, values, new Function1() { + @Override + public String apply(LocalDateTime value) { + return TypeAdapters.serializeLocalDateTime(value); + } + }); + } + + @Deprecated + public final Item2_Updater localDateTimeIn(@NonNull LocalDateTime... values) { + return localDateTimeIn(Arrays.asList(values)); + } + + @Deprecated + public final Item2_Updater localDateTimeNotIn(@NonNull LocalDateTime... values) { + return localDateTimeNotIn(Arrays.asList(values)); + } + + @Deprecated + public Item2_Updater localDateTimeLt(@NonNull LocalDateTime localDateTime) { + return where(schema.localDateTime, "<", TypeAdapters.serializeLocalDateTime(localDateTime)); + } + + @Deprecated + public Item2_Updater localDateTimeLe(@NonNull LocalDateTime localDateTime) { + return where(schema.localDateTime, "<=", TypeAdapters.serializeLocalDateTime(localDateTime)); + } + + @Deprecated + public Item2_Updater localDateTimeGt(@NonNull LocalDateTime localDateTime) { + return where(schema.localDateTime, ">", TypeAdapters.serializeLocalDateTime(localDateTime)); + } + + @Deprecated + public Item2_Updater localDateTimeGe(@NonNull LocalDateTime localDateTime) { + return where(schema.localDateTime, ">=", TypeAdapters.serializeLocalDateTime(localDateTime)); + } + public Item2_Updater nameEq(@NonNull String name) { return where(schema.name, "=", name); } diff --git a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Todo_Deleter.java b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Todo_Deleter.java index 82ccfb3e..f5596a2e 100644 --- a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Todo_Deleter.java +++ b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Todo_Deleter.java @@ -1,10 +1,13 @@ package com.github.gfx.android.orma.example.orma; import android.support.annotation.NonNull; +import com.github.gfx.android.orma.BuiltInSerializers; import com.github.gfx.android.orma.Deleter; import com.github.gfx.android.orma.OrmaConnection; +import com.github.gfx.android.orma.function.Function1; import java.util.Arrays; import java.util.Collection; +import java.util.Date; public class Todo_Deleter extends Deleter { final Todo_Schema schema; @@ -75,6 +78,66 @@ public Todo_Deleter titleGe(@NonNull String title) { return where(schema.title, ">=", title); } + @Deprecated + public Todo_Deleter contentIsNull() { + return where(schema.content, " IS NULL"); + } + + @Deprecated + public Todo_Deleter contentIsNotNull() { + return where(schema.content, " IS NOT NULL"); + } + + @Deprecated + public Todo_Deleter contentEq(@NonNull String content) { + return where(schema.content, "=", content); + } + + @Deprecated + public Todo_Deleter contentNotEq(@NonNull String content) { + return where(schema.content, "<>", content); + } + + @Deprecated + public Todo_Deleter contentIn(@NonNull Collection values) { + return in(false, schema.content, values); + } + + @Deprecated + public Todo_Deleter contentNotIn(@NonNull Collection values) { + return in(true, schema.content, values); + } + + @Deprecated + public final Todo_Deleter contentIn(@NonNull String... values) { + return contentIn(Arrays.asList(values)); + } + + @Deprecated + public final Todo_Deleter contentNotIn(@NonNull String... values) { + return contentNotIn(Arrays.asList(values)); + } + + @Deprecated + public Todo_Deleter contentLt(@NonNull String content) { + return where(schema.content, "<", content); + } + + @Deprecated + public Todo_Deleter contentLe(@NonNull String content) { + return where(schema.content, "<=", content); + } + + @Deprecated + public Todo_Deleter contentGt(@NonNull String content) { + return where(schema.content, ">", content); + } + + @Deprecated + public Todo_Deleter contentGe(@NonNull String content) { + return where(schema.content, ">=", content); + } + public Todo_Deleter doneEq(boolean done) { return where(schema.done, "=", done); } @@ -115,6 +178,74 @@ public Todo_Deleter doneGe(boolean done) { return where(schema.done, ">=", done); } + @Deprecated + public Todo_Deleter createdTimeEq(@NonNull Date createdTime) { + return where(schema.createdTime, "=", BuiltInSerializers.serializeDate(createdTime)); + } + + @Deprecated + public Todo_Deleter createdTimeNotEq(@NonNull Date createdTime) { + return where(schema.createdTime, "<>", BuiltInSerializers.serializeDate(createdTime)); + } + + @Deprecated + public Todo_Deleter createdTimeIn(@NonNull Collection values) { + return in(false, schema.createdTime, values, new Function1() { + @Override + public Long apply(Date value) { + return BuiltInSerializers.serializeDate(value); + } + }); + } + + @Deprecated + public Todo_Deleter createdTimeNotIn(@NonNull Collection values) { + return in(true, schema.createdTime, values, new Function1() { + @Override + public Long apply(Date value) { + return BuiltInSerializers.serializeDate(value); + } + }); + } + + @Deprecated + public final Todo_Deleter createdTimeIn(@NonNull Date... values) { + return createdTimeIn(Arrays.asList(values)); + } + + @Deprecated + public final Todo_Deleter createdTimeNotIn(@NonNull Date... values) { + return createdTimeNotIn(Arrays.asList(values)); + } + + @Deprecated + public Todo_Deleter createdTimeLt(@NonNull Date createdTime) { + return where(schema.createdTime, "<", BuiltInSerializers.serializeDate(createdTime)); + } + + @Deprecated + public Todo_Deleter createdTimeLe(@NonNull Date createdTime) { + return where(schema.createdTime, "<=", BuiltInSerializers.serializeDate(createdTime)); + } + + @Deprecated + public Todo_Deleter createdTimeGt(@NonNull Date createdTime) { + return where(schema.createdTime, ">", BuiltInSerializers.serializeDate(createdTime)); + } + + @Deprecated + public Todo_Deleter createdTimeGe(@NonNull Date createdTime) { + return where(schema.createdTime, ">=", BuiltInSerializers.serializeDate(createdTime)); + } + + /** + * To build a condition createdTime BETWEEN a AND b, which is equivalent to a <= createdTime AND createdTime <= b. + */ + @Deprecated + public Todo_Deleter createdTimeBetween(@NonNull Date createdTimeA, @NonNull Date createdTimeB) { + return whereBetween(schema.createdTime, BuiltInSerializers.serializeDate(createdTimeA), BuiltInSerializers.serializeDate(createdTimeB)); + } + public Todo_Deleter idEq(long id) { return where(schema.id, "=", id); } diff --git a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Todo_Relation.java b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Todo_Relation.java index ed1ea86a..e5a08a4e 100644 --- a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Todo_Relation.java +++ b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Todo_Relation.java @@ -7,8 +7,10 @@ import com.github.gfx.android.orma.OrmaConnection; import com.github.gfx.android.orma.Relation; import com.github.gfx.android.orma.annotation.OnConflict; +import com.github.gfx.android.orma.function.Function1; import java.util.Arrays; import java.util.Collection; +import java.util.Date; public class Todo_Relation extends Relation { final Todo_Schema schema; @@ -116,6 +118,66 @@ public Todo_Relation titleGe(@NonNull String title) { return where(schema.title, ">=", title); } + @Deprecated + public Todo_Relation contentIsNull() { + return where(schema.content, " IS NULL"); + } + + @Deprecated + public Todo_Relation contentIsNotNull() { + return where(schema.content, " IS NOT NULL"); + } + + @Deprecated + public Todo_Relation contentEq(@NonNull String content) { + return where(schema.content, "=", content); + } + + @Deprecated + public Todo_Relation contentNotEq(@NonNull String content) { + return where(schema.content, "<>", content); + } + + @Deprecated + public Todo_Relation contentIn(@NonNull Collection values) { + return in(false, schema.content, values); + } + + @Deprecated + public Todo_Relation contentNotIn(@NonNull Collection values) { + return in(true, schema.content, values); + } + + @Deprecated + public final Todo_Relation contentIn(@NonNull String... values) { + return contentIn(Arrays.asList(values)); + } + + @Deprecated + public final Todo_Relation contentNotIn(@NonNull String... values) { + return contentNotIn(Arrays.asList(values)); + } + + @Deprecated + public Todo_Relation contentLt(@NonNull String content) { + return where(schema.content, "<", content); + } + + @Deprecated + public Todo_Relation contentLe(@NonNull String content) { + return where(schema.content, "<=", content); + } + + @Deprecated + public Todo_Relation contentGt(@NonNull String content) { + return where(schema.content, ">", content); + } + + @Deprecated + public Todo_Relation contentGe(@NonNull String content) { + return where(schema.content, ">=", content); + } + public Todo_Relation doneEq(boolean done) { return where(schema.done, "=", done); } @@ -156,6 +218,74 @@ public Todo_Relation doneGe(boolean done) { return where(schema.done, ">=", done); } + @Deprecated + public Todo_Relation createdTimeEq(@NonNull Date createdTime) { + return where(schema.createdTime, "=", BuiltInSerializers.serializeDate(createdTime)); + } + + @Deprecated + public Todo_Relation createdTimeNotEq(@NonNull Date createdTime) { + return where(schema.createdTime, "<>", BuiltInSerializers.serializeDate(createdTime)); + } + + @Deprecated + public Todo_Relation createdTimeIn(@NonNull Collection values) { + return in(false, schema.createdTime, values, new Function1() { + @Override + public Long apply(Date value) { + return BuiltInSerializers.serializeDate(value); + } + }); + } + + @Deprecated + public Todo_Relation createdTimeNotIn(@NonNull Collection values) { + return in(true, schema.createdTime, values, new Function1() { + @Override + public Long apply(Date value) { + return BuiltInSerializers.serializeDate(value); + } + }); + } + + @Deprecated + public final Todo_Relation createdTimeIn(@NonNull Date... values) { + return createdTimeIn(Arrays.asList(values)); + } + + @Deprecated + public final Todo_Relation createdTimeNotIn(@NonNull Date... values) { + return createdTimeNotIn(Arrays.asList(values)); + } + + @Deprecated + public Todo_Relation createdTimeLt(@NonNull Date createdTime) { + return where(schema.createdTime, "<", BuiltInSerializers.serializeDate(createdTime)); + } + + @Deprecated + public Todo_Relation createdTimeLe(@NonNull Date createdTime) { + return where(schema.createdTime, "<=", BuiltInSerializers.serializeDate(createdTime)); + } + + @Deprecated + public Todo_Relation createdTimeGt(@NonNull Date createdTime) { + return where(schema.createdTime, ">", BuiltInSerializers.serializeDate(createdTime)); + } + + @Deprecated + public Todo_Relation createdTimeGe(@NonNull Date createdTime) { + return where(schema.createdTime, ">=", BuiltInSerializers.serializeDate(createdTime)); + } + + /** + * To build a condition createdTime BETWEEN a AND b, which is equivalent to a <= createdTime AND createdTime <= b. + */ + @Deprecated + public Todo_Relation createdTimeBetween(@NonNull Date createdTimeA, @NonNull Date createdTimeB) { + return whereBetween(schema.createdTime, BuiltInSerializers.serializeDate(createdTimeA), BuiltInSerializers.serializeDate(createdTimeB)); + } + public Todo_Relation idEq(long id) { return where(schema.id, "=", id); } @@ -211,6 +341,16 @@ public Todo_Relation orderByTitleDesc() { return orderBy(schema.title.orderInDescending()); } + @Deprecated + public Todo_Relation orderByContentAsc() { + return orderBy(schema.content.orderInAscending()); + } + + @Deprecated + public Todo_Relation orderByContentDesc() { + return orderBy(schema.content.orderInDescending()); + } + public Todo_Relation orderByDoneAsc() { return orderBy(schema.done.orderInAscending()); } @@ -226,4 +366,14 @@ public Todo_Relation orderByCreatedTimeAsc() { public Todo_Relation orderByCreatedTimeDesc() { return orderBy(schema.createdTime.orderInDescending()); } + + @Deprecated + public Todo_Relation orderByIdAsc() { + return orderBy(schema.id.orderInAscending()); + } + + @Deprecated + public Todo_Relation orderByIdDesc() { + return orderBy(schema.id.orderInDescending()); + } } diff --git a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Todo_Selector.java b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Todo_Selector.java index c0bc8ac4..8a2df17b 100644 --- a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Todo_Selector.java +++ b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Todo_Selector.java @@ -1,10 +1,13 @@ package com.github.gfx.android.orma.example.orma; import android.support.annotation.NonNull; +import com.github.gfx.android.orma.BuiltInSerializers; import com.github.gfx.android.orma.OrmaConnection; import com.github.gfx.android.orma.Selector; +import com.github.gfx.android.orma.function.Function1; import java.util.Arrays; import java.util.Collection; +import java.util.Date; public class Todo_Selector extends Selector { final Todo_Schema schema; @@ -75,6 +78,66 @@ public Todo_Selector titleGe(@NonNull String title) { return where(schema.title, ">=", title); } + @Deprecated + public Todo_Selector contentIsNull() { + return where(schema.content, " IS NULL"); + } + + @Deprecated + public Todo_Selector contentIsNotNull() { + return where(schema.content, " IS NOT NULL"); + } + + @Deprecated + public Todo_Selector contentEq(@NonNull String content) { + return where(schema.content, "=", content); + } + + @Deprecated + public Todo_Selector contentNotEq(@NonNull String content) { + return where(schema.content, "<>", content); + } + + @Deprecated + public Todo_Selector contentIn(@NonNull Collection values) { + return in(false, schema.content, values); + } + + @Deprecated + public Todo_Selector contentNotIn(@NonNull Collection values) { + return in(true, schema.content, values); + } + + @Deprecated + public final Todo_Selector contentIn(@NonNull String... values) { + return contentIn(Arrays.asList(values)); + } + + @Deprecated + public final Todo_Selector contentNotIn(@NonNull String... values) { + return contentNotIn(Arrays.asList(values)); + } + + @Deprecated + public Todo_Selector contentLt(@NonNull String content) { + return where(schema.content, "<", content); + } + + @Deprecated + public Todo_Selector contentLe(@NonNull String content) { + return where(schema.content, "<=", content); + } + + @Deprecated + public Todo_Selector contentGt(@NonNull String content) { + return where(schema.content, ">", content); + } + + @Deprecated + public Todo_Selector contentGe(@NonNull String content) { + return where(schema.content, ">=", content); + } + public Todo_Selector doneEq(boolean done) { return where(schema.done, "=", done); } @@ -115,6 +178,74 @@ public Todo_Selector doneGe(boolean done) { return where(schema.done, ">=", done); } + @Deprecated + public Todo_Selector createdTimeEq(@NonNull Date createdTime) { + return where(schema.createdTime, "=", BuiltInSerializers.serializeDate(createdTime)); + } + + @Deprecated + public Todo_Selector createdTimeNotEq(@NonNull Date createdTime) { + return where(schema.createdTime, "<>", BuiltInSerializers.serializeDate(createdTime)); + } + + @Deprecated + public Todo_Selector createdTimeIn(@NonNull Collection values) { + return in(false, schema.createdTime, values, new Function1() { + @Override + public Long apply(Date value) { + return BuiltInSerializers.serializeDate(value); + } + }); + } + + @Deprecated + public Todo_Selector createdTimeNotIn(@NonNull Collection values) { + return in(true, schema.createdTime, values, new Function1() { + @Override + public Long apply(Date value) { + return BuiltInSerializers.serializeDate(value); + } + }); + } + + @Deprecated + public final Todo_Selector createdTimeIn(@NonNull Date... values) { + return createdTimeIn(Arrays.asList(values)); + } + + @Deprecated + public final Todo_Selector createdTimeNotIn(@NonNull Date... values) { + return createdTimeNotIn(Arrays.asList(values)); + } + + @Deprecated + public Todo_Selector createdTimeLt(@NonNull Date createdTime) { + return where(schema.createdTime, "<", BuiltInSerializers.serializeDate(createdTime)); + } + + @Deprecated + public Todo_Selector createdTimeLe(@NonNull Date createdTime) { + return where(schema.createdTime, "<=", BuiltInSerializers.serializeDate(createdTime)); + } + + @Deprecated + public Todo_Selector createdTimeGt(@NonNull Date createdTime) { + return where(schema.createdTime, ">", BuiltInSerializers.serializeDate(createdTime)); + } + + @Deprecated + public Todo_Selector createdTimeGe(@NonNull Date createdTime) { + return where(schema.createdTime, ">=", BuiltInSerializers.serializeDate(createdTime)); + } + + /** + * To build a condition createdTime BETWEEN a AND b, which is equivalent to a <= createdTime AND createdTime <= b. + */ + @Deprecated + public Todo_Selector createdTimeBetween(@NonNull Date createdTimeA, @NonNull Date createdTimeB) { + return whereBetween(schema.createdTime, BuiltInSerializers.serializeDate(createdTimeA), BuiltInSerializers.serializeDate(createdTimeB)); + } + public Todo_Selector idEq(long id) { return where(schema.id, "=", id); } @@ -170,6 +301,16 @@ public Todo_Selector orderByTitleDesc() { return orderBy(schema.title.orderInDescending()); } + @Deprecated + public Todo_Selector orderByContentAsc() { + return orderBy(schema.content.orderInAscending()); + } + + @Deprecated + public Todo_Selector orderByContentDesc() { + return orderBy(schema.content.orderInDescending()); + } + public Todo_Selector orderByDoneAsc() { return orderBy(schema.done.orderInAscending()); } @@ -185,4 +326,14 @@ public Todo_Selector orderByCreatedTimeAsc() { public Todo_Selector orderByCreatedTimeDesc() { return orderBy(schema.createdTime.orderInDescending()); } + + @Deprecated + public Todo_Selector orderByIdAsc() { + return orderBy(schema.id.orderInAscending()); + } + + @Deprecated + public Todo_Selector orderByIdDesc() { + return orderBy(schema.id.orderInDescending()); + } } diff --git a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Todo_Updater.java b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Todo_Updater.java index 18239e06..9fac37be 100644 --- a/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Todo_Updater.java +++ b/example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Todo_Updater.java @@ -5,6 +5,7 @@ import com.github.gfx.android.orma.BuiltInSerializers; import com.github.gfx.android.orma.OrmaConnection; import com.github.gfx.android.orma.Updater; +import com.github.gfx.android.orma.function.Function1; import java.util.Arrays; import java.util.Collection; import java.util.Date; @@ -103,6 +104,66 @@ public Todo_Updater titleGe(@NonNull String title) { return where(schema.title, ">=", title); } + @Deprecated + public Todo_Updater contentIsNull() { + return where(schema.content, " IS NULL"); + } + + @Deprecated + public Todo_Updater contentIsNotNull() { + return where(schema.content, " IS NOT NULL"); + } + + @Deprecated + public Todo_Updater contentEq(@NonNull String content) { + return where(schema.content, "=", content); + } + + @Deprecated + public Todo_Updater contentNotEq(@NonNull String content) { + return where(schema.content, "<>", content); + } + + @Deprecated + public Todo_Updater contentIn(@NonNull Collection values) { + return in(false, schema.content, values); + } + + @Deprecated + public Todo_Updater contentNotIn(@NonNull Collection values) { + return in(true, schema.content, values); + } + + @Deprecated + public final Todo_Updater contentIn(@NonNull String... values) { + return contentIn(Arrays.asList(values)); + } + + @Deprecated + public final Todo_Updater contentNotIn(@NonNull String... values) { + return contentNotIn(Arrays.asList(values)); + } + + @Deprecated + public Todo_Updater contentLt(@NonNull String content) { + return where(schema.content, "<", content); + } + + @Deprecated + public Todo_Updater contentLe(@NonNull String content) { + return where(schema.content, "<=", content); + } + + @Deprecated + public Todo_Updater contentGt(@NonNull String content) { + return where(schema.content, ">", content); + } + + @Deprecated + public Todo_Updater contentGe(@NonNull String content) { + return where(schema.content, ">=", content); + } + public Todo_Updater doneEq(boolean done) { return where(schema.done, "=", done); } @@ -143,6 +204,74 @@ public Todo_Updater doneGe(boolean done) { return where(schema.done, ">=", done); } + @Deprecated + public Todo_Updater createdTimeEq(@NonNull Date createdTime) { + return where(schema.createdTime, "=", BuiltInSerializers.serializeDate(createdTime)); + } + + @Deprecated + public Todo_Updater createdTimeNotEq(@NonNull Date createdTime) { + return where(schema.createdTime, "<>", BuiltInSerializers.serializeDate(createdTime)); + } + + @Deprecated + public Todo_Updater createdTimeIn(@NonNull Collection values) { + return in(false, schema.createdTime, values, new Function1() { + @Override + public Long apply(Date value) { + return BuiltInSerializers.serializeDate(value); + } + }); + } + + @Deprecated + public Todo_Updater createdTimeNotIn(@NonNull Collection values) { + return in(true, schema.createdTime, values, new Function1() { + @Override + public Long apply(Date value) { + return BuiltInSerializers.serializeDate(value); + } + }); + } + + @Deprecated + public final Todo_Updater createdTimeIn(@NonNull Date... values) { + return createdTimeIn(Arrays.asList(values)); + } + + @Deprecated + public final Todo_Updater createdTimeNotIn(@NonNull Date... values) { + return createdTimeNotIn(Arrays.asList(values)); + } + + @Deprecated + public Todo_Updater createdTimeLt(@NonNull Date createdTime) { + return where(schema.createdTime, "<", BuiltInSerializers.serializeDate(createdTime)); + } + + @Deprecated + public Todo_Updater createdTimeLe(@NonNull Date createdTime) { + return where(schema.createdTime, "<=", BuiltInSerializers.serializeDate(createdTime)); + } + + @Deprecated + public Todo_Updater createdTimeGt(@NonNull Date createdTime) { + return where(schema.createdTime, ">", BuiltInSerializers.serializeDate(createdTime)); + } + + @Deprecated + public Todo_Updater createdTimeGe(@NonNull Date createdTime) { + return where(schema.createdTime, ">=", BuiltInSerializers.serializeDate(createdTime)); + } + + /** + * To build a condition createdTime BETWEEN a AND b, which is equivalent to a <= createdTime AND createdTime <= b. + */ + @Deprecated + public Todo_Updater createdTimeBetween(@NonNull Date createdTimeA, @NonNull Date createdTimeB) { + return whereBetween(schema.createdTime, BuiltInSerializers.serializeDate(createdTimeA), BuiltInSerializers.serializeDate(createdTimeB)); + } + public Todo_Updater idEq(long id) { return where(schema.id, "=", id); } diff --git a/processor/src/main/java/com/github/gfx/android/orma/processor/generator/ConditionQueryHelpers.java b/processor/src/main/java/com/github/gfx/android/orma/processor/generator/ConditionQueryHelpers.java index a440e5eb..042a01f7 100644 --- a/processor/src/main/java/com/github/gfx/android/orma/processor/generator/ConditionQueryHelpers.java +++ b/processor/src/main/java/com/github/gfx/android/orma/processor/generator/ConditionQueryHelpers.java @@ -42,6 +42,8 @@ import javax.lang.model.element.Modifier; +import static com.github.gfx.android.orma.processor.util.Annotations.deprecatedUnless; + public class ConditionQueryHelpers { private final ProcessingContext context; @@ -67,8 +69,6 @@ public List buildConditionHelpers(boolean orderByHelpers) { public List buildConditionHelpers(boolean orderByHelpers, boolean aggregatorHelpers) { List methodSpecs = new ArrayList<>(); schema.getColumns() - .stream() - .filter(ColumnDefinition::hasConditionHelpers) .forEach(column -> buildConditionHelpersForEachColumn(methodSpecs, column)); schema.getIndexes() @@ -80,8 +80,6 @@ public List buildConditionHelpers(boolean orderByHelpers, boolean ag if (orderByHelpers) { schema.getColumns() - .stream() - .filter(ColumnDefinition::hasOrderHelpers) .forEach(column -> buildOrderByHelpers(methodSpecs, column)); schema.getIndexes() @@ -94,8 +92,6 @@ public List buildConditionHelpers(boolean orderByHelpers, boolean ag if (aggregatorHelpers) { schema.getColumnsWithoutAutoId() - .stream() - .filter(ColumnDefinition::hasAggregationHelpers) .forEach(column -> buildAggregationHelpers(methodSpecs, column)); } @@ -153,17 +149,18 @@ void buildConditionHelpersForEachColumn(List methodSpecs, ColumnDefi CodeBlock serializedFieldExpr = serializedFieldExpr(column, paramSpec); - if (column.nullable && column.hasHelper(Column.Helpers.CONDITION_IS_NULL)) { + if (column.nullable) { methodSpecs.add(MethodSpec.methodBuilder(column.name + "IsNull") + .addAnnotations(deprecatedUnless(column.hasHelper(Column.Helpers.CONDITION_IS_NULL))) .addModifiers(Modifier.PUBLIC) .returns(targetClassName) .addStatement("return where($L, $S)", columnExpr, " IS NULL") .build() ); - } - if (column.nullable && column.hasHelper(Column.Helpers.CONDITION_IS_NOT_NULL)) { methodSpecs.add(MethodSpec.methodBuilder(column.name + "IsNotNull") + .addAnnotations( + deprecatedUnless(column.hasHelper(Column.Helpers.CONDITION_IS_NOT_NULL))) .addModifiers(Modifier.PUBLIC) .returns(targetClassName) .addStatement("return where($L, $S)", columnExpr, " IS NOT NULL") @@ -171,51 +168,46 @@ void buildConditionHelpersForEachColumn(List methodSpecs, ColumnDefi ); } - if (column.hasHelper(Column.Helpers.CONDITION_EQ)) { - methodSpecs.add(MethodSpec.methodBuilder(column.name + "Eq") - .addModifiers(Modifier.PUBLIC) - .addParameter(paramSpec) - .returns(targetClassName) - .addStatement("return where($L, $S, $L)", columnExpr, "=", serializedFieldExpr) - .build() - ); - } + methodSpecs.add(MethodSpec.methodBuilder(column.name + "Eq") + .addAnnotations(deprecatedUnless(column.hasHelper(Column.Helpers.CONDITION_EQ))) + .addModifiers(Modifier.PUBLIC) + .addParameter(paramSpec) + .returns(targetClassName) + .addStatement("return where($L, $S, $L)", columnExpr, "=", serializedFieldExpr) + .build() + ); if (isAssociation) { // for foreign keys - if (column.hasHelper(Column.Helpers.CONDITION_EQ)) { - SchemaDefinition associatedSchema = column.getAssociatedSchema(); - associatedSchema.getPrimaryKey().ifPresent(foreignKey -> { - String paramName = column.name + Strings.toUpperFirst(foreignKey.name); - CodeBlock serializedParamExpr = foreignKey.applySerialization("conn", paramName); - methodSpecs.add( - MethodSpec.methodBuilder(column.name + "Eq") - .addModifiers(Modifier.PUBLIC) - .addParameter( - ParameterSpec.builder(foreignKey.getType(), paramName) - .addAnnotations(foreignKey.nullabilityAnnotations()) - .build()) - .returns(targetClassName) - .addStatement("return where($L, $S, $L)", columnExpr, "=", serializedParamExpr) - .build() - ); - }); - } - - // generates only "*Eq" for associations + SchemaDefinition associatedSchema = column.getAssociatedSchema(); + associatedSchema.getPrimaryKey().ifPresent(foreignKey -> { + String paramName = column.name + Strings.toUpperFirst(foreignKey.name); + CodeBlock serializedParamExpr = foreignKey.applySerialization("conn", paramName); + methodSpecs.add( + MethodSpec.methodBuilder(column.name + "Eq") + .addAnnotations(deprecatedUnless(column.hasHelper(Column.Helpers.CONDITION_EQ))) + .addModifiers(Modifier.PUBLIC) + .addParameter( + ParameterSpec.builder(foreignKey.getType(), paramName) + .addAnnotations(foreignKey.nullabilityAnnotations()) + .build()) + .returns(targetClassName) + .addStatement("return where($L, $S, $L)", columnExpr, "=", serializedParamExpr) + .build() + ); + }); return; } - if (column.hasHelper(Column.Helpers.CONDITION_NOT_EQ)) { - methodSpecs.add(MethodSpec.methodBuilder(column.name + "NotEq") - .addModifiers(Modifier.PUBLIC) - .addParameter(paramSpec) - .returns(targetClassName) - .addStatement("return where($L, $S, $L)", columnExpr, "<>", - serializedFieldExpr) - .build() - ); - } + methodSpecs.add(MethodSpec.methodBuilder(column.name + "NotEq") + .addAnnotations(deprecatedUnless(column.hasHelper(Column.Helpers.CONDITION_NOT_EQ))) + .addModifiers(Modifier.PUBLIC) + .addParameter(paramSpec) + .returns(targetClassName) + .addStatement("return where($L, $S, $L)", columnExpr, "<>", + serializedFieldExpr) + .build() + ); if (column.needsTypeAdapter()) { TypeSpec serializerFunction = TypeSpec.anonymousClassBuilder("") @@ -229,138 +221,130 @@ void buildConditionHelpersForEachColumn(List methodSpecs, ColumnDefi .build()) .build(); - if (column.hasHelper(Column.Helpers.CONDITION_IN)) { - methodSpecs.add(MethodSpec.methodBuilder(column.name + "In") - .addModifiers(Modifier.PUBLIC) - .addParameter(ParameterSpec.builder(collectionType, "values") - .addAnnotation(Annotations.nonNull()) - .build()) - .returns(targetClassName) - .addStatement("return in(false, $L, values, $L)", - columnExpr, serializerFunction) - .build() - ); - } - - if (column.hasHelper(Column.Helpers.CONDITION_NOT_IN)) { - methodSpecs.add(MethodSpec.methodBuilder(column.name + "NotIn") - .addModifiers(Modifier.PUBLIC) - .addParameter(ParameterSpec.builder(collectionType, "values") - .addAnnotation(Annotations.nonNull()) - .build()) - .returns(targetClassName) - .addStatement("return in(true, $L, values, $L)", - columnExpr, serializerFunction) - .build() - ); - } - - } else { - if (column.hasHelper(Column.Helpers.CONDITION_IN)) { - methodSpecs.add(MethodSpec.methodBuilder(column.name + "In") - .addModifiers(Modifier.PUBLIC) - .addParameter(ParameterSpec.builder(collectionType, "values") - .addAnnotation(Annotations.nonNull()) - .build()) - .returns(targetClassName) - .addStatement("return in(false, $L, values)", - columnExpr) - .build() - ); - } - - if (column.hasHelper(Column.Helpers.CONDITION_NOT_IN)) { - methodSpecs.add(MethodSpec.methodBuilder(column.name + "NotIn") - .addModifiers(Modifier.PUBLIC) - .addParameter(ParameterSpec.builder(collectionType, "values") - .addAnnotation(Annotations.nonNull()) - .build()) - .returns(targetClassName) - .addStatement("return in(true, $L, values)", - columnExpr) - .build() - ); - } - } - - if (column.hasHelper(Column.Helpers.CONDITION_IN)) { methodSpecs.add(MethodSpec.methodBuilder(column.name + "In") - .addAnnotations(safeVarargsIfNeeded) - .varargs(true) - .addModifiers(Modifier.FINAL) // to use SafeVarargs + .addAnnotations(deprecatedUnless(column.hasHelper(Column.Helpers.CONDITION_IN))) .addModifiers(Modifier.PUBLIC) - .addParameter(ParameterSpec.builder(ArrayTypeName.of(type.box()), "values") + .addParameter(ParameterSpec.builder(collectionType, "values") .addAnnotation(Annotations.nonNull()) .build()) .returns(targetClassName) - .addStatement("return $L($T.asList(values))", - column.name + "In", Types.Arrays) + .addStatement("return in(false, $L, values, $L)", + columnExpr, serializerFunction) .build() ); - } - if (column.hasHelper(Column.Helpers.CONDITION_NOT_IN)) { methodSpecs.add(MethodSpec.methodBuilder(column.name + "NotIn") - .addAnnotations(safeVarargsIfNeeded) - .varargs(true) - .addModifiers(Modifier.FINAL) // to use @SafeVarargs + .addAnnotations(deprecatedUnless(column.hasHelper(Column.Helpers.CONDITION_NOT_IN))) .addModifiers(Modifier.PUBLIC) - .addParameter(ParameterSpec.builder(ArrayTypeName.of(type.box()), "values") + .addParameter(ParameterSpec.builder(collectionType, "values") .addAnnotation(Annotations.nonNull()) .build()) .returns(targetClassName) - .addStatement("return $L($T.asList(values))", - column.name + "NotIn", Types.Arrays) + .addStatement("return in(true, $L, values, $L)", + columnExpr, serializerFunction) .build() ); - } - - if (column.hasHelper(Column.Helpers.CONDITION_LT)) { - methodSpecs.add(MethodSpec.methodBuilder(column.name + "Lt") - .addModifiers(Modifier.PUBLIC) - .addParameter(paramSpec) - .returns(targetClassName) - .addStatement("return where($L, $S, $L)", - columnExpr, "<", - serializedFieldExpr) - .build() - ); - } - if (column.hasHelper(Column.Helpers.CONDITION_LE)) { - methodSpecs.add(MethodSpec.methodBuilder(column.name + "Le") - .addModifiers(Modifier.PUBLIC) - .addParameter(paramSpec) - .returns(targetClassName) - .addStatement("return where($L, $S, $L)", - columnExpr, "<=", - serializedFieldExpr) - .build() - ); - } - if (column.hasHelper(Column.Helpers.CONDITION_GT)) { - methodSpecs.add(MethodSpec.methodBuilder(column.name + "Gt") + } else { + methodSpecs.add(MethodSpec.methodBuilder(column.name + "In") + .addAnnotations(deprecatedUnless(column.hasHelper(Column.Helpers.CONDITION_IN))) .addModifiers(Modifier.PUBLIC) - .addParameter(paramSpec) + .addParameter(ParameterSpec.builder(collectionType, "values") + .addAnnotation(Annotations.nonNull()) + .build()) .returns(targetClassName) - .addStatement("return where($L, $S, $L)", - columnExpr, ">", - serializedFieldExpr) + .addStatement("return in(false, $L, values)", + columnExpr) .build() ); - } - if (column.hasHelper(Column.Helpers.CONDITION_GE)) { - methodSpecs.add(MethodSpec.methodBuilder(column.name + "Ge") + + methodSpecs.add(MethodSpec.methodBuilder(column.name + "NotIn") + .addAnnotations(deprecatedUnless(column.hasHelper(Column.Helpers.CONDITION_NOT_IN))) .addModifiers(Modifier.PUBLIC) - .addParameter(paramSpec) + .addParameter(ParameterSpec.builder(collectionType, "values") + .addAnnotation(Annotations.nonNull()) + .build()) .returns(targetClassName) - .addStatement("return where($L, $S, $L)", - columnExpr, ">=", - serializedFieldExpr) + .addStatement("return in(true, $L, values)", + columnExpr) .build() ); } - if (column.hasHelper(Column.Helpers.CONDITION_BETWEEN) - && SqlTypes.isComparable(column.getStorageType())) { + + methodSpecs.add(MethodSpec.methodBuilder(column.name + "In") + .addAnnotations(deprecatedUnless(column.hasHelper(Column.Helpers.CONDITION_IN))) + .addAnnotations(safeVarargsIfNeeded) + .varargs(true) + .addModifiers(Modifier.FINAL) // to use SafeVarargs + .addModifiers(Modifier.PUBLIC) + .addParameter(ParameterSpec.builder(ArrayTypeName.of(type.box()), "values") + .addAnnotation(Annotations.nonNull()) + .build()) + .returns(targetClassName) + .addStatement("return $L($T.asList(values))", + column.name + "In", Types.Arrays) + .build() + ); + + methodSpecs.add(MethodSpec.methodBuilder(column.name + "NotIn") + .addAnnotations(deprecatedUnless(column.hasHelper(Column.Helpers.CONDITION_NOT_IN))) + .addAnnotations(safeVarargsIfNeeded) + .varargs(true) + .addModifiers(Modifier.FINAL) // to use @SafeVarargs + .addModifiers(Modifier.PUBLIC) + .addParameter(ParameterSpec.builder(ArrayTypeName.of(type.box()), "values") + .addAnnotation(Annotations.nonNull()) + .build()) + .returns(targetClassName) + .addStatement("return $L($T.asList(values))", + column.name + "NotIn", Types.Arrays) + .build() + ); + + methodSpecs.add(MethodSpec.methodBuilder(column.name + "Lt") + .addAnnotations(deprecatedUnless(column.hasHelper(Column.Helpers.CONDITION_LT))) + .addModifiers(Modifier.PUBLIC) + .addParameter(paramSpec) + .returns(targetClassName) + .addStatement("return where($L, $S, $L)", + columnExpr, "<", + serializedFieldExpr) + .build() + ); + + methodSpecs.add(MethodSpec.methodBuilder(column.name + "Le") + .addAnnotations(deprecatedUnless(column.hasHelper(Column.Helpers.CONDITION_LT))) + .addModifiers(Modifier.PUBLIC) + .addParameter(paramSpec) + .returns(targetClassName) + .addStatement("return where($L, $S, $L)", + columnExpr, "<=", + serializedFieldExpr) + .build() + ); + + methodSpecs.add(MethodSpec.methodBuilder(column.name + "Gt") + .addAnnotations(deprecatedUnless(column.hasHelper(Column.Helpers.CONDITION_LT))) + .addModifiers(Modifier.PUBLIC) + .addParameter(paramSpec) + .returns(targetClassName) + .addStatement("return where($L, $S, $L)", + columnExpr, ">", + serializedFieldExpr) + .build() + ); + + methodSpecs.add(MethodSpec.methodBuilder(column.name + "Ge") + .addAnnotations(deprecatedUnless(column.hasHelper(Column.Helpers.CONDITION_GE))) + .addModifiers(Modifier.PUBLIC) + .addParameter(paramSpec) + .returns(targetClassName) + .addStatement("return where($L, $S, $L)", + columnExpr, ">=", + serializedFieldExpr) + .build() + ); + + if (SqlTypes.isComparable(column.getStorageType())) { ParameterSpec paramSpecA = ParameterSpec.builder(type, column.name + "A") .addAnnotations(paramAnnotations) .build(); @@ -373,6 +357,7 @@ void buildConditionHelpersForEachColumn(List methodSpecs, ColumnDefi .addJavadoc( "To build a condition $L BETWEEN a AND b, which is equivalent to a <= $L AND $L <= b.\n", column.name, column.name, column.name) + .addAnnotations(deprecatedUnless(column.hasHelper(Column.Helpers.CONDITION_BETWEEN))) .addModifiers(Modifier.PUBLIC) .addParameter(paramSpecA) .addParameter(paramSpecB) @@ -387,26 +372,25 @@ void buildConditionHelpersForEachColumn(List methodSpecs, ColumnDefi } void buildOrderByHelpers(List methodSpecs, ColumnDefinition column) { - if (column.hasHelper(Column.Helpers.ORDER_IN_ASC)) { - methodSpecs.add(MethodSpec.methodBuilder("orderBy" + Strings.toUpperFirst(column.name) + "Asc") - .addModifiers(Modifier.PUBLIC) - .returns(getTargetClassName()) - .addStatement("return orderBy(schema.$L.orderInAscending())", column.name) - .build()); - } - if (column.hasHelper(Column.Helpers.ORDER_IN_DESC)) { - methodSpecs.add(MethodSpec.methodBuilder("orderBy" + Strings.toUpperFirst(column.name) + "Desc") - .addModifiers(Modifier.PUBLIC) - .returns(getTargetClassName()) - .addStatement("return orderBy(schema.$L.orderInDescending())", column.name) - .build() - ); - } + methodSpecs.add(MethodSpec.methodBuilder("orderBy" + Strings.toUpperFirst(column.name) + "Asc") + .addAnnotations(deprecatedUnless(column.hasHelper(Column.Helpers.ORDER_IN_ASC))) + .addModifiers(Modifier.PUBLIC) + .returns(getTargetClassName()) + .addStatement("return orderBy(schema.$L.orderInAscending())", column.name) + .build()); + methodSpecs.add(MethodSpec.methodBuilder("orderBy" + Strings.toUpperFirst(column.name) + "Desc") + .addAnnotations(deprecatedUnless(column.hasHelper(Column.Helpers.ORDER_IN_DESC))) + .addModifiers(Modifier.PUBLIC) + .returns(getTargetClassName()) + .addStatement("return orderBy(schema.$L.orderInDescending())", column.name) + .build() + ); } void buildAggregationHelpers(List methodSpecs, ColumnDefinition column) { - if (column.hasHelper(Column.Helpers.MIN) && Types.isNumeric(column.type)) { + if (Types.isNumeric(column.type)) { methodSpecs.add(MethodSpec.methodBuilder("minBy" + Strings.toUpperFirst(column.name)) + .addAnnotations(deprecatedUnless(column.hasHelper(Column.Helpers.MIN))) .addAnnotation(Annotations.nullable()) .addModifiers(Modifier.PUBLIC) .returns(column.getBoxType()) @@ -415,8 +399,9 @@ void buildAggregationHelpers(List methodSpecs, ColumnDefinition colu .build() ); } - if (column.hasHelper(Column.Helpers.MAX) && Types.isNumeric(column.type)) { + if (Types.isNumeric(column.type)) { methodSpecs.add(MethodSpec.methodBuilder("maxBy" + Strings.toUpperFirst(column.name)) + .addAnnotations(deprecatedUnless(column.hasHelper(Column.Helpers.MAX))) .addAnnotation(Annotations.nullable()) .addModifiers(Modifier.PUBLIC) .returns(column.getBoxType()) @@ -425,9 +410,10 @@ void buildAggregationHelpers(List methodSpecs, ColumnDefinition colu .build() ); } - if (column.hasHelper(Column.Helpers.SUM) && Types.isNumeric(column.type)) { + if (Types.isNumeric(column.type)) { boolean isInteger = Types.looksLikeIntegerType(column.type); methodSpecs.add(MethodSpec.methodBuilder("sumBy" + Strings.toUpperFirst(column.name)) + .addAnnotations(deprecatedUnless(column.hasHelper(Column.Helpers.SUM))) .addAnnotation(Annotations.nullable()) .addModifiers(Modifier.PUBLIC) .returns(isInteger ? TypeName.LONG.box() : TypeName.DOUBLE.box()) @@ -436,8 +422,9 @@ void buildAggregationHelpers(List methodSpecs, ColumnDefinition colu .build() ); } - if (column.hasHelper(Column.Helpers.AVG) && Types.isNumeric(column.type)) { + if (Types.isNumeric(column.type)) { methodSpecs.add(MethodSpec.methodBuilder("avgBy" + Strings.toUpperFirst(column.name)) + .addAnnotations(deprecatedUnless(column.hasHelper(Column.Helpers.AVG))) .addAnnotation(Annotations.nullable()) .addModifiers(Modifier.PUBLIC) .returns(TypeName.DOUBLE.box()) @@ -512,7 +499,7 @@ void buildConditionHelpersForCompositeIndex(List methodSpecs, IndexD void buildOrderByHelpersForCompositeIndex(List methodSpecs, IndexDefinition index) { CharSequence baseName = buildBaseNameForCompositeIndex(index); - if (index.hasHelper(Column.Helpers.ORDER_IN_ASC)){ + { CodeBlock.Builder conditions = CodeBlock.builder(); for (int i = 0; i < index.columns.size(); i++) { @@ -525,13 +512,14 @@ void buildOrderByHelpersForCompositeIndex(List methodSpecs, IndexDef } MethodSpec.Builder methodSpec = MethodSpec.methodBuilder("orderBy" + baseName + "Asc") + .addAnnotations(deprecatedUnless(index.hasHelper(Column.Helpers.ORDER_IN_ASC))) .addModifiers(Modifier.PUBLIC) .addStatement("return $L", conditions.build()) .returns(targetClassName); methodSpecs.add(methodSpec.build()); } - if (index.hasHelper(Column.Helpers.ORDER_IN_DESC)){ + { CodeBlock.Builder conditions = CodeBlock.builder(); for (int i = 0; i < index.columns.size(); i++) { @@ -544,6 +532,7 @@ void buildOrderByHelpersForCompositeIndex(List methodSpecs, IndexDef } MethodSpec.Builder methodSpec = MethodSpec.methodBuilder("orderBy" + baseName + "Desc") + .addAnnotations(deprecatedUnless(index.hasHelper(Column.Helpers.ORDER_IN_DESC))) .addModifiers(Modifier.PUBLIC) .addStatement("return $L", conditions.build()) .returns(targetClassName); diff --git a/processor/src/main/java/com/github/gfx/android/orma/processor/util/Annotations.java b/processor/src/main/java/com/github/gfx/android/orma/processor/util/Annotations.java index 6bf48262..db6554b2 100644 --- a/processor/src/main/java/com/github/gfx/android/orma/processor/util/Annotations.java +++ b/processor/src/main/java/com/github/gfx/android/orma/processor/util/Annotations.java @@ -37,8 +37,6 @@ public class Annotations { private static final AnnotationSpec checkResult = AnnotationSpec.builder(Types.CheckResult).build(); - private static final AnnotationSpec deprecated = AnnotationSpec.builder(Deprecated.class).build(); - private static final List safeVarArgsAnnotations = Arrays.asList( AnnotationSpec.builder(SafeVarargs.class).build(), suppressWarnings("varargs") @@ -54,6 +52,10 @@ public class Annotations { Annotations.override() ); + private static List deprecated = Collections.singletonList( + AnnotationSpec.builder(Deprecated.class).build() + ); + public static AnnotationSpec override() { return override; } @@ -87,6 +89,18 @@ public static List safeVarargsIfNeeded(TypeName type) { } } + public static List deprecatedIf(boolean needed) { + if (needed) { + return deprecated; + } else { + return Collections.emptyList(); + } + } + + public static List deprecatedUnless(boolean notNeeded) { + return deprecatedIf(!notNeeded); + } + public static AnnotationSpec suppressWarnings(String... warnings) { AnnotationSpec.Builder builder = AnnotationSpec.builder(SuppressWarnings.class); CodeBlock.Builder names = CodeBlock.builder(); @@ -107,10 +121,6 @@ public static AnnotationSpec suppressWarnings(String... warnings) { return builder.build(); } - public static AnnotationSpec deprecated() { - return deprecated; - } - public static AnnotationSpec checkResult() { return checkResult; }