CAY-2689 ServerRuntime API: missing some variants of the performInTransaction() method

Author: stariy95

RELEASE-NOTES.txt

@@ -13,6 +13,8 @@ Date:
 ----------------------------------
 Changes/New Features:
 
+CAY-2689 ServerRuntime API: missing some variants of the performInTransaction() method
+
 Bug Fixes:
 
 CAY-2683 Don't use DISTINCT for joins on to-one related tables

cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java

@@ -21,18 +21,15 @@
 import org.apache.cayenne.access.DataDomain;
 import org.apache.cayenne.access.DataNode;
 import org.apache.cayenne.configuration.CayenneRuntime;
-import org.apache.cayenne.di.ListBuilder;
 import org.apache.cayenne.di.Module;
+import org.apache.cayenne.tx.TransactionDescriptor;
 import org.apache.cayenne.tx.TransactionListener;
 import org.apache.cayenne.tx.TransactionManager;
 import org.apache.cayenne.tx.TransactionalOperation;
 
 import javax.sql.DataSource;
-import java.util.ArrayList;
 import java.util.Collection;
 
-import static java.util.Arrays.asList;
-
 /**
  * Object representing Cayenne stack. Serves as an entry point to Cayenne for user applications and a factory of ObjectContexts.
  * Implementation is a thin wrapper of the dependency injection container.
@@ -105,6 +102,47 @@ public <T> T performInTransaction(TransactionalOperation<T> op, TransactionListe
         return tm.performInTransaction(op, callback);
     }
 
+    /**
+     * Runs provided operation wrapped in a single transaction. Transaction
+     * handling delegated to the internal {@link TransactionManager}. Nested
+     * calls to 'performInTransaction' are safe and attached to the same
+     * in-progress transaction. TransactionalOperation can be some arbitrary
+     * user code, which most often than not will consist of multiple Cayenne
+     * operations.
+     *
+     * @param op         an operation to perform within the transaction.
+     * @param descriptor describes additional transaction parameters
+     * @param <T> result type
+     * @return a value returned by the "op" operation.
+     *
+     * @since 4.2
+     */
+    public <T> T performInTransaction(TransactionalOperation<T> op, TransactionDescriptor descriptor) {
+        TransactionManager tm = injector.getInstance(TransactionManager.class);
+        return tm.performInTransaction(op, descriptor);
+    }
+
+    /**
+     * Runs provided operation wrapped in a single transaction. Transaction
+     * handling delegated to the internal {@link TransactionManager}. Nested
+     * calls to 'performInTransaction' are safe and attached to the same
+     * in-progress transaction. TransactionalOperation can be some arbitrary
+     * user code, which most often than not will consist of multiple Cayenne
+     * operations.
+     *
+     * @param op         an operation to perform within the transaction.
+     * @param callback   a callback to notify as transaction progresses through stages.
+     * @param descriptor describes additional transaction parameters
+     * @param <T> returned value type
+     * @return a value returned by the "op" operation.
+     *
+     * @since 4.2
+     */
+    public <T> T performInTransaction(TransactionalOperation<T> op, TransactionListener callback, TransactionDescriptor descriptor) {
+        TransactionManager tm = injector.getInstance(TransactionManager.class);
+        return tm.performInTransaction(op, callback, descriptor);
+    }
+
     /**
      * Returns the main runtime DataDomain. Note that by default the returned
      * DataDomain is the same as the main DataChannel returned by