服务引擎使用融合性事务

Author: zhongxunking

common/src/main/java/org/bekit/common/transaction/TxExecutor.java

@@ -17,16 +17,20 @@
  * 事务执行器
  */
 public class TxExecutor {
-    // 事务定义（传播行为是REQUIRES_NEW，即每次都开启一个新事务）
-    private static final TransactionDefinition TX_DEFINITION = new DefaultTransactionDefinition(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
-
-    // 事务管理器
-    private PlatformTransactionManager transactionManager;
     // 事务持有器
-    private ThreadLocal<TransactionStatus> txStatusHolder = new ThreadLocal<>();
+    private final ThreadLocal<TransactionStatus> txStatusHolder = new ThreadLocal<>();
+    // 事务管理器
+    private final PlatformTransactionManager transactionManager;
+    // 事务定义
+    private final TransactionDefinition txDefinition;
 
-    public TxExecutor(PlatformTransactionManager transactionManager) {
+    public TxExecutor(PlatformTransactionManager transactionManager, boolean newTx) {
         this.transactionManager = transactionManager;
+        if (newTx) {
+            txDefinition = new DefaultTransactionDefinition(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
+        } else {
+            txDefinition = new DefaultTransactionDefinition(TransactionDefinition.PROPAGATION_REQUIRED);
+        }
     }
 
     /**
@@ -35,10 +39,12 @@ public TxExecutor(PlatformTransactionManager transactionManager) {
      * @throws IllegalStateException 如果已存在事务
      */
     public void createTx() {
-        if (txStatusHolder.get() != null) {
-            throw new IllegalStateException("本线程事务已存在，不能同时创建多个事务");
+        TransactionStatus txStatus = txStatusHolder.get();
+        if (txStatus != null) {
+            throw new IllegalStateException("事务已存在，不能同时创建多个事务");
         }
-        txStatusHolder.set(transactionManager.getTransaction(TX_DEFINITION));
+        txStatus = transactionManager.getTransaction(txDefinition);
+        txStatusHolder.set(txStatus);
     }
 
     /**
@@ -47,11 +53,12 @@ public void createTx() {
      * @throws IllegalStateException 如果不存在事务
      */
     public void commitTx() {
-        if (txStatusHolder.get() == null) {
+        TransactionStatus txStatus = txStatusHolder.get();
+        if (txStatus == null) {
             throw new IllegalStateException("事务不存在，无法提交事务");
         }
-        transactionManager.commit(txStatusHolder.get());
         txStatusHolder.remove();
+        transactionManager.commit(txStatus);
     }
 
     /**
@@ -60,11 +67,12 @@ public void commitTx() {
      * @throws IllegalStateException 如果不存在事务
      */
     public void rollbackTx() {
-        if (txStatusHolder.get() == null) {
+        TransactionStatus txStatus = txStatusHolder.get();
+        if (txStatus == null) {
             throw new IllegalStateException("事务不存在，无法回滚事务");
         }
-        transactionManager.rollback(txStatusHolder.get());
         txStatusHolder.remove();
+        transactionManager.rollback(txStatus);
     }
 
     /**

flow/src/main/java/org/bekit/flow/transaction/FlowTxExecutor.java

@@ -38,7 +38,7 @@ public class FlowTxExecutor extends TxExecutor {
     private Map<Class, FlowTxOperateExecutor> operateExecutorMap = new HashMap<>();
 
     public FlowTxExecutor(String flow, Object flowTx, PlatformTransactionManager transactionManager) {
-        super(transactionManager);
+        super(transactionManager, true);
         this.flow = flow;
         this.flowTx = flowTx;
     }

service/src/main/java/org/bekit/service/service/ServiceParser.java

@@ -54,7 +54,7 @@ public static ServiceExecutor parseService(Object service, PlatformTransactionMa
             if (transactionManager == null) {
                 throw new IllegalArgumentException("服务" + serviceAnnotation.name() + "的enableTx属性为开启状态，但不存在事务管理器（PlatformTransactionManager），请检查是否有配置spring事务管理器");
             }
-            serviceExecutor.setTxExecutor(new TxExecutor(transactionManager));
+            serviceExecutor.setTxExecutor(new TxExecutor(transactionManager, false));
         }
         for (Method method : serviceClass.getDeclaredMethods()) {
             for (Class clazz : ServiceExecutor.SERVICE_PHASE_ANNOTATIONS) {