style

baomidou · Oct 23, 2023 · 7994897 · 7994897
1 parent 03c7cff
commit 7994897
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 21 deletions.
diff --git a/...ou/dynamic/datasource/spring/boot/autoconfigure/DynamicDataSourceAssistConfiguration.java b/...ou/dynamic/datasource/spring/boot/autoconfigure/DynamicDataSourceAssistConfiguration.java
@@ -25,7 +25,6 @@
 import com.baomidou.dynamic.datasource.strategy.DynamicDataSourceStrategy;
 import com.baomidou.dynamic.datasource.tx.DsTxEventListenerFactory;
 import lombok.RequiredArgsConstructor;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;

diff --git a/...starter/src/test/java/com/baomidou/dynamic/datasource/fixture/v1/DsTransactionalTest.java b/...starter/src/test/java/com/baomidou/dynamic/datasource/fixture/v1/DsTransactionalTest.java
@@ -37,20 +37,16 @@
 
 @SpringBootTest(classes = DsTransactionalApplication.class, webEnvironment = RANDOM_PORT)
 public class DsTransactionalTest {
+    @Autowired
+    DataSource dataSource;
+    @Autowired
+    DefaultDataSourceCreator dataSourceCreator;
     @Autowired
     private OrderService orderService;
-
     @Autowired
     private AccountService accountService;
-
     @Autowired
     private ProductService productService;
-
-    @Autowired
-    DataSource dataSource;
-
-    @Autowired
-    DefaultDataSourceCreator dataSourceCreator;
     private DynamicRoutingDataSource ds;
 
     @Test

diff --git a/...starter/src/test/java/com/baomidou/dynamic/datasource/fixture/v3/DsTransactionalTest.java b/...starter/src/test/java/com/baomidou/dynamic/datasource/fixture/v3/DsTransactionalTest.java
@@ -37,20 +37,16 @@
 
 @SpringBootTest(classes = DsTransactionalApplication.class, webEnvironment = RANDOM_PORT)
 public class DsTransactionalTest {
+    @Autowired
+    DataSource dataSource;
+    @Autowired
+    DefaultDataSourceCreator dataSourceCreator;
     @Autowired
     private OrderService orderService;
-
     @Autowired
     private AccountService accountService;
-
     @Autowired
     private ProductService productService;
-
-    @Autowired
-    DataSource dataSource;
-
-    @Autowired
-    DefaultDataSourceCreator dataSourceCreator;
     private DynamicRoutingDataSource ds;
 
     @Test

diff --git a/...source-spring/src/main/java/com/baomidou/dynamic/datasource/DynamicRoutingDataSource.java b/...source-spring/src/main/java/com/baomidou/dynamic/datasource/DynamicRoutingDataSource.java
@@ -268,9 +268,9 @@ private void checkEnv() {
     /**
      * close db
      *
-     * @param ds         dsName
-     * @param dataSource db
-     * @param graceDestroy  If true, close the connection after a delay.
+     * @param ds           dsName
+     * @param dataSource   db
+     * @param graceDestroy If true, close the connection after a delay.
      */
     private void closeDataSource(String ds, DataSource dataSource, boolean graceDestroy) {
         try {

diff --git a/...ce-spring/src/main/java/com/baomidou/dynamic/datasource/tx/DsTxListenerMethodAdapter.java b/...ce-spring/src/main/java/com/baomidou/dynamic/datasource/tx/DsTxListenerMethodAdapter.java
@@ -27,7 +27,6 @@
 
 /**
  * DsTxListenerMethodAdapter Referenced from org.springframework.transaction.event.TransactionalApplicationListenerMethodAdapter
- *
  */
 public class DsTxListenerMethodAdapter extends ApplicationListenerMethodAdapter {
     private final DsTxEventListener dsTxEventListener;