Tests: update Order ToOne to how it should be used.

Author: greenrobot-team

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

@@ -20,6 +20,7 @@
 import java.util.List;
 
 import io.objectbox.BoxStore;
+import io.objectbox.annotation.Backlink;
 import io.objectbox.annotation.Entity;
 import io.objectbox.annotation.Id;
 import io.objectbox.annotation.Index;
@@ -37,12 +38,12 @@ public class Customer implements Serializable {
     @Index
     private String name;
 
+    @Backlink(to = "customer") // Annotation not processed in this test, is set up manually.
     List<Order> orders = new ToMany<>(this, Customer_.orders);
 
     ToMany<Order> ordersStandalone = new ToMany<>(this, Customer_.ordersStandalone);
 
-    /** Used to resolve relations */
-    @Internal
+    /** Used to resolve relations. */
     transient BoxStore __boxStore;
 
     public Customer() {

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

@@ -117,7 +117,7 @@ public List<Order> getToMany(Customer customer) {
             }, Order_.customerId, new ToOneGetter<Order>() {
                 @Override
                 public ToOne<Customer> getToOne(Order order) {
-                    return order.customer__toOne;
+                    return order.getCustomer();
                 }
             });
 

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

@@ -39,15 +39,12 @@ public class Order implements Serializable {
     long customerId;
     String text;
 
-    private Customer customer;
+    @SuppressWarnings("FieldMayBeFinal")
+    private ToOne<Customer> customer = new ToOne<>(this, Order_.customer);
 
-    /** @Depreacted Used to resolve relations */
-    @Internal
+    /** Used to resolve relations. */
     transient BoxStore __boxStore;
 
-    @Internal
-    transient ToOne<Customer> customer__toOne = new ToOne<>(this, Order_.customer);
-
     public Order() {
     }
 
@@ -94,20 +91,8 @@ public void setText(String text) {
         this.text = text;
     }
 
-    public Customer peekCustomer() {
-        return customer;
-    }
-
-    /** To-one relationship, resolved on first access. */
-    public Customer getCustomer() {
-        customer = customer__toOne.getTarget(this.customerId);
+    public ToOne<Customer> getCustomer() {
         return customer;
     }
 
-    /** Set the to-one relation including its ID property. */
-    public void setCustomer(@Nullable Customer customer) {
-        customer__toOne.setTarget(customer);
-        this.customer = customer;
-    }
-
 }

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

@@ -59,10 +59,11 @@ public long getId(Order entity) {
      */
     @Override
     public long put(Order entity) {
-        if(entity.customer__toOne.internalRequiresPutTarget()) {
+        ToOne<Customer> customer = entity.getCustomer();
+        if(customer != null && customer.internalRequiresPutTarget()) {
             Cursor<Customer> targetCursor = getRelationTargetCursor(Customer.class);
             try {
-                entity.customer__toOne.internalPutTarget(targetCursor);
+                customer.internalPutTarget(targetCursor);
             } finally {
                 targetCursor.close();
             }

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

@@ -113,7 +113,7 @@ public long getId(Order object) {
     public static final RelationInfo<Order, Customer> customer = new RelationInfo<>(Order_.__INSTANCE, Customer_.__INSTANCE, customerId, new ToOneGetter<Order>() {
         @Override
         public ToOne<Customer> getToOne(Order object) {
-            return object.customer__toOne;
+            return object.getCustomer();
         }
     });
 

tests/objectbox-java-test/src/test/java/io/objectbox/relation/AbstractRelationTest.java

@@ -64,7 +64,7 @@ protected Customer putCustomer() {
 
     protected Order putOrder(@Nullable Customer customer, @Nullable String text) {
         Order order = new Order();
-        order.setCustomer(customer);
+        order.getCustomer().setTarget(customer);
         order.setText(text);
         orderBox.put(order);
         return order;

tests/objectbox-java-test/src/test/java/io/objectbox/relation/RelationEagerTest.java

@@ -94,20 +94,20 @@ public void testEagerToSingle() {
         // full list
         List<Order> orders = orderBox.query().eager(Order_.customer).build().find();
         assertEquals(2, orders.size());
-        assertTrue(orders.get(0).customer__toOne.isResolved());
-        assertTrue(orders.get(1).customer__toOne.isResolved());
+        assertTrue(orders.get(0).getCustomer().isResolved());
+        assertTrue(orders.get(1).getCustomer().isResolved());
 
         // full list paginated
         orders = orderBox.query().eager(Order_.customer).build().find(0, 10);
         assertEquals(2, orders.size());
-        assertTrue(orders.get(0).customer__toOne.isResolved());
-        assertTrue(orders.get(1).customer__toOne.isResolved());
+        assertTrue(orders.get(0).getCustomer().isResolved());
+        assertTrue(orders.get(1).getCustomer().isResolved());
 
         // list with eager limit
         orders = orderBox.query().eager(1, Order_.customer).build().find();
         assertEquals(2, orders.size());
-        assertTrue(orders.get(0).customer__toOne.isResolved());
-        assertFalse(orders.get(1).customer__toOne.isResolved());
+        assertTrue(orders.get(0).getCustomer().isResolved());
+        assertFalse(orders.get(1).getCustomer().isResolved());
 
         // forEach
         final int[] count = {0};
@@ -119,12 +119,12 @@ public void testEagerToSingle() {
 
         // first
         Order order = orderBox.query().eager(Order_.customer).build().findFirst();
-        assertTrue(order.customer__toOne.isResolved());
+        assertTrue(order.getCustomer().isResolved());
 
         // unique
         orderBox.remove(order);
         order = orderBox.query().eager(Order_.customer).build().findUnique();
-        assertTrue(order.customer__toOne.isResolved());
+        assertTrue(order.getCustomer().isResolved());
     }
 
     @Test

tests/objectbox-java-test/src/test/java/io/objectbox/relation/RelationTest.java

@@ -37,9 +37,9 @@ public void testRelationToOne() {
 
         Order order1 = orderBox.get(order.getId());
         assertEquals(customer.getId(), order1.getCustomerId());
-        assertNull(order1.peekCustomer());
-        assertEquals(customer.getId(), order1.getCustomer().getId());
-        assertNotNull(order1.peekCustomer());
+        assertNull(order1.getCustomer().getCachedTarget());
+        assertEquals(customer.getId(), order1.getCustomer().getTarget().getId());
+        assertNotNull(order1.getCustomer().getCachedTarget());
     }
 
     @Test
@@ -85,7 +85,7 @@ public void testRelationToMany_activeRelationshipChanges() {
         ((ToMany<Order>) orders).reset();
         assertEquals(1, orders.size());
 
-        order2.setCustomer(null);
+        order2.getCustomer().setTarget(null);
         orderBox.put(order2);
 
         ((ToMany<Order>) orders).reset();

tests/objectbox-java-test/src/test/java/io/objectbox/relation/ToOneTest.java

@@ -100,7 +100,7 @@ public void testPutNewSourceAndTarget() {
         Customer target = new Customer();
         target.setName("target1");
 
-        ToOne<Customer> toOne = source.customer__toOne;
+        ToOne<Customer> toOne = source.getCustomer();
         assertTrue(toOne.isResolved());
         assertTrue(toOne.isNull());
         assertNull(toOne.getCachedTarget());