add SOURCE type param to RelationInfo

Author: greenrobot

objectbox-java/src/main/java/io/objectbox/query/QueryBuilder.java

@@ -285,7 +285,7 @@ public QueryBuilder<T> sort(Comparator<T> comparator) {
      * @param <TARGET>     The target entity. For parent/tree like relations, it can be the same type.
      * @return A builder to define query conditions at the target entity side.
      */
-    public <TARGET> QueryBuilder<TARGET> link(RelationInfo<TARGET> relationInfo) {
+    public <TARGET> QueryBuilder<TARGET> link(RelationInfo<?, TARGET> relationInfo) {
         boolean backlink = relationInfo.isBacklink();
         EntityInfo relationOwner = backlink ? relationInfo.targetInfo : relationInfo.sourceInfo;
         return link(relationInfo, relationOwner, relationInfo.targetInfo, backlink);
@@ -312,7 +312,7 @@ private <TARGET> QueryBuilder<TARGET> link(RelationInfo relationInfo, EntityInfo
      * @param <TARGET>     The target entity. For parent/tree like relations, it can be the same type.
      * @return A builder to define query conditions at the target entity side.
      */
-    public <TARGET> QueryBuilder<TARGET> backlink(RelationInfo relationInfo) {
+    public <TARGET> QueryBuilder<TARGET> backlink(RelationInfo<TARGET, ?> relationInfo) {
         if (relationInfo.isBacklink()) {
             throw new IllegalArgumentException("Double backlink: The relation is already a backlink, please use a regular link on the original relation instead.");
         }

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

@@ -31,10 +31,10 @@
  */
 @Internal
 @Immutable
-public class RelationInfo<TARGET> implements Serializable {
+public class RelationInfo<SOURCE, TARGET> implements Serializable {
     private static final long serialVersionUID = 7412962174183812632L;
 
-    public final EntityInfo sourceInfo;
+    public final EntityInfo<SOURCE> sourceInfo;
     public final EntityInfo<TARGET> targetInfo;
 
     /** For relations based on a target ID property (null otherwise). */
@@ -44,24 +44,24 @@ public class RelationInfo<TARGET> implements Serializable {
     public final int targetRelationId;
 
     /** Only set for ToOne relations */
-    public final ToOneGetter toOneGetter;
+    public final ToOneGetter<TARGET> toOneGetter;
 
     /** Only set for ToMany relations */
-    public final ToManyGetter toManyGetter;
+    public final ToManyGetter<TARGET> toManyGetter;
 
     /** For ToMany relations based on ToOne backlinks (null otherwise). */
-    public final ToOneGetter backlinkToOneGetter;
+    public final ToOneGetter<SOURCE> backlinkToOneGetter;
 
     /** For ToMany relations based on ToMany backlinks (null otherwise). */
-    public final ToManyGetter backlinkToManyGetter;
+    public final ToManyGetter<SOURCE> backlinkToManyGetter;
 
     /** For stand-alone to-many relations (0 otherwise). */
     public final int relationId;
 
     /**
      * ToOne
      */
-    public RelationInfo(EntityInfo sourceInfo, EntityInfo<TARGET> targetInfo, Property targetIdProperty,
+    public RelationInfo(EntityInfo<SOURCE> sourceInfo, EntityInfo<TARGET> targetInfo, Property targetIdProperty,
                         ToOneGetter toOneGetter) {
         this.sourceInfo = sourceInfo;
         this.targetInfo = targetInfo;
@@ -77,7 +77,7 @@ public RelationInfo(EntityInfo sourceInfo, EntityInfo<TARGET> targetInfo, Proper
     /**
      * ToMany as a ToOne backlink
      */
-    public RelationInfo(EntityInfo sourceInfo, EntityInfo<TARGET> targetInfo, ToManyGetter toManyGetter,
+    public RelationInfo(EntityInfo<SOURCE> sourceInfo, EntityInfo<TARGET> targetInfo, ToManyGetter toManyGetter,
                         Property targetIdProperty, ToOneGetter backlinkToOneGetter) {
         this.sourceInfo = sourceInfo;
         this.targetInfo = targetInfo;
@@ -93,7 +93,7 @@ public RelationInfo(EntityInfo sourceInfo, EntityInfo<TARGET> targetInfo, ToMany
     /**
      * ToMany as a ToMany backlink
      */
-    public RelationInfo(EntityInfo sourceInfo, EntityInfo<TARGET> targetInfo, ToManyGetter toManyGetter,
+    public RelationInfo(EntityInfo<SOURCE> sourceInfo, EntityInfo<TARGET> targetInfo, ToManyGetter toManyGetter,
             ToManyGetter backlinkToManyGetter, int targetRelationId) {
         this.sourceInfo = sourceInfo;
         this.targetInfo = targetInfo;
@@ -109,7 +109,7 @@ public RelationInfo(EntityInfo sourceInfo, EntityInfo<TARGET> targetInfo, ToMany
     /**
      * Stand-alone ToMany.
      */
-    public RelationInfo(EntityInfo sourceInfo, EntityInfo<TARGET> targetInfo, ToManyGetter toManyGetter,
+    public RelationInfo(EntityInfo<SOURCE> sourceInfo, EntityInfo<TARGET> targetInfo, ToManyGetter toManyGetter,
                         int relationId) {
         this.sourceInfo = sourceInfo;
         this.targetInfo = targetInfo;

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

@@ -67,7 +67,7 @@ public class ToMany<TARGET> implements List<TARGET>, Serializable {
     private final static Integer ONE = Integer.valueOf(1);
 
     private final Object entity;
-    private final RelationInfo<TARGET> relationInfo;
+    private final RelationInfo<Object, TARGET> relationInfo;
 
     private ListFactory listFactory;
     private List<TARGET> entities;
@@ -90,15 +90,15 @@ public class ToMany<TARGET> implements List<TARGET>, Serializable {
     transient private boolean removeFromTargetBox;
     transient private Comparator<TARGET> comparator;
 
-    public ToMany(Object sourceEntity, RelationInfo<TARGET> relationInfo) {
+    public ToMany(Object sourceEntity, RelationInfo<? extends Object, TARGET> relationInfo) {
         if (sourceEntity == null) {
             throw new IllegalArgumentException("No source entity given (null)");
         }
         if (relationInfo == null) {
             throw new IllegalArgumentException("No relation info given (null)");
         }
         this.entity = sourceEntity;
-        this.relationInfo = relationInfo;
+        this.relationInfo = (RelationInfo<Object, TARGET>) relationInfo;
     }
 
     /** Currently only used for non-persisted entities (id == 0). */

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

@@ -105,7 +105,7 @@ public long getId(Customer object) {
         }
     }
 
-    static final RelationInfo<Order> orders =
+    static final RelationInfo<Customer, Order> orders =
             new RelationInfo<>(Customer_.__INSTANCE, Order_.__INSTANCE, new ToManyGetter<Customer>() {
                 @Override
                 public ToMany<Order> getToMany(Customer customer) {
@@ -118,7 +118,7 @@ public ToOne<Customer> getToOne(Order order) {
                 }
             });
 
-    static final RelationInfo<Order> ordersStandalone =
+    static final RelationInfo<Customer, Order> ordersStandalone =
             new RelationInfo<>(Customer_.__INSTANCE, Order_.__INSTANCE, new ToManyGetter<Customer>() {
                 @Override
                 public ToMany<Order> getToMany(Customer customer) {

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

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

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

@@ -42,7 +42,7 @@ public void testPutAndGetPrimitives() {
         Cursor<Customer> cursorSource = InternalAccess.getWriter(customerBox);
         long[] orderIds = {order1.getId(), order2.getId()};
         cursorSource.modifyRelations(1, customerId, orderIds, false);
-        RelationInfo<Order> info = Customer_.ordersStandalone;
+        RelationInfo<Customer, Order> info = Customer_.ordersStandalone;
         int sourceEntityId = info.sourceInfo.getEntityId();
         Cursor<Order> targetCursor = cursorSource.getTx().createCursor(Order.class);
         List<Order> related = targetCursor.getRelationEntities(sourceEntityId, info.relationId, customerId, false);

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

@@ -45,7 +45,7 @@ public void testTargetId_withTargetIdProperty() {
         assertEquals(1977, entity.getCustomerId());
     }
 
-    private RelationInfo<Customer> getRelationInfo(Property targetIdProperty) {
+    private RelationInfo<Order, Customer> getRelationInfo(Property targetIdProperty) {
         return new RelationInfo<>(new Order_(), new Customer_(), targetIdProperty, null);
     }