diff --git a/dynamic-datasource-spring-boot-common/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DynamicDataSourceAssistConfiguration.java b/dynamic-datasource-spring-boot-common/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DynamicDataSourceAssistConfiguration.java index 1ac0b7eb..fab168f9 100644 --- a/dynamic-datasource-spring-boot-common/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DynamicDataSourceAssistConfiguration.java +++ b/dynamic-datasource-spring-boot-common/src/main/java/com/baomidou/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/dynamic-datasource-spring-boot-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/v1/DsTransactionalTest.java b/dynamic-datasource-spring-boot-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/v1/DsTransactionalTest.java index cbae895f..b932b403 100644 --- a/dynamic-datasource-spring-boot-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/v1/DsTransactionalTest.java +++ b/dynamic-datasource-spring-boot-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/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/v3/DsTransactionalTest.java b/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/v3/DsTransactionalTest.java index 30b93587..91de3184 100644 --- a/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/fixture/v3/DsTransactionalTest.java +++ b/dynamic-datasource-spring-boot3-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/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/DynamicRoutingDataSource.java b/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/DynamicRoutingDataSource.java index a37f8e3a..92521be5 100644 --- a/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/DynamicRoutingDataSource.java +++ b/dynamic-datasource-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/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/tx/DsTxListenerMethodAdapter.java b/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/tx/DsTxListenerMethodAdapter.java index 444c5778..9b7dbf8d 100644 --- a/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/tx/DsTxListenerMethodAdapter.java +++ b/dynamic-datasource-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;