You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by wu...@apache.org on 2021/08/29 03:56:31 UTC
[shardingsphere] branch master updated: Unify class name of
transaction module (#12084)
This is an automated email from the ASF dual-hosted git repository.
wuweijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new d19a34f Unify class name of transaction module (#12084)
d19a34f is described below
commit d19a34f471034ad6f640477ee180752c9b37dfe8
Author: Liang Zhang <te...@163.com>
AuthorDate: Sun Aug 29 11:55:51 2021 +0800
Unify class name of transaction module (#12084)
* Rename ShardingSphereTransactionManagerEngine
* Unify class name of transaction module
---
RELEASE-NOTES.md | 2 +-
docs/document/content/dev-manual/transaction.cn.md | 22 ++++----
docs/document/content/dev-manual/transaction.en.md | 16 +++---
.../transaction/principle/2pc-xa-transaction.cn.md | 8 +--
.../transaction/principle/2pc-xa-transaction.en.md | 10 ++--
.../principle/base-transaction-seata.en.md | 4 +-
docs/document/content/others/faq/_index.en.md | 2 +-
.../usage/transaction/spring-boot-starter.cn.md | 2 +-
.../usage/transaction/spring-boot-starter.en.md | 2 +-
.../usage/transaction/spring-namespace.cn.md | 4 +-
.../usage/transaction/spring-namespace.en.md | 4 +-
.../shardingsphere-proxy/usage/transaction.cn.md | 2 +-
.../shardingsphere-proxy/usage/transaction.en.md | 2 +-
.../transaction/xa/spring/boot/XAOrderService.java | 6 +--
.../xa/spring/namspace/XAOrderService.java | 6 +--
.../seata/spring/boot/SeataATOrderService.java | 6 +--
.../core/connection/ShardingSphereConnection.java | 28 +++++-----
.../driver/executor/AbstractBaseExecutorTest.java | 4 +-
.../connection/ShardingSphereConnectionTest.java | 24 ++++-----
.../datasource/ShardingSphereDataSourceTest.java | 6 +--
...ctShardingSphereTransactionManagerFixture.java} | 4 +-
...SEShardingSphereTransactionManagerFixture.java} | 2 +-
...XAShardingSphereTransactionManagerFixture.java} | 2 +-
...ansaction.spi.ShardingSphereTransactionManager} | 4 +-
.../boot/ShardingSphereAutoConfiguration.java | 6 +--
...TransactionTypeScannerBeanDefinitionParser.java | 4 +-
.../namespace/AbstractSpringNamespaceTest.java | 6 +--
...ypeAdvisor.java => TransactionTypeAdvisor.java} | 14 ++---
...ceptor.java => TransactionTypeInterceptor.java} | 22 ++++----
...ypeScanner.java => TransactionTypeScanner.java} | 8 +--
...erTest.java => TransactionTypeScannerTest.java} | 6 +--
.../fixture/FixtureSpringConfiguration.java | 10 ++--
.../spring/transaction/fixture/MockService.java | 8 +--
.../manager/cluster/ClusterContextManager.java | 12 ++---
.../cluster/ClusterContextManagerBuilder.java | 6 +--
.../manager/cluster/ClusterContextManagerTest.java | 8 +--
.../memory/MemoryContextManagerBuilder.java | 6 +--
.../StandaloneContextManagerBuilder.java | 6 +--
.../jdbc/datasource/JDBCBackendDataSource.java | 10 ++--
.../transaction/BackendTransactionManager.java | 28 +++++-----
.../TextProtocolBackendHandlerFactoryTest.java | 4 +-
.../jdbc/connection/BackendConnectionTest.java | 4 +-
.../jdbc/datasource/JDBCBackendDataSourceTest.java | 4 +-
.../transaction/BackendTransactionManagerTest.java | 20 +++----
.../manager/BitronixXATransactionManager.java | 2 +-
...ava => XAShardingSphereTransactionManager.java} | 6 +--
...ansaction.spi.ShardingSphereTransactionManager} | 2 +-
...=> XAShardingSphereTransactionManagerTest.java} | 62 +++++++++++-----------
...> SeataATShardingSphereTransactionManager.java} | 8 +--
...ansaction.spi.ShardingSphereTransactionManager} | 2 +-
...ataATShardingSphereTransactionManagerTest.java} | 28 +++++-----
...=> ShardingSphereTransactionManagerEngine.java} | 38 ++++++-------
...ype.java => ShardingSphereTransactionType.java} | 9 ++--
.../transaction/context/TransactionContexts.java | 6 +--
....java => ShardingSphereTransactionManager.java} | 6 +--
...hardingSphereTransactionManagerEngineTest.java} | 14 ++---
.../context/TransactionContextsTest.java | 22 ++++----
...erShardingSphereTransactionManagerFixture.java} | 4 +-
...> ShardingSphereTransactionManagerFixture.java} | 4 +-
...ansaction.spi.ShardingSphereTransactionManager} | 4 +-
.../src/test/resources/logback-test.xml | 2 +-
61 files changed, 291 insertions(+), 292 deletions(-)
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index a640376..a7187a3 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -172,7 +172,7 @@
1. Use multiple threads to load metadata for different data sources
1. Support `allow.range.query.with.inline.sharding` option
1. The docker of ShardingSphere-Proxy supports loading external lib packages
-1. Support integration with Spring using @ShardingTransactionType
+1. Support integration with Spring using @ShardingSphereTransactionType
1. Enhance ShardingDataSource to compatible with Seata in micro-service distribution transaction
### Refactor
diff --git a/docs/document/content/dev-manual/transaction.cn.md b/docs/document/content/dev-manual/transaction.cn.md
index 3e132c6..cb107c2 100644
--- a/docs/document/content/dev-manual/transaction.cn.md
+++ b/docs/document/content/dev-manual/transaction.cn.md
@@ -5,24 +5,24 @@ weight = 8
chapter = true
+++
-## ShardingTransactionManager
+## ShardingSphereTransactionManager
-| *SPI 名称* | *详细说明* |
-| --------------------------------- | -------------------------- |
-| ShardingTransactionManager | 分布式事务管理器 |
+| *SPI 名称* | *详细说明* |
+| ---------------------------------------- | ------------------------- |
+| ShardingSphereTransactionManager | 分布式事务管理器 |
-| *已知实现类* | *详细说明* |
-| --------------------------------- | -------------------------- |
-| XAShardingTransactionManager | 基于 XA 的分布式事务管理器 |
-| SeataATShardingTransactionManager | 基于 Seata 的分布式事务管理器 |
+| *已知实现类* | *详细说明* |
+| ---------------------------------------- | -------------------------- |
+| XAShardingSphereTransactionManager | 基于 XA 的分布式事务管理器 |
+| SeataATShardingSphereTransactionManager | 基于 Seata 的分布式事务管理器 |
## XATransactionManager
-| *SPI 名称* | *详细说明* |
-| ---------------------------- | --------------------------------- |
+| *SPI 名称* | *详细说明* |
+| ---------------------------- | -------------------------------- |
| XATransactionManager | XA分布式事务管理器 |
-| *已知实现类* | *详细说明* |
+| *已知实现类* | *详细说明* |
| ---------------------------- | --------------------------------- |
| AtomikosTransactionManager | 基于 Atomikos 的 XA 分布式事务管理器 |
| NarayanaXATransactionManager | 基于 Narayana 的 XA 分布式事务管理器 |
diff --git a/docs/document/content/dev-manual/transaction.en.md b/docs/document/content/dev-manual/transaction.en.md
index 65012fa..b195e95 100644
--- a/docs/document/content/dev-manual/transaction.en.md
+++ b/docs/document/content/dev-manual/transaction.en.md
@@ -5,16 +5,16 @@ weight = 8
chapter = true
+++
-## ShardingTransactionManager
+## ShardingSphereTransactionManager
-| *SPI Name* | *Description* |
-| --------------------------------- | ------------------------------------- |
-| ShardingTransactionManager | Distributed transaction manager |
+| *SPI Name* | *Description* |
+| ---------------------------------------- | ------------------------------------- |
+| ShardingSphereTransactionManager | Distributed transaction manager |
-| *Implementation Class* | *Description* |
-| --------------------------------- | ------------------------------------- |
-| XAShardingTransactionManager | XA distributed transaction manager |
-| SeataATShardingTransactionManager | Seata distributed transaction manager |
+| *Implementation Class* | *Description* |
+| ---------------------------------------- | ------------------------------------- |
+| XAShardingSphereTransactionManager | XA distributed transaction manager |
+| SeataATShardingSphereTransactionManager | Seata distributed transaction manager |
## XATransactionManager
diff --git a/docs/document/content/features/transaction/principle/2pc-xa-transaction.cn.md b/docs/document/content/features/transaction/principle/2pc-xa-transaction.cn.md
index 77db391..a782e23 100644
--- a/docs/document/content/features/transaction/principle/2pc-xa-transaction.cn.md
+++ b/docs/document/content/features/transaction/principle/2pc-xa-transaction.cn.md
@@ -3,18 +3,18 @@ title = "XA两阶段事务"
weight = 2
+++
-`XAShardingTransactionManager` 为Apache ShardingSphere 的分布式事务的XA实现类。
+`XAShardingSphereTransactionManager` 为A pache ShardingSphere 的分布式事务的 XA 实现类。
它主要负责对多数据源进行管理和适配，并且将相应事务的开启、提交和回滚操作委托给具体的 XA 事务管理器。
## 开启全局事务
-收到接入端的 `set autoCommit=0` 时，`XAShardingTransactionManager` 将调用具体的 XA 事务管理器开启 XA 全局事务，以 XID 的形式进行标记。
+收到接入端的 `set autoCommit=0` 时，`XAShardingSphereTransactionManager` 将调用具体的 XA 事务管理器开启 XA 全局事务，以 XID 的形式进行标记。
## 执行真实分片SQL
-`XAShardingTransactionManager`将数据库连接所对应的 XAResource 注册到当前 XA 事务中之后，事务管理器会在此阶段发送 `XAResource.start` 命令至数据库。
+`XAShardingSphereTransactionManager` 将数据库连接所对应的 XAResource 注册到当前 XA 事务中之后，事务管理器会在此阶段发送 `XAResource.start` 命令至数据库。
数据库在收到 `XAResource.end` 命令之前的所有 SQL 操作，会被标记为 XA 事务。
例如:
@@ -30,7 +30,7 @@ XAResource1.end ## 提交阶段执行
## 提交或回滚事务
-`XAShardingTransactionManager` 在接收到接入端的提交命令后，会委托实际的 XA 事务管理进行提交动作，
+`XAShardingSphereTransactionManager` 在接收到接入端的提交命令后，会委托实际的 XA 事务管理进行提交动作，
事务管理器将收集到的当前线程中所有注册的 XAResource，并发送 `XAResource.end` 指令，用以标记此 XA 事务边界。
接着会依次发送 `prepare` 指令，收集所有参与 XAResource 投票。
若所有 XAResource 的反馈结果均为正确，则调用 `commit` 指令进行最终提交；
diff --git a/docs/document/content/features/transaction/principle/2pc-xa-transaction.en.md b/docs/document/content/features/transaction/principle/2pc-xa-transaction.en.md
index 7a68626..4e351b9 100644
--- a/docs/document/content/features/transaction/principle/2pc-xa-transaction.en.md
+++ b/docs/document/content/features/transaction/principle/2pc-xa-transaction.en.md
@@ -3,19 +3,19 @@ title = "XA Transaction"
weight = 2
+++
-`XAShardingTransactionManager` is XA transaction manager of Apache ShardingSphere.
+`XAShardingSphereTransactionManager` is XA transaction manager of Apache ShardingSphere.
Its main responsibly is manage and adapt multiple data sources, and sent corresponding transactions to concrete XA transaction manager.
-
+
## Transaction Begin
-When receiving `set autoCommit=0` from client, `XAShardingTransactionManager` will use XA transaction managers to start overall XA transactions, which is marked by XID.
+When receiving `set autoCommit=0` from client, `XAShardingSphereTransactionManager` will use XA transaction managers to start overall XA transactions, which is marked by XID.
## Execute actual sharding SQL
-After `XAShardingTransactionManager` register the corresponding XAResource to the current XA transaction, transaction manager will send `XAResource.start` command to databases.
+After `XAShardingSphereTransactionManager` register the corresponding XAResource to the current XA transaction, transaction manager will send `XAResource.start` command to databases.
After databases received `XAResource.end` command, all SQL operator will mark as XA transaction.
For example:
@@ -31,7 +31,7 @@ XAResource1.end ## execute in the commit phase
## Commit or Rollback
-After `XAShardingTransactionManager` receives the commit command in the access, it will delegate it to the actual XA manager.
+After `XAShardingSphereTransactionManager` receives the commit command in the access, it will delegate it to the actual XA manager.
It will collect all the registered XAResource in the thread, before sending `XAResource.end` to mark the boundary for the XA transaction.
Then it will send prepare command one by one to collect votes from XAResource.
If all the XAResource feedback is OK, it will send commit command to finally finish it;
diff --git a/docs/document/content/features/transaction/principle/base-transaction-seata.en.md b/docs/document/content/features/transaction/principle/base-transaction-seata.en.md
index 4a408c0..2c22bce 100644
--- a/docs/document/content/features/transaction/principle/base-transaction-seata.en.md
+++ b/docs/document/content/features/transaction/principle/base-transaction-seata.en.md
@@ -3,7 +3,7 @@ title = "Seata BASE transaction"
weight = 3
+++
-When integrating Seata AT transaction, we need to integrate TM, RM and TC component into Apache Sharding transaction manager.
+When integrating Seata AT transaction, we need to integrate TM, RM and TC component into ShardingSphere transaction manager.
Seata have proxied `DataSource` interface in order to RPC with TC.
Similarly, Apache ShardingSphere faced to `DataSource` interface to aggregate data sources too.
After Seata `DataSource` encapsulation, it is easy to put Seata AT transaction in to Apache ShardingSphere sharding ecosystem.
@@ -13,7 +13,7 @@ After Seata `DataSource` encapsulation, it is easy to put Seata AT transaction i
## Init Seata Engine
-When an application containing `ShardingTransactionBaseSeataAT` startup, the user-configured DataSource will be wrapped into seata `DataSourceProxy` through `seata.conf`, then registered into RM.
+When an application containing `ShardingSphereTransactionBaseSeataAT` startup, the user-configured DataSource will be wrapped into seata `DataSourceProxy` through `seata.conf`, then registered into RM.
## Transaction Begin
diff --git a/docs/document/content/others/faq/_index.en.md b/docs/document/content/others/faq/_index.en.md
index 024f25f..50a5e37 100644
--- a/docs/document/content/others/faq/_index.en.md
+++ b/docs/document/content/others/faq/_index.en.md
@@ -276,7 +276,7 @@ Answer:
1. ShardingSphere-Proxy could be considered as a mysql sever, so we recommend using mysql command line tool to connect to and operate it.
2. If users would like use a third-party database tool, there may be some errors cause of the certain implementation/options. For example, we recommend Navicat with version 11.1.13(not 12.x), and turn on "introspect using jdbc metadata"(or it will get all real tables info from informations_schema) in idea or datagrip.
-## 23. Found a JtaTransactionManager in spring boot project when integrating with ShardingTransaction of XA
+## 23. Found a JtaTransactionManager in spring boot project when integrating with transaction of XA
Answer:
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/spring-boot-starter.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/spring-boot-starter.cn.md
index c70bb26..3f48709 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/spring-boot-starter.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/spring-boot-starter.cn.md
@@ -50,7 +50,7 @@ public class TransactionConfiguration {
```java
@Transactional
-@ShardingTransactionType(TransactionType.XA) // 支持TransactionType.LOCAL, TransactionType.XA, TransactionType.BASE
+@ShardingSphereTransactionType(TransactionType.XA) // 支持TransactionType.LOCAL, TransactionType.XA, TransactionType.BASE
public void insert() {
jdbcTemplate.execute("INSERT INTO t_order (user_id, status) VALUES (?, ?)", (PreparedStatementCallback<Object>) ps -> {
ps.setObject(1, i);
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/spring-boot-starter.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/spring-boot-starter.en.md
index 7b8adcf..64d24d5 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/spring-boot-starter.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/spring-boot-starter.en.md
@@ -50,7 +50,7 @@ public class TransactionConfiguration {
```java
@Transactional
-@ShardingTransactionType(TransactionType.XA) // Support TransactionType.LOCAL, TransactionType.XA, TransactionType.BASE
+@ShardingSphereTransactionType(TransactionType.XA) // Support TransactionType.LOCAL, TransactionType.XA, TransactionType.BASE
public void insert() {
jdbcTemplate.execute("INSERT INTO t_order (user_id, status) VALUES (?, ?)", (PreparedStatementCallback<Object>) ps -> {
ps.setObject(1, i);
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/spring-namespace.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/spring-namespace.cn.md
index ac53ee7..6822b20 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/spring-namespace.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/spring-namespace.cn.md
@@ -41,7 +41,7 @@ weight = 3
</bean>
<tx:annotation-driven />
-<!-- 开启自动扫描 @ShardingTransactionType 注解，使用 Spring 原生的 AOP 在类和方法上进行增强 -->
+<!-- 开启自动扫描 @ShardingSphereTransactionType 注解，使用 Spring 原生的 AOP 在类和方法上进行增强 -->
<sharding:tx-type-annotation-driven />
```
@@ -49,7 +49,7 @@ weight = 3
```java
@Transactional
-@ShardingTransactionType(TransactionType.XA) // 支持TransactionType.LOCAL, TransactionType.XA, TransactionType.BASE
+@ShardingSphereTransactionType(TransactionType.XA) // 支持TransactionType.LOCAL, TransactionType.XA, TransactionType.BASE
public void insert() {
jdbcTemplate.execute("INSERT INTO t_order (user_id, status) VALUES (?, ?)", (PreparedStatementCallback<Object>) ps -> {
ps.setObject(1, i);
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/spring-namespace.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/spring-namespace.en.md
index 844cf47..09bee4b 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/spring-namespace.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/spring-namespace.en.md
@@ -41,7 +41,7 @@ weight = 3
</bean>
<tx:annotation-driven />
-<!-- Enable auto scan @ShardingTransactionType annotation to inject the transaction type before connection created -->
+<!-- Enable auto scan @ShardingSphereTransactionType annotation to inject the transaction type before connection created -->
<sharding:tx-type-annotation-driven />
```
@@ -49,7 +49,7 @@ weight = 3
```java
@Transactional
-@ShardingTransactionType(TransactionType.XA) // Support TransactionType.LOCAL, TransactionType.XA, TransactionType.BASE
+@ShardingSphereTransactionType(TransactionType.XA) // Support TransactionType.LOCAL, TransactionType.XA, TransactionType.BASE
public void insert() {
jdbcTemplate.execute("INSERT INTO t_order (user_id, status) VALUES (?, ?)", (PreparedStatementCallback<Object>) ps -> {
ps.setObject(1, i);
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/usage/transaction.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/usage/transaction.cn.md
index 2b9856c..3894a63 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/usage/transaction.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/usage/transaction.cn.md
@@ -93,4 +93,4 @@ props:
## BASE 事务
-BASE 目前没有集成至 ShardingSphere-Proxy 的二进制发布包中，使用时需要将实现了 `ShardingTransactionManager` SPI 的 jar 拷贝至 `conf/lib` 目录，然后切换事务类型为 BASE。
+BASE 目前没有集成至 ShardingSphere-Proxy 的二进制发布包中，使用时需要将实现了 `ShardingSphereTransactionManager` SPI 的 jar 拷贝至 `conf/lib` 目录，然后切换事务类型为 BASE。
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/usage/transaction.en.md b/docs/document/content/user-manual/shardingsphere-proxy/usage/transaction.en.md
index dd4c015..dff4d77 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/usage/transaction.en.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/usage/transaction.en.md
@@ -85,4 +85,4 @@ props:
## BASE Transaction
-Since we have not packed the BASE implementation jar into ShardingSphere-Proxy, you should copy relevant jar which implement `ShardingTransactionManager` SPI to `conf/lib`, then switch the transaction type to `BASE`.
+Since we have not packed the BASE implementation jar into ShardingSphere-Proxy, you should copy relevant jar which implement `ShardingSphereTransactionManager` SPI to `conf/lib`, then switch the transaction type to `BASE`.
diff --git a/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-spring-boot-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/spring/boot/XAOrderService.java b/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-spring-boot-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/spring/boot/XAOrderService.java
index e86ea8a..c5fdbe7 100644
--- a/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-spring-boot-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/spring/boot/XAOrderService.java
+++ b/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-spring-boot-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/spring/boot/XAOrderService.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.example.transaction.xa.spring.boot;
-import org.apache.shardingsphere.transaction.annotation.ShardingTransactionType;
+import org.apache.shardingsphere.transaction.annotation.ShardingSphereTransactionType;
import org.apache.shardingsphere.transaction.core.TransactionType;
import org.apache.shardingsphere.transaction.core.TransactionTypeHolder;
import org.springframework.beans.factory.annotation.Autowired;
@@ -65,7 +65,7 @@ public class XAOrderService {
* @return transaction type
*/
@Transactional
- @ShardingTransactionType(TransactionType.XA)
+ @ShardingSphereTransactionType(TransactionType.XA)
public TransactionType insert(final int count) {
return jdbcTemplate.execute("INSERT INTO t_order (user_id, status) VALUES (?, ?)", (PreparedStatementCallback<TransactionType>) preparedStatement -> {
doInsert(count, preparedStatement);
@@ -79,7 +79,7 @@ public class XAOrderService {
* @param count insert record count
*/
@Transactional
- @ShardingTransactionType(TransactionType.XA)
+ @ShardingSphereTransactionType(TransactionType.XA)
public void insertFailed(final int count) {
jdbcTemplate.execute("INSERT INTO t_order (user_id, status) VALUES (?, ?)", (PreparedStatementCallback<TransactionType>) preparedStatement -> {
doInsert(count, preparedStatement);
diff --git a/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/spring/namspace/XAOrderService.java b/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/spring/namspace/XAOrderService.java
index ef6fe94..ab47d6c 100644
--- a/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/spring/namspace/XAOrderService.java
+++ b/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/spring/namspace/XAOrderService.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.example.transaction.xa.spring.namspace;
-import org.apache.shardingsphere.transaction.annotation.ShardingTransactionType;
+import org.apache.shardingsphere.transaction.annotation.ShardingSphereTransactionType;
import org.apache.shardingsphere.transaction.core.TransactionType;
import org.apache.shardingsphere.transaction.core.TransactionTypeHolder;
import org.springframework.beans.factory.annotation.Autowired;
@@ -65,7 +65,7 @@ public class XAOrderService {
* @return transaction type
*/
@Transactional
- @ShardingTransactionType(TransactionType.XA)
+ @ShardingSphereTransactionType(TransactionType.XA)
public TransactionType insert(final int count) {
return jdbcTemplate.execute("INSERT INTO t_order (user_id, status) VALUES (?, ?)", (PreparedStatementCallback<TransactionType>) preparedStatement -> {
doInsert(count, preparedStatement);
@@ -79,7 +79,7 @@ public class XAOrderService {
* @param count insert record count
*/
@Transactional
- @ShardingTransactionType(TransactionType.XA)
+ @ShardingSphereTransactionType(TransactionType.XA)
public void insertFailed(final int count) {
jdbcTemplate.execute("INSERT INTO t_order (user_id, status) VALUES (?, ?)", (PreparedStatementCallback<TransactionType>) preparedStatement -> {
doInsert(count, preparedStatement);
diff --git a/examples/shardingsphere-jdbc-example/transaction-example/transaction-base-seata-spring-boot-example/src/main/java/org/apache/shardingsphere/example/transaction/base/seata/spring/boot/SeataATOrderService.java b/examples/shardingsphere-jdbc-example/transaction-example/transaction-base-seata-spring-boot-example/src/main/java/org/apache/shardingsphere/example/transaction/base/seata/spring/boot/SeataATOrderService.java
index 1ca083b..6f291c3 100644
--- a/examples/shardingsphere-jdbc-example/transaction-example/transaction-base-seata-spring-boot-example/src/main/java/org/apache/shardingsphere/example/transaction/base/seata/spring/boot/SeataATOrderService.java
+++ b/examples/shardingsphere-jdbc-example/transaction-example/transaction-base-seata-spring-boot-example/src/main/java/org/apache/shardingsphere/example/transaction/base/seata/spring/boot/SeataATOrderService.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.example.transaction.base.seata.spring.boot;
-import org.apache.shardingsphere.transaction.annotation.ShardingTransactionType;
+import org.apache.shardingsphere.transaction.annotation.ShardingSphereTransactionType;
import org.apache.shardingsphere.transaction.core.TransactionType;
import org.apache.shardingsphere.transaction.core.TransactionTypeHolder;
import org.springframework.beans.factory.annotation.Autowired;
@@ -64,7 +64,7 @@ public class SeataATOrderService {
* @return transaction type
*/
@Transactional
- @ShardingTransactionType(TransactionType.BASE)
+ @ShardingSphereTransactionType(TransactionType.BASE)
public TransactionType insert(final int count) {
return jdbcTemplate.execute("INSERT INTO t_order (user_id, status) VALUES (?, ?)", (PreparedStatementCallback<TransactionType>) preparedStatement -> {
doInsert(count, preparedStatement);
@@ -78,7 +78,7 @@ public class SeataATOrderService {
* @param count insert record count
*/
@Transactional
- @ShardingTransactionType(TransactionType.BASE)
+ @ShardingSphereTransactionType(TransactionType.BASE)
public void insertFailed(final int count) {
jdbcTemplate.execute("INSERT INTO t_order (user_id, status) VALUES (?, ?)", (PreparedStatementCallback<TransactionType>) preparedStatement -> {
doInsert(count, preparedStatement);
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnection.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnection.java
index 38162e2..855f3a3 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnection.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnection.java
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.infra.executor.sql.prepare.driver.jdbc.Executor
import org.apache.shardingsphere.infra.executor.sql.prepare.driver.jdbc.StatementOption;
import org.apache.shardingsphere.infra.transaction.TransactionHolder;
import org.apache.shardingsphere.transaction.core.TransactionType;
-import org.apache.shardingsphere.transaction.spi.ShardingTransactionManager;
+import org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager;
import javax.sql.DataSource;
import java.sql.Array;
@@ -59,7 +59,7 @@ public final class ShardingSphereConnection extends AbstractConnectionAdapter im
private final TransactionType transactionType;
- private final ShardingTransactionManager shardingTransactionManager;
+ private final ShardingSphereTransactionManager transactionManager;
@Getter(AccessLevel.NONE)
private boolean autoCommit = true;
@@ -69,7 +69,7 @@ public final class ShardingSphereConnection extends AbstractConnectionAdapter im
this.dataSourceMap = dataSourceMap;
this.contextManager = contextManager;
this.transactionType = transactionType;
- shardingTransactionManager = contextManager.getTransactionContexts().getEngines().get(schemaName).getTransactionManager(transactionType);
+ transactionManager = contextManager.getTransactionContexts().getEngines().get(schemaName).getTransactionManager(transactionType);
}
/**
@@ -144,11 +144,11 @@ public final class ShardingSphereConnection extends AbstractConnectionAdapter im
}
private Connection createConnection(final String dataSourceName, final DataSource dataSource) throws SQLException {
- return isInShardingTransaction() ? shardingTransactionManager.getConnection(dataSourceName) : dataSource.getConnection();
+ return isInTransaction() ? transactionManager.getConnection(dataSourceName) : dataSource.getConnection();
}
- private boolean isInShardingTransaction() {
- return null != shardingTransactionManager && shardingTransactionManager.isInTransaction();
+ private boolean isInTransaction() {
+ return null != transactionManager && transactionManager.isInTransaction();
}
/**
@@ -157,7 +157,7 @@ public final class ShardingSphereConnection extends AbstractConnectionAdapter im
* @return true or false
*/
public boolean isHoldTransaction() {
- return (TransactionType.LOCAL == transactionType && !autoCommit) || (TransactionType.XA == transactionType && isInShardingTransaction());
+ return (TransactionType.LOCAL == transactionType && !autoCommit) || (TransactionType.XA == transactionType && isInTransaction());
}
@SuppressWarnings("MagicConstant")
@@ -238,16 +238,16 @@ public final class ShardingSphereConnection extends AbstractConnectionAdapter im
TransactionHolder.setInTransaction();
return;
}
- if (autoCommit != shardingTransactionManager.isInTransaction()) {
+ if (autoCommit != transactionManager.isInTransaction()) {
return;
}
- if (autoCommit && shardingTransactionManager.isInTransaction()) {
- shardingTransactionManager.commit();
+ if (autoCommit && transactionManager.isInTransaction()) {
+ transactionManager.commit();
return;
}
- if (!autoCommit && !shardingTransactionManager.isInTransaction()) {
+ if (!autoCommit && !transactionManager.isInTransaction()) {
closeCachedConnections();
- shardingTransactionManager.begin();
+ transactionManager.begin();
TransactionHolder.setInTransaction();
}
}
@@ -263,7 +263,7 @@ public final class ShardingSphereConnection extends AbstractConnectionAdapter im
if (TransactionType.LOCAL == transactionType) {
getForceExecuteTemplate().execute(getCachedConnections().values(), Connection::commit);
} else {
- shardingTransactionManager.commit();
+ transactionManager.commit();
}
} finally {
TransactionHolder.clear();
@@ -276,7 +276,7 @@ public final class ShardingSphereConnection extends AbstractConnectionAdapter im
if (TransactionType.LOCAL == transactionType) {
getForceExecuteTemplate().execute(getCachedConnections().values(), Connection::rollback);
} else {
- shardingTransactionManager.rollback();
+ transactionManager.rollback();
}
} finally {
TransactionHolder.clear();
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/AbstractBaseExecutorTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/AbstractBaseExecutorTest.java
index 91b339b..4900e18 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/AbstractBaseExecutorTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/AbstractBaseExecutorTest.java
@@ -27,7 +27,7 @@ import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
import org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.SQLExecutorExceptionHandler;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
-import org.apache.shardingsphere.transaction.ShardingTransactionManagerEngine;
+import org.apache.shardingsphere.transaction.ShardingSphereTransactionManagerEngine;
import org.apache.shardingsphere.transaction.context.TransactionContexts;
import org.apache.shardingsphere.transaction.core.TransactionType;
import org.junit.After;
@@ -81,7 +81,7 @@ public abstract class AbstractBaseExecutorTest {
private TransactionContexts mockTransactionContexts() {
TransactionContexts result = mock(TransactionContexts.class);
when(result.getEngines()).thenReturn(mock(Map.class));
- when(result.getEngines().get(DefaultSchema.LOGIC_NAME)).thenReturn(new ShardingTransactionManagerEngine());
+ when(result.getEngines().get(DefaultSchema.LOGIC_NAME)).thenReturn(new ShardingSphereTransactionManagerEngine());
return result;
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnectionTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnectionTest.java
index fd0d469..0dafb74 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnectionTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnectionTest.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.driver.jdbc.core.connection;
-import org.apache.shardingsphere.driver.jdbc.core.fixture.BASEShardingTransactionManagerFixture;
-import org.apache.shardingsphere.driver.jdbc.core.fixture.XAShardingTransactionManagerFixture;
+import org.apache.shardingsphere.driver.jdbc.core.fixture.BASEShardingSphereTransactionManagerFixture;
+import org.apache.shardingsphere.driver.jdbc.core.fixture.XAShardingSphereTransactionManagerFixture;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.infra.database.DefaultSchema;
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration;
-import org.apache.shardingsphere.transaction.ShardingTransactionManagerEngine;
+import org.apache.shardingsphere.transaction.ShardingSphereTransactionManagerEngine;
import org.apache.shardingsphere.transaction.context.TransactionContexts;
import org.apache.shardingsphere.transaction.core.TransactionOperationType;
import org.apache.shardingsphere.transaction.core.TransactionType;
@@ -84,7 +84,7 @@ public final class ShardingSphereConnectionTest {
when(metaDataContexts.getMetaData(DefaultSchema.LOGIC_NAME)).thenReturn(metaData);
transactionContexts = mock(TransactionContexts.class);
when(transactionContexts.getEngines()).thenReturn(mock(Map.class));
- when(transactionContexts.getEngines().get(DefaultSchema.LOGIC_NAME)).thenReturn(new ShardingTransactionManagerEngine());
+ when(transactionContexts.getEngines().get(DefaultSchema.LOGIC_NAME)).thenReturn(new ShardingSphereTransactionManagerEngine());
ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
shardingRuleConfig.getTables().add(new ShardingTableRuleConfiguration("test"));
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
@@ -98,8 +98,8 @@ public final class ShardingSphereConnectionTest {
try {
connection.close();
TransactionTypeHolder.clear();
- XAShardingTransactionManagerFixture.getInvocations().clear();
- BASEShardingTransactionManagerFixture.getInvocations().clear();
+ XAShardingSphereTransactionManagerFixture.getInvocations().clear();
+ BASEShardingSphereTransactionManagerFixture.getInvocations().clear();
} catch (final SQLException ignored) {
}
}
@@ -121,11 +121,11 @@ public final class ShardingSphereConnectionTest {
when(contextManager.getTransactionContexts()).thenReturn(transactionContexts);
connection = new ShardingSphereConnection(connection.getSchemaName(), dataSourceMap, contextManager, TransactionType.XA);
connection.setAutoCommit(false);
- assertTrue(XAShardingTransactionManagerFixture.getInvocations().contains(TransactionOperationType.BEGIN));
+ assertTrue(XAShardingSphereTransactionManagerFixture.getInvocations().contains(TransactionOperationType.BEGIN));
connection.commit();
- assertTrue(XAShardingTransactionManagerFixture.getInvocations().contains(TransactionOperationType.COMMIT));
+ assertTrue(XAShardingSphereTransactionManagerFixture.getInvocations().contains(TransactionOperationType.COMMIT));
connection.rollback();
- assertTrue(XAShardingTransactionManagerFixture.getInvocations().contains(TransactionOperationType.ROLLBACK));
+ assertTrue(XAShardingSphereTransactionManagerFixture.getInvocations().contains(TransactionOperationType.ROLLBACK));
}
@Test
@@ -135,11 +135,11 @@ public final class ShardingSphereConnectionTest {
when(contextManager.getTransactionContexts()).thenReturn(transactionContexts);
connection = new ShardingSphereConnection(connection.getSchemaName(), dataSourceMap, contextManager, TransactionType.BASE);
connection.setAutoCommit(false);
- assertTrue(BASEShardingTransactionManagerFixture.getInvocations().contains(TransactionOperationType.BEGIN));
+ assertTrue(BASEShardingSphereTransactionManagerFixture.getInvocations().contains(TransactionOperationType.BEGIN));
connection.commit();
- assertTrue(BASEShardingTransactionManagerFixture.getInvocations().contains(TransactionOperationType.COMMIT));
+ assertTrue(BASEShardingSphereTransactionManagerFixture.getInvocations().contains(TransactionOperationType.COMMIT));
connection.rollback();
- assertTrue(BASEShardingTransactionManagerFixture.getInvocations().contains(TransactionOperationType.ROLLBACK));
+ assertTrue(BASEShardingSphereTransactionManagerFixture.getInvocations().contains(TransactionOperationType.ROLLBACK));
}
@Test
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSourceTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSourceTest.java
index 9eb2415..b2075a6 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSourceTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSourceTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.driver.jdbc.core.datasource;
import com.google.common.base.Joiner;
import org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConnection;
-import org.apache.shardingsphere.driver.jdbc.core.fixture.XAShardingTransactionManagerFixture;
+import org.apache.shardingsphere.driver.jdbc.core.fixture.XAShardingSphereTransactionManagerFixture;
import org.apache.shardingsphere.infra.database.DefaultSchema;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
@@ -171,13 +171,13 @@ public final class ShardingSphereDataSourceTest {
ShardingSphereConnection connection = (ShardingSphereConnection) shardingSphereDataSource.getConnection();
assertThat(connection.getDataSourceMap().size(), is(1));
assertThat(connection.getTransactionType(), is(TransactionType.XA));
- assertThat(connection.getShardingTransactionManager(), instanceOf(XAShardingTransactionManagerFixture.class));
+ assertThat(connection.getTransactionManager(), instanceOf(XAShardingSphereTransactionManagerFixture.class));
TransactionTypeHolder.set(TransactionType.LOCAL);
connection = (ShardingSphereConnection) shardingSphereDataSource.getConnection();
assertThat(connection.getConnection("ds"), is(dataSource.getConnection()));
assertThat(connection.getDataSourceMap(), is(dataSourceMap));
assertThat(connection.getTransactionType(), is(TransactionType.LOCAL));
- assertNull(connection.getShardingTransactionManager());
+ assertNull(connection.getTransactionManager());
}
private ShardingSphereDataSource createShardingSphereDataSource(final Map<String, DataSource> dataSourceMap) throws SQLException {
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/fixture/AbstractShardingTransactionManagerFixture.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/fixture/AbstractShardingSphereTransactionManagerFixture.java
similarity index 93%
rename from shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/fixture/AbstractShardingTransactionManagerFixture.java
rename to shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/fixture/AbstractShardingSphereTransactionManagerFixture.java
index 1489dfb..c83bacc 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/fixture/AbstractShardingTransactionManagerFixture.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/fixture/AbstractShardingSphereTransactionManagerFixture.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.driver.jdbc.core.fixture;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.transaction.core.ResourceDataSource;
import org.apache.shardingsphere.transaction.core.TransactionOperationType;
-import org.apache.shardingsphere.transaction.spi.ShardingTransactionManager;
+import org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager;
import javax.sql.DataSource;
import java.sql.Connection;
@@ -30,7 +30,7 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.Map;
-public abstract class AbstractShardingTransactionManagerFixture implements ShardingTransactionManager {
+public abstract class AbstractShardingSphereTransactionManagerFixture implements ShardingSphereTransactionManager {
private static final Collection<TransactionOperationType> INVOCATIONS = new LinkedList<>();
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/fixture/BASEShardingTransactionManagerFixture.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/fixture/BASEShardingSphereTransactionManagerFixture.java
similarity index 89%
rename from shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/fixture/BASEShardingTransactionManagerFixture.java
rename to shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/fixture/BASEShardingSphereTransactionManagerFixture.java
index 6480499..c31e05d 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/fixture/BASEShardingTransactionManagerFixture.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/fixture/BASEShardingSphereTransactionManagerFixture.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.driver.jdbc.core.fixture;
import org.apache.shardingsphere.transaction.core.TransactionType;
-public final class BASEShardingTransactionManagerFixture extends AbstractShardingTransactionManagerFixture {
+public final class BASEShardingSphereTransactionManagerFixture extends AbstractShardingSphereTransactionManagerFixture {
@Override
public TransactionType getTransactionType() {
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/fixture/XAShardingTransactionManagerFixture.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/fixture/XAShardingSphereTransactionManagerFixture.java
similarity index 89%
rename from shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/fixture/XAShardingTransactionManagerFixture.java
rename to shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/fixture/XAShardingSphereTransactionManagerFixture.java
index e9e2b69..88952ad 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/fixture/XAShardingTransactionManagerFixture.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/fixture/XAShardingSphereTransactionManagerFixture.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.driver.jdbc.core.fixture;
import org.apache.shardingsphere.transaction.core.TransactionType;
-public final class XAShardingTransactionManagerFixture extends AbstractShardingTransactionManagerFixture {
+public final class XAShardingSphereTransactionManagerFixture extends AbstractShardingSphereTransactionManagerFixture {
@Override
public TransactionType getTransactionType() {
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingTransactionManager b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager
similarity index 80%
rename from shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingTransactionManager
rename to shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager
index 9e41faf..eceedc9 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingTransactionManager
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager
@@ -15,5 +15,5 @@
# limitations under the License.
#
-org.apache.shardingsphere.driver.jdbc.core.fixture.XAShardingTransactionManagerFixture
-org.apache.shardingsphere.driver.jdbc.core.fixture.BASEShardingTransactionManagerFixture
+org.apache.shardingsphere.driver.jdbc.core.fixture.XAShardingSphereTransactionManagerFixture
+org.apache.shardingsphere.driver.jdbc.core.fixture.BASEShardingSphereTransactionManagerFixture
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/ShardingSphereAutoConfiguration.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/ShardingSphereAutoConfiguration.java
index 8f217e8..c3b3f17 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/ShardingSphereAutoConfiguration.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/ShardingSphereAutoConfiguration.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.config.RuleConfiguration;
import org.apache.shardingsphere.spring.boot.datasource.DataSourceMapSetter;
import org.apache.shardingsphere.spring.boot.prop.SpringBootPropertiesConfiguration;
import org.apache.shardingsphere.spring.boot.schema.SchemaNameSetter;
-import org.apache.shardingsphere.spring.transaction.ShardingTransactionTypeScanner;
+import org.apache.shardingsphere.spring.transaction.TransactionTypeScanner;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
@@ -82,8 +82,8 @@ public class ShardingSphereAutoConfiguration implements EnvironmentAware {
* @return transaction type scanner
*/
@Bean
- public ShardingTransactionTypeScanner shardingTransactionTypeScanner() {
- return new ShardingTransactionTypeScanner();
+ public TransactionTypeScanner transactionTypeScanner() {
+ return new TransactionTypeScanner();
}
@Override
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/parser/TransactionTypeScannerBeanDefinitionParser.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/parser/TransactionTypeScannerBeanDefinitionParser.java
index 9c05677..ff3faf3 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/parser/TransactionTypeScannerBeanDefinitionParser.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/parser/TransactionTypeScannerBeanDefinitionParser.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.spring.namespace.parser;
-import org.apache.shardingsphere.spring.transaction.ShardingTransactionTypeScanner;
+import org.apache.shardingsphere.spring.transaction.TransactionTypeScanner;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
@@ -31,7 +31,7 @@ public final class TransactionTypeScannerBeanDefinitionParser extends AbstractBe
@Override
protected AbstractBeanDefinition parseInternal(final Element element, final ParserContext parserContext) {
- BeanDefinitionBuilder factory = BeanDefinitionBuilder.rootBeanDefinition(ShardingTransactionTypeScanner.class);
+ BeanDefinitionBuilder factory = BeanDefinitionBuilder.rootBeanDefinition(TransactionTypeScanner.class);
return factory.getBeanDefinition();
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/AbstractSpringNamespaceTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/AbstractSpringNamespaceTest.java
index f1a0a7b..28bac11 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/AbstractSpringNamespaceTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/AbstractSpringNamespaceTest.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.readwritesplitting.rule.ReadwriteSplittingRule;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
-import org.apache.shardingsphere.spring.transaction.ShardingTransactionTypeScanner;
+import org.apache.shardingsphere.spring.transaction.TransactionTypeScanner;
import org.junit.Test;
import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
@@ -94,7 +94,7 @@ public abstract class AbstractSpringNamespaceTest extends AbstractJUnit4SpringCo
}
@Test
- public void assertShardingTransactionTypeScanner() {
- assertNotNull(applicationContext.getBean(ShardingTransactionTypeScanner.class));
+ public void assertTransactionTypeScanner() {
+ assertNotNull(applicationContext.getBean(TransactionTypeScanner.class));
}
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/main/java/org/apache/shardingsphere/spring/transaction/ShardingTransactionTypeAdvisor.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/main/java/org/apache/shardingsphere/spring/transaction/TransactionTypeAdvisor.java
similarity index 82%
rename from shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/main/java/org/apache/shardingsphere/spring/transaction/ShardingTransactionTypeAdvisor.java
rename to shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/main/java/org/apache/shardingsphere/spring/transaction/TransactionTypeAdvisor.java
index e334722..1c78439 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/main/java/org/apache/shardingsphere/spring/transaction/ShardingTransactionTypeAdvisor.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/main/java/org/apache/shardingsphere/spring/transaction/TransactionTypeAdvisor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.spring.transaction;
import org.aopalliance.aop.Advice;
-import org.apache.shardingsphere.transaction.annotation.ShardingTransactionType;
+import org.apache.shardingsphere.transaction.annotation.ShardingSphereTransactionType;
import org.springframework.aop.Pointcut;
import org.springframework.aop.support.AbstractPointcutAdvisor;
import org.springframework.aop.support.ComposablePointcut;
@@ -26,9 +26,9 @@ import org.springframework.aop.support.annotation.AnnotationMatchingPointcut;
import org.springframework.core.Ordered;
/**
- * Sharding transaction type advisor.
+ * Transaction type advisor.
*/
-public final class ShardingTransactionTypeAdvisor extends AbstractPointcutAdvisor {
+public final class TransactionTypeAdvisor extends AbstractPointcutAdvisor {
private static final long serialVersionUID = 8776494474108508276L;
@@ -36,11 +36,11 @@ public final class ShardingTransactionTypeAdvisor extends AbstractPointcutAdviso
private final Advice transactionTypeInterceptor;
- ShardingTransactionTypeAdvisor() {
- Pointcut classPointcut = new ComposablePointcut(AnnotationMatchingPointcut.forClassAnnotation(ShardingTransactionType.class));
- Pointcut methodPointcut = new ComposablePointcut(AnnotationMatchingPointcut.forMethodAnnotation(ShardingTransactionType.class));
+ TransactionTypeAdvisor() {
+ Pointcut classPointcut = new ComposablePointcut(AnnotationMatchingPointcut.forClassAnnotation(ShardingSphereTransactionType.class));
+ Pointcut methodPointcut = new ComposablePointcut(AnnotationMatchingPointcut.forMethodAnnotation(ShardingSphereTransactionType.class));
transactionTypePointcut = new ComposablePointcut(classPointcut).union(methodPointcut);
- transactionTypeInterceptor = new ShardingTransactionTypeInterceptor();
+ transactionTypeInterceptor = new TransactionTypeInterceptor();
setOrder(Ordered.LOWEST_PRECEDENCE - 1);
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/main/java/org/apache/shardingsphere/spring/transaction/ShardingTransactionTypeInterceptor.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/main/java/org/apache/shardingsphere/spring/transaction/TransactionTypeInterceptor.java
similarity index 72%
rename from shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/main/java/org/apache/shardingsphere/spring/transaction/ShardingTransactionTypeInterceptor.java
rename to shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/main/java/org/apache/shardingsphere/spring/transaction/TransactionTypeInterceptor.java
index 3406b82..41e8798 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/main/java/org/apache/shardingsphere/spring/transaction/ShardingTransactionTypeInterceptor.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/main/java/org/apache/shardingsphere/spring/transaction/TransactionTypeInterceptor.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.spring.transaction;
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
-import org.apache.shardingsphere.transaction.annotation.ShardingTransactionType;
+import org.apache.shardingsphere.transaction.annotation.ShardingSphereTransactionType;
import org.apache.shardingsphere.transaction.core.TransactionType;
import org.apache.shardingsphere.transaction.core.TransactionTypeHolder;
import org.springframework.aop.support.AopUtils;
@@ -30,16 +30,16 @@ import java.lang.reflect.Method;
import java.util.Objects;
/**
- * Sharding transaction type interceptor.
+ * Transaction type interceptor.
*/
-public final class ShardingTransactionTypeInterceptor implements MethodInterceptor {
+public final class TransactionTypeInterceptor implements MethodInterceptor {
@Override
public Object invoke(final MethodInvocation methodInvocation) throws Throwable {
- ShardingTransactionType shardingTransactionType = getAnnotation(methodInvocation);
- Objects.requireNonNull(shardingTransactionType, "could not found sharding transaction type annotation");
+ ShardingSphereTransactionType shardingSphereTransactionType = getAnnotation(methodInvocation);
+ Objects.requireNonNull(shardingSphereTransactionType, "could not found transaction type annotation");
TransactionType preTransactionType = TransactionTypeHolder.get();
- TransactionTypeHolder.set(shardingTransactionType.value());
+ TransactionTypeHolder.set(shardingSphereTransactionType.value());
try {
return methodInvocation.proceed();
} finally {
@@ -50,16 +50,16 @@ public final class ShardingTransactionTypeInterceptor implements MethodIntercept
}
}
- private ShardingTransactionType getAnnotation(final MethodInvocation invocation) {
+ private ShardingSphereTransactionType getAnnotation(final MethodInvocation invocation) {
Objects.requireNonNull(invocation.getThis());
Class<?> targetClass = AopUtils.getTargetClass(invocation.getThis());
- ShardingTransactionType result = getMethodAnnotation(invocation, targetClass);
- return null != result ? result : targetClass.getAnnotation(ShardingTransactionType.class);
+ ShardingSphereTransactionType result = getMethodAnnotation(invocation, targetClass);
+ return null != result ? result : targetClass.getAnnotation(ShardingSphereTransactionType.class);
}
- private ShardingTransactionType getMethodAnnotation(final MethodInvocation invocation, final Class<?> targetClass) {
+ private ShardingSphereTransactionType getMethodAnnotation(final MethodInvocation invocation, final Class<?> targetClass) {
Method specificMethod = ClassUtils.getMostSpecificMethod(invocation.getMethod(), targetClass);
Method userDeclaredMethod = BridgeMethodResolver.findBridgedMethod(specificMethod);
- return userDeclaredMethod.getAnnotation(ShardingTransactionType.class);
+ return userDeclaredMethod.getAnnotation(ShardingSphereTransactionType.class);
}
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/main/java/org/apache/shardingsphere/spring/transaction/ShardingTransactionTypeScanner.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/main/java/org/apache/shardingsphere/spring/transaction/TransactionTypeScanner.java
similarity index 82%
rename from shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/main/java/org/apache/shardingsphere/spring/transaction/ShardingTransactionTypeScanner.java
rename to shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/main/java/org/apache/shardingsphere/spring/transaction/TransactionTypeScanner.java
index 9b2a74a..7735c19 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/main/java/org/apache/shardingsphere/spring/transaction/ShardingTransactionTypeScanner.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/main/java/org/apache/shardingsphere/spring/transaction/TransactionTypeScanner.java
@@ -20,14 +20,14 @@ package org.apache.shardingsphere.spring.transaction;
import org.springframework.aop.framework.AbstractAdvisingBeanPostProcessor;
/**
- * Sharding transaction type scanner.
+ * Transaction type scanner.
*/
-public final class ShardingTransactionTypeScanner extends AbstractAdvisingBeanPostProcessor {
+public final class TransactionTypeScanner extends AbstractAdvisingBeanPostProcessor {
private static final long serialVersionUID = -5140780907955632470L;
- public ShardingTransactionTypeScanner() {
+ public TransactionTypeScanner() {
setBeforeExistingAdvisors(true);
- advisor = new ShardingTransactionTypeAdvisor();
+ advisor = new TransactionTypeAdvisor();
}
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/test/java/org/apache/shardingsphere/spring/transaction/ShardingTransactionTypeScannerTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/test/java/org/apache/shardingsphere/spring/transaction/TransactionTypeScannerTest.java
similarity index 94%
rename from shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/test/java/org/apache/shardingsphere/spring/transaction/ShardingTransactionTypeScannerTest.java
rename to shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/test/java/org/apache/shardingsphere/spring/transaction/TransactionTypeScannerTest.java
index 2741b8f..9bf1b5f 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/test/java/org/apache/shardingsphere/spring/transaction/ShardingTransactionTypeScannerTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/test/java/org/apache/shardingsphere/spring/transaction/TransactionTypeScannerTest.java
@@ -32,20 +32,20 @@ import static org.junit.Assert.assertThat;
@RunWith(SpringRunner.class)
@ContextConfiguration(classes = FixtureSpringConfiguration.class)
-public class ShardingTransactionTypeScannerTest {
+public class TransactionTypeScannerTest {
@Autowired
private MockService mockService;
@Test
- public void assertShardingTransaction() {
+ public void assertTransaction() {
assertThat(mockService.executeLocal(), is(TransactionType.LOCAL));
assertThat(mockService.executeBase(), is(TransactionType.BASE));
assertThat(mockService.execute(), is(TransactionType.XA));
}
@Test
- public void assertShardingTransactionType() {
+ public void assertTransactionType() {
TransactionType preTransactionType = TransactionTypeHolder.get();
mockService.executeLocal();
assertThat(TransactionTypeHolder.get(), is(preTransactionType));
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/test/java/org/apache/shardingsphere/spring/transaction/fixture/FixtureSpringConfiguration.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/test/java/org/apache/shardingsphere/spring/transaction/fixture/FixtureSpringConfiguration.java
index a121276..c9c0741 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/test/java/org/apache/shardingsphere/spring/transaction/fixture/FixtureSpringConfiguration.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/test/java/org/apache/shardingsphere/spring/transaction/fixture/FixtureSpringConfiguration.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.spring.transaction.fixture;
-import org.apache.shardingsphere.spring.transaction.ShardingTransactionTypeScanner;
+import org.apache.shardingsphere.spring.transaction.TransactionTypeScanner;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@@ -27,12 +27,12 @@ import org.springframework.context.annotation.Configuration;
public class FixtureSpringConfiguration {
/**
- * Sharding transaction type scanner configuration.
+ * Transaction type scanner configuration.
*
- * @return sharding transaction type scanner
+ * @return transaction type scanner
*/
@Bean
- public ShardingTransactionTypeScanner shardingTransactionTypeScanner() {
- return new ShardingTransactionTypeScanner();
+ public TransactionTypeScanner transactionTypeScanner() {
+ return new TransactionTypeScanner();
}
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/test/java/org/apache/shardingsphere/spring/transaction/fixture/MockService.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/test/java/org/apache/shardingsphere/spring/transaction/fixture/MockService.java
index b77b771..2f9aa53 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/test/java/org/apache/shardingsphere/spring/transaction/fixture/MockService.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-transaction-spring/src/test/java/org/apache/shardingsphere/spring/transaction/fixture/MockService.java
@@ -17,13 +17,13 @@
package org.apache.shardingsphere.spring.transaction.fixture;
-import org.apache.shardingsphere.transaction.annotation.ShardingTransactionType;
+import org.apache.shardingsphere.transaction.annotation.ShardingSphereTransactionType;
import org.apache.shardingsphere.transaction.core.TransactionType;
import org.apache.shardingsphere.transaction.core.TransactionTypeHolder;
import org.springframework.stereotype.Service;
@Service
-@ShardingTransactionType(TransactionType.XA)
+@ShardingSphereTransactionType(TransactionType.XA)
public class MockService {
/**
@@ -31,7 +31,7 @@ public class MockService {
*
* @return transaction type
*/
- @ShardingTransactionType(TransactionType.LOCAL)
+ @ShardingSphereTransactionType(TransactionType.LOCAL)
public TransactionType executeLocal() {
return TransactionTypeHolder.get();
}
@@ -41,7 +41,7 @@ public class MockService {
*
* @return transaction type
*/
- @ShardingTransactionType(TransactionType.BASE)
+ @ShardingSphereTransactionType(TransactionType.BASE)
public TransactionType executeBase() {
return TransactionTypeHolder.get();
}
diff --git a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManager.java b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManager.java
index d10e396..b6b96a8 100644
--- a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManager.java
+++ b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManager.java
@@ -61,7 +61,7 @@ import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.mode.metadata.MetaDataContextsBuilder;
import org.apache.shardingsphere.mode.persist.PersistService;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
-import org.apache.shardingsphere.transaction.ShardingTransactionManagerEngine;
+import org.apache.shardingsphere.transaction.ShardingSphereTransactionManagerEngine;
import org.apache.shardingsphere.transaction.context.TransactionContexts;
import javax.sql.DataSource;
@@ -414,7 +414,7 @@ public final class ClusterContextManager implements ContextManager {
@Subscribe
public synchronized void renewTransactionContext(final DataSourceChangeCompletedEvent event) throws Exception {
closeStaleEngine(event.getSchemaName());
- Map<String, ShardingTransactionManagerEngine> existedEngines = transactionContexts.getEngines();
+ Map<String, ShardingSphereTransactionManagerEngine> existedEngines = transactionContexts.getEngines();
existedEngines.put(event.getSchemaName(), createNewEngine(event.getDatabaseType(), event.getDataSources()));
renewContexts(existedEngines);
}
@@ -432,19 +432,19 @@ public final class ClusterContextManager implements ContextManager {
}
private void closeStaleEngine(final String schemaName) throws Exception {
- ShardingTransactionManagerEngine staleEngine = transactionContexts.getEngines().remove(schemaName);
+ ShardingSphereTransactionManagerEngine staleEngine = transactionContexts.getEngines().remove(schemaName);
if (null != staleEngine) {
staleEngine.close();
}
}
- private ShardingTransactionManagerEngine createNewEngine(final DatabaseType databaseType, final Map<String, DataSource> dataSources) {
- ShardingTransactionManagerEngine result = new ShardingTransactionManagerEngine();
+ private ShardingSphereTransactionManagerEngine createNewEngine(final DatabaseType databaseType, final Map<String, DataSource> dataSources) {
+ ShardingSphereTransactionManagerEngine result = new ShardingSphereTransactionManagerEngine();
result.init(databaseType, dataSources, metaDataContexts.getProps().getValue(ConfigurationPropertyKey.XA_TRANSACTION_MANAGER_TYPE));
return result;
}
- private void renewContexts(final Map<String, ShardingTransactionManagerEngine> engines) {
+ private void renewContexts(final Map<String, ShardingSphereTransactionManagerEngine> engines) {
transactionContexts = new TransactionContexts(engines);
}
diff --git a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
index c89f130..b6dbc2d 100644
--- a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
+++ b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
@@ -33,7 +33,7 @@ import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositor
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
import org.apache.shardingsphere.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.spi.typed.TypedSPIRegistry;
-import org.apache.shardingsphere.transaction.ShardingTransactionManagerEngine;
+import org.apache.shardingsphere.transaction.ShardingSphereTransactionManagerEngine;
import org.apache.shardingsphere.transaction.context.TransactionContexts;
import javax.sql.DataSource;
@@ -180,10 +180,10 @@ public final class ClusterContextManagerBuilder implements ContextManagerBuilder
}
private TransactionContexts createTransactionContexts(final MetaDataContexts metaDataContexts) {
- Map<String, ShardingTransactionManagerEngine> engines = new HashMap<>(metaDataContexts.getAllSchemaNames().size(), 1);
+ Map<String, ShardingSphereTransactionManagerEngine> engines = new HashMap<>(metaDataContexts.getAllSchemaNames().size(), 1);
String xaTransactionMangerType = metaDataContexts.getProps().getValue(ConfigurationPropertyKey.XA_TRANSACTION_MANAGER_TYPE);
for (String each : metaDataContexts.getAllSchemaNames()) {
- ShardingTransactionManagerEngine engine = new ShardingTransactionManagerEngine();
+ ShardingSphereTransactionManagerEngine engine = new ShardingSphereTransactionManagerEngine();
ShardingSphereResource resource = metaDataContexts.getMetaData(each).getResource();
engine.init(resource.getDatabaseType(), resource.getDataSources(), xaTransactionMangerType);
engines.put(each, engine);
diff --git a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerTest.java b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerTest.java
index bd59fc6..f8398e2 100644
--- a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerTest.java
+++ b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerTest.java
@@ -50,7 +50,7 @@ import org.apache.shardingsphere.infra.optimize.core.metadata.FederateSchemaMeta
import org.apache.shardingsphere.mode.persist.PersistService;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.test.mock.MockedDataSource;
-import org.apache.shardingsphere.transaction.ShardingTransactionManagerEngine;
+import org.apache.shardingsphere.transaction.ShardingSphereTransactionManagerEngine;
import org.apache.shardingsphere.transaction.context.TransactionContexts;
import org.junit.Before;
import org.junit.Test;
@@ -102,10 +102,10 @@ public final class ClusterContextManagerTest {
private ShardingSphereRuleMetaData globalRuleMetaData;
@Mock
- private ShardingTransactionManagerEngine engine;
+ private ShardingSphereTransactionManagerEngine engine;
@Mock
- private Map<String, ShardingTransactionManagerEngine> engines;
+ private Map<String, ShardingSphereTransactionManagerEngine> engines;
@Before
public void setUp() {
@@ -269,7 +269,7 @@ public final class ClusterContextManagerTest {
when(engines.remove("name")).thenReturn(engine);
clusterContextManager.renewTransactionContext(event);
verify(engine).close();
- verify(engines).put(eq("name"), any(ShardingTransactionManagerEngine.class));
+ verify(engines).put(eq("name"), any(ShardingSphereTransactionManagerEngine.class));
}
@Test
diff --git a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-memory-mode/shardingsphere-memory-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/memory/MemoryContextManagerBuilder.java b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-memory-mode/shardingsphere-memory-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/memory/MemoryContextManagerBuilder.java
index 865d3d0..f1c23d0 100644
--- a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-memory-mode/shardingsphere-memory-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/memory/MemoryContextManagerBuilder.java
+++ b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-memory-mode/shardingsphere-memory-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/memory/MemoryContextManagerBuilder.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.mode.metadata.MetaDataContextsBuilder;
import org.apache.shardingsphere.infra.metadata.resource.ShardingSphereResource;
import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
-import org.apache.shardingsphere.transaction.ShardingTransactionManagerEngine;
+import org.apache.shardingsphere.transaction.ShardingSphereTransactionManagerEngine;
import org.apache.shardingsphere.transaction.context.TransactionContexts;
import javax.sql.DataSource;
@@ -52,10 +52,10 @@ public final class MemoryContextManagerBuilder implements ContextManagerBuilder
}
private TransactionContexts createTransactionContexts(final MetaDataContexts metaDataContexts) {
- Map<String, ShardingTransactionManagerEngine> engines = new HashMap<>(metaDataContexts.getAllSchemaNames().size(), 1);
+ Map<String, ShardingSphereTransactionManagerEngine> engines = new HashMap<>(metaDataContexts.getAllSchemaNames().size(), 1);
String xaTransactionMangerType = metaDataContexts.getProps().getValue(ConfigurationPropertyKey.XA_TRANSACTION_MANAGER_TYPE);
for (String each : metaDataContexts.getAllSchemaNames()) {
- ShardingTransactionManagerEngine engine = new ShardingTransactionManagerEngine();
+ ShardingSphereTransactionManagerEngine engine = new ShardingSphereTransactionManagerEngine();
ShardingSphereResource resource = metaDataContexts.getMetaData(each).getResource();
engine.init(resource.getDatabaseType(), resource.getDataSources(), xaTransactionMangerType);
engines.put(each, engine);
diff --git a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
index 9503991..b7d6d74 100644
--- a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
+++ b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-standalone-mode/shardingsphere-standalone-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
@@ -33,7 +33,7 @@ import org.apache.shardingsphere.mode.repository.standalone.StandalonePersistRep
import org.apache.shardingsphere.mode.repository.standalone.StandalonePersistRepositoryConfiguration;
import org.apache.shardingsphere.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.spi.typed.TypedSPIRegistry;
-import org.apache.shardingsphere.transaction.ShardingTransactionManagerEngine;
+import org.apache.shardingsphere.transaction.ShardingSphereTransactionManagerEngine;
import org.apache.shardingsphere.transaction.context.TransactionContexts;
import javax.sql.DataSource;
@@ -172,10 +172,10 @@ public final class StandaloneContextManagerBuilder implements ContextManagerBuil
}
private TransactionContexts createTransactionContexts(final MetaDataContexts metaDataContexts) {
- Map<String, ShardingTransactionManagerEngine> engines = new HashMap<>(metaDataContexts.getAllSchemaNames().size(), 1);
+ Map<String, ShardingSphereTransactionManagerEngine> engines = new HashMap<>(metaDataContexts.getAllSchemaNames().size(), 1);
String xaTransactionMangerType = metaDataContexts.getProps().getValue(ConfigurationPropertyKey.XA_TRANSACTION_MANAGER_TYPE);
for (String each : metaDataContexts.getAllSchemaNames()) {
- ShardingTransactionManagerEngine engine = new ShardingTransactionManagerEngine();
+ ShardingSphereTransactionManagerEngine engine = new ShardingSphereTransactionManagerEngine();
ShardingSphereResource resource = metaDataContexts.getMetaData(each).getResource();
engine.init(resource.getDatabaseType(), resource.getDataSources(), xaTransactionMangerType);
engines.put(each, engine);
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSource.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSource.java
index 27ff484..04b2081 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSource.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSource.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.executor.sql.execute.engine.ConnectionMod
import org.apache.shardingsphere.proxy.backend.communication.BackendDataSource;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.transaction.core.TransactionType;
-import org.apache.shardingsphere.transaction.spi.ShardingTransactionManager;
+import org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager;
import javax.sql.DataSource;
import java.sql.Connection;
@@ -110,12 +110,12 @@ public final class JDBCBackendDataSource implements BackendDataSource {
}
private Connection createConnection(final String schemaName, final String dataSourceName, final DataSource dataSource, final TransactionType transactionType) throws SQLException {
- ShardingTransactionManager shardingTransactionManager
+ ShardingSphereTransactionManager transactionManager
= ProxyContext.getInstance().getContextManager().getTransactionContexts().getEngines().get(schemaName).getTransactionManager(transactionType);
- return isInShardingTransaction(shardingTransactionManager) ? shardingTransactionManager.getConnection(dataSourceName) : dataSource.getConnection();
+ return isInTransaction(transactionManager) ? transactionManager.getConnection(dataSourceName) : dataSource.getConnection();
}
- private boolean isInShardingTransaction(final ShardingTransactionManager shardingTransactionManager) {
- return null != shardingTransactionManager && shardingTransactionManager.isInTransaction();
+ private boolean isInTransaction(final ShardingSphereTransactionManager transactionManager) {
+ return null != transactionManager && transactionManager.isInTransaction();
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/transaction/BackendTransactionManager.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/transaction/BackendTransactionManager.java
index 1d302a2..cf4c759 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/transaction/BackendTransactionManager.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/transaction/BackendTransactionManager.java
@@ -20,9 +20,9 @@ package org.apache.shardingsphere.proxy.backend.communication.jdbc.transaction;
import org.apache.shardingsphere.infra.transaction.TransactionHolder;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import org.apache.shardingsphere.transaction.ShardingTransactionManagerEngine;
+import org.apache.shardingsphere.transaction.ShardingSphereTransactionManagerEngine;
import org.apache.shardingsphere.transaction.core.TransactionType;
-import org.apache.shardingsphere.transaction.spi.ShardingTransactionManager;
+import org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager;
import java.sql.SQLException;
@@ -37,14 +37,14 @@ public final class BackendTransactionManager implements TransactionManager {
private final LocalTransactionManager localTransactionManager;
- private final ShardingTransactionManager shardingTransactionManager;
+ private final ShardingSphereTransactionManager shardingSphereTransactionManager;
public BackendTransactionManager(final BackendConnection backendConnection) {
connection = backendConnection;
transactionType = connection.getTransactionStatus().getTransactionType();
localTransactionManager = new LocalTransactionManager(backendConnection);
- ShardingTransactionManagerEngine engine = ProxyContext.getInstance().getContextManager().getTransactionContexts().getEngines().get(connection.getSchemaName());
- shardingTransactionManager = null == engine ? null : engine.getTransactionManager(transactionType);
+ ShardingSphereTransactionManagerEngine engine = ProxyContext.getInstance().getContextManager().getTransactionContexts().getEngines().get(connection.getSchemaName());
+ shardingSphereTransactionManager = null == engine ? null : engine.getTransactionManager(transactionType);
}
@Override
@@ -55,10 +55,10 @@ public final class BackendTransactionManager implements TransactionManager {
connection.closeDatabaseCommunicationEngines(true);
connection.closeConnections(false);
}
- if (TransactionType.LOCAL == transactionType || null == shardingTransactionManager) {
+ if (TransactionType.LOCAL == transactionType || null == shardingSphereTransactionManager) {
localTransactionManager.begin();
} else {
- shardingTransactionManager.begin();
+ shardingSphereTransactionManager.begin();
}
}
@@ -66,10 +66,10 @@ public final class BackendTransactionManager implements TransactionManager {
public void commit() throws SQLException {
if (connection.getTransactionStatus().isInTransaction()) {
try {
- if (TransactionType.LOCAL == transactionType || null == shardingTransactionManager) {
+ if (TransactionType.LOCAL == transactionType || null == shardingSphereTransactionManager) {
localTransactionManager.commit();
} else {
- shardingTransactionManager.commit();
+ shardingSphereTransactionManager.commit();
}
} finally {
connection.getTransactionStatus().setInTransaction(false);
@@ -82,10 +82,10 @@ public final class BackendTransactionManager implements TransactionManager {
public void rollback() throws SQLException {
if (connection.getTransactionStatus().isInTransaction()) {
try {
- if (TransactionType.LOCAL == transactionType || null == shardingTransactionManager) {
+ if (TransactionType.LOCAL == transactionType || null == shardingSphereTransactionManager) {
localTransactionManager.rollback();
} else {
- shardingTransactionManager.rollback();
+ shardingSphereTransactionManager.rollback();
}
} finally {
connection.getTransactionStatus().setInTransaction(false);
@@ -99,7 +99,7 @@ public final class BackendTransactionManager implements TransactionManager {
if (!connection.getTransactionStatus().isInTransaction()) {
return;
}
- if (TransactionType.LOCAL == transactionType || null == shardingTransactionManager) {
+ if (TransactionType.LOCAL == transactionType || null == shardingSphereTransactionManager) {
localTransactionManager.setSavepoint(savepointName);
}
// TODO Non-local transaction manager
@@ -110,7 +110,7 @@ public final class BackendTransactionManager implements TransactionManager {
if (!connection.getTransactionStatus().isInTransaction()) {
return;
}
- if (TransactionType.LOCAL == transactionType || null == shardingTransactionManager) {
+ if (TransactionType.LOCAL == transactionType || null == shardingSphereTransactionManager) {
localTransactionManager.rollbackTo(savepointName);
}
// TODO Non-local transaction manager
@@ -121,7 +121,7 @@ public final class BackendTransactionManager implements TransactionManager {
if (!connection.getTransactionStatus().isInTransaction()) {
return;
}
- if (TransactionType.LOCAL == transactionType || null == shardingTransactionManager) {
+ if (TransactionType.LOCAL == transactionType || null == shardingSphereTransactionManager) {
localTransactionManager.releaseSavepoint(savepointName);
}
// TODO Non-local transaction manager
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/TextProtocolBackendHandlerFactoryTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/TextProtocolBackendHandlerFactoryTest.java
index 8a479d397..82c9d8e 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/TextProtocolBackendHandlerFactoryTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/TextProtocolBackendHandlerFactoryTest.java
@@ -38,7 +38,7 @@ import org.apache.shardingsphere.proxy.backend.text.distsql.ral.common.ShowDistS
import org.apache.shardingsphere.proxy.backend.text.skip.SkipBackendHandler;
import org.apache.shardingsphere.proxy.backend.text.transaction.TransactionBackendHandler;
import org.apache.shardingsphere.sql.parser.exception.SQLParsingException;
-import org.apache.shardingsphere.transaction.ShardingTransactionManagerEngine;
+import org.apache.shardingsphere.transaction.ShardingSphereTransactionManagerEngine;
import org.apache.shardingsphere.transaction.context.TransactionContexts;
import org.apache.shardingsphere.transaction.core.TransactionType;
import org.junit.Before;
@@ -96,7 +96,7 @@ public final class TextProtocolBackendHandlerFactoryTest {
private TransactionContexts mockTransactionContexts() {
TransactionContexts result = mock(TransactionContexts.class, RETURNS_DEEP_STUBS);
- when(result.getEngines().get("schema")).thenReturn(new ShardingTransactionManagerEngine());
+ when(result.getEngines().get("schema")).thenReturn(new ShardingSphereTransactionManagerEngine());
return result;
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/BackendConnectionTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/BackendConnectionTest.java
index e5835ee..e334f18 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/BackendConnectionTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/BackendConnectionTest.java
@@ -34,7 +34,7 @@ import org.apache.shardingsphere.proxy.backend.communication.DatabaseCommunicati
import org.apache.shardingsphere.proxy.backend.communication.jdbc.datasource.JDBCBackendDataSource;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.transaction.BackendTransactionManager;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import org.apache.shardingsphere.transaction.ShardingTransactionManagerEngine;
+import org.apache.shardingsphere.transaction.ShardingSphereTransactionManagerEngine;
import org.apache.shardingsphere.transaction.context.TransactionContexts;
import org.apache.shardingsphere.transaction.core.TransactionType;
import org.junit.After;
@@ -118,7 +118,7 @@ public final class BackendConnectionTest {
TransactionContexts result = mock(TransactionContexts.class, RETURNS_DEEP_STUBS);
for (int i = 0; i < 10; i++) {
String name = String.format(SCHEMA_PATTERN, i);
- when(result.getEngines().get(name)).thenReturn(new ShardingTransactionManagerEngine());
+ when(result.getEngines().get(name)).thenReturn(new ShardingSphereTransactionManagerEngine());
}
return result;
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSourceTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSourceTest.java
index b6677a1..5145666 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSourceTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSourceTest.java
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.infra.optimize.context.OptimizeContextFactory;
import org.apache.shardingsphere.mode.persist.PersistService;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.datasource.fixture.CallTimeRecordDataSource;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import org.apache.shardingsphere.transaction.ShardingTransactionManagerEngine;
+import org.apache.shardingsphere.transaction.ShardingSphereTransactionManagerEngine;
import org.apache.shardingsphere.transaction.context.TransactionContexts;
import org.junit.Before;
import org.junit.Test;
@@ -89,7 +89,7 @@ public final class JDBCBackendDataSourceTest {
private TransactionContexts createTransactionContexts() {
TransactionContexts result = mock(TransactionContexts.class, RETURNS_DEEP_STUBS);
- when(result.getEngines().get("schema")).thenReturn(mock(ShardingTransactionManagerEngine.class));
+ when(result.getEngines().get("schema")).thenReturn(mock(ShardingSphereTransactionManagerEngine.class));
return result;
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/transaction/BackendTransactionManagerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/transaction/BackendTransactionManagerTest.java
index 6b4455d..056a3af 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/transaction/BackendTransactionManagerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/transaction/BackendTransactionManagerTest.java
@@ -21,10 +21,10 @@ import lombok.SneakyThrows;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import org.apache.shardingsphere.transaction.ShardingTransactionManagerEngine;
+import org.apache.shardingsphere.transaction.ShardingSphereTransactionManagerEngine;
import org.apache.shardingsphere.transaction.context.TransactionContexts;
import org.apache.shardingsphere.transaction.core.TransactionType;
-import org.apache.shardingsphere.transaction.spi.ShardingTransactionManager;
+import org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -54,7 +54,7 @@ public final class BackendTransactionManagerTest {
private LocalTransactionManager localTransactionManager;
@Mock
- private ShardingTransactionManager shardingTransactionManager;
+ private ShardingSphereTransactionManager shardingSphereTransactionManager;
private BackendTransactionManager backendTransactionManager;
@@ -77,9 +77,9 @@ public final class BackendTransactionManagerTest {
private TransactionContexts mockTransactionContexts() {
TransactionContexts result = mock(TransactionContexts.class, RETURNS_DEEP_STUBS);
- ShardingTransactionManagerEngine transactionManagerEngine = mock(ShardingTransactionManagerEngine.class);
+ ShardingSphereTransactionManagerEngine transactionManagerEngine = mock(ShardingSphereTransactionManagerEngine.class);
when(result.getEngines().get("schema")).thenReturn(transactionManagerEngine);
- when(transactionManagerEngine.getTransactionManager(TransactionType.XA)).thenReturn(shardingTransactionManager);
+ when(transactionManagerEngine.getTransactionManager(TransactionType.XA)).thenReturn(shardingSphereTransactionManager);
return result;
}
@@ -99,7 +99,7 @@ public final class BackendTransactionManagerTest {
backendTransactionManager.begin();
verify(transactionStatus, times(0)).setInTransaction(true);
verify(backendConnection, times(0)).closeConnections(false);
- verify(shardingTransactionManager).begin();
+ verify(shardingSphereTransactionManager).begin();
}
@Test
@@ -115,7 +115,7 @@ public final class BackendTransactionManagerTest {
newBackendTransactionManager(TransactionType.XA, true);
backendTransactionManager.commit();
verify(transactionStatus).setInTransaction(false);
- verify(shardingTransactionManager).commit();
+ verify(shardingSphereTransactionManager).commit();
}
@Test
@@ -124,7 +124,7 @@ public final class BackendTransactionManagerTest {
backendTransactionManager.commit();
verify(transactionStatus, times(0)).setInTransaction(false);
verify(localTransactionManager, times(0)).commit();
- verify(shardingTransactionManager, times(0)).commit();
+ verify(shardingSphereTransactionManager, times(0)).commit();
}
@Test
@@ -140,7 +140,7 @@ public final class BackendTransactionManagerTest {
newBackendTransactionManager(TransactionType.XA, true);
backendTransactionManager.rollback();
verify(transactionStatus).setInTransaction(false);
- verify(shardingTransactionManager).rollback();
+ verify(shardingSphereTransactionManager).rollback();
}
@Test
@@ -149,7 +149,7 @@ public final class BackendTransactionManagerTest {
backendTransactionManager.rollback();
verify(transactionStatus, times(0)).setInTransaction(false);
verify(localTransactionManager, times(0)).rollback();
- verify(shardingTransactionManager, times(0)).rollback();
+ verify(shardingSphereTransactionManager, times(0)).rollback();
}
@Test
diff --git a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-bitronix/src/main/java/org/apache/shardingsphere/transaction/xa/bitronix/manager/BitronixXATransactionManager.java b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-bitronix/src/main/java/org/apache/shardingsphere/transaction/xa/bitronix/manager/BitronixXATransactionManager.java
index 6a41728..a222f65 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-bitronix/src/main/java/org/apache/shardingsphere/transaction/xa/bitronix/manager/BitronixXATransactionManager.java
+++ b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-bitronix/src/main/java/org/apache/shardingsphere/transaction/xa/bitronix/manager/BitronixXATransactionManager.java
@@ -32,7 +32,7 @@ import javax.transaction.SystemException;
import javax.transaction.TransactionManager;
/**
- * Bitronix sharding transaction manager.
+ * Bitronix transaction manager.
*/
public final class BitronixXATransactionManager implements XATransactionManager {
diff --git a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/java/org/apache/shardingsphere/transaction/xa/XAShardingTransactionManager.java b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/java/org/apache/shardingsphere/transaction/xa/XAShardingSphereTransactionManager.java
similarity index 94%
rename from shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/java/org/apache/shardingsphere/transaction/xa/XAShardingTransactionManager.java
rename to shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/java/org/apache/shardingsphere/transaction/xa/XAShardingSphereTransactionManager.java
index 87bb317..d38d940 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/java/org/apache/shardingsphere/transaction/xa/XAShardingTransactionManager.java
+++ b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/java/org/apache/shardingsphere/transaction/xa/XAShardingSphereTransactionManager.java
@@ -21,7 +21,7 @@ import lombok.SneakyThrows;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.transaction.core.ResourceDataSource;
import org.apache.shardingsphere.transaction.core.TransactionType;
-import org.apache.shardingsphere.transaction.spi.ShardingTransactionManager;
+import org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager;
import org.apache.shardingsphere.transaction.xa.jta.datasource.XATransactionDataSource;
import org.apache.shardingsphere.transaction.xa.manager.XATransactionManagerLoader;
import org.apache.shardingsphere.transaction.xa.spi.XATransactionManager;
@@ -40,9 +40,9 @@ import java.util.HashMap;
import java.util.Map;
/**
- * Sharding transaction manager for XA.
+ * ShardingSphere Transaction manager for XA.
*/
-public final class XAShardingTransactionManager implements ShardingTransactionManager {
+public final class XAShardingSphereTransactionManager implements ShardingSphereTransactionManager {
private final Map<String, XATransactionDataSource> cachedDataSources = new HashMap<>();
diff --git a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingTransactionManager b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager
similarity index 91%
rename from shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingTransactionManager
rename to shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager
index 08f4fde..679b6e7 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingTransactionManager
+++ b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.transaction.xa.XAShardingTransactionManager
+org.apache.shardingsphere.transaction.xa.XAShardingSphereTransactionManager
diff --git a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/test/java/org/apache/shardingsphere/transaction/xa/XAShardingTransactionManagerTest.java b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/test/java/org/apache/shardingsphere/transaction/xa/XAShardingSphereTransactionManagerTest.java
similarity index 73%
rename from shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/test/java/org/apache/shardingsphere/transaction/xa/XAShardingTransactionManagerTest.java
rename to shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/test/java/org/apache/shardingsphere/transaction/xa/XAShardingSphereTransactionManagerTest.java
index 1986d36..26be044 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/test/java/org/apache/shardingsphere/transaction/xa/XAShardingTransactionManagerTest.java
+++ b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/test/java/org/apache/shardingsphere/transaction/xa/XAShardingSphereTransactionManagerTest.java
@@ -50,24 +50,24 @@ import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
@RunWith(MockitoJUnitRunner.class)
-public final class XAShardingTransactionManagerTest {
+public final class XAShardingSphereTransactionManagerTest {
- private final XAShardingTransactionManager xaShardingTransactionManager = new XAShardingTransactionManager();
+ private final XAShardingSphereTransactionManager xaTransactionManager = new XAShardingSphereTransactionManager();
@Before
public void setUp() {
Collection<ResourceDataSource> resourceDataSources = createResourceDataSources(DatabaseTypeRegistry.getActualDatabaseType("H2"));
- xaShardingTransactionManager.init(DatabaseTypeRegistry.getActualDatabaseType("H2"), resourceDataSources, XATransactionManagerType.ATOMIKOS.getType());
+ xaTransactionManager.init(DatabaseTypeRegistry.getActualDatabaseType("H2"), resourceDataSources, XATransactionManagerType.ATOMIKOS.getType());
}
@After
public void tearDown() throws Exception {
- xaShardingTransactionManager.close();
+ xaTransactionManager.close();
}
@Test
public void assertGetTransactionType() {
- assertThat(xaShardingTransactionManager.getTransactionType(), is(TransactionType.XA));
+ assertThat(xaTransactionManager.getTransactionType(), is(TransactionType.XA));
}
@Test
@@ -78,74 +78,74 @@ public final class XAShardingTransactionManagerTest {
@Test
public void assertIsInTransaction() {
- assertFalse(xaShardingTransactionManager.isInTransaction());
- xaShardingTransactionManager.begin();
- assertTrue(xaShardingTransactionManager.isInTransaction());
- xaShardingTransactionManager.commit();
+ assertFalse(xaTransactionManager.isInTransaction());
+ xaTransactionManager.begin();
+ assertTrue(xaTransactionManager.isInTransaction());
+ xaTransactionManager.commit();
}
@Test
public void assertGetConnection() throws SQLException {
- xaShardingTransactionManager.begin();
- Connection actual1 = xaShardingTransactionManager.getConnection("ds1");
- Connection actual2 = xaShardingTransactionManager.getConnection("ds2");
- Connection actual3 = xaShardingTransactionManager.getConnection("ds3");
+ xaTransactionManager.begin();
+ Connection actual1 = xaTransactionManager.getConnection("ds1");
+ Connection actual2 = xaTransactionManager.getConnection("ds2");
+ Connection actual3 = xaTransactionManager.getConnection("ds3");
assertThat(actual1, instanceOf(Connection.class));
assertThat(actual2, instanceOf(Connection.class));
assertThat(actual3, instanceOf(Connection.class));
- xaShardingTransactionManager.commit();
+ xaTransactionManager.commit();
}
@Test
public void assertGetConnectionOfNestedTransaction() throws SQLException {
ThreadLocal<Set<Transaction>> transactions = getEnlistedTransactions(getCachedDataSources().get("ds1"));
- xaShardingTransactionManager.begin();
+ xaTransactionManager.begin();
assertTrue(transactions.get().isEmpty());
- xaShardingTransactionManager.getConnection("ds1");
+ xaTransactionManager.getConnection("ds1");
assertThat(transactions.get().size(), is(1));
executeNestedTransaction(transactions);
assertThat(transactions.get().size(), is(1));
- xaShardingTransactionManager.commit();
+ xaTransactionManager.commit();
assertTrue(transactions.get().isEmpty());
}
private void executeNestedTransaction(final ThreadLocal<Set<Transaction>> transactions) throws SQLException {
- xaShardingTransactionManager.begin();
- xaShardingTransactionManager.getConnection("ds1");
+ xaTransactionManager.begin();
+ xaTransactionManager.getConnection("ds1");
assertThat(transactions.get().size(), is(2));
- xaShardingTransactionManager.commit();
+ xaTransactionManager.commit();
assertThat(transactions.get().size(), is(1));
}
@Test
public void assertClose() throws Exception {
- xaShardingTransactionManager.close();
+ xaTransactionManager.close();
Map<String, XATransactionDataSource> cachedSingleXADataSourceMap = getCachedDataSources();
assertTrue(cachedSingleXADataSourceMap.isEmpty());
}
@Test
public void assertCommit() {
- xaShardingTransactionManager.begin();
- assertTrue(xaShardingTransactionManager.isInTransaction());
- xaShardingTransactionManager.commit();
- assertFalse(xaShardingTransactionManager.isInTransaction());
+ xaTransactionManager.begin();
+ assertTrue(xaTransactionManager.isInTransaction());
+ xaTransactionManager.commit();
+ assertFalse(xaTransactionManager.isInTransaction());
}
@Test
public void assertRollback() {
- xaShardingTransactionManager.begin();
- assertTrue(xaShardingTransactionManager.isInTransaction());
- xaShardingTransactionManager.rollback();
- assertFalse(xaShardingTransactionManager.isInTransaction());
+ xaTransactionManager.begin();
+ assertTrue(xaTransactionManager.isInTransaction());
+ xaTransactionManager.rollback();
+ assertFalse(xaTransactionManager.isInTransaction());
}
@SneakyThrows(ReflectiveOperationException.class)
@SuppressWarnings("unchecked")
private Map<String, XATransactionDataSource> getCachedDataSources() {
- Field field = xaShardingTransactionManager.getClass().getDeclaredField("cachedDataSources");
+ Field field = xaTransactionManager.getClass().getDeclaredField("cachedDataSources");
field.setAccessible(true);
- return (Map<String, XATransactionDataSource>) field.get(xaShardingTransactionManager);
+ return (Map<String, XATransactionDataSource>) field.get(xaTransactionManager);
}
@SneakyThrows(ReflectiveOperationException.class)
diff --git a/shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingTransactionManager.java b/shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManager.java
similarity index 94%
rename from shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingTransactionManager.java
rename to shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManager.java
index 3f7fb64..86d382f 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingTransactionManager.java
+++ b/shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManager.java
@@ -32,7 +32,7 @@ import lombok.SneakyThrows;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.transaction.core.ResourceDataSource;
import org.apache.shardingsphere.transaction.core.TransactionType;
-import org.apache.shardingsphere.transaction.spi.ShardingTransactionManager;
+import org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager;
import javax.sql.DataSource;
import java.sql.Connection;
@@ -42,9 +42,9 @@ import java.util.HashMap;
import java.util.Map;
/**
- * Seata AT sharding transaction manager.
+ * Seata AT transaction manager.
*/
-public final class SeataATShardingTransactionManager implements ShardingTransactionManager {
+public final class SeataATShardingSphereTransactionManager implements ShardingSphereTransactionManager {
private final Map<String, DataSource> dataSourceMap = new HashMap<>();
@@ -54,7 +54,7 @@ public final class SeataATShardingTransactionManager implements ShardingTransact
private final boolean enableSeataAT;
- public SeataATShardingTransactionManager() {
+ public SeataATShardingSphereTransactionManager() {
FileConfiguration config = new FileConfiguration("seata.conf");
enableSeataAT = config.getBoolean("sharding.transaction.seata.at.enable", true);
applicationId = config.getConfig("client.application.id");
diff --git a/shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/main/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingTransactionManager b/shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/main/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager
similarity index 96%
rename from shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/main/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingTransactionManager
rename to shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/main/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager
index 58b29cc..b28db70 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/main/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingTransactionManager
+++ b/shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/main/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.transaction.base.seata.at.SeataATShardingTransactionManager
+org.apache.shardingsphere.transaction.base.seata.at.SeataATShardingSphereTransactionManager
diff --git a/shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingTransactionManagerTest.java b/shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManagerTest.java
similarity index 87%
rename from shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingTransactionManagerTest.java
rename to shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManagerTest.java
index 04fc21b..c490a99 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingTransactionManagerTest.java
+++ b/shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManagerTest.java
@@ -61,13 +61,13 @@ import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
@RunWith(MockitoJUnitRunner.class)
-public final class SeataATShardingTransactionManagerTest {
+public final class SeataATShardingSphereTransactionManagerTest {
private static final MockSeataServer MOCK_SEATA_SERVER = new MockSeataServer();
private final DataSource dataSource = getDataSource();
- private final SeataATShardingTransactionManager seataATShardingTransactionManager = new SeataATShardingTransactionManager();
+ private final SeataATShardingSphereTransactionManager seataTransactionManager = new SeataATShardingSphereTransactionManager();
private final Queue<Object> requestQueue = MOCK_SEATA_SERVER.getMessageHandler().getRequestQueue();
@@ -90,7 +90,7 @@ public final class SeataATShardingTransactionManagerTest {
@Before
public void setUp() {
- seataATShardingTransactionManager.init(DatabaseTypeRegistry.getActualDatabaseType("MySQL"), getResourceDataSources(), "seata");
+ seataTransactionManager.init(DatabaseTypeRegistry.getActualDatabaseType("MySQL"), getResourceDataSources(), "seata");
}
@After
@@ -98,7 +98,7 @@ public final class SeataATShardingTransactionManagerTest {
ExecutorDataMap.getValue().clear();
RootContext.unbind();
SeataTransactionHolder.clear();
- seataATShardingTransactionManager.close();
+ seataTransactionManager.close();
releaseRpcClient();
requestQueue.clear();
responseQueue.clear();
@@ -121,19 +121,19 @@ public final class SeataATShardingTransactionManagerTest {
Map<String, DataSource> actual = getDataSourceMap();
assertThat(actual.size(), is(1));
assertThat(actual.get("demo_ds"), instanceOf(DataSourceProxy.class));
- assertThat(seataATShardingTransactionManager.getTransactionType(), is(TransactionType.BASE));
+ assertThat(seataTransactionManager.getTransactionType(), is(TransactionType.BASE));
}
@Test
public void assertGetConnection() throws SQLException {
- Connection actual = seataATShardingTransactionManager.getConnection("demo_ds");
+ Connection actual = seataTransactionManager.getConnection("demo_ds");
assertThat(actual, instanceOf(ConnectionProxy.class));
}
@Test
public void assertBegin() {
- seataATShardingTransactionManager.begin();
- assertTrue(seataATShardingTransactionManager.isInTransaction());
+ seataTransactionManager.begin();
+ assertTrue(seataTransactionManager.isInTransaction());
assertResult();
}
@@ -141,28 +141,28 @@ public final class SeataATShardingTransactionManagerTest {
public void assertCommit() {
SeataTransactionHolder.set(GlobalTransactionContext.getCurrentOrCreate());
setXID("testXID");
- seataATShardingTransactionManager.commit();
+ seataTransactionManager.commit();
assertResult();
}
@Test(expected = IllegalStateException.class)
public void assertCommitWithoutBegin() {
SeataTransactionHolder.set(GlobalTransactionContext.getCurrentOrCreate());
- seataATShardingTransactionManager.commit();
+ seataTransactionManager.commit();
}
@Test
public void assertRollback() {
SeataTransactionHolder.set(GlobalTransactionContext.getCurrentOrCreate());
setXID("testXID");
- seataATShardingTransactionManager.rollback();
+ seataTransactionManager.rollback();
assertResult();
}
@Test(expected = IllegalStateException.class)
public void assertRollbackWithoutBegin() {
SeataTransactionHolder.set(GlobalTransactionContext.getCurrentOrCreate());
- seataATShardingTransactionManager.rollback();
+ seataTransactionManager.rollback();
}
private void assertResult() {
@@ -179,9 +179,9 @@ public final class SeataATShardingTransactionManagerTest {
@SneakyThrows(ReflectiveOperationException.class)
@SuppressWarnings("unchecked")
private Map<String, DataSource> getDataSourceMap() {
- Field field = seataATShardingTransactionManager.getClass().getDeclaredField("dataSourceMap");
+ Field field = seataTransactionManager.getClass().getDeclaredField("dataSourceMap");
field.setAccessible(true);
- return (Map<String, DataSource>) field.get(seataATShardingTransactionManager);
+ return (Map<String, DataSource>) field.get(seataTransactionManager);
}
@SneakyThrows(ReflectiveOperationException.class)
diff --git a/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/ShardingTransactionManagerEngine.java b/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/ShardingSphereTransactionManagerEngine.java
similarity index 65%
rename from shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/ShardingTransactionManagerEngine.java
rename to shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/ShardingSphereTransactionManagerEngine.java
index 74417e3..5b3b76b 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/ShardingTransactionManagerEngine.java
+++ b/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/ShardingSphereTransactionManagerEngine.java
@@ -22,7 +22,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.transaction.core.ResourceDataSource;
import org.apache.shardingsphere.transaction.core.TransactionType;
-import org.apache.shardingsphere.transaction.spi.ShardingTransactionManager;
+import org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager;
import javax.sql.DataSource;
import java.util.Collection;
@@ -33,37 +33,37 @@ import java.util.ServiceLoader;
import java.util.stream.Collectors;
/**
- * Sharding transaction manager engine.
+ * ShardingSphere transaction manager engine.
*/
@Slf4j
-public final class ShardingTransactionManagerEngine {
+public final class ShardingSphereTransactionManagerEngine {
- private final Map<TransactionType, ShardingTransactionManager> transactionManagerMap = new EnumMap<>(TransactionType.class);
+ private final Map<TransactionType, ShardingSphereTransactionManager> transactionManagers = new EnumMap<>(TransactionType.class);
- public ShardingTransactionManagerEngine() {
- loadShardingTransactionManager();
+ public ShardingSphereTransactionManagerEngine() {
+ loadTransactionManager();
}
- private void loadShardingTransactionManager() {
- for (ShardingTransactionManager each : ServiceLoader.load(ShardingTransactionManager.class)) {
- if (transactionManagerMap.containsKey(each.getTransactionType())) {
+ private void loadTransactionManager() {
+ for (ShardingSphereTransactionManager each : ServiceLoader.load(ShardingSphereTransactionManager.class)) {
+ if (transactionManagers.containsKey(each.getTransactionType())) {
log.warn("Find more than one {} transaction manager implementation class, use `{}` now",
- each.getTransactionType(), transactionManagerMap.get(each.getTransactionType()).getClass().getName());
+ each.getTransactionType(), transactionManagers.get(each.getTransactionType()).getClass().getName());
continue;
}
- transactionManagerMap.put(each.getTransactionType(), each);
+ transactionManagers.put(each.getTransactionType(), each);
}
}
/**
- * Initialize sharding transaction managers.
+ * Initialize transaction managers.
*
* @param databaseType database type
* @param dataSourceMap data source map
* @param xaTransactionMangerType XA transaction manger type
*/
public void init(final DatabaseType databaseType, final Map<String, DataSource> dataSourceMap, final String xaTransactionMangerType) {
- transactionManagerMap.forEach((key, value) -> value.init(databaseType, getResourceDataSources(dataSourceMap), xaTransactionMangerType));
+ transactionManagers.forEach((key, value) -> value.init(databaseType, getResourceDataSources(dataSourceMap), xaTransactionMangerType));
}
private Collection<ResourceDataSource> getResourceDataSources(final Map<String, DataSource> dataSourceMap) {
@@ -71,13 +71,13 @@ public final class ShardingTransactionManagerEngine {
}
/**
- * Get sharding transaction manager.
+ * Get transaction manager.
*
* @param transactionType transaction type
- * @return sharding transaction manager
+ * @return transaction manager
*/
- public ShardingTransactionManager getTransactionManager(final TransactionType transactionType) {
- ShardingTransactionManager result = transactionManagerMap.get(transactionType);
+ public ShardingSphereTransactionManager getTransactionManager(final TransactionType transactionType) {
+ ShardingSphereTransactionManager result = transactionManagers.get(transactionType);
if (TransactionType.LOCAL != transactionType) {
Preconditions.checkNotNull(result, "Cannot find transaction manager of [%s]", transactionType);
}
@@ -85,12 +85,12 @@ public final class ShardingTransactionManagerEngine {
}
/**
- * Close sharding transaction managers.
+ * Close transaction managers.
*
* @throws Exception exception
*/
public void close() throws Exception {
- for (Entry<TransactionType, ShardingTransactionManager> entry : transactionManagerMap.entrySet()) {
+ for (Entry<TransactionType, ShardingSphereTransactionManager> entry : transactionManagers.entrySet()) {
entry.getValue().close();
}
}
diff --git a/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/annotation/ShardingTransactionType.java b/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/annotation/ShardingSphereTransactionType.java
similarity index 86%
rename from shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/annotation/ShardingTransactionType.java
rename to shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/annotation/ShardingSphereTransactionType.java
index 2d071af..2435720 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/annotation/ShardingTransactionType.java
+++ b/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/annotation/ShardingSphereTransactionType.java
@@ -26,18 +26,17 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * Sharding transactional annotation.
+ * ShardingSphere transactional annotation.
*/
@Target({ElementType.METHOD, ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@Inherited
-public @interface ShardingTransactionType {
+public @interface ShardingSphereTransactionType {
/**
- * Sharding transaction type, include LOCAL, XA, BASE.
- * default LOCAL.
+ * Transaction type, include LOCAL, XA, BASE, default is LOCAL.
*
- * @return Sharding transaction type
+ * @return transaction type
*/
TransactionType value() default TransactionType.LOCAL;
}
diff --git a/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/context/TransactionContexts.java b/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/context/TransactionContexts.java
index 40edf12..8626386 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/context/TransactionContexts.java
+++ b/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/context/TransactionContexts.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.transaction.context;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.transaction.ShardingTransactionManagerEngine;
+import org.apache.shardingsphere.transaction.ShardingSphereTransactionManagerEngine;
import java.util.HashMap;
import java.util.Map;
@@ -31,7 +31,7 @@ import java.util.Map;
@Getter
public final class TransactionContexts implements AutoCloseable {
- private final Map<String, ShardingTransactionManagerEngine> engines;
+ private final Map<String, ShardingSphereTransactionManagerEngine> engines;
public TransactionContexts() {
this(new HashMap<>());
@@ -39,7 +39,7 @@ public final class TransactionContexts implements AutoCloseable {
@Override
public void close() throws Exception {
- for (ShardingTransactionManagerEngine each : engines.values()) {
+ for (ShardingSphereTransactionManagerEngine each : engines.values()) {
each.close();
}
}
diff --git a/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/spi/ShardingTransactionManager.java b/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/spi/ShardingSphereTransactionManager.java
similarity index 93%
rename from shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/spi/ShardingTransactionManager.java
rename to shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/spi/ShardingSphereTransactionManager.java
index 97de37c..be4e084 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/spi/ShardingTransactionManager.java
+++ b/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/spi/ShardingSphereTransactionManager.java
@@ -26,12 +26,12 @@ import java.sql.SQLException;
import java.util.Collection;
/**
- * Sharding transaction manager.
+ * ShardingSphere transaction manager.
*/
-public interface ShardingTransactionManager extends AutoCloseable {
+public interface ShardingSphereTransactionManager extends AutoCloseable {
/**
- * Initialize sharding transaction manager.
+ * Initialize transaction manager.
*
* @param databaseType database type
* @param resourceDataSources resource data sources
diff --git a/shardingsphere-transaction/shardingsphere-transaction-core/src/test/java/org/apache/shardingsphere/transaction/ShardingTransactionManagerEngineTest.java b/shardingsphere-transaction/shardingsphere-transaction-core/src/test/java/org/apache/shardingsphere/transaction/ShardingSphereTransactionManagerEngineTest.java
similarity index 67%
rename from shardingsphere-transaction/shardingsphere-transaction-core/src/test/java/org/apache/shardingsphere/transaction/ShardingTransactionManagerEngineTest.java
rename to shardingsphere-transaction/shardingsphere-transaction-core/src/test/java/org/apache/shardingsphere/transaction/ShardingSphereTransactionManagerEngineTest.java
index 76560f5..c72ca56 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-core/src/test/java/org/apache/shardingsphere/transaction/ShardingTransactionManagerEngineTest.java
+++ b/shardingsphere-transaction/shardingsphere-transaction-core/src/test/java/org/apache/shardingsphere/transaction/ShardingSphereTransactionManagerEngineTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.transaction;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
import org.apache.shardingsphere.transaction.core.TransactionType;
import org.apache.shardingsphere.transaction.core.XATransactionManagerType;
-import org.apache.shardingsphere.transaction.core.fixture.ShardingTransactionManagerFixture;
+import org.apache.shardingsphere.transaction.core.fixture.ShardingSphereTransactionManagerFixture;
import org.junit.Test;
import java.util.Collections;
@@ -30,21 +30,21 @@ import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-public final class ShardingTransactionManagerEngineTest {
+public final class ShardingSphereTransactionManagerEngineTest {
- private final ShardingTransactionManagerEngine shardingTransactionManagerEngine = new ShardingTransactionManagerEngine();
+ private final ShardingSphereTransactionManagerEngine transactionManagerEngine = new ShardingSphereTransactionManagerEngine();
@Test
public void assertGetEngine() {
- assertThat(shardingTransactionManagerEngine.getTransactionManager(TransactionType.XA), instanceOf(ShardingTransactionManagerFixture.class));
+ assertThat(transactionManagerEngine.getTransactionManager(TransactionType.XA), instanceOf(ShardingSphereTransactionManagerFixture.class));
}
@Test
public void assertRegisterTransactionResource() {
Runnable caller = mock(Runnable.class);
- ShardingTransactionManagerFixture shardingTransactionManager = (ShardingTransactionManagerFixture) shardingTransactionManagerEngine.getTransactionManager(TransactionType.XA);
- shardingTransactionManager.setCaller(caller);
- shardingTransactionManagerEngine.init(DatabaseTypeRegistry.getActualDatabaseType("H2"), Collections.emptyMap(), XATransactionManagerType.ATOMIKOS.getType());
+ ShardingSphereTransactionManagerFixture transactionManager = (ShardingSphereTransactionManagerFixture) transactionManagerEngine.getTransactionManager(TransactionType.XA);
+ transactionManager.setCaller(caller);
+ transactionManagerEngine.init(DatabaseTypeRegistry.getActualDatabaseType("H2"), Collections.emptyMap(), XATransactionManagerType.ATOMIKOS.getType());
verify(caller).run();
}
}
diff --git a/shardingsphere-transaction/shardingsphere-transaction-core/src/test/java/org/apache/shardingsphere/transaction/context/TransactionContextsTest.java b/shardingsphere-transaction/shardingsphere-transaction-core/src/test/java/org/apache/shardingsphere/transaction/context/TransactionContextsTest.java
index 97745bb..28b07de 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-core/src/test/java/org/apache/shardingsphere/transaction/context/TransactionContextsTest.java
+++ b/shardingsphere-transaction/shardingsphere-transaction-core/src/test/java/org/apache/shardingsphere/transaction/context/TransactionContextsTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.transaction.context;
import org.apache.shardingsphere.infra.database.DefaultSchema;
-import org.apache.shardingsphere.transaction.ShardingTransactionManagerEngine;
+import org.apache.shardingsphere.transaction.ShardingSphereTransactionManagerEngine;
import org.junit.Test;
import java.util.Collections;
@@ -37,34 +37,34 @@ public final class TransactionContextsTest {
@Test
public void assertNewInstanceWithEmptyEngines() {
TransactionContexts transactionContexts = new TransactionContexts();
- Map<String, ShardingTransactionManagerEngine> engines = transactionContexts.getEngines();
+ Map<String, ShardingSphereTransactionManagerEngine> engines = transactionContexts.getEngines();
assertTrue(engines.isEmpty());
}
@Test
public void assertGetDefaultTransactionManagerEngine() {
- Map<String, ShardingTransactionManagerEngine> actualEngines = Collections.singletonMap(DefaultSchema.LOGIC_NAME, new ShardingTransactionManagerEngine());
+ Map<String, ShardingSphereTransactionManagerEngine> actualEngines = Collections.singletonMap(DefaultSchema.LOGIC_NAME, new ShardingSphereTransactionManagerEngine());
TransactionContexts transactionContexts = new TransactionContexts(actualEngines);
- Map<String, ShardingTransactionManagerEngine> engines = transactionContexts.getEngines();
+ Map<String, ShardingSphereTransactionManagerEngine> engines = transactionContexts.getEngines();
assertThat(engines.size(), is(1));
assertThat(engines, is(actualEngines));
- ShardingTransactionManagerEngine defaultEngine = transactionContexts.getEngines().get(DefaultSchema.LOGIC_NAME);
+ ShardingSphereTransactionManagerEngine defaultEngine = transactionContexts.getEngines().get(DefaultSchema.LOGIC_NAME);
assertNotNull(defaultEngine);
}
@Test
public void assertClose() throws Exception {
- ShardingTransactionManagerEngine shardingTransactionManagerEngine = mock(ShardingTransactionManagerEngine.class);
- TransactionContexts transactionContexts = new TransactionContexts(Collections.singletonMap(DefaultSchema.LOGIC_NAME, shardingTransactionManagerEngine));
+ ShardingSphereTransactionManagerEngine shardingSphereTransactionManagerEngine = mock(ShardingSphereTransactionManagerEngine.class);
+ TransactionContexts transactionContexts = new TransactionContexts(Collections.singletonMap(DefaultSchema.LOGIC_NAME, shardingSphereTransactionManagerEngine));
transactionContexts.close();
- verify(shardingTransactionManagerEngine).close();
+ verify(shardingSphereTransactionManagerEngine).close();
}
@Test(expected = Exception.class)
public void assertCloseThrowsException() throws Exception {
- ShardingTransactionManagerEngine shardingTransactionManagerEngine = mock(ShardingTransactionManagerEngine.class);
- doThrow(new RuntimeException("")).when(shardingTransactionManagerEngine).close();
- TransactionContexts transactionContexts = new TransactionContexts(Collections.singletonMap(DefaultSchema.LOGIC_NAME, shardingTransactionManagerEngine));
+ ShardingSphereTransactionManagerEngine shardingSphereTransactionManagerEngine = mock(ShardingSphereTransactionManagerEngine.class);
+ doThrow(new RuntimeException("")).when(shardingSphereTransactionManagerEngine).close();
+ TransactionContexts transactionContexts = new TransactionContexts(Collections.singletonMap(DefaultSchema.LOGIC_NAME, shardingSphereTransactionManagerEngine));
transactionContexts.close();
}
}
diff --git a/shardingsphere-transaction/shardingsphere-transaction-core/src/test/java/org/apache/shardingsphere/transaction/core/fixture/OtherShardingTransactionManagerFixture.java b/shardingsphere-transaction/shardingsphere-transaction-core/src/test/java/org/apache/shardingsphere/transaction/core/fixture/OtherShardingSphereTransactionManagerFixture.java
similarity index 90%
rename from shardingsphere-transaction/shardingsphere-transaction-core/src/test/java/org/apache/shardingsphere/transaction/core/fixture/OtherShardingTransactionManagerFixture.java
rename to shardingsphere-transaction/shardingsphere-transaction-core/src/test/java/org/apache/shardingsphere/transaction/core/fixture/OtherShardingSphereTransactionManagerFixture.java
index 669e9d7..99b50cd 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-core/src/test/java/org/apache/shardingsphere/transaction/core/fixture/OtherShardingTransactionManagerFixture.java
+++ b/shardingsphere-transaction/shardingsphere-transaction-core/src/test/java/org/apache/shardingsphere/transaction/core/fixture/OtherShardingSphereTransactionManagerFixture.java
@@ -20,12 +20,12 @@ package org.apache.shardingsphere.transaction.core.fixture;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.transaction.core.ResourceDataSource;
import org.apache.shardingsphere.transaction.core.TransactionType;
-import org.apache.shardingsphere.transaction.spi.ShardingTransactionManager;
+import org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager;
import java.sql.Connection;
import java.util.Collection;
-public final class OtherShardingTransactionManagerFixture implements ShardingTransactionManager {
+public final class OtherShardingSphereTransactionManagerFixture implements ShardingSphereTransactionManager {
@Override
public void init(final DatabaseType databaseType, final Collection<ResourceDataSource> resourceDataSources, final String transactionMangerType) {
diff --git a/shardingsphere-transaction/shardingsphere-transaction-core/src/test/java/org/apache/shardingsphere/transaction/core/fixture/ShardingTransactionManagerFixture.java b/shardingsphere-transaction/shardingsphere-transaction-core/src/test/java/org/apache/shardingsphere/transaction/core/fixture/ShardingSphereTransactionManagerFixture.java
similarity index 91%
rename from shardingsphere-transaction/shardingsphere-transaction-core/src/test/java/org/apache/shardingsphere/transaction/core/fixture/ShardingTransactionManagerFixture.java
rename to shardingsphere-transaction/shardingsphere-transaction-core/src/test/java/org/apache/shardingsphere/transaction/core/fixture/ShardingSphereTransactionManagerFixture.java
index 6a267b6..2f0a8db 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-core/src/test/java/org/apache/shardingsphere/transaction/core/fixture/ShardingTransactionManagerFixture.java
+++ b/shardingsphere-transaction/shardingsphere-transaction-core/src/test/java/org/apache/shardingsphere/transaction/core/fixture/ShardingSphereTransactionManagerFixture.java
@@ -21,12 +21,12 @@ import lombok.Setter;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.transaction.core.ResourceDataSource;
import org.apache.shardingsphere.transaction.core.TransactionType;
-import org.apache.shardingsphere.transaction.spi.ShardingTransactionManager;
+import org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager;
import java.sql.Connection;
import java.util.Collection;
-public final class ShardingTransactionManagerFixture implements ShardingTransactionManager {
+public final class ShardingSphereTransactionManagerFixture implements ShardingSphereTransactionManager {
@Setter
private Runnable caller;
diff --git a/shardingsphere-transaction/shardingsphere-transaction-core/src/test/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingTransactionManager b/shardingsphere-transaction/shardingsphere-transaction-core/src/test/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager
similarity index 87%
rename from shardingsphere-transaction/shardingsphere-transaction-core/src/test/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingTransactionManager
rename to shardingsphere-transaction/shardingsphere-transaction-core/src/test/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager
index c9cb07f..161f495 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-core/src/test/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingTransactionManager
+++ b/shardingsphere-transaction/shardingsphere-transaction-core/src/test/resources/META-INF/services/org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager
@@ -15,5 +15,5 @@
# limitations under the License.
#
-org.apache.shardingsphere.transaction.core.fixture.ShardingTransactionManagerFixture
-org.apache.shardingsphere.transaction.core.fixture.OtherShardingTransactionManagerFixture
+org.apache.shardingsphere.transaction.core.fixture.ShardingSphereTransactionManagerFixture
+org.apache.shardingsphere.transaction.core.fixture.OtherShardingSphereTransactionManagerFixture
diff --git a/shardingsphere-transaction/shardingsphere-transaction-core/src/test/resources/logback-test.xml b/shardingsphere-transaction/shardingsphere-transaction-core/src/test/resources/logback-test.xml
index 737f202..23413fa 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-core/src/test/resources/logback-test.xml
+++ b/shardingsphere-transaction/shardingsphere-transaction-core/src/test/resources/logback-test.xml
@@ -25,7 +25,7 @@
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
<appender-ref ref="console" />
</logger>
- <logger name="org.apache.shardingsphere.transaction.ShardingTransactionManagerEngine" level="off" />
+ <logger name="org.apache.shardingsphere.transaction.ShardingSphereTransactionManagerEngine" level="off" />
<root>
<level value="error" />