From 3859c9616d0a7a04e68427d173b863161b818140 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 20 Dec 2016 14:28:00 +0300
Subject: StringUtils.EMPTY

---
 .../src/main/java/com/juick/configuration/DataConfiguration.java     | 5 +++--
 .../src/main/java/com/juick/configuration/SearchConfiguration.java   | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'juick-server/src/main/java/com/juick/configuration')

diff --git a/juick-server/src/main/java/com/juick/configuration/DataConfiguration.java b/juick-server/src/main/java/com/juick/configuration/DataConfiguration.java
index efee4731..4258703d 100644
--- a/juick-server/src/main/java/com/juick/configuration/DataConfiguration.java
+++ b/juick-server/src/main/java/com/juick/configuration/DataConfiguration.java
@@ -3,6 +3,7 @@ package com.juick.configuration;
 import com.juick.database.MySqlUpdater;
 import com.juick.service.search.SearchService;
 import org.apache.commons.dbcp2.BasicDataSource;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.annotation.*;
 import org.springframework.core.env.Environment;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -34,8 +35,8 @@ public class DataConfiguration implements TransactionManagementConfigurer {
 
         dataSource.setDriverClassName(env.getProperty("datasource_driver", "com.mysql.jdbc.Driver"));
         dataSource.setUrl(env.getProperty("datasource_url"));
-        dataSource.setUsername(env.getProperty("datasource_user", ""));
-        dataSource.setPassword(env.getProperty("datasource_password", ""));
+        dataSource.setUsername(env.getProperty("datasource_user", StringUtils.EMPTY));
+        dataSource.setPassword(env.getProperty("datasource_password", StringUtils.EMPTY));
 
         dataSource.setValidationQuery("select 1");
 
diff --git a/juick-server/src/main/java/com/juick/configuration/SearchConfiguration.java b/juick-server/src/main/java/com/juick/configuration/SearchConfiguration.java
index 5f04ea4e..e6b446b6 100644
--- a/juick-server/src/main/java/com/juick/configuration/SearchConfiguration.java
+++ b/juick-server/src/main/java/com/juick/configuration/SearchConfiguration.java
@@ -3,6 +3,7 @@ package com.juick.configuration;
 import com.juick.service.search.SearchService;
 import com.juick.service.search.SphinxSearchServiceImpl;
 import org.apache.commons.dbcp2.BasicDataSource;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
@@ -28,8 +29,8 @@ public class SearchConfiguration {
 
         dataSource.setDriverClassName(env.getProperty("sphinx_driver", "com.mysql.jdbc.Driver"));
         dataSource.setUrl(env.getProperty("sphinx_url"));
-        dataSource.setUsername(env.getProperty("sphinx_user", ""));
-        dataSource.setPassword(env.getProperty("sphinx_password", ""));
+        dataSource.setUsername(env.getProperty("sphinx_user", StringUtils.EMPTY));
+        dataSource.setPassword(env.getProperty("sphinx_password", StringUtils.EMPTY));
 
         return dataSource;
     }
-- 
cgit v1.2.3