From e35c939ed2298580a975d20344d66dd713f8cf8f Mon Sep 17 00:00:00 2001
From: Brett Wooldridge <brett.wooldridge@gmail.com>
Date: Tue, 14 Jan 2014 19:28:16 +0900
Subject: [PATCH] Allow setting the dataSource directly on the HikariConfig.

---
 .../java/com/zaxxer/hikari/HikariConfig.java  | 19 +++++++++++++++++
 .../java/com/zaxxer/hikari/HikariPool.java    | 21 ++++++++++++-------
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zaxxer/hikari/HikariConfig.java b/src/main/java/com/zaxxer/hikari/HikariConfig.java
index 5bafd776..ce7565f0 100644
--- a/src/main/java/com/zaxxer/hikari/HikariConfig.java
+++ b/src/main/java/com/zaxxer/hikari/HikariConfig.java
@@ -24,6 +24,8 @@ import java.sql.Connection;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
+import javax.sql.DataSource;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -60,6 +62,7 @@ public final class HikariConfig implements HikariConfigMBean
     private boolean isJdbc4connectionTest;
     private boolean isAutoCommit;
     private Properties dataSourceProperties;
+    private DataSource dataSource;
 
     /**
      * Default constructor
@@ -212,6 +215,16 @@ public final class HikariConfig implements HikariConfigMBean
         }
     }
 
+    public DataSource getDataSource()
+    {
+        return dataSource;
+    }
+
+    public void setDataSource(DataSource dataSource)
+    {
+        this.dataSource = dataSource;
+    }
+
     public String getDataSourceClassName()
     {
         return dataSourceClassName;
@@ -398,6 +411,12 @@ public final class HikariConfig implements HikariConfigMBean
         	connectionTimeout = CONNECTION_TIMEOUT;
         }
 
+        if (dataSource == null && dataSourceClassName == null)
+        {
+            logger.error("one of either dataSource or dataSourceClassName must be specified");
+            throw new IllegalStateException("one of either dataSource or dataSourceClassName must be specified");
+        }
+
         if (idleTimeout < 0)
         {
             logger.error("idleTimeout cannot be negative.");
diff --git a/src/main/java/com/zaxxer/hikari/HikariPool.java b/src/main/java/com/zaxxer/hikari/HikariPool.java
index 315dc04a..a5a16f7f 100644
--- a/src/main/java/com/zaxxer/hikari/HikariPool.java
+++ b/src/main/java/com/zaxxer/hikari/HikariPool.java
@@ -82,16 +82,23 @@ public final class HikariPool implements HikariPoolMBean
         this.transactionIsolation = configuration.getTransactionIsolation();
         this.debug = LOGGER.isDebugEnabled();
 
-        String dsClassName = configuration.getDataSourceClassName();
-        try
+        if (configuration.getDataSource() == null)
         {
-            Class<?> clazz = this.getClass().getClassLoader().loadClass(dsClassName);
-            this.dataSource = (DataSource) clazz.newInstance();
-            PropertyBeanSetter.setTargetFromProperties(dataSource, configuration.getDataSourceProperties());
+            String dsClassName = configuration.getDataSourceClassName();
+            try
+            {
+                Class<?> clazz = this.getClass().getClassLoader().loadClass(dsClassName);
+                this.dataSource = (DataSource) clazz.newInstance();
+                PropertyBeanSetter.setTargetFromProperties(dataSource, configuration.getDataSourceProperties());
+            }
+            catch (Exception e)
+            {
+                throw new RuntimeException("Could not create datasource instance: " + dsClassName, e);
+            }
         }
-        catch (Exception e)
+        else
         {
-            throw new RuntimeException("Could not create datasource instance: " + dsClassName, e);
+            this.dataSource = configuration.getDataSource();
         }
 
         HikariMBeanElf.registerMBeans(configuration, this);