From 7b0d1a92aa13931333213dc4d2971eabb41303e5 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Tue, 26 Sep 2017 07:34:39 +0300 Subject: tomcat-jdbc -> Hikari --- .../src/main/java/com/juick/configuration/DataConfiguration.java | 7 ++++--- .../src/main/java/com/juick/configuration/SearchConfiguration.java | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'juick-server-jdbc/src/main/java/com') 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)); -- cgit v1.2.3