From 8e290fca0c94ead4c287027c89294e2b1b2579ac Mon Sep 17 00:00:00 2001 From: lihengming <89921218@qq.com> Date: Sat, 10 Mar 2018 18:42:42 +0800 Subject: [PATCH 1/4] update > spring boot version to 2.0.0.RELEASE --- druid-spring-boot-starter/pom.xml | 5 ++--- .../spring/boot/testcase/DruidDataSourceTestCase.java | 10 ++-------- .../spring/boot/testcase/DruidFilterTestCase.java | 8 +++++--- .../boot/testcase/DruidMultiDataSourceTestCase.java | 5 +++-- .../druid/spring/boot/testcase/Issue1796TestCase.java | 5 +++-- 5 files changed, 15 insertions(+), 18 deletions(-) diff --git a/druid-spring-boot-starter/pom.xml b/druid-spring-boot-starter/pom.xml index 77667afb42..50b45d61fe 100644 --- a/druid-spring-boot-starter/pom.xml +++ b/druid-spring-boot-starter/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.alibaba druid-spring-boot-starter - 1.1.8 + 1.1.9-SNAPSHOT jar druid-spring-boot-starter Spring Boot with Druid support,help you simplify Druid config in Spring Boot. @@ -12,7 +12,7 @@ 1.1.8 - 2.0.0.RC1 + 2.0.0.RELEASE @@ -51,7 +51,6 @@ org.springframework.boot spring-boot-autoconfigure - 2.0.0.RC1 diff --git a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidDataSourceTestCase.java b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidDataSourceTestCase.java index 2b295636e2..0901333dfa 100644 --- a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidDataSourceTestCase.java +++ b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidDataSourceTestCase.java @@ -15,22 +15,16 @@ */ package com.alibaba.druid.spring.boot.testcase; +import javax.annotation.Resource; + import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; import com.alibaba.druid.spring.boot.demo.DemoApplication; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.util.EnvironmentTestUtils; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; import org.springframework.test.context.junit4.SpringRunner; -import javax.annotation.Resource; -import javax.sql.DataSource; - import static org.assertj.core.api.Assertions.assertThat; /** diff --git a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidFilterTestCase.java b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidFilterTestCase.java index 58598fb176..ec62ea690d 100644 --- a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidFilterTestCase.java +++ b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidFilterTestCase.java @@ -1,17 +1,19 @@ package com.alibaba.druid.spring.boot.testcase; +import java.util.List; + +import javax.annotation.Resource; + import com.alibaba.druid.filter.Filter; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.spring.boot.demo.DemoApplication; + import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; -import javax.annotation.Resource; -import java.util.List; - import static org.assertj.core.api.Assertions.assertThat; /** diff --git a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidMultiDataSourceTestCase.java b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidMultiDataSourceTestCase.java index bbf9d46e1f..ef4fcbbb4a 100644 --- a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidMultiDataSourceTestCase.java +++ b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidMultiDataSourceTestCase.java @@ -17,16 +17,17 @@ package com.alibaba.druid.spring.boot.testcase; import java.sql.SQLException; +import javax.annotation.Resource; + import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.spring.boot.demo.DemoApplication; + import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; -import javax.annotation.Resource; - import static org.assertj.core.api.Assertions.assertThat; /** diff --git a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/Issue1796TestCase.java b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/Issue1796TestCase.java index 8bace93387..efa3847c59 100644 --- a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/Issue1796TestCase.java +++ b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/Issue1796TestCase.java @@ -1,15 +1,16 @@ package com.alibaba.druid.spring.boot.testcase; +import javax.annotation.Resource; + import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.spring.boot.demo.DemoApplication; + import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; -import javax.annotation.Resource; - import static org.assertj.core.api.Assertions.assertThat; /** From 5deaacb46f798eb59db79a6ff127740f20680d27 Mon Sep 17 00:00:00 2001 From: lihengming <89921218@qq.com> Date: Sat, 10 Mar 2018 18:45:54 +0800 Subject: [PATCH 2/4] update > for 1.1.9 --- druid-spring-boot-starter/README.md | 4 ++-- druid-spring-boot-starter/README_EN.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/druid-spring-boot-starter/README.md b/druid-spring-boot-starter/README.md index a4f689a596..63956f1a51 100644 --- a/druid-spring-boot-starter/README.md +++ b/druid-spring-boot-starter/README.md @@ -12,12 +12,12 @@ Druid Spring Boot Starter 用于帮助你在Spring Boot项目中轻松集成Drui com.alibaba druid-spring-boot-starter - 1.1.8 + 1.1.9 ``` ```Gradle``` ```xml - compile 'com.alibaba:druid-spring-boot-starter:1.1.8' + compile 'com.alibaba:druid-spring-boot-starter:1.1.9' ``` 2. 添加配置 diff --git a/druid-spring-boot-starter/README_EN.md b/druid-spring-boot-starter/README_EN.md index b4aae7b16b..a1d7d01226 100644 --- a/druid-spring-boot-starter/README_EN.md +++ b/druid-spring-boot-starter/README_EN.md @@ -12,12 +12,12 @@ Spring Boot with Druid support, help you simplify Druid config in Spring Boot. com.alibaba druid-spring-boot-starter - 1.1.8 + 1.1.9 ``` ```Gradle``` ```xml - compile 'com.alibaba:druid-spring-boot-starter:1.1.8' + compile 'com.alibaba:druid-spring-boot-starter:1.1.9' ``` 2. Add configuration properties. ```xml From bc734832739af785240df105f425a085cb0c8775 Mon Sep 17 00:00:00 2001 From: lihengming <89921218@qq.com> Date: Sat, 10 Mar 2018 18:50:10 +0800 Subject: [PATCH 3/4] update > for 1.1.9 --- druid-spring-boot-starter/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/druid-spring-boot-starter/README.md b/druid-spring-boot-starter/README.md index 63956f1a51..8e30f6be4d 100644 --- a/druid-spring-boot-starter/README.md +++ b/druid-spring-boot-starter/README.md @@ -111,7 +111,7 @@ spring.datasource.druid.two.max-active=20 spring.datasource.druid.two.max-wait=20000 ... ``` -**强烈注意**：Spring Boot 2.X 版本不再支持配置继承，多数据源的话每个数据源都需要单独配置，否则配置不会生效 +**强烈注意**：Spring Boot 2.X 版本不再支持配置继承，多数据源的话每个数据源的所有配置都需要单独配置，否则配置不会生效 2. 创建数据源 ```java From c49d85bb5894bbdb4f86c461dfa4f82b1bf93e7a Mon Sep 17 00:00:00 2001 From: lihengming <89921218@qq.com> Date: Sat, 10 Mar 2018 21:59:33 +0800 Subject: [PATCH 4/4] fix > for #2395 --- .../autoconfigure/stat/DruidStatViewServletConfiguration.java | 2 +- .../autoconfigure/stat/DruidWebStatFilterConfiguration.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidStatViewServletConfiguration.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidStatViewServletConfiguration.java index eda38c3960..efe754be62 100644 --- a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidStatViewServletConfiguration.java +++ b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidStatViewServletConfiguration.java @@ -29,7 +29,7 @@ import org.springframework.context.annotation.Bean; @ConditionalOnProperty(name = "spring.datasource.druid.stat-view-servlet.enabled", havingValue = "true", matchIfMissing = true) public class DruidStatViewServletConfiguration { @Bean - public ServletRegistrationBean servletRegistrationBean(DruidStatProperties properties) { + public ServletRegistrationBean statViewServletRegistrationBean(DruidStatProperties properties) { DruidStatProperties.StatViewServlet config = properties.getStatViewServlet(); ServletRegistrationBean registrationBean = new ServletRegistrationBean(); registrationBean.setServlet(new StatViewServlet()); diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidWebStatFilterConfiguration.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidWebStatFilterConfiguration.java index d160f018f9..9117ee83a8 100644 --- a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidWebStatFilterConfiguration.java +++ b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidWebStatFilterConfiguration.java @@ -29,7 +29,7 @@ import org.springframework.context.annotation.Bean; @ConditionalOnProperty(name = "spring.datasource.druid.web-stat-filter.enabled", havingValue = "true", matchIfMissing = true) public class DruidWebStatFilterConfiguration { @Bean - public FilterRegistrationBean filterRegistrationBean(DruidStatProperties properties) { + public FilterRegistrationBean webStatFilterRegistrationBean(DruidStatProperties properties) { DruidStatProperties.WebStatFilter config = properties.getWebStatFilter(); FilterRegistrationBean registrationBean = new FilterRegistrationBean(); WebStatFilter filter = new WebStatFilter();