SpringCloud/spring-cloud-connectors
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish Hikari pooling PR.

Browse Source
This commit is contained in:
Scott Frederick
2015-05-22 11:13:38 -05:00
parent 0a77349303
commit 4a3f169252
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -1,3 +1,3 @@
version=1.1.2.AL2-SNAPSHOT
version=1.1.2.BUILD-SNAPSHOT
group=org.springframework.cloud

10
spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/relational/HikariCpPooledDataSourceCreator.java
View File

@@ -22,8 +22,8 @@ public class HikariCpPooledDataSourceCreator<SI extends RelationalServiceInfo> i
private DataSourceConfigurer configurer = new DataSourceConfigurer();
protected void setBasicDataSourceProperties(DataSource basicDataSource, RelationalServiceInfo serviceInfo,
ServiceConnectorConfig serviceConnectorConfig,
String driverClassName, String validationQuery) {
ServiceConnectorConfig serviceConnectorConfig,
String driverClassName, String validationQuery) {
BeanWrapper target = new BeanWrapperImpl(basicDataSource);
target.setPropertyValue("driverClassName", driverClassName);
target.setPropertyValue("jdbcUrl", serviceInfo.getJdbcUrl());
@@ -31,12 +31,6 @@ public class HikariCpPooledDataSourceCreator<SI extends RelationalServiceInfo> i
target.setPropertyValue("connectionTestQuery", validationQuery);
}
if (serviceConnectorConfig == null) {
// choose sensible values so that we set max connection pool size to what
// free tier services on Cloud Foundry and Heroku allow
//target.setPropertyValue("maximumPoolSize", 4);
//target.setPropertyValue("idleTimeout", 55000);
}
configurer.configure(basicDataSource, (DataSourceConfig)serviceConnectorConfig);
}