Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

update > optimize code

Browse Source
This commit is contained in:
lihengming
2017-08-30 16:27:35 +08:00
parent 56d15618b0
commit 087705b6ed
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceWrapper.java
+5 -5
View File
@@ -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());
}
}
druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidDataSourceTestCase.java
+4 -4
View File
@@ -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);
}