Test cursors: drop redundant final, clean up.

Author: greenrobot-team

tests/objectbox-java-test/src/main/java/io/objectbox/TestEntityCursor.java

@@ -70,7 +70,7 @@ public TestEntityCursor(io.objectbox.Transaction tx, long cursor, BoxStore boxSt
     }
 
     @Override
-    public final long getId(TestEntity entity) {
+    public long getId(TestEntity entity) {
         return ID_GETTER.getId(entity);
     }
 
@@ -80,7 +80,7 @@ public final long getId(TestEntity entity) {
      * @return The ID of the object within its box.
      */
     @Override
-    public final long put(TestEntity entity) {
+    public long put(TestEntity entity) {
         String[] simpleStringArray = entity.getSimpleStringArray();
         int __id10 = simpleStringArray != null ? __ID_simpleStringArray : 0;
 

tests/objectbox-java-test/src/main/java/io/objectbox/index/model/EntityLongIndexCursor.java

@@ -19,7 +19,6 @@
 
 import io.objectbox.BoxStore;
 import io.objectbox.Cursor;
-import io.objectbox.EntityInfo;
 import io.objectbox.Transaction;
 
 // THIS CODE was originally GENERATED BY ObjectBox.
@@ -29,9 +28,6 @@
  */
 public final class EntityLongIndexCursor extends Cursor<EntityLongIndex> {
 
-    private static EntityInfo PROPERTIES = new EntityLongIndex_();
-
-
     // Property IDs get verified in Cursor base class
     private final static int __ID_indexedLong = EntityLongIndex_.indexedLong.id;
     private final static int __ID_float1 = EntityLongIndex_.float1.id;
@@ -41,11 +37,11 @@ public final class EntityLongIndexCursor extends Cursor<EntityLongIndex> {
     private final static int __ID_float5 = EntityLongIndex_.float5.id;
 
     public EntityLongIndexCursor(Transaction tx, long cursor, BoxStore boxStore) {
-        super(tx, cursor, PROPERTIES, boxStore);
+        super(tx, cursor, EntityLongIndex_.__INSTANCE, boxStore);
     }
 
     @Override
-    public final long getId(EntityLongIndex entity) {
+    public long getId(EntityLongIndex entity) {
         return entity.getId();
     }
 
@@ -55,7 +51,7 @@ public final long getId(EntityLongIndex entity) {
      * @return The ID of the object within its box.
      */
     @Override
-    public final long put(EntityLongIndex entity) {
+    public long put(EntityLongIndex entity) {
         Float float1 = entity.float1;
         int __id2 = float1 != null ? __ID_float1 : 0;
         Float float2 = entity.float2;
@@ -84,9 +80,4 @@ public final long put(EntityLongIndex entity) {
         return __assignedId;
     }
 
-    // TODO do we need this? @Override
-    protected final boolean isEntityUpdateable() {
-        return true;
-    }
-
 }

tests/objectbox-java-test/src/main/java/io/objectbox/relation/CustomerCursor.java

@@ -17,11 +17,8 @@
 package io.objectbox.relation;
 
 
-import java.util.List;
-
 import io.objectbox.BoxStore;
 import io.objectbox.Cursor;
-import io.objectbox.EntityInfo;
 import io.objectbox.Transaction;
 import io.objectbox.internal.CursorFactory;
 
@@ -38,18 +35,15 @@ public Cursor<Customer> createCursor(Transaction tx, long cursorHandle, BoxStore
         }
     }
 
-    private static EntityInfo PROPERTIES = new Customer_();
-
-
     // Property IDs get verified in Cursor base class
     private final static int __ID_name = Customer_.name.id;
 
     public CustomerCursor(Transaction tx, long cursor, BoxStore boxStore) {
-        super(tx, cursor, PROPERTIES, boxStore);
+        super(tx, cursor, Customer_.__INSTANCE, boxStore);
     }
 
     @Override
-    public final long getId(Customer entity) {
+    public long getId(Customer entity) {
         return entity.getId();
     }
 
@@ -59,7 +53,7 @@ public final long getId(Customer entity) {
      * @return The ID of the object within its box.
      */
     @Override
-    public final long put(Customer entity) {
+    public long put(Customer entity) {
         String name = entity.getName();
         int __id1 = name != null ? __ID_name : 0;
 
@@ -80,15 +74,4 @@ public final long put(Customer entity) {
         return __assignedId;
     }
 
-    // TODO @Override
-    protected final void attachEntity(Customer entity) {
-        // TODO super.attachEntity(entity);
-        entity.__boxStore = boxStoreForEntities;
-    }
-
-    // TODO do we need this? @Override
-    protected final boolean isEntityUpdateable() {
-        return true;
-    }
-
 }

tests/objectbox-java-test/src/main/java/io/objectbox/relation/OrderCursor.java

@@ -48,7 +48,7 @@ public OrderCursor(Transaction tx, long cursor, BoxStore boxStore) {
     }
 
     @Override
-    public final long getId(Order entity) {
+    public long getId(Order entity) {
         return ID_GETTER.getId(entity);
     }
 
@@ -58,7 +58,7 @@ public final long getId(Order entity) {
      * @return The ID of the object within its box.
      */
     @Override
-    public final long put(Order entity) {
+    public long put(Order entity) {
         if(entity.customer__toOne.internalRequiresPutTarget()) {
             Cursor<Customer> targetCursor = getRelationTargetCursor(Customer.class);
             try {
@@ -85,31 +85,4 @@ public final long put(Order entity) {
         return __assignedId;
     }
 
-    // TODO @Override
-    protected final void attachEntity(Order entity) {
-        // TODO super.attachEntity(entity);
-        //entity.__boxStore = boxStoreForEntities;
-    }
-
-    // TODO do we need this? @Override
-    protected final boolean isEntityUpdateable() {
-        return true;
-    }
-
-    /** Internal query to resolve the "orders" to-many relationship of Customer. */
-    /* TODO
-    public List<Order> _queryCustomer_Orders(long customerId) {
-        synchronized (this) {
-            if (customer_OrdersQuery == null) {
-                QueryBuilder<Order> queryBuilder = queryBuilder();
-                queryBuilder.where(Properties.customerId.eq(null));
-                customer_OrdersQuery = queryBuilder.build();
-            }
-        }
-        Query<Order> query = customer_OrdersQuery.forCurrentThread();
-        query.setParameter(0, customerId);
-        return query.list();
-    }
-    */
-
 }

tests/objectbox-java-test/src/test/java/io/objectbox/tree/DataBranchCursor.java

@@ -33,7 +33,7 @@ public DataBranchCursor(io.objectbox.Transaction tx, long cursor, BoxStore boxSt
     }
 
     @Override
-    public final long getId(DataBranch entity) {
+    public long getId(DataBranch entity) {
         return ID_GETTER.getId(entity);
     }
 
@@ -43,7 +43,7 @@ public final long getId(DataBranch entity) {
      * @return The ID of the object within its box.
      */
     @Override
-    public final long put(DataBranch entity) {
+    public long put(DataBranch entity) {
         ToOne<DataBranch> parent = entity.parent;
         if(parent != null && parent.internalRequiresPutTarget()) {
             Cursor<DataBranch> targetCursor = getRelationTargetCursor(DataBranch.class);

tests/objectbox-java-test/src/test/java/io/objectbox/tree/DataLeafCursor.java

@@ -36,7 +36,7 @@ public DataLeafCursor(io.objectbox.Transaction tx, long cursor, BoxStore boxStor
     }
 
     @Override
-    public final long getId(DataLeaf entity) {
+    public long getId(DataLeaf entity) {
         return ID_GETTER.getId(entity);
     }
 
@@ -46,7 +46,7 @@ public final long getId(DataLeaf entity) {
      * @return The ID of the object within its box.
      */
     @Override
-    public final long put(DataLeaf entity) {
+    public long put(DataLeaf entity) {
         ToOne<DataBranch> dataBranch = entity.dataBranch;
         if(dataBranch != null && dataBranch.internalRequiresPutTarget()) {
             Cursor<DataBranch> targetCursor = getRelationTargetCursor(DataBranch.class);

tests/objectbox-java-test/src/test/java/io/objectbox/tree/MetaBranchCursor.java

@@ -33,7 +33,7 @@ public MetaBranchCursor(io.objectbox.Transaction tx, long cursor, BoxStore boxSt
     }
 
     @Override
-    public final long getId(MetaBranch entity) {
+    public long getId(MetaBranch entity) {
         return ID_GETTER.getId(entity);
     }
 
@@ -43,7 +43,7 @@ public final long getId(MetaBranch entity) {
      * @return The ID of the object within its box.
      */
     @Override
-    public final long put(MetaBranch entity) {
+    public long put(MetaBranch entity) {
         ToOne<MetaBranch> parent = entity.parent;
         if(parent != null && parent.internalRequiresPutTarget()) {
             Cursor<MetaBranch> targetCursor = getRelationTargetCursor(MetaBranch.class);

tests/objectbox-java-test/src/test/java/io/objectbox/tree/MetaLeafCursor.java

@@ -39,7 +39,7 @@ public MetaLeafCursor(io.objectbox.Transaction tx, long cursor, BoxStore boxStor
     }
 
     @Override
-    public final long getId(MetaLeaf entity) {
+    public long getId(MetaLeaf entity) {
         return ID_GETTER.getId(entity);
     }
 
@@ -49,7 +49,7 @@ public final long getId(MetaLeaf entity) {
      * @return The ID of the object within its box.
      */
     @Override
-    public final long put(MetaLeaf entity) {
+    public long put(MetaLeaf entity) {
         ToOne<MetaBranch> branch = entity.branch;
         if(branch != null && branch.internalRequiresPutTarget()) {
             Cursor<MetaBranch> targetCursor = getRelationTargetCursor(MetaBranch.class);

tests/test-proguard/src/main/java/io/objectbox/test/proguard/ObfuscatedEntityCursor.java

@@ -48,7 +48,7 @@ public ObfuscatedEntityCursor(Transaction tx, long cursor, BoxStore boxStore) {
     }
 
     @Override
-    public final long getId(ObfuscatedEntity entity) {
+    public long getId(ObfuscatedEntity entity) {
         return ID_GETTER.getId(entity);
     }
 
@@ -58,7 +58,7 @@ public final long getId(ObfuscatedEntity entity) {
      * @return The ID of the object within its box.
      */
     @Override
-    public final long put(ObfuscatedEntity entity) {
+    public long put(ObfuscatedEntity entity) {
         String myString = entity.getMyString();
         int __id2 = myString != null ? __ID_myString : 0;