You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2026/09/12 17:11:45 UTC
(cayenne) 01/02: CAY-3016 Get rid of RelationshipQuery
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit ceaf90f93c89378e835a74b410d0894fa0153c9d
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Sat Sep 12 11:24:41 2026 -0400
CAY-3016 Get rid of RelationshipQuery
cleanup
---
cayenne/src/main/java/org/apache/cayenne/DataChannel.java | 2 +-
cayenne/src/main/java/org/apache/cayenne/access/DataContext.java | 2 +-
.../src/main/java/org/apache/cayenne/access/DataContextChannel.java | 2 +-
cayenne/src/main/java/org/apache/cayenne/access/DataDomain.java | 2 +-
cayenne/src/test/java/org/apache/cayenne/MockDataChannel.java | 4 ++--
.../java/org/apache/cayenne/access/DataContextDecoratedStackIT.java | 4 ++--
.../org/apache/cayenne/access/DataContextResolveRelationshipIT.java | 6 +++---
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/cayenne/src/main/java/org/apache/cayenne/DataChannel.java b/cayenne/src/main/java/org/apache/cayenne/DataChannel.java
index 8a19622c8..903ef1936 100644
--- a/cayenne/src/main/java/org/apache/cayenne/DataChannel.java
+++ b/cayenne/src/main/java/org/apache/cayenne/DataChannel.java
@@ -143,7 +143,7 @@ public interface DataChannel {
* null, or a to-many relationship has no matching objects.
* @since 5.0
*/
- List<? extends Persistent> onResolveRelationship(ObjectContext context, ObjectId sourceId, String relationshipName);
+ List<? extends Persistent> onRelationshipQuery(ObjectContext context, ObjectId sourceId, String relationshipName);
/**
* Processes synchronization request from a child ObjectContext, returning a GraphDiff
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/DataContext.java b/cayenne/src/main/java/org/apache/cayenne/access/DataContext.java
index 2d7f0a2d1..03126b05e 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/DataContext.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/DataContext.java
@@ -781,7 +781,7 @@ public class DataContext implements ObjectContext {
List<Persistent> related = resolveRelationshipInSelf(sourceId, relationshipName, resolveToMany);
return related != null
? related
- : getChannel().onResolveRelationship(this, sourceId, relationshipName);
+ : getChannel().onRelationshipQuery(this, sourceId, relationshipName);
}
@SuppressWarnings("unchecked")
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/DataContextChannel.java b/cayenne/src/main/java/org/apache/cayenne/access/DataContextChannel.java
index 21c994cc0..5226093a0 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/DataContextChannel.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/DataContextChannel.java
@@ -97,7 +97,7 @@ public record DataContextChannel(DataContext context) implements DataChannel {
}
@Override
- public List<Persistent> onResolveRelationship(ObjectContext childContext, ObjectId sourceId, String relationshipName) {
+ public List<Persistent> onRelationshipQuery(ObjectContext childContext, ObjectId sourceId, String relationshipName) {
checkChildContext(childContext);
List<? extends Persistent> related = context.resolveRelationship(sourceId, relationshipName, true);
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/DataDomain.java b/cayenne/src/main/java/org/apache/cayenne/access/DataDomain.java
index e485a4e7b..a4b6cd513 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/DataDomain.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/DataDomain.java
@@ -400,7 +400,7 @@ public class DataDomain implements DataChannel {
* @since 5.0
*/
@Override
- public List<Persistent> onResolveRelationship(ObjectContext context, ObjectId sourceId, String relationshipName) {
+ public List<Persistent> onRelationshipQuery(ObjectContext context, ObjectId sourceId, String relationshipName) {
checkStopped();
return new DataDomainRelationshipAction(this, context, sourceId, relationshipName).execute();
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/MockDataChannel.java b/cayenne/src/test/java/org/apache/cayenne/MockDataChannel.java
index fca74ba5e..168117d81 100644
--- a/cayenne/src/test/java/org/apache/cayenne/MockDataChannel.java
+++ b/cayenne/src/test/java/org/apache/cayenne/MockDataChannel.java
@@ -105,8 +105,8 @@ public class MockDataChannel implements DataChannel {
return objects == null || objects.isEmpty() ? null : (Persistent) objects.getFirst();
}
- public List<Persistent> onResolveRelationship(ObjectContext context, ObjectId sourceId,
- String relationshipName) {
+ public List<Persistent> onRelationshipQuery(ObjectContext context, ObjectId sourceId,
+ String relationshipName) {
requestObjects.add(sourceId);
return (List<Persistent>) response.firstList();
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackIT.java
index 59f7d4386..6009c7fbd 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackIT.java
@@ -126,8 +126,8 @@ public class DataContextDecoratedStackIT {
}
@Override
- public List<? extends Persistent> onResolveRelationship(ObjectContext context, ObjectId sourceId, String relationshipName) {
- return channel.onResolveRelationship(context, sourceId, relationshipName);
+ public List<? extends Persistent> onRelationshipQuery(ObjectContext context, ObjectId sourceId, String relationshipName) {
+ return channel.onRelationshipQuery(context, sourceId, relationshipName);
}
@Override
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextResolveRelationshipIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextResolveRelationshipIT.java
index 8ba056577..0bc3ae8c2 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextResolveRelationshipIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextResolveRelationshipIT.java
@@ -120,7 +120,7 @@ public class DataContextResolveRelationshipIT {
Artist childA = child.localObject(a);
env.runWithQueriesBlocked(() -> {
- List<? extends Persistent> related = child.getChannel().onResolveRelationship(child, childA.getObjectId(), Artist.PAINTING_ARRAY.getName());
+ List<? extends Persistent> related = child.getChannel().onRelationshipQuery(child, childA.getObjectId(), Artist.PAINTING_ARRAY.getName());
assertEquals(2, related.size());
for (Persistent p : related) {
assertSame(child, p.getObjectContext());
@@ -141,7 +141,7 @@ public class DataContextResolveRelationshipIT {
Painting childP = child.localObject(p);
env.runWithQueriesBlocked(() -> {
- List<? extends Persistent> related = child.getChannel().onResolveRelationship(child, childP.getObjectId(),
+ List<? extends Persistent> related = child.getChannel().onRelationshipQuery(child, childP.getObjectId(),
Painting.TO_ARTIST.getName());
assertEquals(1, related.size());
assertSame(child, related.getFirst().getObjectContext());
@@ -162,7 +162,7 @@ public class DataContextResolveRelationshipIT {
// a NEW object is unknown to the database, so its relationships must be resolved from the parent context
env.runWithQueriesBlocked(() -> {
- List<? extends Persistent> related = child.getChannel().onResolveRelationship(child, childA.getObjectId(),
+ List<? extends Persistent> related = child.getChannel().onRelationshipQuery(child, childA.getObjectId(),
Artist.PAINTING_ARRAY.getName());
assertEquals(1, related.size());
assertSame(child, related.getFirst().getObjectContext());