You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ds...@apache.org on 2018/10/15 22:54:29 UTC
[geode] branch feature/GEODE-5861 updated: props are now used to
set the DataSource properties on hikari
This is an automated email from the ASF dual-hosted git repository.
dschneider pushed a commit to branch feature/GEODE-5861
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-5861 by this push:
new c13c330 props are now used to set the DataSource properties on hikari
c13c330 is described below
commit c13c3300a5bc6ba80cc283b399a9ae0c2e896974
Author: Darrel Schneider <ds...@pivotal.io>
AuthorDate: Mon Oct 15 15:53:54 2018 -0700
props are now used to set the DataSource properties on hikari
---
.../geode/internal/datasource/DataSourceFactory.java | 5 +++--
.../geode/internal/datasource/HikariJdbcDataSource.java | 14 ++++++++++++--
.../java/org/apache/geode/internal/jndi/JNDIInvoker.java | 2 +-
3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/DataSourceFactory.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/DataSourceFactory.java
index 2b9e8d8..b471f52 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/DataSourceFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/DataSourceFactory.java
@@ -53,7 +53,8 @@ public class DataSourceFactory {
/** Creates a new instance of DataSourceFactory */
public DataSourceFactory() {}
- public static DataSource getHikariDataSource(Map configMap) throws DataSourceCreateException {
+ public static DataSource getHikariDataSource(Map configMap, List<ConfigProperty> props)
+ throws DataSourceCreateException {
ConfiguredDataSourceProperties configs = createDataSourceProperties(configMap);
if (configs.getURL() == null) {
logger.error("DataSourceFactory::getHikariDataSource:URL String to Database is null");
@@ -61,7 +62,7 @@ public class DataSourceFactory {
"DataSourceFactory::getHikariDataSource:URL String to Database is null");
}
try {
- return new HikariJdbcDataSource(configs);
+ return new HikariJdbcDataSource(configs, props);
} catch (Exception ex) {
logger.error(String.format(
"DataSourceFactory::getHikariDataSource:Exception while creating GemfireBasicDataSource.Exception String=%s",
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/HikariJdbcDataSource.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/HikariJdbcDataSource.java
index 4bc47a6..b5e6f37 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/HikariJdbcDataSource.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/HikariJdbcDataSource.java
@@ -18,6 +18,8 @@ import java.io.PrintWriter;
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.SQLFeatureNotSupportedException;
+import java.util.List;
+import java.util.Properties;
import java.util.logging.Logger;
import javax.sql.DataSource;
@@ -29,15 +31,23 @@ class HikariJdbcDataSource implements DataSource, AutoCloseable {
private final HikariDataSource delegate;
// TODO: set more config properties
- HikariJdbcDataSource(ConfiguredDataSourceProperties config) {
+ HikariJdbcDataSource(ConfiguredDataSourceProperties config, List<ConfigProperty> props) {
HikariDataSource ds = new HikariDataSource();
ds.setJdbcUrl(config.getURL());
ds.setUsername(config.getUser());
ds.setPassword(config.getPassword());
- // ds.setDataSourceProperties(config.getConnectionProperties());
+ ds.setDataSourceProperties(createProperties(props));
this.delegate = ds;
}
+ private Properties createProperties(List<ConfigProperty> props) {
+ Properties result = new Properties();
+ for (ConfigProperty prop : props) {
+ result.setProperty(prop.getName(), prop.getValue());
+ }
+ return result;
+ }
+
@Override
public Connection getConnection() throws SQLException {
return this.delegate.getConnection();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/jndi/JNDIInvoker.java b/geode-core/src/main/java/org/apache/geode/internal/jndi/JNDIInvoker.java
index b4fa049..b3105cb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/jndi/JNDIInvoker.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/jndi/JNDIInvoker.java
@@ -358,7 +358,7 @@ public class JNDIInvoker {
if (writer.fineEnabled())
writer.fine("Bound java:/" + jndiName + " to Context");
} else if (value.equals("HikariDataSource")) {
- ds = DataSourceFactory.getHikariDataSource(map);
+ ds = DataSourceFactory.getHikariDataSource(map, props);
ctx.rebind("java:/" + jndiName, ds);
dataSourceMap.put(jndiName, ds);
if (writer.fineEnabled())