From 087705b6ed4212ed34b02c2ebcd08951779d9b30 Mon Sep 17 00:00:00 2001 From: lihengming <89921218@qq.com> Date: Wed, 30 Aug 2017 16:27:35 +0800 Subject: [PATCH 1/2] update > optimize code --- .../boot/autoconfigure/DruidDataSourceWrapper.java | 10 +++++----- .../spring/boot/testcase/DruidDataSourceTestCase.java | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceWrapper.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceWrapper.java index d023cf4e7d..e9c9d9f6ee 100644 --- a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceWrapper.java +++ b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceWrapper.java @@ -35,22 +35,22 @@ import org.springframework.boot.context.properties.ConfigurationProperties; @ConfigurationProperties("spring.datasource.druid") class DruidDataSourceWrapper extends DruidDataSource implements InitializingBean { @Autowired - private DataSourceProperties sourceProperties; + private DataSourceProperties basicProperties; @Override public void afterPropertiesSet() throws Exception { //if not found prefix 'spring.datasource.druid' jdbc properties ,'spring.datasource' prefix jdbc properties will be used. if (super.getUsername() == null) { - super.setUsername(sourceProperties.determineUsername()); + super.setUsername(basicProperties.determineUsername()); } if (super.getPassword() == null) { - super.setPassword(sourceProperties.determinePassword()); + super.setPassword(basicProperties.determinePassword()); } if (super.getUrl() == null) { - super.setUrl(sourceProperties.determineUrl()); + super.setUrl(basicProperties.determineUrl()); } if (super.getDriverClassName() == null) { - super.setDriverClassName(sourceProperties.determineDriverClassName()); + super.setDriverClassName(basicProperties.determineDriverClassName()); } } 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 5133903cfe..91625369b9 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 @@ -56,13 +56,13 @@ public class DruidDataSourceTestCase { EnvironmentTestUtils.addEnvironment(this.context, PREFIX + "pool-prepared-statements=true"); //EnvironmentTestUtils.addEnvironment(this.context, PREFIX + "max-open-prepared-statements=5");//Duplicated with following EnvironmentTestUtils.addEnvironment(this.context, PREFIX + "max-pool-prepared-statement-per-connection-size=5"); - EnvironmentTestUtils.addEnvironment(this.context, PREFIX + "validation-query=select 'x'"); + EnvironmentTestUtils.addEnvironment(this.context, PREFIX + "validation-query=select 1"); EnvironmentTestUtils.addEnvironment(this.context, PREFIX + "validation-query-timeout=1"); EnvironmentTestUtils.addEnvironment(this.context, PREFIX + "test-on-borrow=true"); EnvironmentTestUtils.addEnvironment(this.context, PREFIX + "test-while-idle=true"); EnvironmentTestUtils.addEnvironment(this.context, PREFIX + "test-on-return=true"); EnvironmentTestUtils.addEnvironment(this.context, PREFIX + "time-between-eviction-runs-millis=10000"); - EnvironmentTestUtils.addEnvironment(this.context, PREFIX + "min-evictable-idle-time-millis=12345"); + EnvironmentTestUtils.addEnvironment(this.context, PREFIX + "min-evictable-idle-time-millis=30001"); EnvironmentTestUtils.addEnvironment(this.context, PREFIX + "connection-properties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000"); EnvironmentTestUtils.addEnvironment(this.context, PREFIX + "async-close-connection-enable=true"); @@ -77,13 +77,13 @@ public class DruidDataSourceTestCase { assertThat(ds.isPoolPreparedStatements()).isTrue(); //assertThat(ds.getMaxOpenPreparedStatements()).isEqualTo(5); //Duplicated with following assertThat(ds.getMaxPoolPreparedStatementPerConnectionSize()).isEqualTo(5); - assertThat(ds.getValidationQuery()).isEqualTo("select 'x'"); + assertThat(ds.getValidationQuery()).isEqualTo("select 1"); assertThat(ds.getValidationQueryTimeout()).isEqualTo(1); assertThat(ds.isTestWhileIdle()).isTrue(); assertThat(ds.isTestOnBorrow()).isTrue(); assertThat(ds.isTestOnReturn()).isTrue(); assertThat(ds.getTimeBetweenEvictionRunsMillis()).isEqualTo(10000); - assertThat(ds.getMinEvictableIdleTimeMillis()).isEqualTo(12345); + assertThat(ds.getMinEvictableIdleTimeMillis()).isEqualTo(30001); assertThat(ds.getConnectProperties().size()).isEqualTo(2); assertThat(ds.isAsyncCloseConnectionEnable()).isEqualTo(true); } From 93ff96d5769253cb532fa3203bd10b57016dd195 Mon Sep 17 00:00:00 2001 From: lihengming <89921218@qq.com> Date: Mon, 4 Sep 2017 15:45:42 +0800 Subject: [PATCH 2/2] update > 1.1.3 --- 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 fb62a2ad86..874edea8e8 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.2 + 1.1.3 ``` ```Gradle``` ```xml - compile 'com.alibaba:druid-spring-boot-starter:1.1.2' + compile 'com.alibaba:druid-spring-boot-starter:1.1.3' ``` 2. 添加配置 diff --git a/druid-spring-boot-starter/README_EN.md b/druid-spring-boot-starter/README_EN.md index 395eb37ef0..c24caab7cb 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.2 + 1.1.3 ``` ```Gradle``` ```xml - compile 'com.alibaba:druid-spring-boot-starter:1.1.2' + compile 'com.alibaba:druid-spring-boot-starter:1.1.3' ``` 2. Add configuration properties. ```xml