This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch past-M2 in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit a74dfaa303311c8e3edb6f3d9ad1c18565f111be Author: Andrus Adamchik <[email protected]> AuthorDate: Sun Jun 14 17:52:38 2026 -0400 Removing deprecated DataContext.transactionFactory property --- .../java/org/apache/cayenne/access/DataContext.java | 19 ------------------- .../java/org/apache/cayenne/access/DataDomain.java | 11 +++++++++++ .../apache/cayenne/access/DataDomainQueryAction.java | 2 +- .../configuration/runtime/DataContextFactory.java | 8 +------- 4 files changed, 13 insertions(+), 27 deletions(-) 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 97d81920d..bc479d2fa 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/DataContext.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/DataContext.java @@ -61,7 +61,6 @@ import org.apache.cayenne.reflect.PropertyVisitor; import org.apache.cayenne.reflect.ToManyProperty; import org.apache.cayenne.reflect.ToOneProperty; import org.apache.cayenne.runtime.CayenneRuntime; -import org.apache.cayenne.tx.TransactionFactory; import org.apache.cayenne.util.EventUtil; import org.apache.cayenne.util.GenericResponse; import org.apache.cayenne.util.Util; @@ -150,8 +149,6 @@ public class DataContext implements ObjectContext { protected transient QueryCache queryCache; protected transient EntityResolver entityResolver; - protected transient TransactionFactory transactionFactory; - protected transient DataContextMergeHandler mergeHandler; protected boolean validatingObjectsOnCommit = true; @@ -228,7 +225,6 @@ public class DataContext implements ObjectContext { protected void attachToRuntime(Injector injector) { attachToChannel(injector.getInstance(DataChannel.class)); setQueryCache(new NestedQueryCache(injector.getInstance(QueryCache.class))); - this.transactionFactory = injector.getInstance(TransactionFactory.class); } /** @@ -1398,21 +1394,6 @@ public class DataContext implements ObjectContext { } } - TransactionFactory getTransactionFactory() { - attachToRuntimeIfNeeded(); - return transactionFactory; - } - - /** - * @since 4.0 - * @deprecated avoid using this directly. Transaction management - * at this level will be eventually removed - */ - @Deprecated - public void setTransactionFactory(TransactionFactory transactionFactory) { - this.transactionFactory = transactionFactory; - } - @Override public <T> ResultBatchIterator<T> batchIterator(Select<T> query, int size) { return new ResultBatchIterator<T>(iterator(query), size); 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 9f963ae5e..904b70388 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/DataDomain.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/DataDomain.java @@ -44,6 +44,7 @@ import org.apache.cayenne.map.EntitySorter; import org.apache.cayenne.query.Query; import org.apache.cayenne.tx.BaseTransaction; import org.apache.cayenne.tx.Transaction; +import org.apache.cayenne.tx.TransactionFactory; import org.apache.cayenne.tx.TransactionManager; import org.apache.cayenne.util.ToStringBuilder; @@ -80,6 +81,12 @@ public class DataDomain implements DataChannel { @Inject protected TransactionManager transactionManager; + /** + * @since 5.0 + */ + @Inject + protected TransactionFactory transactionFactory; + /** * @since 4.0 */ @@ -766,6 +773,10 @@ public class DataDomain implements DataChannel { return transactionManager; } + TransactionFactory getTransactionFactory() { + return transactionFactory; + } + AdhocObjectFactory getObjectFactory() { return objectFactory; } diff --git a/cayenne/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java b/cayenne/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java index fd1dd1475..95c616dd2 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java @@ -178,7 +178,7 @@ class DataDomainQueryAction implements QueryRouter, OperationObserver { if (tx != null) { runIteratedQuery(tx); } else { - tx = context.getTransactionFactory().createTransaction(); + tx = domain.getTransactionFactory().createTransaction(); BaseTransaction.bindThreadTransaction(tx); try { runIteratedQuery(tx); 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 305f8baa2..4416f5074 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 @@ -31,7 +31,6 @@ import org.apache.cayenne.configuration.ObjectContextFactory; import org.apache.cayenne.configuration.ObjectStoreFactory; import org.apache.cayenne.di.Inject; import org.apache.cayenne.event.EventManager; -import org.apache.cayenne.tx.TransactionFactory; /** * @since 3.1 @@ -52,9 +51,6 @@ public class DataContextFactory implements ObjectContextFactory { @Inject protected QueryCache queryCache; - - @Inject - protected TransactionFactory transactionFactory; @Override public ObjectContext createContext() { @@ -101,7 +97,6 @@ public class DataContextFactory implements ObjectContextFactory { context.setValidatingObjectsOnCommit(parent.isValidatingObjectsOnCommit()); context.setUsingSharedSnapshotCache(parent.isUsingSharedSnapshotCache()); context.setQueryCache(new NestedQueryCache(queryCache)); - context.setTransactionFactory(transactionFactory); return context; } @@ -118,10 +113,9 @@ public class DataContextFactory implements ObjectContextFactory { parent, objectStoreFactory.createObjectStore(snapshotCache)); context.setValidatingObjectsOnCommit(parent.isValidatingObjectsOnCommit()); context.setQueryCache(new NestedQueryCache(queryCache)); - context.setTransactionFactory(transactionFactory); return context; } - + protected DataContext newInstance(DataChannel parent, ObjectStore objectStore) { return new DataContext(parent, objectStore); }
