diff --git a/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/annotation/DSTransactional.java b/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/annotation/DSTransactional.java index ce9ae5b..326eeec 100644 --- a/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/annotation/DSTransactional.java +++ b/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/annotation/DSTransactional.java @@ -15,8 +15,6 @@ */ package com.baomidou.dynamic.datasource.annotation; - - import com.baomidou.dynamic.datasource.tx.DsPropagation; import java.lang.annotation.*; @@ -35,4 +33,4 @@ public @interface DSTransactional { Class[] noRollbackFor() default {}; DsPropagation propagation() default DsPropagation.REQUIRED; -} +} \ No newline at end of file diff --git a/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/enums/XADataSourceEnum.java b/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/enums/XADataSourceEnum.java index 3ea1c6f..5aa40f8 100644 --- a/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/enums/XADataSourceEnum.java +++ b/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/enums/XADataSourceEnum.java @@ -26,7 +26,7 @@ import lombok.Getter; */ @Getter public enum XADataSourceEnum { - ORACLE(DbType.ORACLE,"oracle.jdbc.xa.client.OracleXADataSource"), + ORACLE(DbType.ORACLE, "oracle.jdbc.xa.client.OracleXADataSource"), MYSQL(DbType.MYSQL, "com.mysql.cj.jdbc.MysqlXADataSource"), POSTGRE_SQL(DbType.POSTGRE_SQL, "org.postgresql.xa.PGXADataSource"), H2(DbType.H2, "org.h2.jdbcx.JdbcDataSource"), @@ -40,7 +40,7 @@ public enum XADataSourceEnum { this.xaDataSourceClassName = xaDataSourceClassName; } - public static boolean contains(DbType dbType){ + public static boolean contains(DbType dbType) { for (XADataSourceEnum item : values()) { if (item.getDbType() == dbType) { return true; @@ -49,7 +49,7 @@ public enum XADataSourceEnum { return false; } - public static String getByDbType(DbType dbType){ + public static String getByDbType(DbType dbType) { for (XADataSourceEnum item : values()) { if (item.getDbType() == dbType) { return item.getXaDataSourceClassName(); @@ -57,4 +57,4 @@ public enum XADataSourceEnum { } return null; } -} +} \ No newline at end of file diff --git a/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/tx/AtomikosTransactionFactory.java b/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/tx/AtomikosTransactionFactory.java index c5b9391..cbe10a2 100644 --- a/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/tx/AtomikosTransactionFactory.java +++ b/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/tx/AtomikosTransactionFactory.java @@ -37,8 +37,8 @@ public class AtomikosTransactionFactory extends SpringManagedTransactionFactory // e.g:ConnectionHolder conHolder = (ConnectionHolder) TransactionSynchronizationManager.getResource(dataSource); if (dataSource instanceof DynamicRoutingDataSource) { - determineDataSource = ((DynamicRoutingDataSource)dataSource).determineDataSource(); + determineDataSource = ((DynamicRoutingDataSource) dataSource).determineDataSource(); } return new SpringManagedTransaction(determineDataSource); } -} +} \ No newline at end of file diff --git a/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/tx/ConnectionFactory.java b/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/tx/ConnectionFactory.java index e38896d..866d7ae 100644 --- a/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/tx/ConnectionFactory.java +++ b/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/tx/ConnectionFactory.java @@ -173,7 +173,7 @@ public class ConnectionFactory { } } - savePointMap.put(xid,savePointHolders); + savePointMap.put(xid, savePointHolders); } catch (SQLException ex) { throw new CannotCreateTransactionException("Could not create JDBC savepoint", ex); } diff --git a/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/tx/ConnectionProxy.java b/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/tx/ConnectionProxy.java index 41d25cd..640ca5a 100644 --- a/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/tx/ConnectionProxy.java +++ b/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/tx/ConnectionProxy.java @@ -335,8 +335,12 @@ public class ConnectionProxy implements Connection { @Override public boolean equals(Object o) { - if (this == o) {return true;} - if (!(o instanceof ConnectionProxy)) {return false;} + if (this == o) { + return true; + } + if (!(o instanceof ConnectionProxy)) { + return false; + } ConnectionProxy that = (ConnectionProxy) o; return Objects.equals(connection, that.connection) && Objects.equals(ds, that.ds); } diff --git a/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/tx/LocalTxUtil.java b/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/tx/LocalTxUtil.java index d804195..c60a155 100644 --- a/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/tx/LocalTxUtil.java +++ b/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/tx/LocalTxUtil.java @@ -52,7 +52,7 @@ public final class LocalTxUtil { try { ConnectionFactory.notify(xid, true); } finally { - if (!hasSavepoint){ + if (!hasSavepoint) { log.debug("dynamic-datasource commit local tx [{}]", TransactionContext.getXID()); TransactionContext.remove(); } @@ -67,10 +67,10 @@ public final class LocalTxUtil { try { ConnectionFactory.notify(xid, false); } finally { - if (!hasSavepoint){ + if (!hasSavepoint) { log.debug("dynamic-datasource commit local tx [{}]", TransactionContext.getXID()); TransactionContext.remove(); } } } -} +} \ No newline at end of file diff --git a/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/tx/TransactionalTemplate.java b/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/tx/TransactionalTemplate.java index 601e2bf..d2b9f9f 100644 --- a/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/tx/TransactionalTemplate.java +++ b/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/tx/TransactionalTemplate.java @@ -88,7 +88,7 @@ public class TransactionalTemplate { private Object doExecute(TransactionalExecutor transactionalExecutor) throws Throwable { TransactionalInfo transactionInfo = transactionalExecutor.getTransactionInfo(); DsPropagation propagation = transactionInfo.propagation; - if (!StringUtils.isEmpty(TransactionContext.getXID())&&!propagation.equals(DsPropagation.NESTED)) { + if (!StringUtils.isEmpty(TransactionContext.getXID()) && !propagation.equals(DsPropagation.NESTED)) { return transactionalExecutor.execute(); } boolean state = true; @@ -169,4 +169,4 @@ public class TransactionalTemplate { public boolean existingTransaction() { return !StringUtils.isEmpty(TransactionContext.getXID()); } -} +} \ No newline at end of file