This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 0840db2 refator transactionManagerType to XATransactionManagerType
(#8647)
0840db2 is described below
commit 0840db2947f4a143693844e31b5007d0f0e0b872
Author: xiaoyu <[email protected]>
AuthorDate: Wed Dec 16 17:07:34 2020 +0800
refator transactionManagerType to XATransactionManagerType (#8647)
* refator transactionManagerType to XATransactionManagerType
---
.../shardingsphere-jdbc/configuration/props.cn.md | 2 +-
.../shardingsphere-jdbc/configuration/props.en.md | 2 +-
.../shardingsphere-jdbc/usage/transaction/narayana.cn.md | 6 +++---
.../shardingsphere-jdbc/usage/transaction/narayana.en.md | 6 +++---
.../shardingsphere-proxy/configuration/props.cn.md | 4 ++--
.../shardingsphere-proxy/configuration/props.en.md | 2 +-
.../user-manual/shardingsphere-proxy/usage/transaction.cn.md | 2 +-
.../user-manual/shardingsphere-proxy/usage/transaction.en.md | 4 ++--
.../main/resources/META-INF/sharding-databases-tables.yaml | 2 +-
.../main/resources/META-INF/sharding-databases-tables.yaml | 2 +-
.../transaction/GovernanceTransactionContextsTest.java | 8 ++++----
.../infra/config/properties/ConfigurationPropertyKey.java | 2 +-
.../jdbc/core/datasource/ShardingSphereDataSource.java | 8 ++++----
.../datasource/GovernanceShardingSphereDataSource.java | 12 ++++++------
.../proxy/initializer/impl/AbstractBootstrapInitializer.java | 10 +++++-----
.../initializer/impl/GovernanceBootstrapInitializer.java | 4 ++--
.../proxy/initializer/impl/StandardBootstrapInitializer.java | 2 +-
.../src/main/resources/conf/server.yaml | 2 +-
.../initializer/impl/AbstractBootstrapInitializerTest.java | 2 +-
.../initializer/impl/GovernanceBootstrapInitializerTest.java | 4 ++--
.../initializer/impl/StandardBootstrapInitializerTest.java | 4 ++--
.../xa/atomikos/manager/AtomikosTransactionManager.java | 4 ++--
.../xa/bitronix/manager/BitronixXATransactionManager.java | 4 ++--
.../transaction/xa/XAShardingTransactionManagerTest.java | 4 ++--
.../xa/manager/XATransactionManagerLoaderTest.java | 4 ++--
.../xa/narayana/manager/NarayanaXATransactionManager.java | 4 ++--
.../transaction/ShardingTransactionManagerEngine.java | 6 +++---
...sactionManagerType.java => XATransactionManagerType.java} | 8 ++++----
.../transaction/ShardingTransactionManagerEngineTest.java | 4 ++--
29 files changed, 64 insertions(+), 64 deletions(-)
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/props.cn.md
b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/props.cn.md
index 9a01523..a8c5bca 100644
---
a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/props.cn.md
+++
b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/props.cn.md
@@ -18,4 +18,4 @@ Apache ShardingSphere 提供属性配置的方式配置系统级配置。
| max-connections-size-per-query (?) | int |
一次查询请求在每个数据库实例中所能使用的最大连接数。
| 1 |
| check-table-metadata-enabled (?) | boolean | 是否在程序启动和更新时检查分片元数据的结构一致性。
| false |
| query-with-cipher-column (?) | boolean |
是否使用加密列进行查询。在有原文列的情况下，可以使用原文列进行查询。
|
true |
-| transaction-manager-type (?) | String |
事务管理器类型。列如：Atomikos，Narayana
| Atomikos |
+| xa-transaction-manager-type (?) | String | XA
事务管理器类型。列如：Atomikos，Narayana
| Atomikos |
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/props.en.md
b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/props.en.md
index 5ff8ca3..acf5df0 100644
---
a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/props.en.md
+++
b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/props.en.md
@@ -18,4 +18,4 @@ Apache ShardingSphere provides the way of property
configuration to configure sy
| max-connections-size-per-query (?) | int | Max opened connection
size for each query.
| 1
|
| check-table-metadata-enabled (?) | boolean | Whether validate table
meta data consistency when application startup or updated.
| false
|
| query-with-cipher-column (?) | boolean | Whether query with cipher
column for data encrypt. User you can use plaintext to query if have.
| true
|
-| transaction-manager-type (?) | String | Transaction manager type.
Include: Atomikos, Narayana.
| Atomikos
|
+| xa-transaction-manager-type (?) | String | XA Transaction manager
type. Include: Atomikos, Narayana.
|
Atomikos |
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/narayana.cn.md
b/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/narayana.cn.md
index 22c8534..73d1708 100644
---
a/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/narayana.cn.md
+++
b/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/narayana.cn.md
@@ -64,7 +64,7 @@ Yaml:
```yaml
props:
- transaction-manager-type: Narayana
+ xa-transaction-manager-type: Narayana
```
SpringBoot:
@@ -73,7 +73,7 @@ SpringBoot:
spring:
shardingsphere:
props:
- transaction-manager-type: Narayana
+ xa-transaction-manager-type: Narayana
```
Spring Namespace:
@@ -81,7 +81,7 @@ Spring Namespace:
```xml
<shardingsphere:data-source id="xxx" data-source-names="xxx" rule-refs="xxx">
<props>
- <prop key="transaction-manager-type">Narayana</prop>
+ <prop key="xa-transaction-manager-type">Narayana</prop>
</props>
</shardingsphere:data-source>
```
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/narayana.en.md
b/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/narayana.en.md
index 2b01cd0..69d39ee 100644
---
a/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/narayana.en.md
+++
b/docs/document/content/user-manual/shardingsphere-jdbc/usage/transaction/narayana.en.md
@@ -64,7 +64,7 @@ Yaml:
```yaml
props:
- transaction-manager-type: Narayana
+ xa-transaction-manager-type: Narayana
```
SpringBoot:
@@ -73,7 +73,7 @@ SpringBoot:
spring:
shardingsphere:
props:
- transaction-manager-type: Narayana
+ xa-transaction-manager-type: Narayana
```
Spring Namespace:
@@ -81,7 +81,7 @@ Spring Namespace:
```xml
<shardingsphere:data-source id="xxx" data-source-names="xxx" rule-refs="xxx">
<props>
- <prop key="transaction-manager-type">Narayana</prop>
+ <prop key="xa-transaction-manager-type">Narayana</prop>
</props>
</shardingsphere:data-source>
```
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/configuration/props.cn.md
b/docs/document/content/user-manual/shardingsphere-proxy/configuration/props.cn.md
index e037fc7..289b764 100644
---
a/docs/document/content/user-manual/shardingsphere-proxy/configuration/props.cn.md
+++
b/docs/document/content/user-manual/shardingsphere-proxy/configuration/props.cn.md
@@ -22,5 +22,5 @@ Apache ShardingSphere 提供属性配置的方式配置系统级配置。
| proxy-frontend-flush-threshold (?) | int | 在 ShardingSphere-Proxy
中设置传输数据条数的 IO 刷新阈值。
| 128
|
| proxy-transaction-type (?) | String | ShardingSphere-Proxy
中使用的默认事务类型。包括：LOCAL、XA 和 BASE。
| LOCAL
|
| proxy-opentracing-enabled (?) | boolean | 是否允许在
ShardingSphere-Proxy 中使用 OpenTracing。
| false |
-| proxy-hint-enabled (?) | boolean | 是否允许在
ShardingSphere-Proxy 中使用 Hint。使用 Hint 会将 Proxy 的线程处理模型由 IO
多路复用变更为每个请求一个独立的线程，会降低 Proxy 的吞吐量。
| false |
-| transaction-manager-type (?) | String |
事务管理器类型。列如：Atomikos，Narayana。
| Atomikos |
+| proxy-hint-enabled (?) | boolean | 是否允许在
ShardingSphere-Proxy 中使用 Hint。使用 Hint 会将 Proxy 的线程处理模型由 IO
多路复用变更为每个请求一个独立的线程，会降低 Proxy 的吞吐量。
| false |
+| xa-transaction-manager-type (?) | String | XA
事务管理器类型。列如：Atomikos，Narayana。
| Atomikos |
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/configuration/props.en.md
b/docs/document/content/user-manual/shardingsphere-proxy/configuration/props.en.md
index 8ee2113..342a5cd 100644
---
a/docs/document/content/user-manual/shardingsphere-proxy/configuration/props.en.md
+++
b/docs/document/content/user-manual/shardingsphere-proxy/configuration/props.en.md
@@ -23,4 +23,4 @@ Apache ShardingSphere provides the way of property
configuration to configure sy
| proxy-transaction-type (?) | String | Default transaction type
of ShardingSphere-Proxy. Include: LOCAL, XA and BASE.
| LOCAL
|
| proxy-opentracing-enabled (?) | boolean | Whether enable
opentracing for ShardingSphere-Proxy.
|
false |
| proxy-hint-enabled (?) | boolean | Whether enable hint for
ShardingSphere-Proxy. Using Hint will switch proxy thread mode from IO
multiplexing to per connection per thread, which will reduce system throughput.
|
false |
-| transaction-manager-type (?) | String | Transaction manager type.
Include: Atomikos, Narayana.
| Atomikos
|
+| xa-transaction-manager-type (?) | String | XA Transaction manager
type. Include: Atomikos, Narayana.
|
Atomikos |
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 5273f2a..cfcca29 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
@@ -47,7 +47,7 @@ ShardingSphere-Proxy 接入的分布式事务 API 同 ShardingSphere-JDBC 保持
```yaml
props:
- transaction-manager-type: Narayana
+ xa-transaction-manager-type: Narayana
```
3. 新增 `jbossts-properties.xml` 文件来定制化 Narayana 配置项，它的加载路径顺序：`user.dir (pwd)` >
`user.home` > `java.home` > `classpath`。
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 d0f5707..83c02a0 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
@@ -41,11 +41,11 @@ Default XA transaction manager of ShardingSphere is
Atomikos. Users can customiz
</dependency>
```
-2. Configure `transaction-manager-type` in `conf/server.yaml`：
+2. Configure `xa-transaction-manager-type` in `conf/server.yaml`：
```yaml
props:
- transaction-manager-type: Narayana
+ xa-transaction-manager-type: Narayana
```
3. Add `jbossts-properties.xml` to customize Narayana configuration.
diff --git
a/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-bitronix-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables.yaml
b/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-bitronix-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables.yaml
index 0d597fd..3b5d115 100644
---
a/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-bitronix-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables.yaml
+++
b/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-bitronix-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables.yaml
@@ -67,4 +67,4 @@ rules:
props:
sql-show: false
- transaction-manager-type: Bitronix
+ xa-transaction-manager-type: Bitronix
diff --git
a/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-narayana-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables.yaml
b/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-narayana-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables.yaml
index 8d0d057..639ee1d 100644
---
a/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-narayana-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables.yaml
+++
b/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-narayana-raw-jdbc-example/src/main/resources/META-INF/sharding-databases-tables.yaml
@@ -67,4 +67,4 @@ rules:
props:
sql-show: false
- transaction-manager-type: Narayana
+ xa-transaction-manager-type: Narayana
diff --git
a/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/transaction/GovernanceTransactionContextsTest.java
b/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/transaction/GovernanceTransactionContextsTest.java
index 80b38dd..a6a63c2 100644
---
a/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/transaction/GovernanceTransactionContextsTest.java
+++
b/shardingsphere-governance/shardingsphere-governance-context/src/test/java/org/apache/shardingsphere/governance/context/transaction/GovernanceTransactionContextsTest.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.governance.context.transaction;
import
org.apache.shardingsphere.governance.core.event.model.datasource.DataSourceChangeCompletedEvent;
import org.apache.shardingsphere.transaction.ShardingTransactionManagerEngine;
import org.apache.shardingsphere.transaction.context.TransactionContexts;
-import org.apache.shardingsphere.transaction.core.TransactionManagerType;
+import org.apache.shardingsphere.transaction.core.XATransactionManagerType;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -55,14 +55,14 @@ public final class GovernanceTransactionContextsTest {
public void assertNewInstance() {
when(transactionContexts.getDefaultTransactionManagerEngine()).thenReturn(engine);
when(transactionContexts.getEngines()).thenReturn(Collections.singletonMap("name",
engine));
- GovernanceTransactionContexts actual = new
GovernanceTransactionContexts(transactionContexts,
TransactionManagerType.ATOMIKOS.getType());
+ GovernanceTransactionContexts actual = new
GovernanceTransactionContexts(transactionContexts,
XATransactionManagerType.ATOMIKOS.getType());
assertThat(actual.getEngines(), is(Collections.singletonMap("name",
engine)));
assertThat(actual.getDefaultTransactionManagerEngine(), is(engine));
}
@Test
public void assertClose() throws Exception {
- GovernanceTransactionContexts actual = new
GovernanceTransactionContexts(transactionContexts,
TransactionManagerType.ATOMIKOS.getType());
+ GovernanceTransactionContexts actual = new
GovernanceTransactionContexts(transactionContexts,
XATransactionManagerType.ATOMIKOS.getType());
actual.close();
verify(transactionContexts).close();
}
@@ -72,7 +72,7 @@ public final class GovernanceTransactionContextsTest {
when(event.getSchemaName()).thenReturn("name");
when(transactionContexts.getEngines()).thenReturn(engineMap);
when(engineMap.remove(eq("name"))).thenReturn(engine);
- GovernanceTransactionContexts actual = new
GovernanceTransactionContexts(transactionContexts,
TransactionManagerType.ATOMIKOS.getType());
+ GovernanceTransactionContexts actual = new
GovernanceTransactionContexts(transactionContexts,
XATransactionManagerType.ATOMIKOS.getType());
actual.renew(event);
verify(engine).close();
verify(engineMap).put(eq("name"),
any(ShardingTransactionManagerEngine.class));
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/properties/ConfigurationPropertyKey.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/properties/ConfigurationPropertyKey.java
index 9873b8a..68f7026 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/properties/ConfigurationPropertyKey.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/properties/ConfigurationPropertyKey.java
@@ -111,7 +111,7 @@ public enum ConfigurationPropertyKey implements
TypedPropertyKey {
* ShardingSphere-Proxy will run with XA transaction with Bitronix.
* </p>
*/
- TRANSACTION_MANAGER_TYPE("transaction-manager-type", "Atomikos",
String.class),
+ XA_TRANSACTION_MANAGER_TYPE("xa-transaction-manager-type", "Atomikos",
String.class),
/**
* Whether enable opentracing for ShardingSphere-Proxy.
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java
index 6c79c83..9a74c77 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java
@@ -53,13 +53,13 @@ public final class ShardingSphereDataSource extends
AbstractUnsupportedOperation
public ShardingSphereDataSource(final Map<String, DataSource>
dataSourceMap, final Collection<RuleConfiguration> configurations, final
Properties props) throws SQLException {
metaDataContexts = new MetaDataContextsBuilder(
Collections.singletonMap(DefaultSchema.LOGIC_NAME,
dataSourceMap), Collections.singletonMap(DefaultSchema.LOGIC_NAME,
configurations), props).build();
- String transactionMangerType =
metaDataContexts.getProps().getValue(ConfigurationPropertyKey.TRANSACTION_MANAGER_TYPE);
- transactionContexts =
createTransactionContexts(metaDataContexts.getDefaultMetaData().getResource().getDatabaseType(),
dataSourceMap, transactionMangerType);
+ String xaTransactionMangerType =
metaDataContexts.getProps().getValue(ConfigurationPropertyKey.XA_TRANSACTION_MANAGER_TYPE);
+ transactionContexts =
createTransactionContexts(metaDataContexts.getDefaultMetaData().getResource().getDatabaseType(),
dataSourceMap, xaTransactionMangerType);
}
- private TransactionContexts createTransactionContexts(final DatabaseType
databaseType, final Map<String, DataSource> dataSourceMap, final String
transactionMangerType) {
+ private TransactionContexts createTransactionContexts(final DatabaseType
databaseType, final Map<String, DataSource> dataSourceMap, final String
xaTransactionMangerType) {
ShardingTransactionManagerEngine engine = new
ShardingTransactionManagerEngine();
- engine.init(databaseType, dataSourceMap, transactionMangerType);
+ engine.init(databaseType, dataSourceMap, xaTransactionMangerType);
return new
StandardTransactionContexts(Collections.singletonMap(DefaultSchema.LOGIC_NAME,
engine));
}
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSource.java
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSource.java
index dd7e77b..16e4ff3 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSource.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSource.java
@@ -61,18 +61,18 @@ public final class GovernanceShardingSphereDataSource
extends AbstractUnsupporte
public GovernanceShardingSphereDataSource(final GovernanceConfiguration
governanceConfig) throws SQLException {
GovernanceFacade governanceFacade =
createGovernanceFacade(governanceConfig);
metaDataContexts = new
GovernanceMetaDataContexts(createMetaDataContexts(governanceFacade),
governanceFacade);
- String transactionMangerType =
metaDataContexts.getProps().getValue(ConfigurationPropertyKey.TRANSACTION_MANAGER_TYPE);
+ String xaTransactionMangerType =
metaDataContexts.getProps().getValue(ConfigurationPropertyKey.XA_TRANSACTION_MANAGER_TYPE);
transactionContexts =
createTransactionContexts(metaDataContexts.getDefaultMetaData().getResource().getDatabaseType(),
-
metaDataContexts.getDefaultMetaData().getResource().getDataSources(),
transactionMangerType);
+
metaDataContexts.getDefaultMetaData().getResource().getDataSources(),
xaTransactionMangerType);
}
public GovernanceShardingSphereDataSource(final Map<String, DataSource>
dataSourceMap, final Collection<RuleConfiguration> ruleConfigs,
final Properties props, final
GovernanceConfiguration governanceConfig) throws SQLException {
GovernanceFacade governanceFacade =
createGovernanceFacade(governanceConfig);
metaDataContexts = new
GovernanceMetaDataContexts(createMetaDataContexts(dataSourceMap, ruleConfigs,
props), governanceFacade);
- String transactionMangerType =
metaDataContexts.getProps().getValue(ConfigurationPropertyKey.TRANSACTION_MANAGER_TYPE);
+ String xaTransactionMangerType =
metaDataContexts.getProps().getValue(ConfigurationPropertyKey.XA_TRANSACTION_MANAGER_TYPE);
transactionContexts =
createTransactionContexts(metaDataContexts.getDefaultMetaData().getResource().getDatabaseType(),
-
metaDataContexts.getDefaultMetaData().getResource().getDataSources(),
transactionMangerType);
+
metaDataContexts.getDefaultMetaData().getResource().getDataSources(),
xaTransactionMangerType);
uploadLocalConfiguration(governanceFacade);
}
@@ -100,9 +100,9 @@ public final class GovernanceShardingSphereDataSource
extends AbstractUnsupporte
return metaDataContextsBuilder.build();
}
- private TransactionContexts createTransactionContexts(final DatabaseType
databaseType, final Map<String, DataSource> dataSourceMap, final String
transactionMangerType) {
+ private TransactionContexts createTransactionContexts(final DatabaseType
databaseType, final Map<String, DataSource> dataSourceMap, final String
xaTransactionMangerType) {
ShardingTransactionManagerEngine engine = new
ShardingTransactionManagerEngine();
- engine.init(databaseType, dataSourceMap, transactionMangerType);
+ engine.init(databaseType, dataSourceMap, xaTransactionMangerType);
return new
StandardTransactionContexts(Collections.singletonMap(DefaultSchema.LOGIC_NAME,
engine));
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/impl/AbstractBootstrapInitializer.java
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/impl/AbstractBootstrapInitializer.java
index 89511af..622e9bb 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/impl/AbstractBootstrapInitializer.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/impl/AbstractBootstrapInitializer.java
@@ -57,8 +57,8 @@ public abstract class AbstractBootstrapInitializer implements
BootstrapInitializ
public final void init(final YamlProxyConfiguration yamlConfig, final int
port) throws SQLException {
ProxyConfiguration proxyConfig = getProxyConfiguration(yamlConfig);
MetaDataContexts metaDataContexts =
decorateMetaDataContexts(createMetaDataContexts(proxyConfig));
- String transactionMangerType =
metaDataContexts.getProps().getValue(ConfigurationPropertyKey.TRANSACTION_MANAGER_TYPE);
- TransactionContexts transactionContexts =
decorateTransactionContexts(createTransactionContexts(metaDataContexts),
transactionMangerType);
+ String xaTransactionMangerType =
metaDataContexts.getProps().getValue(ConfigurationPropertyKey.XA_TRANSACTION_MANAGER_TYPE);
+ TransactionContexts transactionContexts =
decorateTransactionContexts(createTransactionContexts(metaDataContexts),
xaTransactionMangerType);
ProxyContext.getInstance().init(metaDataContexts, transactionContexts);
initOpenTracing();
setDatabaseServerInfo();
@@ -86,11 +86,11 @@ public abstract class AbstractBootstrapInitializer
implements BootstrapInitializ
private TransactionContexts createTransactionContexts(final
MetaDataContexts metaDataContexts) {
Map<String, ShardingTransactionManagerEngine>
transactionManagerEngines = new
HashMap<>(metaDataContexts.getAllSchemaNames().size(), 1);
- String transactionMangerType =
metaDataContexts.getProps().getValue(ConfigurationPropertyKey.TRANSACTION_MANAGER_TYPE);
+ String xaTransactionMangerType =
metaDataContexts.getProps().getValue(ConfigurationPropertyKey.XA_TRANSACTION_MANAGER_TYPE);
for (String each : metaDataContexts.getAllSchemaNames()) {
ShardingTransactionManagerEngine engine = new
ShardingTransactionManagerEngine();
ShardingSphereResource resource =
metaDataContexts.getMetaData(each).getResource();
- engine.init(resource.getDatabaseType(), resource.getDataSources(),
transactionMangerType);
+ engine.init(resource.getDatabaseType(), resource.getDataSources(),
xaTransactionMangerType);
transactionManagerEngines.put(each, engine);
}
return new StandardTransactionContexts(transactionManagerEngines);
@@ -115,7 +115,7 @@ public abstract class AbstractBootstrapInitializer
implements BootstrapInitializ
protected abstract MetaDataContexts
decorateMetaDataContexts(MetaDataContexts metaDataContexts);
- protected abstract TransactionContexts
decorateTransactionContexts(TransactionContexts transactionContexts, String
transactionManagerType);
+ protected abstract TransactionContexts
decorateTransactionContexts(TransactionContexts transactionContexts, String
xaTransactionMangerType);
protected abstract void initLockContext();
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/impl/GovernanceBootstrapInitializer.java
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/impl/GovernanceBootstrapInitializer.java
index f052c14..96d2f9f 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/impl/GovernanceBootstrapInitializer.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/impl/GovernanceBootstrapInitializer.java
@@ -121,8 +121,8 @@ public final class GovernanceBootstrapInitializer extends
AbstractBootstrapIniti
}
@Override
- protected TransactionContexts decorateTransactionContexts(final
TransactionContexts transactionContexts, final String transactionManagerType) {
- return new GovernanceTransactionContexts(transactionContexts,
transactionManagerType);
+ protected TransactionContexts decorateTransactionContexts(final
TransactionContexts transactionContexts, final String xaTransactionMangerType) {
+ return new GovernanceTransactionContexts(transactionContexts,
xaTransactionMangerType);
}
@Override
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/impl/StandardBootstrapInitializer.java
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/impl/StandardBootstrapInitializer.java
index a6c3371..6ecc167 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/impl/StandardBootstrapInitializer.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/impl/StandardBootstrapInitializer.java
@@ -41,7 +41,7 @@ public final class StandardBootstrapInitializer extends
AbstractBootstrapInitial
}
@Override
- protected TransactionContexts decorateTransactionContexts(final
TransactionContexts transactionContexts, final String transactionManagerType) {
+ protected TransactionContexts decorateTransactionContexts(final
TransactionContexts transactionContexts, final String xaTransactionMangerType) {
return transactionContexts;
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/conf/server.yaml
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/conf/server.yaml
index adc79e5..f858525 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/conf/server.yaml
+++
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/conf/server.yaml
@@ -50,7 +50,7 @@
# # XA: Proxy will run with XA transaction.
# # BASE: Proxy will run with B.A.S.E transaction.
# proxy-transaction-type: LOCAL
-# transaction-manager-type: Atomikos
+# xa-transaction-manager-type: Atomikos
# proxy-opentracing-enabled: false
# proxy-hint-enabled: false
# query-with-cipher-column: true
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/AbstractBootstrapInitializerTest.java
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/AbstractBootstrapInitializerTest.java
index ef63677..c9543c1 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/AbstractBootstrapInitializerTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/AbstractBootstrapInitializerTest.java
@@ -78,7 +78,7 @@ public abstract class AbstractBootstrapInitializerTest {
doReturn(mock(ProxyConfiguration.class)).when(abstractBootstrapInitializer).getProxyConfiguration(any());
MetaDataContexts metaDataContexts = mock(MetaDataContexts.class);
ConfigurationProperties props = mock(ConfigurationProperties.class);
-
when(props.getValue(ConfigurationPropertyKey.TRANSACTION_MANAGER_TYPE)).thenReturn("atomikos");
+
when(props.getValue(ConfigurationPropertyKey.XA_TRANSACTION_MANAGER_TYPE)).thenReturn("Atomikos");
when(props.getValue(ConfigurationPropertyKey.PROXY_OPENTRACING_ENABLED)).thenReturn(Boolean.FALSE);
when(metaDataContexts.getProps()).thenReturn(props);
doReturn(metaDataContexts).when(abstractBootstrapInitializer).decorateMetaDataContexts(any());
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/GovernanceBootstrapInitializerTest.java
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/GovernanceBootstrapInitializerTest.java
index 853c605..5f50481 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/GovernanceBootstrapInitializerTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/GovernanceBootstrapInitializerTest.java
@@ -37,7 +37,7 @@ import
org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfi
import
org.apache.shardingsphere.sharding.api.config.strategy.sharding.ShardingStrategyConfiguration;
import
org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration;
import org.apache.shardingsphere.transaction.context.TransactionContexts;
-import org.apache.shardingsphere.transaction.core.TransactionManagerType;
+import org.apache.shardingsphere.transaction.core.XATransactionManagerType;
import org.junit.Test;
import java.io.IOException;
@@ -221,7 +221,7 @@ public final class GovernanceBootstrapInitializerTest
extends AbstractBootstrapI
@Test
public void assertDecorateTransactionContexts() {
TransactionContexts transactionContexts =
mock(TransactionContexts.class);
- TransactionContexts actualTransactionContexts =
getInitializer().decorateTransactionContexts(transactionContexts,
TransactionManagerType.ATOMIKOS.getType());
+ TransactionContexts actualTransactionContexts =
getInitializer().decorateTransactionContexts(transactionContexts,
XATransactionManagerType.ATOMIKOS.getType());
assertNotNull(actualTransactionContexts);
assertThat(actualTransactionContexts,
instanceOf(GovernanceTransactionContexts.class));
assertThat(actualTransactionContexts.getEngines(),
is(transactionContexts.getEngines()));
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/StandardBootstrapInitializerTest.java
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/StandardBootstrapInitializerTest.java
index f198cf6..472d1b3 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/StandardBootstrapInitializerTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/initializer/impl/StandardBootstrapInitializerTest.java
@@ -35,7 +35,7 @@ import
org.apache.shardingsphere.proxy.config.yaml.YamlProxyServerConfiguration;
import org.apache.shardingsphere.proxy.fixture.FixtureRuleConfiguration;
import org.apache.shardingsphere.proxy.fixture.FixtureYamlRuleConfiguration;
import org.apache.shardingsphere.transaction.context.TransactionContexts;
-import org.apache.shardingsphere.transaction.core.TransactionManagerType;
+import org.apache.shardingsphere.transaction.core.XATransactionManagerType;
import org.junit.Test;
import java.util.Collection;
@@ -194,7 +194,7 @@ public final class StandardBootstrapInitializerTest extends
AbstractBootstrapIni
@Test
public void assertDecorateTransactionContexts() {
TransactionContexts transactionContexts =
mock(TransactionContexts.class);
-
assertThat(getInitializer().decorateTransactionContexts(transactionContexts,
TransactionManagerType.ATOMIKOS.getType()), is(transactionContexts));
+
assertThat(getInitializer().decorateTransactionContexts(transactionContexts,
XATransactionManagerType.ATOMIKOS.getType()), is(transactionContexts));
}
protected void doEnvironmentPrepare() {
diff --git
a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-atomikos/src/main/java/org/apache/shardingsphere/transaction/xa/atomikos/manager/AtomikosTransactionManager.java
b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-atomikos/src/main/java/org/apache/shardingsphere/transaction/xa/atomikos/manager/AtomikosTransactionManager.java
index e0a4501..76ba61c2 100644
---
a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-atomikos/src/main/java/org/apache/shardingsphere/transaction/xa/atomikos/manager/AtomikosTransactionManager.java
+++
b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-atomikos/src/main/java/org/apache/shardingsphere/transaction/xa/atomikos/manager/AtomikosTransactionManager.java
@@ -21,7 +21,7 @@ import com.atomikos.icatch.config.UserTransactionService;
import com.atomikos.icatch.config.UserTransactionServiceImp;
import com.atomikos.icatch.jta.UserTransactionManager;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.transaction.core.TransactionManagerType;
+import org.apache.shardingsphere.transaction.core.XATransactionManagerType;
import org.apache.shardingsphere.transaction.xa.spi.SingleXAResource;
import org.apache.shardingsphere.transaction.xa.spi.XATransactionManager;
@@ -74,6 +74,6 @@ public final class AtomikosTransactionManager implements
XATransactionManager {
@Override
public String getType() {
- return TransactionManagerType.ATOMIKOS.getType();
+ return XATransactionManagerType.ATOMIKOS.getType();
}
}
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 68c812b..6a41728 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
@@ -22,7 +22,7 @@ import bitronix.tm.TransactionManagerServices;
import bitronix.tm.recovery.RecoveryException;
import bitronix.tm.resource.ResourceRegistrar;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.transaction.core.TransactionManagerType;
+import org.apache.shardingsphere.transaction.core.XATransactionManagerType;
import org.apache.shardingsphere.transaction.xa.spi.SingleXAResource;
import org.apache.shardingsphere.transaction.xa.spi.XATransactionManager;
@@ -72,6 +72,6 @@ public final class BitronixXATransactionManager implements
XATransactionManager
@Override
public String getType() {
- return TransactionManagerType.BITRONIX.getType();
+ return XATransactionManagerType.BITRONIX.getType();
}
}
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/XAShardingTransactionManagerTest.java
index cb1116f..1eff1a9 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/XAShardingTransactionManagerTest.java
@@ -32,7 +32,7 @@ import lombok.SneakyThrows;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
import org.apache.shardingsphere.transaction.core.ResourceDataSource;
-import org.apache.shardingsphere.transaction.core.TransactionManagerType;
+import org.apache.shardingsphere.transaction.core.XATransactionManagerType;
import org.apache.shardingsphere.transaction.core.TransactionType;
import org.apache.shardingsphere.transaction.xa.fixture.DataSourceUtils;
import
org.apache.shardingsphere.transaction.xa.jta.datasource.XATransactionDataSource;
@@ -56,7 +56,7 @@ public final class XAShardingTransactionManagerTest {
@Before
public void setUp() {
Collection<ResourceDataSource> resourceDataSources =
createResourceDataSources(DatabaseTypeRegistry.getActualDatabaseType("H2"));
-
xaShardingTransactionManager.init(DatabaseTypeRegistry.getActualDatabaseType("H2"),
resourceDataSources, TransactionManagerType.ATOMIKOS.getType());
+
xaShardingTransactionManager.init(DatabaseTypeRegistry.getActualDatabaseType("H2"),
resourceDataSources, XATransactionManagerType.ATOMIKOS.getType());
}
@After
diff --git
a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/test/java/org/apache/shardingsphere/transaction/xa/manager/XATransactionManagerLoaderTest.java
b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/test/java/org/apache/shardingsphere/transaction/xa/manager/XATransactionManagerLoaderTest.java
index 5929a6b..ac18fcc 100644
---
a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/test/java/org/apache/shardingsphere/transaction/xa/manager/XATransactionManagerLoaderTest.java
+++
b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/test/java/org/apache/shardingsphere/transaction/xa/manager/XATransactionManagerLoaderTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.transaction.xa.manager;
-import org.apache.shardingsphere.transaction.core.TransactionManagerType;
+import org.apache.shardingsphere.transaction.core.XATransactionManagerType;
import
org.apache.shardingsphere.transaction.xa.atomikos.manager.AtomikosTransactionManager;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -31,6 +31,6 @@ public final class XATransactionManagerLoaderTest {
@Test
public void assertGetTransactionManager() {
-
assertThat(XATransactionManagerLoader.getInstance().getXATransactionManager(TransactionManagerType.ATOMIKOS.getType()),
instanceOf(AtomikosTransactionManager.class));
+
assertThat(XATransactionManagerLoader.getInstance().getXATransactionManager(XATransactionManagerType.ATOMIKOS.getType()),
instanceOf(AtomikosTransactionManager.class));
}
}
diff --git
a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-narayana/src/main/java/org/apache/shardingsphere/transaction/xa/narayana/manager/NarayanaXATransactionManager.java
b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-narayana/src/main/java/org/apache/shardingsphere/transaction/xa/narayana/manager/NarayanaXATransactionManager.java
index 123de94..b496897 100644
---
a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-narayana/src/main/java/org/apache/shardingsphere/transaction/xa/narayana/manager/NarayanaXATransactionManager.java
+++
b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-narayana/src/main/java/org/apache/shardingsphere/transaction/xa/narayana/manager/NarayanaXATransactionManager.java
@@ -23,7 +23,7 @@ import com.arjuna.ats.jbossatx.jta.RecoveryManagerService;
import com.arjuna.ats.jta.common.jtaPropertyManager;
import java.util.Objects;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.transaction.core.TransactionManagerType;
+import org.apache.shardingsphere.transaction.core.XATransactionManagerType;
import org.apache.shardingsphere.transaction.xa.spi.SingleXAResource;
import org.apache.shardingsphere.transaction.xa.spi.XATransactionManager;
@@ -86,6 +86,6 @@ public final class NarayanaXATransactionManager implements
XATransactionManager
@Override
public String getType() {
- return TransactionManagerType.NARAYANA.getType();
+ return XATransactionManagerType.NARAYANA.getType();
}
}
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/ShardingTransactionManagerEngine.java
index 73617ca..985d733 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/ShardingTransactionManagerEngine.java
@@ -61,11 +61,11 @@ public final class ShardingTransactionManagerEngine {
*
* @param databaseType database type
* @param dataSourceMap data source map
- * @param transactionMangerType transaction manger type
+ * @param xaTransactionMangerType XA transaction manger type
*/
- public void init(final DatabaseType databaseType, final Map<String,
DataSource> dataSourceMap, final String transactionMangerType) {
+ public void init(final DatabaseType databaseType, final Map<String,
DataSource> dataSourceMap, final String xaTransactionMangerType) {
for (Entry<TransactionType, ShardingTransactionManager> entry :
transactionManagerMap.entrySet()) {
- entry.getValue().init(databaseType,
getResourceDataSources(dataSourceMap), transactionMangerType);
+ entry.getValue().init(databaseType,
getResourceDataSources(dataSourceMap), xaTransactionMangerType);
}
}
diff --git
a/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/core/TransactionManagerType.java
b/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/core/XATransactionManagerType.java
similarity index 86%
rename from
shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/core/TransactionManagerType.java
rename to
shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/core/XATransactionManagerType.java
index ebb49bf..c2b0925 100644
---
a/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/core/TransactionManagerType.java
+++
b/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/core/XATransactionManagerType.java
@@ -23,11 +23,11 @@ import lombok.RequiredArgsConstructor;
import java.util.Arrays;
/**
- * Transaction manager type.
+ * XA transaction manager type.
*/
@RequiredArgsConstructor
@Getter
-public enum TransactionManagerType {
+public enum XATransactionManagerType {
ATOMIKOS("Atomikos"),
@@ -45,7 +45,7 @@ public enum TransactionManagerType {
* @param type value to be transaction manager type
* @return value from transaction manager type
*/
- public static TransactionManagerType valueFrom(final String type) {
- return Arrays.stream(values()).filter(each ->
each.type.equalsIgnoreCase(type)).findFirst().orElse(TransactionManagerType.ATOMIKOS);
+ public static XATransactionManagerType valueFrom(final String type) {
+ return Arrays.stream(values()).filter(each ->
each.type.equalsIgnoreCase(type)).findFirst().orElse(XATransactionManagerType.ATOMIKOS);
}
}
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/ShardingTransactionManagerEngineTest.java
index 1312cef..beaa8c9 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/ShardingTransactionManagerEngineTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.transaction;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
-import org.apache.shardingsphere.transaction.core.TransactionManagerType;
+import org.apache.shardingsphere.transaction.core.XATransactionManagerType;
import org.apache.shardingsphere.transaction.core.TransactionType;
import
org.apache.shardingsphere.transaction.core.fixture.ShardingTransactionManagerFixture;
import org.junit.Test;
@@ -45,7 +45,7 @@ public final class ShardingTransactionManagerEngineTest {
Runnable caller = mock(Runnable.class);
ShardingTransactionManagerFixture shardingTransactionManager =
(ShardingTransactionManagerFixture)
shardingTransactionManagerEngine.getTransactionManager(TransactionType.XA);
shardingTransactionManager.setCaller(caller);
-
shardingTransactionManagerEngine.init(DatabaseTypeRegistry.getActualDatabaseType("H2"),
mock(Map.class), TransactionManagerType.ATOMIKOS.getType());
+
shardingTransactionManagerEngine.init(DatabaseTypeRegistry.getActualDatabaseType("H2"),
mock(Map.class), XATransactionManagerType.ATOMIKOS.getType());
verify(caller).run();
}
}
