Refactor ShardingSphereDistributionTransactionManager.containsProvide…

…rType() (#33077)
apache · Sep 30, 2024 · e935d21 · e935d21
1 parent 726713d
commit e935d21
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 14 deletions.
diff --git a/...g/apache/shardingsphere/transaction/spi/ShardingSphereDistributionTransactionManager.java b/...g/apache/shardingsphere/transaction/spi/ShardingSphereDistributionTransactionManager.java
@@ -94,9 +94,7 @@ public interface ShardingSphereDistributionTransactionManager extends TypedSPI,
  * @param providerType transaction manager provider type 
  * @return contains provider type or not
  */
- default boolean containsProviderType(final String providerType) {
- return true;
- }
+ boolean containsProviderType(String providerType);
 
  /**
  * Close transaction manager.

diff --git a/...ache/shardingsphere/transaction/core/fixture/ShardingSphereTransactionManagerFixture.java b/...ache/shardingsphere/transaction/core/fixture/ShardingSphereTransactionManagerFixture.java
@@ -69,6 +69,11 @@ public void commit(final boolean rollbackOnly) {
  public void rollback() {
  }
 
+ @Override
+ public boolean containsProviderType(final String providerType) {
+ return true;
+ }
+
  @Override
  public void close() {
  }

diff --git a/...ngsphere/transaction/distsql/handler/fixture/ShardingSphereTransactionManagerFixture.java b/...ngsphere/transaction/distsql/handler/fixture/ShardingSphereTransactionManagerFixture.java
@@ -69,6 +69,11 @@ public void commit(final boolean rollbackOnly) {
  public void rollback() {
  }
 
+ @Override
+ public boolean containsProviderType(final String providerType) {
+ return true;
+ }
+
  @Override
  public void close() {
  }

diff --git a/...che/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManager.java b/...che/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManager.java
@@ -145,6 +145,11 @@ private void checkSeataATEnabled() {
  ShardingSpherePreconditions.checkState(enableSeataAT, SeataATDisabledException::new);
  }
 
+ @Override
+ public boolean containsProviderType(final String providerType) {
+ return true;
+ }
+
  @Override
  public void close() {
  dataSourceMap.clear();

diff --git a/...ain/java/org/apache/shardingsphere/transaction/xa/XAShardingSphereTransactionManager.java b/...ain/java/org/apache/shardingsphere/transaction/xa/XAShardingSphereTransactionManager.java
@@ -134,17 +134,6 @@ public void rollback() {
  xaTransactionManagerProvider.getTransactionManager().rollback();
  }
 
- @Override
- public void close() {
- for (XATransactionDataSource each : cachedDataSources.values()) {
- each.close();
- }
- cachedDataSources.clear();
- if (null != xaTransactionManagerProvider) {
- xaTransactionManagerProvider.close();
- }
- }
-
  @Override
  public boolean containsProviderType(final String providerType) {
  try {
@@ -156,6 +145,17 @@ public boolean containsProviderType(final String providerType) {
 
  }
 
+ @Override
+ public void close() {
+ for (XATransactionDataSource each : cachedDataSources.values()) {
+ each.close();
+ }
+ cachedDataSources.clear();
+ if (null != xaTransactionManagerProvider) {
+ xaTransactionManagerProvider.close();
+ }
+ }
+
  @Override
  public String getType() {
  return TransactionType.XA.name();