Merge branch 'property-virtual' into dev

Author: greenrobot-team

objectbox-java/src/main/java/io/objectbox/Property.java

@@ -44,6 +44,7 @@ public class Property<ENTITY> implements Serializable {
 
     public final String name;
     public final boolean isId;
+    public final boolean isVirtual;
     public final String dbName;
     public final Class<? extends PropertyConverter> converterClass;
 
@@ -58,6 +59,10 @@ public Property(EntityInfo<ENTITY> entity, int ordinal, int id, Class<?> type, S
         this(entity, ordinal, id, type, name, false, name, null, null);
     }
 
+    public Property(EntityInfo<ENTITY> entity, int ordinal, int id, Class<?> type, String name, boolean isVirtual) {
+        this(entity, ordinal, id, type, name, false, isVirtual, name, null, null);
+    }
+
     public Property(EntityInfo<ENTITY> entity, int ordinal, int id, Class<?> type, String name, boolean isId,
                     @Nullable String dbName) {
         this(entity, ordinal, id, type, name, isId, dbName, null, null);
@@ -66,12 +71,19 @@ public Property(EntityInfo<ENTITY> entity, int ordinal, int id, Class<?> type, S
     public Property(EntityInfo<ENTITY> entity, int ordinal, int id, Class<?> type, String name, boolean isId,
                     @Nullable String dbName, @Nullable Class<? extends PropertyConverter> converterClass,
                     @Nullable Class customType) {
+        this(entity, ordinal, id, type, name, isId, false, dbName, converterClass, customType);
+    }
+
+    public Property(EntityInfo<ENTITY> entity, int ordinal, int id, Class<?> type, String name, boolean isId,
+                    boolean isVirtual, @Nullable String dbName,
+                    @Nullable Class<? extends PropertyConverter> converterClass, @Nullable Class customType) {
         this.entity = entity;
         this.ordinal = ordinal;
         this.id = id;
         this.type = type;
         this.name = name;
         this.isId = isId;
+        this.isVirtual = isVirtual;
         this.dbName = dbName;
         this.converterClass = converterClass;
         this.customType = customType;

objectbox-java/src/main/java/io/objectbox/relation/ToOne.java

@@ -79,7 +79,7 @@ public ToOne(Object sourceEntity, RelationInfo relationInfo) {
         }
         this.entity = sourceEntity;
         this.relationInfo = relationInfo;
-        virtualProperty = relationInfo.targetIdProperty == null;
+        virtualProperty = relationInfo.targetIdProperty.isVirtual;
     }
 
     /**

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

@@ -35,7 +35,7 @@
 public class ToOneTest extends AbstractRelationTest {
 
     @Test
-    public void testTargetId_withTargetIdProperty() {
+    public void testTargetId_regularTargetIdProperty() {
         Order entity = putOrder(null, null);
         ToOne<Customer> toOne = new ToOne<>(entity, getRelationInfo(Order_.customerId));
         entity.setCustomerId(1042);
@@ -49,10 +49,15 @@ private RelationInfo<Order, Customer> getRelationInfo(Property targetIdProperty)
         return new RelationInfo<>(new Order_(), new Customer_(), targetIdProperty, null);
     }
 
+    private RelationInfo<Order, Customer> getRelationInfoVirtualTargetProperty() {
+        Property<Order> virtualTargetProperty = new Property<>(Order_.__INSTANCE, 2, 3, long.class, "customerId", true);
+        return new RelationInfo<>(new Order_(), new Customer_(), virtualTargetProperty, null);
+    }
+
     @Test
-    public void testTargetId_noTargetIdProperty() {
+    public void testTargetId_virtualTargetIdProperty() {
         Order entity = putOrder(null, null);
-        ToOne<Customer> toOne = new ToOne<>(entity, getRelationInfo(null));
+        ToOne<Customer> toOne = new ToOne<>(entity, getRelationInfoVirtualTargetProperty());
         entity.setCustomerId(1042);
         assertEquals(0, toOne.getTargetId());
         toOne.setTargetId(1977);
@@ -71,15 +76,15 @@ public void testGetAndSetTarget() {
         customerBox.put(target, target2);
         Order source = putOrder(null, null);
 
-        // Without customerId
-        ToOne<Customer> toOne = new ToOne<>(source, getRelationInfo(null));
+        // With virtual customerId
+        ToOne<Customer> toOne = new ToOne<>(source, getRelationInfoVirtualTargetProperty());
         toOne.setTargetId(1977);
         assertEquals("target1", toOne.getTarget().getName());
 
         toOne.setTarget(target2);
         assertEquals(target2.getId(), toOne.getTargetId());
 
-        // With customerId
+        // With regular customerId
         toOne = new ToOne<>(source, getRelationInfo(Order_.customerId));
         source.setCustomerId(1977);
         assertEquals("target1", toOne.getTarget().getName());