You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2020/11/13 13:03:24 UTC
[shardingsphere] branch master updated: add TypedSPI to
XATransactionManager (#8156)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 c3f78d6 add TypedSPI to XATransactionManager (#8156)
c3f78d6 is described below
commit c3f78d6ac78807dbfc9b70db285fa5d9f1e5aa69
Author: kimmking <ki...@163.com>
AuthorDate: Fri Nov 13 21:02:04 2020 +0800
add TypedSPI to XATransactionManager (#8156)
---
.../xa/atomikos/manager/AtomikosTransactionManager.java | 16 ++++++++++++++++
.../bitronix/manager/BitronixXATransactionManager.java | 16 ++++++++++++++++
.../xa/fixture/FixtureXATransactionManager.java | 16 ++++++++++++++++
.../narayana/manager/NarayanaXATransactionManager.java | 16 ++++++++++++++++
.../transaction/xa/spi/XATransactionManager.java | 5 ++++-
5 files changed, 68 insertions(+), 1 deletion(-)
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 3dc3851..19da34e 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
@@ -28,6 +28,7 @@ import javax.sql.XADataSource;
import javax.transaction.RollbackException;
import javax.transaction.SystemException;
import javax.transaction.TransactionManager;
+import java.util.Properties;
/**
* Atomikos XA transaction manager.
@@ -68,4 +69,19 @@ public final class AtomikosTransactionManager implements XATransactionManager {
public void close() {
userTransactionService.shutdown(true);
}
+
+ @Override
+ public String getType() {
+ return "atomikos";
+ }
+
+ @Override
+ public Properties getProps() {
+ return null;
+ }
+
+ @Override
+ public void setProps(Properties props) {
+
+ }
}
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 307916c..58e6dd7 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
@@ -29,6 +29,7 @@ import javax.sql.XADataSource;
import javax.transaction.RollbackException;
import javax.transaction.SystemException;
import javax.transaction.TransactionManager;
+import java.util.Properties;
/**
* Bitronix sharding transaction manager.
@@ -67,4 +68,19 @@ public final class BitronixXATransactionManager implements XATransactionManager
public void close() {
bitronixTransactionManager.shutdown();
}
+
+ @Override
+ public String getType() {
+ return "bitronix";
+ }
+
+ @Override
+ public Properties getProps() {
+ return null;
+ }
+
+ @Override
+ public void setProps(Properties props) {
+
+ }
}
diff --git a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/test/java/org/apache/shardingsphere/transaction/xa/fixture/FixtureXATransactionManager.java b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/test/java/org/apache/shardingsphere/transaction/xa/fixture/FixtureXATransactionManager.java
index c13f601..fa97c00 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/test/java/org/apache/shardingsphere/transaction/xa/fixture/FixtureXATransactionManager.java
+++ b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/test/java/org/apache/shardingsphere/transaction/xa/fixture/FixtureXATransactionManager.java
@@ -22,6 +22,7 @@ import org.apache.shardingsphere.transaction.xa.spi.XATransactionManager;
import javax.sql.XADataSource;
import javax.transaction.TransactionManager;
+import java.util.Properties;
public final class FixtureXATransactionManager implements XATransactionManager {
@@ -49,4 +50,19 @@ public final class FixtureXATransactionManager implements XATransactionManager {
@Override
public void close() {
}
+
+ @Override
+ public String getType() {
+ return "fixture";
+ }
+
+ @Override
+ public Properties getProps() {
+ return null;
+ }
+
+ @Override
+ public void setProps(Properties props) {
+
+ }
}
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 45c53b4..cc1daac 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
@@ -29,6 +29,7 @@ import javax.sql.XADataSource;
import javax.transaction.RollbackException;
import javax.transaction.SystemException;
import javax.transaction.TransactionManager;
+import java.util.Properties;
/**
* Narayana transaction manager.
@@ -74,4 +75,19 @@ public final class NarayanaXATransactionManager implements XATransactionManager
recoveryManagerService.stop();
recoveryManagerService.destroy();
}
+
+ @Override
+ public String getType() {
+ return "narayana";
+ }
+
+ @Override
+ public Properties getProps() {
+ return null;
+ }
+
+ @Override
+ public void setProps(Properties props) {
+
+ }
}
diff --git a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-spi/src/main/java/org/apache/shardingsphere/transaction/xa/spi/XATransactionManager.java b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-spi/src/main/java/org/apache/shardingsphere/transaction/xa/spi/XATransactionManager.java
index 476b64d..0fe4e72 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-spi/src/main/java/org/apache/shardingsphere/transaction/xa/spi/XATransactionManager.java
+++ b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-spi/src/main/java/org/apache/shardingsphere/transaction/xa/spi/XATransactionManager.java
@@ -17,13 +17,16 @@
package org.apache.shardingsphere.transaction.xa.spi;
+import org.apache.shardingsphere.infra.spi.typed.TypedSPI;
+
import javax.sql.XADataSource;
import javax.transaction.TransactionManager;
+import java.util.Properties;
/**
* XA transaction manager.
*/
-public interface XATransactionManager extends AutoCloseable {
+public interface XATransactionManager extends AutoCloseable, TypedSPI {
/**
* Initialize XA transaction manager.