aboutsummaryrefslogtreecommitdiff
path: root/juick-server-jdbc/src/main/java
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2017-09-27 09:04:41 +0000
committerGravatar Vitaly Takmazov2017-09-27 09:04:41 +0000
commit5807d0d11b6694bfaac0d83c6bd3960c2a4f7827 (patch)
tree33b4e0ddf349999630962bac597f7f414bfba139 /juick-server-jdbc/src/main/java
parent2b57ecc4f101a81d593dfa923b630fa950f63924 (diff)
Revert "tomcat-jdbc -> Hikari"
This reverts commit 7b0d1a92aa13931333213dc4d2971eabb41303e5.
Diffstat (limited to 'juick-server-jdbc/src/main/java')
-rw-r--r--juick-server-jdbc/src/main/java/com/juick/configuration/DataConfiguration.java7
-rw-r--r--juick-server-jdbc/src/main/java/com/juick/configuration/SearchConfiguration.java5
2 files changed, 5 insertions, 7 deletions
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));