(cayenne) 01/02: CAY-2829 Merge `BaseContext` with `DataContext` and deprecate it - Remove usage of `BaseContext`

[ntimofeev]

This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git

commit 8ee1db6b8ab60bde81ca480d473e32b2bfda5b6c
Author: stariy95 <stari...@gmail.com>
AuthorDate: Mon Dec 4 17:02:58 2023 +0400

    CAY-2829 Merge `BaseContext` with `DataContext` and deprecate it
     - Remove usage of `BaseContext`
---
 .../main/java/org/apache/cayenne/util/ObjectContextQueryAction.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/cayenne/src/main/java/org/apache/cayenne/util/ObjectContextQueryAction.java 
b/cayenne/src/main/java/org/apache/cayenne/util/ObjectContextQueryAction.java
index 5487a4b08..0efab27c0 100644
--- 
a/cayenne/src/main/java/org/apache/cayenne/util/ObjectContextQueryAction.java
+++ 
b/cayenne/src/main/java/org/apache/cayenne/util/ObjectContextQueryAction.java
@@ -25,12 +25,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.cayenne.BaseContext;
 import org.apache.cayenne.ObjectContext;
 import org.apache.cayenne.ObjectId;
 import org.apache.cayenne.PersistenceState;
 import org.apache.cayenne.Persistent;
 import org.apache.cayenne.QueryResponse;
+import org.apache.cayenne.access.DataContext;
 import org.apache.cayenne.cache.QueryCache;
 import org.apache.cayenne.cache.QueryCacheEntryFactory;
 import org.apache.cayenne.map.EntityInheritanceTree;
@@ -321,7 +321,7 @@ public abstract class ObjectContextQueryAction {
                          * nested contexts).
                          */
                         if (((Persistent) object).getPersistenceState() == 
PersistenceState.NEW
-                                && !(actingContext.getChannel() instanceof 
BaseContext)) {
+                                && !(actingContext.getChannel() instanceof 
ObjectContext)) {
                             this.response = new ListResponse();
                             return DONE;
                         }
@@ -389,7 +389,7 @@ public abstract class ObjectContextQueryAction {
      * @since 3.0
      */
     protected QueryCache getQueryCache() {
-        return ((BaseContext) actingContext).getQueryCache();
+        return ((DataContext) actingContext).getQueryCache();
     }
 
     /**