Loading sharding-core/src/main/java/io/shardingsphere/core/transaction/listener/TransactionListener.java +4 −4 Original line number Diff line number Diff line Loading @@ -21,23 +21,23 @@ import com.google.common.eventbus.AllowConcurrentEvents; import com.google.common.eventbus.Subscribe; import io.shardingsphere.core.transaction.event.TransactionEvent; import io.shardingsphere.core.transaction.spi.Transaction; import lombok.AllArgsConstructor; import lombok.RequiredArgsConstructor; /** * Transaction Listener. * * @author zhaojun */ @AllArgsConstructor @RequiredArgsConstructor public class TransactionListener { private Transaction transaction; private final Transaction transaction; /** * Listen event. * * @param transactionEvent transaction event * @throws Exception * @throws Exception exception */ @Subscribe @AllowConcurrentEvents Loading sharding-core/src/main/java/io/shardingsphere/core/transaction/spi/Transaction.java +3 −0 Original line number Diff line number Diff line Loading @@ -29,6 +29,7 @@ public interface Transaction { /** * Do start a user transaction. * * @param transactionEvent transaction event * @throws Exception Exception */ void begin(TransactionEvent transactionEvent) throws Exception; Loading @@ -36,6 +37,7 @@ public interface Transaction { /** * Do transaction commit. * * @param transactionEvent transaction event * @throws Exception Exception */ void commit(TransactionEvent transactionEvent) throws Exception; Loading @@ -43,6 +45,7 @@ public interface Transaction { /** * Do transaction rollback. * * @param transactionEvent transaction event * @throws Exception Exception */ void rollback(TransactionEvent transactionEvent) throws Exception; Loading sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/representer/DataSourceRepresenter.java +1 −1 Original line number Diff line number Diff line Loading @@ -56,7 +56,7 @@ public class DataSourceRepresenter extends Representer { } @Override protected Set<Property> getProperties(final Class<? extends Object> type) { protected Set<Property> getProperties(final Class<?> type) { Set<Property> propertySet; try { propertySet = super.getProperties(type); Loading sharding-jdbc-transaction-parent/sharding-jdbc-transaction/src/main/java/io/shardingsphere/transaction/xa/AtomikosXaTransaction.java +7 −4 Original line number Diff line number Diff line Loading @@ -32,7 +32,7 @@ import javax.transaction.SystemException; import javax.transaction.UserTransaction; /** * Atomikos XA transaction implement for Transaction spi. * Atomikos XA transaction implement for Transaction SPI. * * @author zhaojun */ Loading @@ -45,21 +45,24 @@ public class AtomikosXaTransaction implements Transaction { TransactionEventHolder.set(XaTransactionEvent.class); } /** * Init. */ public static void init() { } @Override public void begin(TransactionEvent transactionEvent) throws SystemException, NotSupportedException { public void begin(final TransactionEvent transactionEvent) throws SystemException, NotSupportedException { userTransaction.begin(); } @Override public void commit(TransactionEvent transactionEvent) throws HeuristicRollbackException, RollbackException, HeuristicMixedException, SystemException { public void commit(final TransactionEvent transactionEvent) throws HeuristicRollbackException, RollbackException, HeuristicMixedException, SystemException { userTransaction.commit(); } @Override public void rollback(TransactionEvent transactionEvent) throws SystemException { public void rollback(final TransactionEvent transactionEvent) throws SystemException { userTransaction.rollback(); } } sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/transaction/TransactionLoader.java +6 −15 Original line number Diff line number Diff line Loading @@ -18,6 +18,8 @@ package io.shardingsphere.core.jdbc.core.transaction; import io.shardingsphere.core.transaction.spi.Transaction; import lombok.AccessLevel; import lombok.NoArgsConstructor; import java.util.Iterator; import java.util.ServiceLoader; Loading @@ -27,27 +29,16 @@ import java.util.ServiceLoader; * * @author zhaojun */ @NoArgsConstructor(access = AccessLevel.PRIVATE) public final class TransactionLoader { private TransactionLoader() { } /** * Using ServiceLoader to dynamic load spi transaction. * * @return transaction spi * @return transaction SPI */ public static Transaction load() { Transaction result = null; ServiceLoader<Transaction> loader = ServiceLoader.load(Transaction.class); Iterator<Transaction> iterator = loader.iterator(); while (iterator.hasNext()) { result = iterator.next(); break; } if (null == result) { result = new WeakXaTransaction(); } return result; Iterator<Transaction> iterator = ServiceLoader.load(Transaction.class).iterator(); return iterator.hasNext() ? iterator.next() : new WeakXaTransaction(); } } Loading
sharding-core/src/main/java/io/shardingsphere/core/transaction/listener/TransactionListener.java +4 −4 Original line number Diff line number Diff line Loading @@ -21,23 +21,23 @@ import com.google.common.eventbus.AllowConcurrentEvents; import com.google.common.eventbus.Subscribe; import io.shardingsphere.core.transaction.event.TransactionEvent; import io.shardingsphere.core.transaction.spi.Transaction; import lombok.AllArgsConstructor; import lombok.RequiredArgsConstructor; /** * Transaction Listener. * * @author zhaojun */ @AllArgsConstructor @RequiredArgsConstructor public class TransactionListener { private Transaction transaction; private final Transaction transaction; /** * Listen event. * * @param transactionEvent transaction event * @throws Exception * @throws Exception exception */ @Subscribe @AllowConcurrentEvents Loading
sharding-core/src/main/java/io/shardingsphere/core/transaction/spi/Transaction.java +3 −0 Original line number Diff line number Diff line Loading @@ -29,6 +29,7 @@ public interface Transaction { /** * Do start a user transaction. * * @param transactionEvent transaction event * @throws Exception Exception */ void begin(TransactionEvent transactionEvent) throws Exception; Loading @@ -36,6 +37,7 @@ public interface Transaction { /** * Do transaction commit. * * @param transactionEvent transaction event * @throws Exception Exception */ void commit(TransactionEvent transactionEvent) throws Exception; Loading @@ -43,6 +45,7 @@ public interface Transaction { /** * Do transaction rollback. * * @param transactionEvent transaction event * @throws Exception Exception */ void rollback(TransactionEvent transactionEvent) throws Exception; Loading
sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/yaml/representer/DataSourceRepresenter.java +1 −1 Original line number Diff line number Diff line Loading @@ -56,7 +56,7 @@ public class DataSourceRepresenter extends Representer { } @Override protected Set<Property> getProperties(final Class<? extends Object> type) { protected Set<Property> getProperties(final Class<?> type) { Set<Property> propertySet; try { propertySet = super.getProperties(type); Loading
sharding-jdbc-transaction-parent/sharding-jdbc-transaction/src/main/java/io/shardingsphere/transaction/xa/AtomikosXaTransaction.java +7 −4 Original line number Diff line number Diff line Loading @@ -32,7 +32,7 @@ import javax.transaction.SystemException; import javax.transaction.UserTransaction; /** * Atomikos XA transaction implement for Transaction spi. * Atomikos XA transaction implement for Transaction SPI. * * @author zhaojun */ Loading @@ -45,21 +45,24 @@ public class AtomikosXaTransaction implements Transaction { TransactionEventHolder.set(XaTransactionEvent.class); } /** * Init. */ public static void init() { } @Override public void begin(TransactionEvent transactionEvent) throws SystemException, NotSupportedException { public void begin(final TransactionEvent transactionEvent) throws SystemException, NotSupportedException { userTransaction.begin(); } @Override public void commit(TransactionEvent transactionEvent) throws HeuristicRollbackException, RollbackException, HeuristicMixedException, SystemException { public void commit(final TransactionEvent transactionEvent) throws HeuristicRollbackException, RollbackException, HeuristicMixedException, SystemException { userTransaction.commit(); } @Override public void rollback(TransactionEvent transactionEvent) throws SystemException { public void rollback(final TransactionEvent transactionEvent) throws SystemException { userTransaction.rollback(); } }
sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/transaction/TransactionLoader.java +6 −15 Original line number Diff line number Diff line Loading @@ -18,6 +18,8 @@ package io.shardingsphere.core.jdbc.core.transaction; import io.shardingsphere.core.transaction.spi.Transaction; import lombok.AccessLevel; import lombok.NoArgsConstructor; import java.util.Iterator; import java.util.ServiceLoader; Loading @@ -27,27 +29,16 @@ import java.util.ServiceLoader; * * @author zhaojun */ @NoArgsConstructor(access = AccessLevel.PRIVATE) public final class TransactionLoader { private TransactionLoader() { } /** * Using ServiceLoader to dynamic load spi transaction. * * @return transaction spi * @return transaction SPI */ public static Transaction load() { Transaction result = null; ServiceLoader<Transaction> loader = ServiceLoader.load(Transaction.class); Iterator<Transaction> iterator = loader.iterator(); while (iterator.hasNext()) { result = iterator.next(); break; } if (null == result) { result = new WeakXaTransaction(); } return result; Iterator<Transaction> iterator = ServiceLoader.load(Transaction.class).iterator(); return iterator.hasNext() ? iterator.next() : new WeakXaTransaction(); } }