Skip to content

Commit e5f579d

Browse files
greenrobot-teamgreenrobot-team
committed
Unchecked warnings: fix type params for ToOneGetter/ToManyGetter (#59)
1 parent e109699 commit e5f579d

File tree

10 files changed

+26
-26
lines changed

10 files changed

+26
-26
lines changed

‎objectbox-java/src/main/java/io/objectbox/internal/ToManyGetter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
import io.objectbox.annotation.apihint.Internal;
2323

2424
@Internal
25-
public interface ToManyGetter<SOURCE> extends Serializable {
26-
<TARGET> List<TARGET> getToMany(SOURCE object);
25+
public interface ToManyGetter<SOURCE, TARGET> extends Serializable {
26+
List<TARGET> getToMany(SOURCE object);
2727
}

‎objectbox-java/src/main/java/io/objectbox/internal/ToOneGetter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
import io.objectbox.relation.ToOne;
2323

2424
@Internal
25-
public interface ToOneGetter<SOURCE> extends Serializable {
26-
<TARGET> ToOne<TARGET> getToOne(SOURCE object);
25+
public interface ToOneGetter<SOURCE, TARGET> extends Serializable {
26+
ToOne<TARGET> getToOne(SOURCE object);
2727
}

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,16 @@ public class RelationInfo<SOURCE, TARGET> implements Serializable {
4646
public final int targetRelationId;
4747

4848
/** Only set for ToOne relations */
49-
public final ToOneGetter<SOURCE> toOneGetter;
49+
public final ToOneGetter<SOURCE, TARGET> toOneGetter;
5050

5151
/** Only set for ToMany relations */
52-
public final ToManyGetter<SOURCE> toManyGetter;
52+
public final ToManyGetter<SOURCE, TARGET> toManyGetter;
5353

5454
/** For ToMany relations based on ToOne backlinks (null otherwise). */
55-
public final ToOneGetter<TARGET> backlinkToOneGetter;
55+
public final ToOneGetter<TARGET, SOURCE> backlinkToOneGetter;
5656

5757
/** For ToMany relations based on ToMany backlinks (null otherwise). */
58-
public final ToManyGetter<TARGET> backlinkToManyGetter;
58+
public final ToManyGetter<TARGET, SOURCE> backlinkToManyGetter;
5959

6060
/** For stand-alone to-many relations (0 otherwise). */
6161
public final int relationId;
@@ -64,7 +64,7 @@ public class RelationInfo<SOURCE, TARGET> implements Serializable {
6464
* ToOne
6565
*/
6666
public RelationInfo(EntityInfo<SOURCE> sourceInfo, EntityInfo<TARGET> targetInfo, Property<SOURCE> targetIdProperty,
67-
ToOneGetter<SOURCE> toOneGetter) {
67+
ToOneGetter<SOURCE, TARGET> toOneGetter) {
6868
this.sourceInfo = sourceInfo;
6969
this.targetInfo = targetInfo;
7070
this.targetIdProperty = targetIdProperty;
@@ -79,8 +79,8 @@ public RelationInfo(EntityInfo<SOURCE> sourceInfo, EntityInfo<TARGET> targetInfo
7979
/**
8080
* ToMany as a ToOne backlink
8181
*/
82-
public RelationInfo(EntityInfo<SOURCE> sourceInfo, EntityInfo<TARGET> targetInfo, ToManyGetter<SOURCE> toManyGetter,
83-
Property<TARGET> targetIdProperty, ToOneGetter<TARGET> backlinkToOneGetter) {
82+
public RelationInfo(EntityInfo<SOURCE> sourceInfo, EntityInfo<TARGET> targetInfo, ToManyGetter<SOURCE, TARGET> toManyGetter,
83+
Property<TARGET> targetIdProperty, ToOneGetter<TARGET, SOURCE> backlinkToOneGetter) {
8484
this.sourceInfo = sourceInfo;
8585
this.targetInfo = targetInfo;
8686
this.targetIdProperty = targetIdProperty;
@@ -95,8 +95,8 @@ public RelationInfo(EntityInfo<SOURCE> sourceInfo, EntityInfo<TARGET> targetInfo
9595
/**
9696
* ToMany as a ToMany backlink
9797
*/
98-
public RelationInfo(EntityInfo<SOURCE> sourceInfo, EntityInfo<TARGET> targetInfo, ToManyGetter<SOURCE> toManyGetter,
99-
ToManyGetter<TARGET> backlinkToManyGetter, int targetRelationId) {
98+
public RelationInfo(EntityInfo<SOURCE> sourceInfo, EntityInfo<TARGET> targetInfo, ToManyGetter<SOURCE, TARGET> toManyGetter,
99+
ToManyGetter<TARGET, SOURCE> backlinkToManyGetter, int targetRelationId) {
100100
this.sourceInfo = sourceInfo;
101101
this.targetInfo = targetInfo;
102102
this.toManyGetter = toManyGetter;
@@ -111,7 +111,7 @@ public RelationInfo(EntityInfo<SOURCE> sourceInfo, EntityInfo<TARGET> targetInfo
111111
/**
112112
* Stand-alone ToMany.
113113
*/
114-
public RelationInfo(EntityInfo<SOURCE> sourceInfo, EntityInfo<TARGET> targetInfo, ToManyGetter<SOURCE> toManyGetter,
114+
public RelationInfo(EntityInfo<SOURCE> sourceInfo, EntityInfo<TARGET> targetInfo, ToManyGetter<SOURCE, TARGET> toManyGetter,
115115
int relationId) {
116116
this.sourceInfo = sourceInfo;
117117
this.targetInfo = targetInfo;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@ public boolean internalCheckApplyToDbRequired() {
696696

697697
private boolean prepareToManyBacklinkEntitiesForDb(long entityId, IdGetter<TARGET> idGetter,
698698
@Nullable Map<TARGET, Boolean> setAdded, @Nullable Map<TARGET, Boolean> setRemoved) {
699-
ToManyGetter<TARGET> backlinkToManyGetter = relationInfo.backlinkToManyGetter;
699+
ToManyGetter<TARGET, Object> backlinkToManyGetter = relationInfo.backlinkToManyGetter;
700700

701701
synchronized (this) {
702702
if (setAdded != null && !setAdded.isEmpty()) {
@@ -740,7 +740,7 @@ private boolean prepareToManyBacklinkEntitiesForDb(long entityId, IdGetter<TARGE
740740

741741
private boolean prepareToOneBacklinkEntitiesForDb(long entityId, IdGetter<TARGET> idGetter,
742742
@Nullable Map<TARGET, Boolean> setAdded, @Nullable Map<TARGET, Boolean> setRemoved) {
743-
ToOneGetter<TARGET> backlinkToOneGetter = relationInfo.backlinkToOneGetter;
743+
ToOneGetter<TARGET, Object> backlinkToOneGetter = relationInfo.backlinkToOneGetter;
744744

745745
synchronized (this) {
746746
if (setAdded != null && !setAdded.isEmpty()) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,20 +109,20 @@ public long getId(Customer object) {
109109
}
110110

111111
public static final RelationInfo<Customer, Order> orders =
112-
new RelationInfo<>(Customer_.__INSTANCE, Order_.__INSTANCE, new ToManyGetter<Customer>() {
112+
new RelationInfo<>(Customer_.__INSTANCE, Order_.__INSTANCE, new ToManyGetter<Customer, Order>() {
113113
@Override
114114
public List<Order> getToMany(Customer customer) {
115115
return customer.getOrders();
116116
}
117-
}, Order_.customerId, new ToOneGetter<Order>() {
117+
}, Order_.customerId, new ToOneGetter<Order, Customer>() {
118118
@Override
119119
public ToOne<Customer> getToOne(Order order) {
120120
return order.getCustomer();
121121
}
122122
});
123123

124124
public static final RelationInfo<Customer, Order> ordersStandalone =
125-
new RelationInfo<>(Customer_.__INSTANCE, Order_.__INSTANCE, new ToManyGetter<Customer>() {
125+
new RelationInfo<>(Customer_.__INSTANCE, Order_.__INSTANCE, new ToManyGetter<Customer, Order>() {
126126
@Override
127127
public List<Order> getToMany(Customer customer) {
128128
return customer.getOrders();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public long getId(Order object) {
110110
}
111111
}
112112

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

‎tests/objectbox-java-test/src/test/java/io/objectbox/tree/DataBranch_.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public long getId(DataBranch object) {
106106

107107
/** To-one relation "parent" to target entity "DataBranch". */
108108
public static final RelationInfo<DataBranch, DataBranch> parent =
109-
new RelationInfo<>(DataBranch_.__INSTANCE, DataBranch_.__INSTANCE, parentId, new ToOneGetter<DataBranch>() {
109+
new RelationInfo<>(DataBranch_.__INSTANCE, DataBranch_.__INSTANCE, parentId, new ToOneGetter<DataBranch, DataBranch>() {
110110
@Override
111111
public ToOne<DataBranch> getToOne(DataBranch entity) {
112112
return entity.parent;
@@ -115,7 +115,7 @@ public ToOne<DataBranch> getToOne(DataBranch entity) {
115115

116116
/** To-one relation "metaBranch" to target entity "MetaBranch". */
117117
public static final RelationInfo<DataBranch, MetaBranch> metaBranch =
118-
new RelationInfo<>(DataBranch_.__INSTANCE, MetaBranch_.__INSTANCE, metaBranchId, new ToOneGetter<DataBranch>() {
118+
new RelationInfo<>(DataBranch_.__INSTANCE, MetaBranch_.__INSTANCE, metaBranchId, new ToOneGetter<DataBranch, MetaBranch>() {
119119
@Override
120120
public ToOne<MetaBranch> getToOne(DataBranch entity) {
121121
return entity.metaBranch;

‎tests/objectbox-java-test/src/test/java/io/objectbox/tree/DataLeaf_.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public long getId(DataLeaf object) {
118118

119119
/** To-one relation "dataBranch" to target entity "DataBranch". */
120120
public static final RelationInfo<DataLeaf, DataBranch> dataBranch =
121-
new RelationInfo<>(DataLeaf_.__INSTANCE, io.objectbox.tree.DataBranch_.__INSTANCE, dataBranchId, new ToOneGetter<DataLeaf>() {
121+
new RelationInfo<>(DataLeaf_.__INSTANCE, io.objectbox.tree.DataBranch_.__INSTANCE, dataBranchId, new ToOneGetter<DataLeaf, DataBranch>() {
122122
@Override
123123
public ToOne<DataBranch> getToOne(DataLeaf entity) {
124124
return entity.dataBranch;
@@ -127,7 +127,7 @@ public ToOne<DataBranch> getToOne(DataLeaf entity) {
127127

128128
/** To-one relation "metaLeaf" to target entity "MetaLeaf". */
129129
public static final RelationInfo<DataLeaf, MetaLeaf> metaLeaf =
130-
new RelationInfo<>(DataLeaf_.__INSTANCE, io.objectbox.tree.MetaLeaf_.__INSTANCE, metaLeafId, new ToOneGetter<DataLeaf>() {
130+
new RelationInfo<>(DataLeaf_.__INSTANCE, io.objectbox.tree.MetaLeaf_.__INSTANCE, metaLeafId, new ToOneGetter<DataLeaf, MetaLeaf>() {
131131
@Override
132132
public ToOne<MetaLeaf> getToOne(DataLeaf entity) {
133133
return entity.metaLeaf;

‎tests/objectbox-java-test/src/test/java/io/objectbox/tree/MetaBranch_.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public long getId(MetaBranch object) {
106106

107107
/** To-one relation "parent" to target entity "MetaBranch". */
108108
public static final RelationInfo<MetaBranch, MetaBranch> parent =
109-
new RelationInfo<>(MetaBranch_.__INSTANCE, MetaBranch_.__INSTANCE, parentId, new ToOneGetter<MetaBranch>() {
109+
new RelationInfo<>(MetaBranch_.__INSTANCE, MetaBranch_.__INSTANCE, parentId, new ToOneGetter<MetaBranch, MetaBranch>() {
110110
@Override
111111
public ToOne<MetaBranch> getToOne(MetaBranch entity) {
112112
return entity.parent;

‎tests/objectbox-java-test/src/test/java/io/objectbox/tree/MetaLeaf_.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public long getId(MetaLeaf object) {
129129

130130
/** To-one relation "branch" to target entity "MetaBranch". */
131131
public static final RelationInfo<MetaLeaf, MetaBranch> branch =
132-
new RelationInfo<>(MetaLeaf_.__INSTANCE, MetaBranch_.__INSTANCE, branchId, new ToOneGetter<MetaLeaf>() {
132+
new RelationInfo<>(MetaLeaf_.__INSTANCE, MetaBranch_.__INSTANCE, branchId, new ToOneGetter<MetaLeaf, MetaBranch>() {
133133
@Override
134134
public ToOne<MetaBranch> getToOne(MetaLeaf entity) {
135135
return entity.branch;

0 commit comments

Comments
 (0)