Skip to content

Commit 4fec87f

Browse files
committed
some renames, added ToManyGetter
1 parent 6e9e8bf commit 4fec87f

3 files changed

Lines changed: 23 additions & 7 deletions

File tree

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,30 +23,36 @@ public class RelationInfo<TARGET> implements Serializable {
2323
public final Property targetIdProperty;
2424

2525
/** For ToMany relations based on backlinks (null otherwise). */
26-
public final ToOneGetter toOneGetter;
26+
public final ToOneGetter backlinkToOneGetter;
2727

2828
/** For stand-alone to-many relations (0 otherwise). */
2929
public final int relationId;
3030

31+
/**
32+
* ToOne
33+
*/
3134
public RelationInfo(EntityInfo sourceInfo, EntityInfo<TARGET> targetInfo, Property targetIdProperty) {
3235
this(sourceInfo, targetInfo, targetIdProperty, null);
3336
}
3437

3538
public RelationInfo(EntityInfo sourceInfo, EntityInfo<TARGET> targetInfo, Property targetIdProperty,
36-
ToOneGetter toOneGetter) {
39+
ToOneGetter backlinkToOneGetter) {
3740
this.sourceInfo = sourceInfo;
3841
this.targetInfo = targetInfo;
3942
this.targetIdProperty = targetIdProperty;
40-
this.toOneGetter = toOneGetter;
43+
this.backlinkToOneGetter = backlinkToOneGetter;
4144
relationId = 0;
4245
}
4346

47+
/**
48+
* Stand-alone to-many.
49+
*/
4450
public RelationInfo(EntityInfo sourceInfo, EntityInfo<TARGET> targetInfo, int relationId) {
4551
this.sourceInfo = sourceInfo;
4652
this.targetInfo = targetInfo;
4753
this.relationId = relationId;
4854
this.targetIdProperty = null;
49-
this.toOneGetter = null;
55+
this.backlinkToOneGetter = null;
5056
}
5157
}
5258

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ public boolean internalCheckApplyToDbRequired() {
479479
if ((setAdded == null || setAdded.isEmpty()) && (setRemoved == null || setRemoved.isEmpty())) {
480480
return false;
481481
}
482-
ToOneGetter toOneGetter = relationInfo.toOneGetter;
482+
ToOneGetter backlinkToOneGetter = relationInfo.backlinkToOneGetter;
483483
long entityId = relationInfo.sourceInfo.getIdGetter().getId(entity);
484484
if (entityId == 0) {
485485
throw new IllegalStateException("Source entity has no ID (should have been put before)");
@@ -496,7 +496,7 @@ public boolean internalCheckApplyToDbRequired() {
496496
return !setAdded.isEmpty() || !setRemoved.isEmpty();
497497
} else {
498498
for (TARGET target : setAdded.keySet()) {
499-
ToOne<Object> toOne = toOneGetter.getToOne(target);
499+
ToOne<Object> toOne = backlinkToOneGetter.getToOne(target);
500500
if (toOne == null) {
501501
throw new IllegalStateException("The ToOne property for " +
502502
relationInfo.targetInfo.getEntityName() + "." + relationInfo.targetIdProperty.name +
@@ -513,7 +513,7 @@ public boolean internalCheckApplyToDbRequired() {
513513
setAdded.clear();
514514

515515
for (TARGET target : setRemoved.keySet()) {
516-
ToOne<Object> toOne = toOneGetter.getToOne(target);
516+
ToOne<Object> toOne = backlinkToOneGetter.getToOne(target);
517517
long toOneTargetId = toOne.getTargetId();
518518
if (toOneTargetId == entityId) {
519519
toOne.setTarget(null);
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package io.objectbox.relation;
2+
3+
import java.io.Serializable;
4+
5+
import io.objectbox.annotation.apihint.Internal;
6+
7+
@Internal
8+
public interface ToManyGetter<SOURCE> extends Serializable {
9+
<TARGET> ToMany<TARGET> getToOne(SOURCE object);
10+
}

0 commit comments

Comments
 (0)