Make Property generic to its entity type and hold EntityInfo in it

greenrobot · greenrobot · commit 8f79c776b170 · 2018-06-27T22:10:35.000+02:00
diff --git a/objectbox-java/src/main/java/io/objectbox/Property.java b/objectbox-java/src/main/java/io/objectbox/Property.java
@@ -29,17 +29,18 @@
 /**
  * Meta data describing a property
  */
-public class Property implements Serializable {
+public class Property<ENTITY> implements Serializable {
     private static final long serialVersionUID = 8613291105982758093L;
 
+    public final EntityInfo<ENTITY> entity;
     public final int ordinal;
     public final int id;
 
     /** One of the supported types to be mapped to the DB. */
     public final Class<?> type;
 
     public final String name;
-    public final boolean primaryKey;
+    public final boolean isId;
     public final String dbName;
     public final Class<? extends PropertyConverter> converterClass;
 
@@ -50,21 +51,23 @@ public class Property implements Serializable {
     // Also, this should make the Property class truly @Immutable.
     private boolean idVerified;
 
-    public Property(int ordinal, int id, Class<?> type, String name, boolean primaryKey, String dbName) {
-        this(ordinal, id, type, name, primaryKey, dbName, null, null);
+    public Property(EntityInfo<ENTITY> entity, int ordinal, int id, Class<?> type, String name) {
+        this(entity, ordinal, id, type, name, false, name, null, null);
     }
 
-    public Property(int ordinal, int id, Class<?> type, String name) {
-        this(ordinal, id, type, name, false, name, null, null);
+    public Property(EntityInfo<ENTITY> entity, int ordinal, int id, Class<?> type, String name, boolean isId,
+                    String dbName) {
+        this(entity, ordinal, id, type, name, isId, dbName, null, null);
     }
 
-    public Property(int ordinal, int id, Class<?> type, String name, boolean primaryKey, String dbName,
-                    Class<? extends PropertyConverter> converterClass, Class customType) {
+    public Property(EntityInfo<ENTITY> entity, int ordinal, int id, Class<?> type, String name, boolean isId,
+                    String dbName, Class<? extends PropertyConverter> converterClass, Class customType) {
+        this.entity = entity;
         this.ordinal = ordinal;
         this.id = id;
         this.type = type;
         this.name = name;
-        this.primaryKey = primaryKey;
+        this.isId = isId;
         this.dbName = dbName;
         this.converterClass = converterClass;
         this.customType = customType;
diff --git a/objectbox-kotlin/src/main/kotlin/io/objectbox/kotlin/Extensions.kt b/objectbox-kotlin/src/main/kotlin/io/objectbox/kotlin/Extensions.kt
@@ -32,11 +32,11 @@ inline fun <reified T> BoxStore.boxFor(): Box<T> = boxFor(T::class.java)
 inline fun <T : Any> BoxStore.boxFor(clazz: KClass<T>): Box<T> = boxFor(clazz.java)
 
 /** An alias for the "in" method, which is a reserved keyword in Kotlin. */
-inline fun <reified T> QueryBuilder<T>.inValues(property: Property, values: LongArray): QueryBuilder<T>
+inline fun <reified T> QueryBuilder<T>.inValues(property: Property<T>, values: LongArray): QueryBuilder<T>
         = `in`(property, values)
 
 /** An alias for the "in" method, which is a reserved keyword in Kotlin. */
-inline fun <reified T> QueryBuilder<T>.inValues(property: Property, values: IntArray): QueryBuilder<T>
+inline fun <reified T> QueryBuilder<T>.inValues(property: Property<T>, values: IntArray): QueryBuilder<T>
         = `in`(property, values)
 
 /**
diff --git a/tests/objectbox-java-test/src/main/java/io/objectbox/TestEntityMinimal_.java b/tests/objectbox-java-test/src/main/java/io/objectbox/TestEntityMinimal_.java
@@ -47,10 +47,12 @@ public long getId(TestEntityMinimal object) {
         }
     };
 
+    public final static TestEntityMinimal_ __INSTANCE = new TestEntityMinimal_();
+
     private static int ID;
 
-    public final static Property id = new Property(ID++, ID, long.class, "id", true, "id");
-    public final static Property text = new Property(ID++, ID, String.class, "text", false, "text");
+    public final static Property id = new Property(__INSTANCE, ID++, ID, long.class, "id", true, "id");
+    public final static Property text = new Property(__INSTANCE, ID++, ID, String.class, "text", false, "text");
 
     public final static Property[] __ALL_PROPERTIES = {
             id,
diff --git a/tests/objectbox-java-test/src/main/java/io/objectbox/TestEntity_.java b/tests/objectbox-java-test/src/main/java/io/objectbox/TestEntity_.java
@@ -43,18 +43,20 @@ public final class TestEntity_ implements EntityInfo<TestEntity> {
     @Internal
     static final TestEntityIdGetter __ID_GETTER = new TestEntityIdGetter();
 
+    public final static TestEntity_ __INSTANCE = new TestEntity_();
+
     private static int ID;
 
-    public final static Property id = new Property(ID++, ID, long.class, "id", true, "id");
-    public final static Property simpleBoolean = new Property(ID++, ID, boolean.class, "simpleBoolean", false, "simpleBoolean");
-    public final static Property simpleByte = new Property(ID++, ID, byte.class, "simpleByte", false, "simpleByte");
-    public final static Property simpleShort = new Property(ID++, ID, short.class, "simpleShort", false, "simpleShort");
-    public final static Property simpleInt = new Property(ID++, ID, int.class, "simpleInt", false, "simpleInt");
-    public final static Property simpleLong = new Property(ID++, ID, long.class, "simpleLong", false, "simpleLong");
-    public final static Property simpleFloat = new Property(ID++, ID, float.class, "simpleFloat", false, "simpleFloat");
-    public final static Property simpleDouble = new Property(ID++, ID, double.class, "simpleDouble", false, "simpleDouble");
-    public final static Property simpleString = new Property(ID++, ID, String.class, "simpleString", false, "simpleString");
-    public final static Property simpleByteArray = new Property(ID++, ID, byte[].class, "simpleByteArray", false, "simpleByteArray");
+    public final static Property id = new Property(__INSTANCE, ID++, ID, long.class, "id", true, "id");
+    public final static Property simpleBoolean = new Property(__INSTANCE, ID++, ID, boolean.class, "simpleBoolean", false, "simpleBoolean");
+    public final static Property simpleByte = new Property(__INSTANCE, ID++, ID, byte.class, "simpleByte", false, "simpleByte");
+    public final static Property simpleShort = new Property(__INSTANCE, ID++, ID, short.class, "simpleShort", false, "simpleShort");
+    public final static Property simpleInt = new Property(__INSTANCE, ID++, ID, int.class, "simpleInt", false, "simpleInt");
+    public final static Property simpleLong = new Property(__INSTANCE, ID++, ID, long.class, "simpleLong", false, "simpleLong");
+    public final static Property simpleFloat = new Property(__INSTANCE, ID++, ID, float.class, "simpleFloat", false, "simpleFloat");
+    public final static Property simpleDouble = new Property(__INSTANCE, ID++, ID, double.class, "simpleDouble", false, "simpleDouble");
+    public final static Property simpleString = new Property(__INSTANCE, ID++, ID, String.class, "simpleString", false, "simpleString");
+    public final static Property simpleByteArray = new Property(__INSTANCE, ID++, ID, byte[].class, "simpleByteArray", false, "simpleByteArray");
 
     public final static Property[] __ALL_PROPERTIES = {
             id,
diff --git a/tests/objectbox-java-test/src/main/java/io/objectbox/index/model/EntityLongIndex_.java b/tests/objectbox-java-test/src/main/java/io/objectbox/index/model/EntityLongIndex_.java
@@ -36,13 +36,15 @@ public class EntityLongIndex_ implements EntityInfo<EntityLongIndex> {
 
     public static final String __NAME_IN_DB = "EntityLongIndex";
 
-    public final static Property id = new Property(0, 7, long.class, "id", true, "_id");
-    public final static Property indexedLong = new Property(1, 1, long.class, "indexedLong");
-    public final static Property float1 = new Property(2, 2, Float.class, "float1");
-    public final static Property float2 = new Property(3, 3, Float.class, "float2");
-    public final static Property float3 = new Property(4, 4, Float.class, "float3");
-    public final static Property float4 = new Property(5, 5, Float.class, "float4");
-    public final static Property float5 = new Property(6, 6, Float.class, "float5");
+    public final static EntityLongIndex_ __INSTANCE = new EntityLongIndex_();
+
+    public final static Property id = new Property(__INSTANCE, 0, 7, long.class, "id", true, "_id");
+    public final static Property indexedLong = new Property(__INSTANCE, 1, 1, long.class, "indexedLong");
+    public final static Property float1 = new Property(__INSTANCE, 2, 2, Float.class, "float1");
+    public final static Property float2 = new Property(__INSTANCE, 3, 3, Float.class, "float2");
+    public final static Property float3 = new Property(__INSTANCE, 4, 4, Float.class, "float3");
+    public final static Property float4 = new Property(__INSTANCE, 5, 5, Float.class, "float4");
+    public final static Property float5 = new Property(__INSTANCE, 6, 6, Float.class, "float5");
 
     public final static Property[] __ALL_PROPERTIES = {
             id,
diff --git a/tests/objectbox-java-test/src/main/java/io/objectbox/relation/Customer_.java b/tests/objectbox-java-test/src/main/java/io/objectbox/relation/Customer_.java
@@ -46,8 +46,10 @@ public class Customer_ implements EntityInfo<Customer> {
     @Internal
     static final CustomerIdGetter __ID_GETTER = new CustomerIdGetter();
 
-    public final static Property id = new Property(0, 1, long.class, "id", true, "_id");
-    public final static Property name = new Property(1, 2, String.class, "name");
+    public final static Customer_ __INSTANCE = new Customer_();
+
+    public final static Property id = new Property(__INSTANCE, 0, 1, long.class, "id", true, "_id");
+    public final static Property name = new Property(__INSTANCE, 1, 2, String.class, "name");
 
     public final static Property[] __ALL_PROPERTIES = {
             id,
@@ -56,8 +58,6 @@ public class Customer_ implements EntityInfo<Customer> {
 
     public final static Property __ID_PROPERTY = id;
 
-    public final static Customer_ __INSTANCE = new Customer_();
-
     @Override
     public String getEntityName() {
         return __ENTITY_NAME;
diff --git a/tests/objectbox-java-test/src/main/java/io/objectbox/relation/Order_.java b/tests/objectbox-java-test/src/main/java/io/objectbox/relation/Order_.java
@@ -51,10 +51,12 @@ public class Order_ implements EntityInfo<Order> {
     @Internal
     static final OrderIdGetter __ID_GETTER = new OrderIdGetter();
 
-    public final static Property id = new Property(0, 1, long.class, "id", true, "_id");
-    public final static Property date = new Property(1, 2, java.util.Date.class, "date");
-    public final static Property customerId = new Property(2, 3, long.class, "customerId");
-    public final static Property text = new Property(3, 4, String.class, "text");
+    public final static Order_ __INSTANCE = new Order_();
+
+    public final static Property id = new Property(__INSTANCE, 0, 1, long.class, "id", true, "_id");
+    public final static Property date = new Property(__INSTANCE, 1, 2, java.util.Date.class, "date");
+    public final static Property customerId = new Property(__INSTANCE, 2, 3, long.class, "customerId");
+    public final static Property text = new Property(__INSTANCE, 3, 4, String.class, "text");
 
     public final static Property[] __ALL_PROPERTIES = {
             id,
@@ -65,8 +67,6 @@ public class Order_ implements EntityInfo<Order> {
 
     public final static Property __ID_PROPERTY = id;
 
-    public final static Order_ __INSTANCE = new Order_();
-
     @Override
     public String getEntityName() {
         return __ENTITY_NAME;
diff --git a/tests/test-proguard/src/main/java/io/objectbox/test/proguard/ObfuscatedEntity_.java b/tests/test-proguard/src/main/java/io/objectbox/test/proguard/ObfuscatedEntity_.java
@@ -48,9 +48,11 @@ public final class ObfuscatedEntity_ implements EntityInfo<ObfuscatedEntity> {
     @Internal
     static final ObfuscatedEntityIdGetter __ID_GETTER = new ObfuscatedEntityIdGetter();
 
-    public final static Property id = new Property(0, 1, long.class, "id", true, "id");
-    public final static Property myInt = new Property(1, 2, int.class, "myInt");
-    public final static Property myString = new Property(2, 3, String.class, "myString");
+    public final static ObfuscatedEntity_ __INSTANCE = new ObfuscatedEntity_();
+
+    public final static Property id = new Property(__INSTANCE, 0, 1, long.class, "id", true, "id");
+    public final static Property myInt = new Property(__INSTANCE, 1, 2, int.class, "myInt");
+    public final static Property myString = new Property(__INSTANCE, 2, 3, String.class, "myString");
 
     public final static Property[] __ALL_PROPERTIES = {
         id,
@@ -60,8 +62,6 @@ public final class ObfuscatedEntity_ implements EntityInfo<ObfuscatedEntity> {
 
     public final static Property __ID_PROPERTY = id;
 
-    public final static ObfuscatedEntity_ __INSTANCE = new ObfuscatedEntity_();
-
     @Override
     public String getEntityName() {
         return __ENTITY_NAME;
