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:44 UTC
(cayenne) branch master updated (144a774bd -> b43d048ab)
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
from 144a774bd CAY-3021 Get rid of ObjectIdQuery
new ceaf90f93 CAY-3016 Get rid of RelationshipQuery
new b43d048ab refactoring, cleanup
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/cayenne/DataChannel.java | 21 +++++++-
.../org/apache/cayenne/access/DataContext.java | 35 ++++---------
.../apache/cayenne/access/DataContextChannel.java | 2 +-
.../cayenne/access/DataContextQueryAction.java | 2 +-
.../java/org/apache/cayenne/access/DataDomain.java | 2 +-
.../cayenne/access/HierarchicalObjectResolver.java | 2 +-
.../configuration/runtime/DataContextFactory.java | 10 +---
.../java/org/apache/cayenne/MockDataChannel.java | 4 +-
.../java/org/apache/cayenne/PregeneratedPKIT.java | 2 +-
.../access/DataContextDecoratedStackIT.java | 15 +++++-
.../apache/cayenne/access/DataContextExtrasIT.java | 2 +-
.../access/DataContextFlattenedAttributesIT.java | 2 +-
.../access/DataContextInvalidateObjectsIT.java | 60 +++++++++++-----------
.../cayenne/access/DataContextQueryCachingIT.java | 14 ++---
.../access/DataContextResolveRelationshipIT.java | 6 +--
15 files changed, 93 insertions(+), 86 deletions(-)
(cayenne) 01/02: CAY-3016 Get rid of RelationshipQuery
Posted by aa...@apache.org.
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());
(cayenne) 02/02: refactoring, cleanup
Posted by aa...@apache.org.
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 b43d048abd4eb10a3c25d6d757e363629b4c232a
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Sat Sep 12 11:26:46 2026 -0400
refactoring, cleanup
---
.../main/java/org/apache/cayenne/DataChannel.java | 19 +++++++
.../org/apache/cayenne/access/DataContext.java | 33 +++---------
.../cayenne/access/DataContextQueryAction.java | 2 +-
.../cayenne/access/HierarchicalObjectResolver.java | 2 +-
.../configuration/runtime/DataContextFactory.java | 10 +---
.../java/org/apache/cayenne/PregeneratedPKIT.java | 2 +-
.../access/DataContextDecoratedStackIT.java | 11 ++++
.../apache/cayenne/access/DataContextExtrasIT.java | 2 +-
.../access/DataContextFlattenedAttributesIT.java | 2 +-
.../access/DataContextInvalidateObjectsIT.java | 60 +++++++++++-----------
.../cayenne/access/DataContextQueryCachingIT.java | 14 ++---
11 files changed, 82 insertions(+), 75 deletions(-)
diff --git a/cayenne/src/main/java/org/apache/cayenne/DataChannel.java b/cayenne/src/main/java/org/apache/cayenne/DataChannel.java
index 903ef1936..d76e5f347 100644
--- a/cayenne/src/main/java/org/apache/cayenne/DataChannel.java
+++ b/cayenne/src/main/java/org/apache/cayenne/DataChannel.java
@@ -19,6 +19,7 @@
package org.apache.cayenne;
+import org.apache.cayenne.access.DataDomain;
import org.apache.cayenne.event.EventManager;
import org.apache.cayenne.event.EventSubject;
import org.apache.cayenne.graph.GraphDiff;
@@ -88,6 +89,24 @@ public interface DataChannel {
*/
DataChannel getParent();
+ /**
+ * Returns a DataDomain at the root of this channel's stack, looked up by walking the chain of parent channels
+ * starting with this channel. Returns null if the root channel is not a DataDomain.
+ *
+ * @since 5.0
+ */
+ default DataDomain getDataDomain() {
+ DataChannel c = this;
+ while (c != null) {
+ if (c instanceof DataDomain dataDomain) {
+ return dataDomain;
+ }
+ c = c.getParent();
+ }
+
+ return null;
+ }
+
/**
* Executes a query, using provided <em>context</em> to register persistent objects if
* query returns any objects.
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 03126b05e..9f6117d98 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/DataContext.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/DataContext.java
@@ -152,8 +152,6 @@ public class DataContext implements ObjectContext {
this.objectStore = Objects.requireNonNull(objectStore);
objectStore.setContext(this);
- EventManager eventManager = channel.getEventManager();
-
// Listen to our channel events. A parent context posts its events on its own
// behalf, not on behalf of the channel adapter wrapping it, so listen to the context in that case
if (channel instanceof DataContextChannel(DataContext context)) {
@@ -164,14 +162,14 @@ public class DataContext implements ObjectContext {
EventUtil.listenForChannelEvents(channel, mergeHandler);
}
- DataDomain domain = getParentDataDomain();
+ DataDomain domain = channel.getDataDomain();
this.usingSharedSnapshotCache = domain != null && objectStore.getDataRowCache() == domain.getSharedSnapshotCache();
if (!usingSharedSnapshotCache) {
DataRowStore cache = objectStore.getDataRowCache();
if (cache != null) {
- cache.setEventManager(eventManager);
+ cache.setEventManager(channel.getEventManager());
}
}
}
@@ -187,23 +185,13 @@ public class DataContext implements ObjectContext {
}
/**
- * Returns a DataDomain used by this DataContext. DataDomain is looked up in the DataChannel hierarchy. If the final
- * channel is not a DataDomain, null is returned.
- *
* @return DataDomain that is a direct or indirect parent of this DataContext in the DataChannel hierarchy.
* @since 1.1
+ * @deprecated use {@link DataChannel#getDataDomain()} on the channel returned by {@link #getChannel()}
*/
+ @Deprecated(since = "5.0", forRemoval = true)
public DataDomain getParentDataDomain() {
-
- DataChannel c = channel;
- while (c != null) {
- if (c instanceof DataDomain dataDomain) {
- return dataDomain;
- }
- c = c.getParent();
- }
-
- return null;
+ return channel.getDataDomain();
}
/**
@@ -353,15 +341,11 @@ public class DataContext implements ObjectContext {
this.queryCache = queryCache;
}
- private EventManager eventManager() {
- return channel != null ? channel.getEventManager() : null;
- }
-
/**
* @since 1.2
*/
protected void fireDataChannelCommitted(Object postedBy, GraphDiff changes) {
- EventManager manager = eventManager();
+ EventManager manager = channel.getEventManager();
if (manager != null) {
GraphEvent e = new GraphEvent(this, postedBy, changes);
@@ -373,7 +357,7 @@ public class DataContext implements ObjectContext {
* @since 1.2
*/
protected void fireDataChannelRolledback(Object postedBy, GraphDiff changes) {
- EventManager manager = eventManager();
+ EventManager manager = channel.getEventManager();
if (manager != null) {
GraphEvent e = new GraphEvent(this, postedBy, changes);
@@ -1233,14 +1217,13 @@ public class DataContext implements ObjectContext {
return localObject;
}
-
}
/**
* @since 1.2
*/
protected void fireDataChannelChanged(Object postedBy, GraphDiff changes) {
- EventManager manager = eventManager();
+ EventManager manager = channel.getEventManager();
if (manager != null) {
GraphEvent e = new GraphEvent(this, postedBy, changes);
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/DataContextQueryAction.java b/cayenne/src/main/java/org/apache/cayenne/access/DataContextQueryAction.java
index 5b836ab8b..749903d8e 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/DataContextQueryAction.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/DataContextQueryAction.java
@@ -86,7 +86,7 @@ class DataContextQueryAction {
runQuery();
List<?> rawIds = response.firstList();
- int maxIdQualifierSize = context.getParentDataDomain().getMaxIdQualifierSize();
+ int maxIdQualifierSize = context.getChannel().getDataDomain().getMaxIdQualifierSize();
IncrementalFaultList<?> paginatedList = createIncrementalFaultList(rawIds, maxIdQualifierSize);
// replace result with a paginated list that will deal with id-to-object resolution
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/HierarchicalObjectResolver.java b/cayenne/src/main/java/org/apache/cayenne/access/HierarchicalObjectResolver.java
index 25363aa81..4a30b6995 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/HierarchicalObjectResolver.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/HierarchicalObjectResolver.java
@@ -157,7 +157,7 @@ class HierarchicalObjectResolver {
return true;
}
- int maxIdQualifierSize = context.getParentDataDomain().getMaxIdQualifierSize();
+ int maxIdQualifierSize = context.getChannel().getDataDomain().getMaxIdQualifierSize();
List<DbJoin> joins = getDbJoins(relationship);
Map<DbJoin, String> joinToDataRowKey = getDataRowKeys(joins, pathPrefix);
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DataContextFactory.java b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DataContextFactory.java
index 97f5aef70..0a17ec501 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DataContextFactory.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DataContextFactory.java
@@ -49,17 +49,11 @@ public class DataContextFactory implements ObjectContextFactory {
@Override
public ObjectContext createContext(DataChannel parent) {
- DataChannel c = parent;
- while (c != null && !(c instanceof DataDomain)) {
- c = c.getParent();
- }
-
- if (c == null) {
+ DataDomain domain = parent.getDataDomain();
+ if (domain == null) {
throw new IllegalArgumentException("Parent DataChannel is not attached to a DataDomain: " + parent);
}
- DataDomain domain = (DataDomain) c;
-
// for new dataRowStores use the same name for all stores it makes it easier to track the event subject
DataRowStore snapshotCache = domain.isSharedCacheEnabled()
? domain.getSharedSnapshotCache()
diff --git a/cayenne/src/test/java/org/apache/cayenne/PregeneratedPKIT.java b/cayenne/src/test/java/org/apache/cayenne/PregeneratedPKIT.java
index b9ab596a5..69a1bb3a3 100644
--- a/cayenne/src/test/java/org/apache/cayenne/PregeneratedPKIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/PregeneratedPKIT.java
@@ -72,7 +72,7 @@ public class PregeneratedPKIT {
void updateId(DataContext context, ObjectId id) throws Exception {
DbEntity entity = context.getEntityResolver().getDbEntity("ARTIST");
- DataNode node = context.getParentDataDomain().lookupDataNode(entity.getDataMap());
+ DataNode node = context.getChannel().getDataDomain().lookupDataNode(entity.getDataMap());
Object pk = node.getPkGenerator().generatePk(
node,
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 6009c7fbd..199dbad90 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackIT.java
@@ -76,6 +76,17 @@ public class DataContextDecoratedStackIT {
}
@Test
+ public void getDataDomain() {
+ DataDomain dd = env.runtime().getDataDomain();
+ DataChannel decorator = new DataChannelDecorator(dd);
+ DataContext context = (DataContext) env.runtime().newContext(decorator);
+
+ assertSame(dd, decorator.getDataDomain());
+ assertSame(dd, context.getChannel().getDataDomain());
+ }
+
+ @Test
+ @SuppressWarnings("removal")
public void getParentDataDomain() {
DataDomain dd = env.runtime().getDataDomain();
DataChannel decorator = new DataChannelDecorator(dd);
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java
index e7d35a042..217072d2e 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java
@@ -244,7 +244,7 @@ public class DataContextExtrasIT {
@Test
public void commitChangesError() {
- DataDomain domain = context.getParentDataDomain();
+ DataDomain domain = context.getChannel().getDataDomain();
// setup mockup PK generator that will blow on PK request
// to emulate an exception
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java
index 0863c1b72..6b0a020e7 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java
@@ -205,7 +205,7 @@ public class DataContextFlattenedAttributesIT {
ColumnSelect<Object[]> originalQuery = ObjectSelect.query(CompoundPaintingLongNames.class)
.columns(CompoundPaintingLongNames.SELF);
- DataNode dataNode = context.getParentDataDomain().getDataNodes().iterator().next();
+ DataNode dataNode = context.getChannel().getDataDomain().getDataNodes().iterator().next();
TranslatedSelect translator =
new DbAdapterDelegatedSelectTranslator().translate(originalQuery, dataNode.getAdapter(), context.getEntityResolver());
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextInvalidateObjectsIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextInvalidateObjectsIT.java
index 396be94f1..9d5e06e28 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextInvalidateObjectsIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextInvalidateObjectsIT.java
@@ -96,22 +96,22 @@ public class DataContextInvalidateObjectsIT {
assertEquals(0, a2.getPaintingArray().size());
assertNotNull(context
- .getParentDataDomain()
+ .getChannel().getDataDomain()
.getSharedSnapshotCache()
.getCachedSnapshot(a1.getObjectId()));
assertNotNull(context
- .getParentDataDomain()
+ .getChannel().getDataDomain()
.getSharedSnapshotCache()
.getCachedSnapshot(a2.getObjectId()));
context.invalidateObjects(artists);
assertNull(context
- .getParentDataDomain()
+ .getChannel().getDataDomain()
.getSharedSnapshotCache()
.getCachedSnapshot(a1.getObjectId()));
assertNull(context
- .getParentDataDomain()
+ .getChannel().getDataDomain()
.getSharedSnapshotCache()
.getCachedSnapshot(a2.getObjectId()));
@@ -139,11 +139,11 @@ public class DataContextInvalidateObjectsIT {
assertSame(a1, p2.getToArtist());
assertNotNull(context
- .getParentDataDomain()
+ .getChannel().getDataDomain()
.getSharedSnapshotCache()
.getCachedSnapshot(p1.getObjectId()));
assertNotNull(context
- .getParentDataDomain()
+ .getChannel().getDataDomain()
.getSharedSnapshotCache()
.getCachedSnapshot(p2.getObjectId()));
@@ -152,11 +152,11 @@ public class DataContextInvalidateObjectsIT {
context.invalidateObjects(paints);
assertNull(context
- .getParentDataDomain()
+ .getChannel().getDataDomain()
.getSharedSnapshotCache()
.getCachedSnapshot(p1.getObjectId()));
assertNull(context
- .getParentDataDomain()
+ .getChannel().getDataDomain()
.getSharedSnapshotCache()
.getCachedSnapshot(p2.getObjectId()));
@@ -181,14 +181,14 @@ public class DataContextInvalidateObjectsIT {
assertEquals(2, a1.getPaintingArray().size());
assertNotNull(context
- .getParentDataDomain()
+ .getChannel().getDataDomain()
.getSharedSnapshotCache()
.getCachedSnapshot(a1.getObjectId()));
context.invalidateObjects(a1);
assertNull(context
- .getParentDataDomain()
+ .getChannel().getDataDomain()
.getSharedSnapshotCache()
.getCachedSnapshot(a1.getObjectId()));
@@ -232,12 +232,12 @@ public class DataContextInvalidateObjectsIT {
assertSame(a1, p1.getToArtist());
assertNotNull(context
- .getParentDataDomain()
+ .getChannel().getDataDomain()
.getSharedSnapshotCache()
.getCachedSnapshot(p1.getObjectId()));
assertNotNull(context
- .getParentDataDomain()
+ .getChannel().getDataDomain()
.getSharedSnapshotCache()
.getCachedSnapshot(p2.getObjectId()));
@@ -246,13 +246,13 @@ public class DataContextInvalidateObjectsIT {
q.cacheStrategy(QueryCacheStrategy.LOCAL_CACHE_REFRESH).select(context);
assertNotNull(context
- .getParentDataDomain()
+ .getChannel().getDataDomain()
.getSharedSnapshotCache()
.getCachedSnapshot(p1.getObjectId()));
// probably refreshed eagerly
assertNotNull(context
- .getParentDataDomain()
+ .getChannel().getDataDomain()
.getSharedSnapshotCache()
.getCachedSnapshot(p2.getObjectId()));
@@ -284,12 +284,12 @@ public class DataContextInvalidateObjectsIT {
assertSame(a1, p1.getToArtist());
assertNotNull(context
- .getParentDataDomain()
+ .getChannel().getDataDomain()
.getSharedSnapshotCache()
.getCachedSnapshot(p1.getObjectId()));
assertNotNull(context
- .getParentDataDomain()
+ .getChannel().getDataDomain()
.getSharedSnapshotCache()
.getCachedSnapshot(p2.getObjectId()));
@@ -298,13 +298,13 @@ public class DataContextInvalidateObjectsIT {
q.cacheStrategy(QueryCacheStrategy.SHARED_CACHE_REFRESH).select(context);
assertNotNull(context
- .getParentDataDomain()
+ .getChannel().getDataDomain()
.getSharedSnapshotCache()
.getCachedSnapshot(p1.getObjectId()));
// probably refreshed eagerly
assertNotNull(context
- .getParentDataDomain()
+ .getChannel().getDataDomain()
.getSharedSnapshotCache()
.getCachedSnapshot(p2.getObjectId()));
@@ -336,12 +336,12 @@ public class DataContextInvalidateObjectsIT {
assertSame(a1, p1.getToArtist());
assertNotNull(context
- .getParentDataDomain()
+ .getChannel().getDataDomain()
.getSharedSnapshotCache()
.getCachedSnapshot(p1.getObjectId()));
assertNotNull(context
- .getParentDataDomain()
+ .getChannel().getDataDomain()
.getSharedSnapshotCache()
.getCachedSnapshot(p2.getObjectId()));
@@ -355,7 +355,7 @@ public class DataContextInvalidateObjectsIT {
assertEquals("c", p2.getToArtist().getArtistName());
// this should invalidate results for the next query run
- context.getParentDataDomain().getQueryCache().removeGroup("X");
+ context.getChannel().getDataDomain().getQueryCache().removeGroup("X");
// this should force a refresh
context.performQuery(q);
@@ -382,38 +382,38 @@ public class DataContextInvalidateObjectsIT {
Painting p2 = a1.getPaintingArray().get(0);
assertNotNull(context
- .getParentDataDomain()
+ .getChannel().getDataDomain()
.getSharedSnapshotCache()
.getCachedSnapshot(a1.getObjectId()));
assertNotNull(context
- .getParentDataDomain()
+ .getChannel().getDataDomain()
.getSharedSnapshotCache()
.getCachedSnapshot(a2.getObjectId()));
assertNotNull(context
- .getParentDataDomain()
+ .getChannel().getDataDomain()
.getSharedSnapshotCache()
.getCachedSnapshot(p1.getObjectId()));
assertNotNull(context
- .getParentDataDomain()
+ .getChannel().getDataDomain()
.getSharedSnapshotCache()
.getCachedSnapshot(p2.getObjectId()));
context.invalidateObjects(context.getObjectStore().registeredNodes());
assertNull(context
- .getParentDataDomain()
+ .getChannel().getDataDomain()
.getSharedSnapshotCache()
.getCachedSnapshot(a1.getObjectId()));
assertNull(context
- .getParentDataDomain()
+ .getChannel().getDataDomain()
.getSharedSnapshotCache()
.getCachedSnapshot(a2.getObjectId()));
assertNull(context
- .getParentDataDomain()
+ .getChannel().getDataDomain()
.getSharedSnapshotCache()
.getCachedSnapshot(p1.getObjectId()));
assertNull(context
- .getParentDataDomain()
+ .getChannel().getDataDomain()
.getSharedSnapshotCache()
.getCachedSnapshot(p2.getObjectId()));
@@ -441,7 +441,7 @@ public class DataContextInvalidateObjectsIT {
assertEquals(PersistenceState.HOLLOW, parentArtist.getPersistenceState());
assertFalse(context.hasChanges());
assertNull(context
- .getParentDataDomain()
+ .getChannel().getDataDomain()
.getSharedSnapshotCache()
.getCachedSnapshot(parentArtist.getObjectId()));
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextQueryCachingIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextQueryCachingIT.java
index 57514bf0a..889552be4 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextQueryCachingIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextQueryCachingIT.java
@@ -62,7 +62,7 @@ public class DataContextQueryCachingIT {
"ARTIST_ID",
"ESTIMATED_PRICE");
- domain = context.getParentDataDomain();
+ domain = context.getChannel().getDataDomain();
}
protected void createInsertDataSet() throws Exception {
@@ -95,7 +95,7 @@ public class DataContextQueryCachingIT {
assertEquals(rows1, resultRows);
QueryMetadata cacheKey = select.getMetaData(context.getEntityResolver());
- assertNull(context.getParentDataDomain().getQueryCache().get(cacheKey));
+ assertNull(context.getChannel().getDataDomain().getQueryCache().get(cacheKey));
assertEquals(rows1, context.getQueryCache().get(cacheKey));
@@ -107,7 +107,7 @@ public class DataContextQueryCachingIT {
List<?> freshResultRows = context.performQuery(select);
assertEquals(1, engine.getRunCount());
assertEquals(rows2, freshResultRows);
- assertNull(context.getParentDataDomain().getQueryCache().get(cacheKey));
+ assertNull(context.getChannel().getDataDomain().getQueryCache().get(cacheKey));
assertEquals(rows2, context.getQueryCache().get(cacheKey));
} finally {
engine.stopInterceptNode();
@@ -132,7 +132,7 @@ public class DataContextQueryCachingIT {
QueryMetadata cacheKey = select.getMetaData(context.getEntityResolver());
- assertEquals(rows1, context.getParentDataDomain().getQueryCache().get(
+ assertEquals(rows1, context.getChannel().getDataDomain().getQueryCache().get(
cacheKey));
assertNull(context.getQueryCache().get(cacheKey));
@@ -145,7 +145,7 @@ public class DataContextQueryCachingIT {
List<?> freshResultRows = context.performQuery(select);
assertEquals(1, engine.getRunCount());
assertEquals(rows2, freshResultRows);
- assertEquals(rows2, context.getParentDataDomain().getQueryCache().get(
+ assertEquals(rows2, context.getChannel().getDataDomain().getQueryCache().get(
cacheKey));
assertNull(context.getQueryCache().get(cacheKey));
} finally {
@@ -170,7 +170,7 @@ public class DataContextQueryCachingIT {
assertEquals(2, resultRows.size());
assertTrue(resultRows.get(0) instanceof Persistent);
QueryMetadata cacheKey = select.getMetaData(context.getEntityResolver());
- assertNull(context.getParentDataDomain().getQueryCache().get(cacheKey));
+ assertNull(context.getChannel().getDataDomain().getQueryCache().get(cacheKey));
assertEquals(resultRows, context.getQueryCache().get(cacheKey));
@@ -184,7 +184,7 @@ public class DataContextQueryCachingIT {
assertEquals(1, engine.getRunCount());
assertEquals(4, freshResultRows.size());
assertTrue(resultRows.get(0) instanceof Persistent);
- assertNull(context.getParentDataDomain().getQueryCache().get(cacheKey));
+ assertNull(context.getChannel().getDataDomain().getQueryCache().get(cacheKey));
assertEquals(freshResultRows, context.getQueryCache().get(cacheKey));
} finally {
engine.stopInterceptNode();