From acf1106beea664c4e619b482a87dd6f61f803775 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=80=E6=BA=90=E6=B5=B7=E5=93=A5?= Date: Sun, 16 Apr 2023 18:17:58 +0800 Subject: [PATCH] add FlexTransactionManager; close #I6V7XN --- .../transaction/TransactionalManager.java | 8 +- .../spring/boot/DbAutoConfiguration.java | 14 +++- .../spring/FlexTransactionManager.java | 81 +++++++++++++++++++ .../test/controller/AccountController.java | 36 ++++++++- .../test/service/AccountService.java | 26 ++++++ .../src/main/resources/application.yml | 1 - 6 files changed, 157 insertions(+), 9 deletions(-) create mode 100644 mybatis-flex-spring/src/main/java/com/mybatisflex/spring/FlexTransactionManager.java create mode 100644 mybatis-flex-test/mybatis-flex-spring-boot-test/src/main/java/com/mybatisflex/test/service/AccountService.java diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/transaction/TransactionalManager.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/transaction/TransactionalManager.java index ac5cf941..0ca70550 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/transaction/TransactionalManager.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/transaction/TransactionalManager.java @@ -124,20 +124,20 @@ public class TransactionalManager { } private static Boolean execNewTransactional(Supplier supplier) { - String xid = TransactionalManager.startTransactional(); + String xid = startTransactional(); Boolean success = false; boolean rollbacked = false; try { success = supplier.get(); } catch (Exception e) { rollbacked = true; - TransactionalManager.rollback(xid); + rollback(xid); throw new TransactionException(e.getMessage(), e); } finally { if (success != null && success) { - TransactionalManager.commit(xid); + commit(xid); } else if (!rollbacked) { - TransactionalManager.rollback(xid); + rollback(xid); } } return success; diff --git a/mybatis-flex-spring-boot-starter/src/main/java/com/mybatisflex/spring/boot/DbAutoConfiguration.java b/mybatis-flex-spring-boot-starter/src/main/java/com/mybatisflex/spring/boot/DbAutoConfiguration.java index b3886b3f..f76f4469 100644 --- a/mybatis-flex-spring-boot-starter/src/main/java/com/mybatisflex/spring/boot/DbAutoConfiguration.java +++ b/mybatis-flex-spring-boot-starter/src/main/java/com/mybatisflex/spring/boot/DbAutoConfiguration.java @@ -17,10 +17,13 @@ package com.mybatisflex.spring.boot; import com.mybatisflex.core.FlexGlobalConfig; import com.mybatisflex.core.row.Db; +import com.mybatisflex.spring.FlexTransactionManager; import com.mybatisflex.spring.SpringRowSessionManager; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.context.annotation.Configuration; +import org.springframework.transaction.TransactionManager; +import org.springframework.transaction.annotation.TransactionManagementConfigurer; import java.util.logging.Level; import java.util.logging.Logger; @@ -28,7 +31,7 @@ import java.util.logging.Logger; @ConditionalOnClass(Db.class) @Configuration(proxyBeanMethods = false) @AutoConfigureAfter({MybatisFlexAutoConfiguration.class}) -public class DbAutoConfiguration { +public class DbAutoConfiguration implements TransactionManagementConfigurer { public DbAutoConfiguration() { FlexGlobalConfig defaultConfig = FlexGlobalConfig.getDefaultConfig(); @@ -39,4 +42,13 @@ public class DbAutoConfiguration { Db.invoker().setRowSessionManager(new SpringRowSessionManager()); } } + + + @Override + public TransactionManager annotationDrivenTransactionManager() { + return new FlexTransactionManager(); + } + + + } diff --git a/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/FlexTransactionManager.java b/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/FlexTransactionManager.java new file mode 100644 index 00000000..aa5e02d2 --- /dev/null +++ b/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/FlexTransactionManager.java @@ -0,0 +1,81 @@ +/** + * Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com). + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.mybatisflex.spring; + +import com.mybatisflex.core.transaction.TransactionContext; +import com.mybatisflex.core.transaction.TransactionalManager; +import com.mybatisflex.core.util.StringUtil; +import org.springframework.transaction.TransactionDefinition; +import org.springframework.transaction.TransactionException; +import org.springframework.transaction.support.AbstractPlatformTransactionManager; +import org.springframework.transaction.support.DefaultTransactionStatus; + +public class FlexTransactionManager extends AbstractPlatformTransactionManager { + + @Override + protected Object doGetTransaction() throws TransactionException { + return new TransactionObject(TransactionContext.getXID()); + } + + @Override + protected boolean isExistingTransaction(Object transaction) throws TransactionException { + TransactionObject transactionObject = (TransactionObject) transaction; + return StringUtil.isNotBlank(transactionObject.prevXid); + } + + @Override + protected Object doSuspend(Object transaction) throws TransactionException { + TransactionContext.release(); + TransactionObject transactionObject = (TransactionObject) transaction; + return transactionObject.prevXid; + } + + @Override + protected void doResume(Object transaction, Object suspendedResources) throws TransactionException { + String xid = (String) suspendedResources; + TransactionContext.hold(xid); + } + + @Override + protected void doBegin(Object transaction, TransactionDefinition definition) throws TransactionException { + TransactionObject transactionObject = (TransactionObject) transaction; + transactionObject.currentXid = TransactionalManager.startTransactional(); + } + + @Override + protected void doCommit(DefaultTransactionStatus status) throws TransactionException { + TransactionObject transactionObject = (TransactionObject) status.getTransaction(); + TransactionalManager.commit(transactionObject.currentXid); + } + + @Override + protected void doRollback(DefaultTransactionStatus status) throws TransactionException { + TransactionObject transactionObject = (TransactionObject) status.getTransaction(); + TransactionalManager.rollback(transactionObject.currentXid); + } + + + static class TransactionObject { + + private final String prevXid; + private String currentXid; + + public TransactionObject(String prevXid) { + this.prevXid = prevXid; + } + } + +} diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-test/src/main/java/com/mybatisflex/test/controller/AccountController.java b/mybatis-flex-test/mybatis-flex-spring-boot-test/src/main/java/com/mybatisflex/test/controller/AccountController.java index 1ce2cee3..7ad7b89c 100644 --- a/mybatis-flex-test/mybatis-flex-spring-boot-test/src/main/java/com/mybatisflex/test/controller/AccountController.java +++ b/mybatis-flex-test/mybatis-flex-spring-boot-test/src/main/java/com/mybatisflex/test/controller/AccountController.java @@ -19,9 +19,11 @@ import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.test.mapper.AccountMapper; import com.mybatisflex.test.model.Account; -import org.springframework.beans.factory.annotation.Autowired; +import com.mybatisflex.test.service.AccountService; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -29,10 +31,14 @@ import java.util.stream.Collectors; @RestController public class AccountController { - @Autowired + @Resource AccountMapper accountMapper; + @Resource + AccountService accountService; + + @PostMapping("/account/add") String add(@RequestBody Account account){ accountMapper.insert(account); @@ -41,11 +47,35 @@ public class AccountController { @GetMapping("/account/{id}") - Account selectOne(@PathVariable("id") Long id) { + @Transactional + public Account selectOne(@PathVariable("id") Long id) { + + Account account = new Account(); + account.setId(1L); + account.setUserName("heihei"); + accountMapper.update(account); + + + accountService.update2(); + +// update2(); + + return accountMapper.selectOneById(id); } +// +// @Transactional(propagation = Propagation.REQUIRES_NEW) +// @GetMapping("/account/uuu") +// public void update2(){ +// Account account = new Account(); +// account.setId(2L); +// account.setUserName("haha"); +// accountMapper.update(account); +// } + + @GetMapping("/selectListByIds/{id}") List selectListByIds(@PathVariable("id") String id) { List ids = Arrays.stream(id.split(",")).mapToLong(Long::parseLong).boxed().collect(Collectors.toList()); diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-test/src/main/java/com/mybatisflex/test/service/AccountService.java b/mybatis-flex-test/mybatis-flex-spring-boot-test/src/main/java/com/mybatisflex/test/service/AccountService.java new file mode 100644 index 00000000..961d4945 --- /dev/null +++ b/mybatis-flex-test/mybatis-flex-spring-boot-test/src/main/java/com/mybatisflex/test/service/AccountService.java @@ -0,0 +1,26 @@ +package com.mybatisflex.test.service; + +import com.mybatisflex.test.mapper.AccountMapper; +import com.mybatisflex.test.model.Account; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; + +@Component +public class AccountService { + + + @Resource + AccountMapper accountMapper; + + + @Transactional(propagation = Propagation.REQUIRES_NEW) + public void update2() { + Account account = new Account(); + account.setId(2L); + account.setUserName("haha"); + accountMapper.update(account); + } +} diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-test/src/main/resources/application.yml b/mybatis-flex-test/mybatis-flex-spring-boot-test/src/main/resources/application.yml index 8c0f0a71..717a1fcf 100644 --- a/mybatis-flex-test/mybatis-flex-spring-boot-test/src/main/resources/application.yml +++ b/mybatis-flex-test/mybatis-flex-spring-boot-test/src/main/resources/application.yml @@ -4,7 +4,6 @@ spring: console: enabled: true datasource: - url: jdbc:h2:mem:testdb driver-class-name: org.h2.Driver username: sa password: