From 194a9a763c6b11d207e682b2f93de94475c473b4 Mon Sep 17 00:00:00 2001
From: Alexander Alexeev
Date: Sat, 12 Nov 2016 01:34:07 +0700
Subject: extracted application configuration from Mvc configuration with
 application specific beans; extracted bean initialization from constructor;
 force using properties;

---
 .../com/juick/configuration/DataConfiguration.java    | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

(limited to 'juick-core/src/main/java/com/juick/configuration/DataConfiguration.java')

diff --git a/juick-core/src/main/java/com/juick/configuration/DataConfiguration.java b/juick-core/src/main/java/com/juick/configuration/DataConfiguration.java
index 62ca0f88..f31dbcdb 100644
--- a/juick-core/src/main/java/com/juick/configuration/DataConfiguration.java
+++ b/juick-core/src/main/java/com/juick/configuration/DataConfiguration.java
@@ -1,11 +1,9 @@
 package com.juick.configuration;
 
 import org.apache.commons.dbcp2.BasicDataSource;
-import org.springframework.beans.factory.config.PlaceholderConfigurerSupport;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.core.env.Environment;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
@@ -21,26 +19,21 @@ import javax.sql.DataSource;
  */
 @Configuration
 @EnableTransactionManagement
-@PropertySource(value = {"classpath:juick.conf", "file:${user.home}/juick.conf"})
+@PropertySource(value = {"classpath:juick.conf"})
 public class DataConfiguration implements TransactionManagementConfigurer {
     @Resource
     private Environment env;
 
-    @Bean
-    public static PlaceholderConfigurerSupport propertySourcesPlaceholderConfigurer() {
-        PlaceholderConfigurerSupport configurer = new PropertySourcesPlaceholderConfigurer();
-
-        configurer.setFileEncoding("utf-8");
-        configurer.setOrder(0);
-        return configurer;
-    }
-
     @Bean
     public DataSource dataSource() {
         BasicDataSource dataSource = new BasicDataSource();
 
         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.setValidationQuery("select 1");
 
         return dataSource;
     }
@@ -56,7 +49,7 @@ public class DataConfiguration implements TransactionManagementConfigurer {
     }
 
     @Bean
-    public JdbcTemplate jdbc() {
+    public JdbcTemplate jdbcTemplate() {
         return new JdbcTemplate(dataSource());
     }
 }
-- 
cgit v1.2.3