diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.java index 730176dae9..2e9abd9146 100644 --- a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.java +++ b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.java @@ -55,18 +55,4 @@ public class DruidDataSourceAutoConfigure { LOGGER.info("Init DruidDataSource"); return new DruidDataSourceWrapper(); } - - @Bean - @ConditionalOnMissingBean - @ConditionalOnBean({MeterRegistry.class, DruidDataSource.class}) - public DataSourcePoolMetadataProvider druidPoolDataSourceMetadataProvider() { - return (dataSource) -> { - DruidDataSource ds = DataSourceUnwrapper.unwrap(dataSource, - DruidDataSource.class); - if (ds != null) { - return new DruidDataSourcePoolMetadata(ds); - } - return null; - }; - } } diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/metrics/DruidDataSourcePoolMetadata.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/metrics/DruidDataSourcePoolMetadata.java deleted file mode 100644 index d105921e19..0000000000 --- a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/metrics/DruidDataSourcePoolMetadata.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.alibaba.druid.spring.boot.autoconfigure.metrics; - -import com.alibaba.druid.pool.DruidDataSource; -import org.springframework.boot.jdbc.metadata.AbstractDataSourcePoolMetadata; - -/** - * @author hai - * @version 1.0 - * Created on 2021/11/16 下午7:15 - * @description - */ -public class DruidDataSourcePoolMetadata extends AbstractDataSourcePoolMetadata { - - /** - * Create an instance with the data source to use. - * - * @param dataSource the data source - */ - public DruidDataSourcePoolMetadata(DruidDataSource dataSource) { - super(dataSource); - } - - @Override - public Integer getActive() { - return getDataSource().getActiveCount(); - } - - @Override - public Integer getMax() { - return getDataSource().getMaxActive(); - } - - @Override - public Integer getMin() { - return getDataSource().getMinIdle(); - } - - @Override - public String getValidationQuery() { - return getDataSource().getValidationQuery(); - } - - @Override - public Boolean getDefaultAutoCommit() { - return getDataSource().isDefaultAutoCommit(); - } -}