From 2b57ecc4f101a81d593dfa923b630fa950f63924 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Wed, 27 Sep 2017 09:04:26 +0000
Subject: Revert "SingleConnectionDataSource for sphinx"

This reverts commit 937f3290b52a88e4cc39c3e24d90184d456eb225.
---
 .../src/main/java/com/juick/configuration/SearchConfiguration.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'juick-server-jdbc/src/main')

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 782d191f..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,13 +19,13 @@ 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;
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
-import org.springframework.jdbc.datasource.SingleConnectionDataSource;
 
 import javax.annotation.Resource;
 import javax.sql.DataSource;
@@ -43,10 +43,10 @@ public class SearchConfiguration {
     // But Datasource interface has no close() method
     @Bean
     public DataSource searchDataSource() {
-        SingleConnectionDataSource dataSource = new SingleConnectionDataSource();
+        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