From 483a4ac3df2900608b61bd007ae8d0b75287cd3a Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Wed, 1 Nov 2017 17:10:53 +0300 Subject: jdbc: cleanup configuration --- .../com/juick/configuration/DataConfiguration.java | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'juick-server-jdbc') 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 394e7639..6f028fc6 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 @@ -19,16 +19,14 @@ package com.juick.configuration; import com.juick.service.search.SearchService; import org.apache.commons.dbcp2.BasicDataSource; -import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.*; -import org.springframework.core.env.Environment; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.transaction.annotation.TransactionManagementConfigurer; -import javax.annotation.Resource; import java.util.Collections; import java.util.List; @@ -40,8 +38,14 @@ import java.util.List; @PropertySource(value = {"classpath:juick.conf"}) @ComponentScan(basePackages = {"com.juick.service"}) public class DataConfiguration implements TransactionManagementConfigurer { - @Resource - private Environment env; + @Value("${datasource_driver:com.mysql.jdbc.Driver}") + private String datasourceDriver; + @Value("${datasource_url:}") + private String datasourceUrl; + @Value("${datasource_user:}") + private String datasourceUser; + @Value("${datasource_password:}") + private String datasourcePassword; // NOTE: The close() method will be called automatically with default @Bean settings // But Datasource interface has no close() method @@ -49,10 +53,10 @@ public class DataConfiguration implements TransactionManagementConfigurer { public BasicDataSource 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", StringUtils.EMPTY)); - dataSource.setPassword(env.getProperty("datasource_password", StringUtils.EMPTY)); + dataSource.setDriverClassName(datasourceDriver); + dataSource.setUrl(datasourceUrl); + dataSource.setUsername(datasourceUser); + dataSource.setPassword(datasourcePassword); dataSource.setValidationQuery("select 1"); -- cgit v1.2.3