From 4a3f1692525c9cf10d9084fb2f438e6c07eb8511 Mon Sep 17 00:00:00 2001 From: Scott Frederick Date: Fri, 22 May 2015 11:13:38 -0500 Subject: [PATCH] Polish Hikari pooling PR. --- gradle.properties | 2 +- .../relational/HikariCpPooledDataSourceCreator.java | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/gradle.properties b/gradle.properties index f3e3b15..1c405b7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -version=1.1.2.AL2-SNAPSHOT +version=1.1.2.BUILD-SNAPSHOT group=org.springframework.cloud diff --git a/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/relational/HikariCpPooledDataSourceCreator.java b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/relational/HikariCpPooledDataSourceCreator.java index a48406b..f932de6 100644 --- a/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/relational/HikariCpPooledDataSourceCreator.java +++ b/spring-cloud-spring-service-connector/src/main/java/org/springframework/cloud/service/relational/HikariCpPooledDataSourceCreator.java @@ -22,8 +22,8 @@ public class HikariCpPooledDataSourceCreator 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 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); }