diff options
4 files changed, 9 insertions, 12 deletions
diff --git a/juick-server-jdbc/build.gradle b/juick-server-jdbc/build.gradle index e24caddf..780048a7 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}" - compile 'com.zaxxer:HikariCP:2.7.1' + providedCompile 'org.apache.tomcat:tomcat-jdbc:8.5.20' 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 a5baae2b..c4c77b40 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,7 +18,6 @@ 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; @@ -48,14 +47,14 @@ public class DataConfiguration implements TransactionManagementConfigurer { // But Datasource interface has no close() method @Bean public DataSource dataSource() { - HikariDataSource dataSource = new HikariDataSource(); + org.apache.tomcat.jdbc.pool.DataSource dataSource = new org.apache.tomcat.jdbc.pool.DataSource(); dataSource.setDriverClassName(env.getProperty("datasource_driver", "com.mysql.jdbc.Driver")); - dataSource.setJdbcUrl(env.getProperty("datasource_url")); + dataSource.setUrl(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 1fc02039..90dcefdc 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,7 +19,6 @@ 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; @@ -43,10 +42,10 @@ public class SearchConfiguration { // But Datasource interface has no close() method @Bean public DataSource searchDataSource() { - HikariDataSource dataSource = new HikariDataSource(); + org.apache.tomcat.jdbc.pool.DataSource dataSource = new org.apache.tomcat.jdbc.pool.DataSource(); dataSource.setDriverClassName(env.getProperty("sphinx_driver", "com.mysql.jdbc.Driver")); - dataSource.setJdbcUrl(env.getProperty("sphinx_url")); + dataSource.setUrl(env.getProperty("sphinx_url")); dataSource.setUsername(env.getProperty("sphinx_user", StringUtils.EMPTY)); dataSource.setPassword(env.getProperty("sphinx_password", StringUtils.EMPTY)); diff --git a/src/test/java/com/juick/tests/ApiTests.java b/src/test/java/com/juick/tests/ApiTests.java index 403adfa6..d97f84d2 100644 --- a/src/test/java/com/juick/tests/ApiTests.java +++ b/src/test/java/com/juick/tests/ApiTests.java @@ -32,7 +32,6 @@ import com.juick.service.TagService; import com.juick.service.UserService; import com.juick.service.search.SearchService; import com.juick.www.WebApp; -import com.zaxxer.hikari.HikariDataSource; import org.apache.commons.lang3.StringUtils; import org.junit.Before; import org.junit.Test; @@ -80,11 +79,11 @@ public class ApiTests { db.start(); db.createDB("juick"); db.source("schema.sql"); - HikariDataSource dataSource = new HikariDataSource(); + org.apache.tomcat.jdbc.pool.DataSource dataSource = new org.apache.tomcat.jdbc.pool.DataSource(); dataSource.setDriverClassName("com.mysql.jdbc.Driver"); - dataSource.setJdbcUrl("jdbc:mysql://localhost:33306/juick?autoReconnect=true&user=root"); + dataSource.setUrl("jdbc:mysql://localhost:33306/juick?autoReconnect=true&user=root"); - // dataSource.setValidationQuery("select 1"); + dataSource.setValidationQuery("select 1"); return dataSource; } catch (ManagedProcessException e) { |