tomcat-jdbc -> Hikari

3 files changed, 8 insertions, 6 deletions

diff --git a/juick-server-jdbc/build.gradle b/juick-server-jdbc/build.gradle
index 780048a7..e24caddf 100644
--- a/juick-server-jdbc/build.gradle
+++ b/juick-server-jdbc/build.gradle
@@ -31,7 +31,7 @@ dependencies {
     compile "org.springframework:spring-context:${rootProject.springFrameworkVersion}"
     compile "org.springframework:spring-jdbc:${rootProject.springFrameworkVersion}"
 
-    providedCompile 'org.apache.tomcat:tomcat-jdbc:8.5.20'
+    compile 'com.zaxxer:HikariCP:2.7.1'
     compile "com.googlecode.log4jdbc:log4jdbc:1.2"
     compile "javax.inject:javax.inject:1"
 
diff --git a/juick-server-jdbc/src/main/java/com/juick/configuration/DataConfiguration.java b/juick-server-jdbc/src/main/java/com/juick/configuration/DataConfiguration.java
index c4c77b40..a5baae2b 100644
--- a/juick-server-jdbc/src/main/java/com/juick/configuration/DataConfiguration.java
+++ b/juick-server-jdbc/src/main/java/com/juick/configuration/DataConfiguration.java
@@ -18,6 +18,7 @@
 package com.juick.configuration;
 
 import com.juick.service.search.SearchService;
+import com.zaxxer.hikari.HikariDataSource;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.annotation.*;
 import org.springframework.core.env.Environment;
@@ -47,14 +48,14 @@ public class DataConfiguration implements TransactionManagementConfigurer {
     // But Datasource interface has no close() method
     @Bean
     public DataSource dataSource() {
-        org.apache.tomcat.jdbc.pool.DataSource dataSource = new org.apache.tomcat.jdbc.pool.DataSource();
+        HikariDataSource dataSource = new HikariDataSource();
 
         dataSource.setDriverClassName(env.getProperty("datasource_driver", "com.mysql.jdbc.Driver"));
-        dataSource.setUrl(env.getProperty("datasource_url"));
+        dataSource.setJdbcUrl(env.getProperty("datasource_url"));
         dataSource.setUsername(env.getProperty("datasource_user", StringUtils.EMPTY));
         dataSource.setPassword(env.getProperty("datasource_password", StringUtils.EMPTY));
 
-        dataSource.setValidationQuery("select 1");
+        //dataSource.setValidationQuery("select 1");
 
         return dataSource;
     }
diff --git a/juick-server-jdbc/src/main/java/com/juick/configuration/SearchConfiguration.java b/juick-server-jdbc/src/main/java/com/juick/configuration/SearchConfiguration.java
index 90dcefdc..1fc02039 100644
--- a/juick-server-jdbc/src/main/java/com/juick/configuration/SearchConfiguration.java
+++ b/juick-server-jdbc/src/main/java/com/juick/configuration/SearchConfiguration.java
@@ -19,6 +19,7 @@ package com.juick.configuration;
 
 import com.juick.service.search.SearchService;
 import com.juick.service.search.SphinxSearchServiceImpl;
+import com.zaxxer.hikari.HikariDataSource;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -42,10 +43,10 @@ public class SearchConfiguration {
     // But Datasource interface has no close() method
     @Bean
     public DataSource searchDataSource() {
-        org.apache.tomcat.jdbc.pool.DataSource dataSource = new org.apache.tomcat.jdbc.pool.DataSource();
+        HikariDataSource dataSource = new HikariDataSource();
 
         dataSource.setDriverClassName(env.getProperty("sphinx_driver", "com.mysql.jdbc.Driver"));
-        dataSource.setUrl(env.getProperty("sphinx_url"));
+        dataSource.setJdbcUrl(env.getProperty("sphinx_url"));
         dataSource.setUsername(env.getProperty("sphinx_user", StringUtils.EMPTY));
         dataSource.setPassword(env.getProperty("sphinx_password", StringUtils.EMPTY));