diff --git a/.travis.yml b/.travis.yml index 3486a55..3daa368 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,9 @@ install: false cache: directories: - $HOME/.m2/repository +addons: + apt: + update: true after_success: - cd druid-spring-boot2-example/druid-spring-boot2-mybatis-example - mvn clean test -Pcoveralls jacoco:report coveralls:report \ No newline at end of file diff --git a/Changelog.md b/Changelog.md index ba6c343..976aaf2 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,10 @@ # Changelog +## 1.1.10 +### Enhancements +1. 升级 parent 版本到 1.2.2 +2. 升级 druid 到 1.1.10 + ## 1.1.9 ### Enhancements 1. 升级 druid 到 1.1.9 diff --git a/README.md b/README.md index ae53047..6f51c60 100644 --- a/README.md +++ b/README.md @@ -15,24 +15,24 @@ Druid Spring Boot Starter 将帮助你在 Spring Boot 中使用 Druid。 com.github.drtrang druid-spring-boot-starter - 1.1.9 + 1.1.10 com.github.drtrang druid-spring-boot-actuator-starter - 1.1.9 + 1.1.10 com.github.drtrang druid-spring-boot2-starter - 1.1.9 + 1.1.10 com.github.drtrang druid-spring-boot2-actuator-starter - 1.1.9 + 1.1.10 ``` diff --git a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/pom.xml b/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/pom.xml index c8debbe..0ac5547 100644 --- a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/pom.xml +++ b/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/pom.xml @@ -1,13 +1,12 @@ - 4.0.0 com.github.drtrang druid-spring-boot2-actuator - 1.1.9 + 1.1.10 druid-spring-boot2-actuator-autoconfigure diff --git a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/DruidDataSourceEndpoint.java b/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/DruidDataSourceEndpoint.java index 239ba5b..81869fc 100644 --- a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/DruidDataSourceEndpoint.java +++ b/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/DruidDataSourceEndpoint.java @@ -1,12 +1,13 @@ package com.github.trang.druid.actuate; -import com.alibaba.druid.stat.DruidStatManagerFacade; +import java.util.List; +import java.util.Map; + import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; import org.springframework.boot.context.properties.ConfigurationProperties; -import java.util.List; -import java.util.Map; +import com.alibaba.druid.stat.DruidStatManagerFacade; /** * 将 Druid 的信息暴露出来 diff --git a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/DruidDataSourceMvcEndpoint.java b/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/DruidDataSourceMvcEndpoint.java index 5402c27..5c3301c 100644 --- a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/DruidDataSourceMvcEndpoint.java +++ b/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/DruidDataSourceMvcEndpoint.java @@ -1,14 +1,15 @@ package com.github.trang.druid.actuate; -import com.alibaba.druid.stat.DruidStatService; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; + import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; import org.springframework.boot.actuate.endpoint.annotation.Selector; import org.springframework.boot.actuate.endpoint.web.annotation.EndpointWebExtension; import org.springframework.boot.context.properties.ConfigurationProperties; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; +import com.alibaba.druid.stat.DruidStatService; /** * 将 {@link DruidDataSourceEndpoint} 适配成 {@link MvcEndpoint} diff --git a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/DruidDataSourcePoolMetadata.java b/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/DruidDataSourcePoolMetadata.java index 7d367b3..ac1c1da 100644 --- a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/DruidDataSourcePoolMetadata.java +++ b/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/DruidDataSourcePoolMetadata.java @@ -1,8 +1,9 @@ package com.github.trang.druid.actuate; -import com.alibaba.druid.pool.DruidDataSource; import org.springframework.boot.jdbc.metadata.AbstractDataSourcePoolMetadata; +import com.alibaba.druid.pool.DruidDataSource; + /** * Druid 的基础元数据 * diff --git a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/autoconfigure/DruidDataSourceActuatorAutoConfiguration.java b/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/autoconfigure/DruidDataSourceActuatorAutoConfiguration.java index c0b36b0..7b55e1c 100644 --- a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/autoconfigure/DruidDataSourceActuatorAutoConfiguration.java +++ b/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/autoconfigure/DruidDataSourceActuatorAutoConfiguration.java @@ -1,11 +1,12 @@ package com.github.trang.druid.actuate.autoconfigure; -import com.alibaba.druid.pool.DruidDataSource; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; +import com.alibaba.druid.pool.DruidDataSource; + /** * Druid Actuator 自动配置，默认开启 * diff --git a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/autoconfigure/DruidDataSourceEndpointConfiguration.java b/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/autoconfigure/DruidDataSourceEndpointConfiguration.java index c453575..9acdaba 100644 --- a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/autoconfigure/DruidDataSourceEndpointConfiguration.java +++ b/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/autoconfigure/DruidDataSourceEndpointConfiguration.java @@ -1,12 +1,13 @@ package com.github.trang.druid.actuate.autoconfigure; -import com.github.trang.druid.actuate.DruidDataSourceEndpoint; -import com.github.trang.druid.actuate.DruidDataSourceMvcEndpoint; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import com.github.trang.druid.actuate.DruidDataSourceEndpoint; +import com.github.trang.druid.actuate.DruidDataSourceMvcEndpoint; + /** * Druid Endpoint & Druid MvcEndpoint 自动配置，默认开启 * diff --git a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/autoconfigure/DruidDataSourceMetadataProviderConfiguration.java b/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/autoconfigure/DruidDataSourceMetadataProviderConfiguration.java index 00d682e..ed52cfd 100644 --- a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/autoconfigure/DruidDataSourceMetadataProviderConfiguration.java +++ b/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/autoconfigure/DruidDataSourceMetadataProviderConfiguration.java @@ -1,13 +1,14 @@ package com.github.trang.druid.actuate.autoconfigure; -import com.alibaba.druid.pool.DruidDataSource; -import com.github.trang.druid.actuate.DruidDataSourcePoolMetadata; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.jdbc.metadata.DataSourcePoolMetadataProvider; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import com.alibaba.druid.pool.DruidDataSource; +import com.github.trang.druid.actuate.DruidDataSourcePoolMetadata; + /** * Druid Metadata 自动配置，适用于 Metrics，默认开启 * diff --git a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories b/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories index f135d76..8a11740 100644 --- a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories +++ b/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.github.trang.druid.actuate.autoconfigure.DruidDataSourceActuatorAutoConfiguration \ No newline at end of file + com.github.trang.druid.actuate.autoconfigure.DruidDataSourceActuatorAutoConfiguration \ No newline at end of file diff --git a/druid-spring-boot-actuator/druid-spring-boot-actuator-starter/pom.xml b/druid-spring-boot-actuator/druid-spring-boot-actuator-starter/pom.xml index 35562af..38ac1aa 100644 --- a/druid-spring-boot-actuator/druid-spring-boot-actuator-starter/pom.xml +++ b/druid-spring-boot-actuator/druid-spring-boot-actuator-starter/pom.xml @@ -1,13 +1,12 @@ - 4.0.0 com.github.drtrang druid-spring-boot2-actuator - 1.1.9 + 1.1.10 druid-spring-boot2-actuator-starter diff --git a/druid-spring-boot-actuator/pom.xml b/druid-spring-boot-actuator/pom.xml index aa51ffa..18f0da2 100644 --- a/druid-spring-boot-actuator/pom.xml +++ b/druid-spring-boot-actuator/pom.xml @@ -1,13 +1,12 @@ - 4.0.0 com.github.drtrang druid-spring-boot2-parent - 1.1.9 + 1.1.10 druid-spring-boot2-actuator diff --git a/druid-spring-boot-example/druid-spring-boot-jpa-example/pom.xml b/druid-spring-boot-example/druid-spring-boot-jpa-example/pom.xml index 48b7a35..b4dc5cc 100644 --- a/druid-spring-boot-example/druid-spring-boot-jpa-example/pom.xml +++ b/druid-spring-boot-example/druid-spring-boot-jpa-example/pom.xml @@ -1,13 +1,12 @@ - 4.0.0 com.github.drtrang druid-spring-boot2-example - 1.1.9 + 1.1.10 druid-spring-boot2-jpa-example diff --git a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/DruidJpaApplication.java b/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/DruidJpaApplication.java index 72ea518..71b34a1 100644 --- a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/DruidJpaApplication.java +++ b/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/DruidJpaApplication.java @@ -1,13 +1,15 @@ package com.github.trang.druid.example.jpa; -import com.github.trang.druid.example.jpa.repository.CityRepository; -import com.google.gson.Gson; -import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import com.github.trang.druid.example.jpa.repository.CityRepository; +import com.google.gson.Gson; + +import lombok.extern.slf4j.Slf4j; + /** * DruidSpringBootStarterApplication * diff --git a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/config/DynamicDataSource.java b/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/config/DynamicDataSource.java index 0da6d1b..f64ec23 100644 --- a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/config/DynamicDataSource.java +++ b/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/config/DynamicDataSource.java @@ -1,17 +1,19 @@ package com.github.trang.druid.example.jpa.config; -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; - -import javax.sql.DataSource; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; +import javax.sql.DataSource; + +import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + /** * 动态数据源，基于简单的轮询算法 * diff --git a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/config/SpringDataSourceConfig.java b/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/config/SpringDataSourceConfig.java index 44f9cd1..bdafc5f 100644 --- a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/config/SpringDataSourceConfig.java +++ b/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/config/SpringDataSourceConfig.java @@ -1,16 +1,19 @@ package com.github.trang.druid.example.jpa.config; -import com.alibaba.druid.pool.DruidDataSource; -import com.github.trang.druid.autoconfigure.DruidDataSourceCustomizer; -import lombok.extern.slf4j.Slf4j; +import java.util.HashMap; +import java.util.Map; + +import javax.sql.DataSource; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Profile; -import javax.sql.DataSource; -import java.util.HashMap; -import java.util.Map; +import com.alibaba.druid.pool.DruidDataSource; +import com.github.trang.druid.autoconfigure.DruidDataSourceCustomizer; + +import lombok.extern.slf4j.Slf4j; /** * 多数据源配置，只在 #{@code spring.profiles.active=dynamic} 时生效 diff --git a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/controller/CityController.java b/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/controller/CityController.java index ffd97a0..2942e39 100644 --- a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/controller/CityController.java +++ b/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/controller/CityController.java @@ -1,13 +1,14 @@ package com.github.trang.druid.example.jpa.controller; -import com.github.trang.druid.example.jpa.model.City; -import com.github.trang.druid.example.jpa.repository.CityRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import com.github.trang.druid.example.jpa.model.City; +import com.github.trang.druid.example.jpa.repository.CityRepository; + /** * CityController * diff --git a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/model/City.java b/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/model/City.java index 4d5aafa..f64e4f8 100644 --- a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/model/City.java +++ b/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/model/City.java @@ -1,10 +1,16 @@ package com.github.trang.druid.example.jpa.model; -import lombok.Data; - -import javax.persistence.*; import java.io.Serializable; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +import lombok.Data; + /** * City * diff --git a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/repository/CityRepository.java b/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/repository/CityRepository.java index 4cbb4d8..faff76b 100644 --- a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/repository/CityRepository.java +++ b/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/repository/CityRepository.java @@ -1,8 +1,9 @@ package com.github.trang.druid.example.jpa.repository; -import com.github.trang.druid.example.jpa.model.City; import org.springframework.data.jpa.repository.JpaRepository; +import com.github.trang.druid.example.jpa.model.City; + /** * CityRepository * diff --git a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/BaseTest.java b/druid-spring-boot-example/druid-spring-boot-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/BaseTest.java index 296c33a..ca99d9c 100644 --- a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/BaseTest.java +++ b/druid-spring-boot-example/druid-spring-boot-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/BaseTest.java @@ -1,8 +1,5 @@ package com.github.trang.druid.example.jpa.test.coveralls; -import com.github.trang.druid.example.jpa.DruidJpaApplication; -import com.github.trang.druid.example.jpa.repository.CityRepository; -import com.google.gson.Gson; import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -10,6 +7,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; +import com.github.trang.druid.example.jpa.DruidJpaApplication; +import com.github.trang.druid.example.jpa.repository.CityRepository; +import com.google.gson.Gson; + /** * BaseTest * diff --git a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/DynamicDataSourceTests.java b/druid-spring-boot-example/druid-spring-boot-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/DynamicDataSourceTests.java index e182361..8121a4a 100644 --- a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/DynamicDataSourceTests.java +++ b/druid-spring-boot-example/druid-spring-boot-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/DynamicDataSourceTests.java @@ -1,19 +1,20 @@ package com.github.trang.druid.example.jpa.test.coveralls; -import com.alibaba.druid.pool.DruidDataSource; -import com.github.trang.druid.autoconfigure.datasource.DruidDataSource2; -import com.github.trang.druid.example.jpa.config.DynamicDataSource; -import org.junit.Assert; -import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ActiveProfiles; +import static org.junit.Assert.assertEquals; import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; -import static org.junit.Assert.assertEquals; +import org.junit.Assert; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ActiveProfiles; + +import com.alibaba.druid.pool.DruidDataSource; +import com.github.trang.druid.autoconfigure.datasource.DruidDataSource2; +import com.github.trang.druid.example.jpa.config.DynamicDataSource; /** * 动态数据源测试 diff --git a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/JpaTests.java b/druid-spring-boot-example/druid-spring-boot-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/JpaTests.java index 0042098..0dc07eb 100644 --- a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/JpaTests.java +++ b/druid-spring-boot-example/druid-spring-boot-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/JpaTests.java @@ -1,10 +1,11 @@ package com.github.trang.druid.example.jpa.test.coveralls; -import com.github.trang.druid.example.jpa.model.City; +import java.util.List; + import org.junit.Assert; import org.junit.Test; -import java.util.List; +import com.github.trang.druid.example.jpa.model.City; /** * MyBatis 测试 diff --git a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/SingleDataSourceTests.java b/druid-spring-boot-example/druid-spring-boot-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/SingleDataSourceTests.java index fb8af70..eaabaa2 100644 --- a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/SingleDataSourceTests.java +++ b/druid-spring-boot-example/druid-spring-boot-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/SingleDataSourceTests.java @@ -1,11 +1,12 @@ package com.github.trang.druid.example.jpa.test.coveralls; -import com.alibaba.druid.pool.DruidDataSource; +import static org.junit.Assert.assertEquals; + import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ActiveProfiles; -import static org.junit.Assert.assertEquals; +import com.alibaba.druid.pool.DruidDataSource; /** * 单数据源测试 diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/pom.xml b/druid-spring-boot-example/druid-spring-boot-mybatis-example/pom.xml index d45d4ae..20bf24f 100644 --- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/pom.xml +++ b/druid-spring-boot-example/druid-spring-boot-mybatis-example/pom.xml @@ -1,13 +1,12 @@ - 4.0.0 com.github.drtrang druid-spring-boot2-example - 1.1.9 + 1.1.10 druid-spring-boot2-mybatis-example diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/DruidMybatisApplication.java b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/DruidMybatisApplication.java index e64e70a..4e05e65 100644 --- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/DruidMybatisApplication.java +++ b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/DruidMybatisApplication.java @@ -1,14 +1,16 @@ package com.github.trang.druid.example.mybatis; -import com.github.trang.druid.example.mybatis.mapper.CityMapper; -import com.google.gson.Gson; -import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.annotation.MapperScan; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import com.github.trang.druid.example.mybatis.mapper.CityMapper; +import com.google.gson.Gson; + +import lombok.extern.slf4j.Slf4j; + /** * DruidSpringBootStarterApplication * diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/config/DynamicDataSource.java b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/config/DynamicDataSource.java index 734ec14..36acb48 100644 --- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/config/DynamicDataSource.java +++ b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/config/DynamicDataSource.java @@ -1,17 +1,19 @@ package com.github.trang.druid.example.mybatis.config; -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; - -import javax.sql.DataSource; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; +import javax.sql.DataSource; + +import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + /** * 动态数据源，基于简单的轮询算法 * diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/config/SpringDataSourceConfig.java b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/config/SpringDataSourceConfig.java index 90a9029..38fa6e6 100644 --- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/config/SpringDataSourceConfig.java +++ b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/config/SpringDataSourceConfig.java @@ -1,16 +1,19 @@ package com.github.trang.druid.example.mybatis.config; -import com.alibaba.druid.pool.DruidDataSource; -import com.github.trang.druid.autoconfigure.DruidDataSourceCustomizer; -import lombok.extern.slf4j.Slf4j; +import java.util.HashMap; +import java.util.Map; + +import javax.sql.DataSource; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Profile; -import javax.sql.DataSource; -import java.util.HashMap; -import java.util.Map; +import com.alibaba.druid.pool.DruidDataSource; +import com.github.trang.druid.autoconfigure.DruidDataSourceCustomizer; + +import lombok.extern.slf4j.Slf4j; /** * 多数据源配置，只在 #{@code spring.profiles.active=dynamic} 时生效 diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/controller/CityController.java b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/controller/CityController.java index 84477ed..d649c60 100644 --- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/controller/CityController.java +++ b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/controller/CityController.java @@ -1,9 +1,13 @@ package com.github.trang.druid.example.mybatis.controller; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + import com.github.trang.druid.example.mybatis.mapper.CityMapper; import com.github.trang.druid.example.mybatis.model.City; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; /** * CityController diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/mapper/CityMapper.java b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/mapper/CityMapper.java index 99f50f5..39e4bd9 100644 --- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/mapper/CityMapper.java +++ b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/mapper/CityMapper.java @@ -1,11 +1,12 @@ package com.github.trang.druid.example.mybatis.mapper; -import com.github.trang.druid.example.mybatis.model.City; +import java.util.List; + import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import java.util.List; +import com.github.trang.druid.example.mybatis.model.City; /** * CityMapper diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/model/City.java b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/model/City.java index 085f087..ace6ebd 100644 --- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/model/City.java +++ b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/model/City.java @@ -1,9 +1,9 @@ package com.github.trang.druid.example.mybatis.model; -import lombok.Data; - import java.io.Serializable; +import lombok.Data; + /** * City * diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/BaseTest.java b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/BaseTest.java index 0897c83..70ef59c 100644 --- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/BaseTest.java +++ b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/BaseTest.java @@ -1,8 +1,5 @@ package com.github.trang.druid.example.mybatis.test.coveralls; -import com.github.trang.druid.example.mybatis.DruidMybatisApplication; -import com.github.trang.druid.example.mybatis.mapper.CityMapper; -import com.google.gson.Gson; import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -10,6 +7,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; +import com.github.trang.druid.example.mybatis.DruidMybatisApplication; +import com.github.trang.druid.example.mybatis.mapper.CityMapper; +import com.google.gson.Gson; + /** * BaseTest * diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/DruidTest.java b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/DruidTest.java index 6d47864..d47b9bb 100644 --- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/DruidTest.java +++ b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/DruidTest.java @@ -1,13 +1,15 @@ package com.github.trang.druid.example.mybatis.test.coveralls; +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + import com.alibaba.druid.filter.config.ConfigTools; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.SQLUtils.FormatOption; import com.alibaba.druid.sql.visitor.VisitorFeature; -import lombok.extern.slf4j.Slf4j; -import org.junit.Test; -import static org.junit.Assert.assertEquals; +import lombok.extern.slf4j.Slf4j; /** * DruidTest diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/DynamicDataSourceTests.java b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/DynamicDataSourceTests.java index 63be24c..cf23170 100644 --- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/DynamicDataSourceTests.java +++ b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/DynamicDataSourceTests.java @@ -1,19 +1,20 @@ package com.github.trang.druid.example.mybatis.test.coveralls; -import com.alibaba.druid.pool.DruidDataSource; -import com.github.trang.druid.autoconfigure.datasource.DruidDataSource2; -import com.github.trang.druid.example.mybatis.config.DynamicDataSource; -import org.junit.Assert; -import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ActiveProfiles; +import static org.junit.Assert.assertEquals; import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; -import static org.junit.Assert.assertEquals; +import org.junit.Assert; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ActiveProfiles; + +import com.alibaba.druid.pool.DruidDataSource; +import com.github.trang.druid.autoconfigure.datasource.DruidDataSource2; +import com.github.trang.druid.example.mybatis.config.DynamicDataSource; /** * 动态数据源测试 diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/MyBatisTests.java b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/MyBatisTests.java index 43581db..9049d40 100644 --- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/MyBatisTests.java +++ b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/MyBatisTests.java @@ -1,12 +1,13 @@ package com.github.trang.druid.example.mybatis.test.coveralls; -import com.github.trang.druid.example.mybatis.model.City; -import org.junit.Assert; -import org.junit.Test; - import java.util.List; import java.util.Optional; +import org.junit.Assert; +import org.junit.Test; + +import com.github.trang.druid.example.mybatis.model.City; + /** * MyBatis 测试 * diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/SingleDataSourceTests.java b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/SingleDataSourceTests.java index 94bb331..6491c8c 100644 --- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/SingleDataSourceTests.java +++ b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/SingleDataSourceTests.java @@ -1,11 +1,12 @@ package com.github.trang.druid.example.mybatis.test.coveralls; -import com.alibaba.druid.pool.DruidDataSource; +import static org.junit.Assert.assertEquals; + import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ActiveProfiles; -import static org.junit.Assert.assertEquals; +import com.alibaba.druid.pool.DruidDataSource; /** * 单数据源测试 diff --git a/druid-spring-boot-example/pom.xml b/druid-spring-boot-example/pom.xml index 5d9f8a4..8b51154 100644 --- a/druid-spring-boot-example/pom.xml +++ b/druid-spring-boot-example/pom.xml @@ -1,13 +1,12 @@ - 4.0.0 com.github.drtrang druid-spring-boot2-parent - 1.1.9 + 1.1.10 druid-spring-boot2-example diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/pom.xml b/druid-spring-boot/druid-spring-boot-autoconfigure/pom.xml index aff7ef0..530a81e 100644 --- a/druid-spring-boot/druid-spring-boot-autoconfigure/pom.xml +++ b/druid-spring-boot/druid-spring-boot-autoconfigure/pom.xml @@ -1,13 +1,12 @@ - 4.0.0 com.github.drtrang druid-spring-boot2 - 1.1.9 + 1.1.10 druid-spring-boot2-autoconfigure diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidAutoConfiguration.java b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidAutoConfiguration.java index d23bed0..4866934 100644 --- a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidAutoConfiguration.java +++ b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidAutoConfiguration.java @@ -1,16 +1,14 @@ package com.github.trang.druid.autoconfigure; -import com.alibaba.druid.filter.config.ConfigFilter; -import com.alibaba.druid.filter.logging.CommonsLogFilter; -import com.alibaba.druid.filter.logging.Log4j2Filter; -import com.alibaba.druid.filter.logging.Log4jFilter; -import com.alibaba.druid.filter.logging.Slf4jLogFilter; -import com.alibaba.druid.filter.stat.StatFilter; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.wall.WallConfig; -import com.alibaba.druid.wall.WallFilter; -import com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties; -import lombok.extern.slf4j.Slf4j; +import static com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties.DruidConstants.DRUID_COMMONS_LOG_FILTER_PREFIX; +import static com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties.DruidConstants.DRUID_CONFIG_FILTER_PREFIX; +import static com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties.DruidConstants.DRUID_LOG4J2_FILTER_PREFIX; +import static com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties.DruidConstants.DRUID_LOG4J_FILTER_PREFIX; +import static com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties.DruidConstants.DRUID_SLF4J_FILTER_PREFIX; +import static com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties.DruidConstants.DRUID_STAT_FILTER_PREFIX; +import static com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties.DruidConstants.DRUID_WALL_CONFIG_PREFIX; +import static com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties.DruidConstants.DRUID_WALL_FILTER_PREFIX; + import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -23,7 +21,18 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import static com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties.DruidConstants.*; +import com.alibaba.druid.filter.config.ConfigFilter; +import com.alibaba.druid.filter.logging.CommonsLogFilter; +import com.alibaba.druid.filter.logging.Log4j2Filter; +import com.alibaba.druid.filter.logging.Log4jFilter; +import com.alibaba.druid.filter.logging.Slf4jLogFilter; +import com.alibaba.druid.filter.stat.StatFilter; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.wall.WallConfig; +import com.alibaba.druid.wall.WallFilter; +import com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties; + +import lombok.extern.slf4j.Slf4j; /** * Druid 连接池的自动配置 diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceConfiguration.java b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceConfiguration.java index a2fb6f9..345c05f 100644 --- a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceConfiguration.java +++ b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceConfiguration.java @@ -1,10 +1,13 @@ package com.github.trang.druid.autoconfigure; -import com.alibaba.druid.pool.DruidDataSource; -import com.github.trang.druid.autoconfigure.DruidDataSourceConfiguration.DruidDataSourceImportSelector; -import com.github.trang.druid.autoconfigure.datasource.DruidDataSource2; -import com.github.trang.druid.autoconfigure.util.CharMatcher; -import lombok.extern.slf4j.Slf4j; +import static java.util.Collections.emptyMap; +import static org.springframework.beans.factory.support.BeanDefinitionBuilder.genericBeanDefinition; + +import java.util.List; +import java.util.Map; +import java.util.stream.Stream; +import java.util.stream.Stream.Builder; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.annotation.Autowired; @@ -20,13 +23,12 @@ import org.springframework.context.annotation.ImportSelector; import org.springframework.core.env.Environment; import org.springframework.core.type.AnnotationMetadata; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Stream; -import java.util.stream.Stream.Builder; +import com.alibaba.druid.pool.DruidDataSource; +import com.github.trang.druid.autoconfigure.DruidDataSourceConfiguration.DruidDataSourceImportSelector; +import com.github.trang.druid.autoconfigure.datasource.DruidDataSource2; +import com.github.trang.druid.autoconfigure.util.CharMatcher; -import static org.springframework.beans.factory.support.BeanDefinitionBuilder.genericBeanDefinition; +import lombok.extern.slf4j.Slf4j; /** * Druid 数据源配置 @@ -71,7 +73,7 @@ public class DruidDataSourceConfiguration { public void setEnvironment(Environment environment) { this.dataSources = Binder.get(environment) .bind(PREFIX, Bindable.mapOf(String.class, Object.class)) - .orElseGet(HashMap::new); + .orElse(emptyMap()); } @Override @@ -117,7 +119,7 @@ public class DruidDataSourceConfiguration { this.environment = environment; this.dataSources = Binder.get(environment) .bind(PREFIX, Bindable.mapOf(String.class, Object.class)) - .orElseGet(HashMap::new); + .orElse(emptyMap()); } @Autowired @@ -172,7 +174,7 @@ public class DruidDataSourceConfiguration { public void setEnvironment(Environment environment) { this.dataSources = Binder.get(environment) .bind(PREFIX, Bindable.mapOf(String.class, Object.class)) - .orElseGet(HashMap::new); + .orElse(emptyMap()); } @Override diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceInitializerAutoConfiguration.java b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceInitializerAutoConfiguration.java index cae4e73..85d8ad4 100644 --- a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceInitializerAutoConfiguration.java +++ b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceInitializerAutoConfiguration.java @@ -1,13 +1,14 @@ package com.github.trang.druid.autoconfigure; -import com.alibaba.druid.pool.DruidDataSource; -import com.github.trang.druid.autoconfigure.datasource.init.DataSourceInitializerInvoker; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; +import com.alibaba.druid.pool.DruidDataSource; +import com.github.trang.druid.autoconfigure.datasource.init.DataSourceInitializerInvoker; + /** * 支持数据源初始化时执行 SQL * diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidServletConfiguration.java b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidServletConfiguration.java index c9de70e..b0a74da 100644 --- a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidServletConfiguration.java +++ b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidServletConfiguration.java @@ -1,10 +1,9 @@ package com.github.trang.druid.autoconfigure; -import com.alibaba.druid.support.http.StatViewServlet; -import com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties; -import com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties.DruidStatViewServletProperties; +import static com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties.DruidConstants.DRUID_STAT_VIEW_SERVLET_PREFIX; + +import javax.servlet.Servlet; -import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; @@ -13,9 +12,11 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.util.StringUtils; -import javax.servlet.Servlet; +import com.alibaba.druid.support.http.StatViewServlet; +import com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties; +import com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties.DruidStatViewServletProperties; -import static com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties.DruidConstants.*; +import lombok.extern.slf4j.Slf4j; /** * Druid Servlet 配置 @@ -36,7 +37,7 @@ public class DruidServletConfiguration { * 2. 提供监控信息的 JSON API */ @Bean - public ServletRegistrationBean servletRegistrationBean(DruidDataSourceProperties druidProperties) { + public ServletRegistrationBean druidStatViewServlet(DruidDataSourceProperties druidProperties) { log.debug("druid stat-view-servlet init..."); DruidStatViewServletProperties properties = druidProperties.getStatViewServlet(); ServletRegistrationBean registration = new ServletRegistrationBean<>(new StatViewServlet()); diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidStatConfiguration.java b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidStatConfiguration.java index 43c8b42..99b5107 100644 --- a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidStatConfiguration.java +++ b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidStatConfiguration.java @@ -1,11 +1,10 @@ package com.github.trang.druid.autoconfigure; -import com.alibaba.druid.support.http.WebStatFilter; -import com.alibaba.druid.support.spring.stat.DruidStatInterceptor; -import com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties; -import com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties.DruidAopStatProperties; -import com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties.DruidWebStatProperties; -import lombok.extern.slf4j.Slf4j; +import static com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties.DruidConstants.DRUID_AOP_STAT_PREFIX; +import static com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties.DruidConstants.DRUID_WEB_STAT_PREFIX; + +import javax.servlet.Filter; + import org.aopalliance.aop.Advice; import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator; import org.springframework.aop.support.RegexpMethodPointcutAdvisor; @@ -18,9 +17,13 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.util.StringUtils; -import javax.servlet.Filter; +import com.alibaba.druid.support.http.WebStatFilter; +import com.alibaba.druid.support.spring.stat.DruidStatInterceptor; +import com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties; +import com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties.DruidAopStatProperties; +import com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties.DruidWebStatProperties; -import static com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties.DruidConstants.*; +import lombok.extern.slf4j.Slf4j; /** * Druid 监控配置 @@ -55,7 +58,7 @@ public class DruidStatConfiguration { } @Bean - public DefaultAdvisorAutoProxyCreator druidStatProxyCreator() { + public DefaultAdvisorAutoProxyCreator druidStatProxy() { log.debug("druid aop-stat init..."); DefaultAdvisorAutoProxyCreator druidStatProxyCreator = new DefaultAdvisorAutoProxyCreator(); druidStatProxyCreator.setProxyTargetClass(proxyTargetClass); @@ -74,7 +77,7 @@ public class DruidStatConfiguration { public static class DruidWebStatConfiguration { @Bean - public FilterRegistrationBean filterRegistrationBean(DruidDataSourceProperties druidProperties) { + public FilterRegistrationBean druidWebStatFilter(DruidDataSourceProperties druidProperties) { log.debug("druid web-stat-filter init..."); DruidWebStatProperties properties = druidProperties.getWebStat(); FilterRegistrationBean registration = new FilterRegistrationBean<>(new WebStatFilter()); diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/datasource/AbstractDruidDataSource2.java b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/datasource/AbstractDruidDataSource2.java index 484c9a8..cf7f944 100644 --- a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/datasource/AbstractDruidDataSource2.java +++ b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/datasource/AbstractDruidDataSource2.java @@ -1,23 +1,25 @@ package com.github.trang.druid.autoconfigure.datasource; +import static com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties.DruidConstants.DRUID_DATA_SOURCE_PREFIX; + +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +import javax.annotation.PostConstruct; + +import org.springframework.beans.factory.ObjectProvider; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.util.StringUtils; + import com.alibaba.druid.filter.Filter; import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.config.ConfigFilter; import com.alibaba.druid.pool.DruidDataSource; import com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties; import com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties.DruidConfigFilterProperties; -import org.springframework.beans.factory.ObjectProvider; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.util.StringUtils; - -import javax.annotation.PostConstruct; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; - -import static com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties.DruidConstants.*; /** * Druid 多数据源支持，会自动注入 'spring.datasource' 和 'spring.datasource.druid' 配置 diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/datasource/init/DataSourceInitializer.java b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/datasource/init/DataSourceInitializer.java index 011c46b..956ca78 100644 --- a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/datasource/init/DataSourceInitializer.java +++ b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/datasource/init/DataSourceInitializer.java @@ -1,6 +1,11 @@ package com.github.trang.druid.autoconfigure.datasource.init; -import com.alibaba.druid.pool.DruidDataSource; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import javax.sql.DataSource; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; @@ -16,10 +21,7 @@ import org.springframework.jdbc.datasource.init.DatabasePopulatorUtils; import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator; import org.springframework.util.StringUtils; -import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; +import com.alibaba.druid.pool.DruidDataSource; /** * Initialize {@link DataSource} List based on a matching {@link DataSourceProperties} config. diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/datasource/init/DataSourceInitializerInvoker.java b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/datasource/init/DataSourceInitializerInvoker.java index bf38ec3..2309e63 100644 --- a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/datasource/init/DataSourceInitializerInvoker.java +++ b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/datasource/init/DataSourceInitializerInvoker.java @@ -1,6 +1,10 @@ package com.github.trang.druid.autoconfigure.datasource.init; -import com.alibaba.druid.pool.DruidDataSource; +import java.util.ArrayList; +import java.util.List; + +import javax.sql.DataSource; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.InitializingBean; @@ -10,9 +14,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceSchemaCreatedEvent; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationListener; -import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import com.alibaba.druid.pool.DruidDataSource; /** * Bean to handle {@link DataSource} initialization by running {@literal schema-*.sql} on diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/properties/DruidDataSourceProperties.java b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/properties/DruidDataSourceProperties.java index c4552ec..3300ada 100644 --- a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/properties/DruidDataSourceProperties.java +++ b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/properties/DruidDataSourceProperties.java @@ -1,15 +1,17 @@ package com.github.trang.druid.autoconfigure.properties; -import com.alibaba.druid.pool.DruidDataSource; -import lombok.Getter; -import lombok.Setter; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.context.properties.NestedConfigurationProperty; +import static com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties.DruidConstants.DRUID_DATA_SOURCE_PREFIX; import java.util.HashMap; import java.util.Map; -import static com.github.trang.druid.autoconfigure.properties.DruidDataSourceProperties.DruidConstants.*; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.NestedConfigurationProperty; + +import com.alibaba.druid.pool.DruidDataSource; + +import lombok.Getter; +import lombok.Setter; /** * Druid 自定义配置 @@ -17,7 +19,8 @@ import static com.github.trang.druid.autoconfigure.properties.DruidDataSourcePro * @author trang */ @ConfigurationProperties(prefix = DRUID_DATA_SOURCE_PREFIX) -@Getter @Setter +@Getter +@Setter public class DruidDataSourceProperties { Map dataSources = new HashMap<>(16); diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/util/CharMatcher.java b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/util/CharMatcher.java index 25afce9..33d0ea3 100644 --- a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/util/CharMatcher.java +++ b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/util/CharMatcher.java @@ -1,10 +1,10 @@ package com.github.trang.druid.autoconfigure.util; -import org.springframework.util.StringUtils; - import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.springframework.util.StringUtils; + /** * @author trang */ diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories index 54cf6ec..c78c537 100644 --- a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories +++ b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories @@ -1,3 +1,3 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.github.trang.druid.autoconfigure.DruidAutoConfiguration,\ - com.github.trang.druid.autoconfigure.DruidDataSourceInitializerAutoConfiguration \ No newline at end of file + com.github.trang.druid.autoconfigure.DruidAutoConfiguration,\ + com.github.trang.druid.autoconfigure.DruidDataSourceInitializerAutoConfiguration \ No newline at end of file diff --git a/druid-spring-boot/druid-spring-boot-starter/pom.xml b/druid-spring-boot/druid-spring-boot-starter/pom.xml index 422c409..c42f5b6 100644 --- a/druid-spring-boot/druid-spring-boot-starter/pom.xml +++ b/druid-spring-boot/druid-spring-boot-starter/pom.xml @@ -1,13 +1,12 @@ - 4.0.0 com.github.drtrang druid-spring-boot2 - 1.1.9 + 1.1.10 druid-spring-boot2-starter diff --git a/druid-spring-boot/pom.xml b/druid-spring-boot/pom.xml index 0c3bf0f..bb9dd28 100644 --- a/druid-spring-boot/pom.xml +++ b/druid-spring-boot/pom.xml @@ -1,13 +1,12 @@ - 4.0.0 com.github.drtrang druid-spring-boot2-parent - 1.1.9 + 1.1.10 druid-spring-boot2 diff --git a/pom.xml b/pom.xml index 50d0f1e..469749c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,17 +1,17 @@ - 4.0.0 com.github.drtrang parent2 - 1.1.2 + 1.2.2 com.github.drtrang druid-spring-boot2-parent - 1.1.9 + 1.1.10 pom druid-spring-boot2-parent @@ -42,6 +42,7 @@ scm:git:https://github.com/drtrang/druid-spring-boot.git scm:git:git@github.com:drtrang/druid-spring-boot.git https://github.com/drtrang/druid-spring-boot + HEAD @@ -55,10 +56,6 @@ druid-spring-boot-example - - 1.1.9 - -