Merge {Test,Prod}DataSource into DataSourceConfig.

No functional changes.

Author: php-coder

src/main/java/ru/mystamps/web/config/ProdDataSource.java renamed to src/main/java/ru/mystamps/web/config/DataSourceConfig.java

@@ -27,25 +27,48 @@
 import org.springframework.context.annotation.Profile;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
 
 @Configuration
-@Profile("prod")
-@PropertySource("classpath:prod/spring/database.properties")
-public class ProdDataSource {
+public interface DataSourceConfig {
 
-	@Inject
-	private Environment env;
+	DataSource getDataSource();
 
-	@Bean(destroyMethod = "close")
-	public DataSource getDataSource() {
-		BasicDataSource dataSource = new BasicDataSource();
+	@Profile("prod")
+	@PropertySource("classpath:prod/spring/database.properties")
+	class ProdDataSourceConfig implements DataSourceConfig {
 
-		dataSource.setDriverClassName(env.getRequiredProperty("db.driverClassName"));
-		dataSource.setUrl(env.getRequiredProperty("db.url"));
-		dataSource.setUsername(env.getRequiredProperty("db.username"));
-		dataSource.setPassword(env.getRequiredProperty("db.password"));
+		@Inject
+		private Environment env;
+		
+		@Bean(destroyMethod = "close")
+		@Override
+		public DataSource getDataSource() {
+			BasicDataSource dataSource = new BasicDataSource();
+			
+			dataSource.setDriverClassName(env.getRequiredProperty("db.driverClassName"));
+			dataSource.setUrl(env.getRequiredProperty("db.url"));
+			dataSource.setUsername(env.getRequiredProperty("db.username"));
+			dataSource.setPassword(env.getRequiredProperty("db.password"));
+			
+			return dataSource;
+		}
+		
+	}
+	
+	@Profile("test")
+	class TestDataSourceConfig implements DataSourceConfig {
+		
+		@Bean(destroyMethod = "shutdown")
+		@Override
+		public DataSource getDataSource() {
+			return new EmbeddedDatabaseBuilder()
+				.setType(EmbeddedDatabaseType.H2)
+				.setName("mystamps")
+				.build();
+		}
 
-		return dataSource;
 	}
 
 }

src/main/java/ru/mystamps/web/config/DbConfig.java

@@ -21,7 +21,6 @@
 import java.util.Map;
 
 import javax.inject.Inject;
-import javax.sql.DataSource;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -42,17 +41,14 @@
 @EnableTransactionManagement
 @EnableJpaRepositories("ru.mystamps.web.dao")
 @PropertySource("classpath:${spring.profiles.active}/spring/database.properties")
-@Import({
-	TestDataSource.class,
-	ProdDataSource.class
-})
+@Import(DataSourceConfig.class)
 public class DbConfig {
 
 	@Inject
 	private Environment env;
 
 	@Inject
-	private DataSource dataSource;
+	private DataSourceConfig dataSourceConfig;
 
 	@Bean
 	public JpaVendorAdapter getJpaVendorAdapter() {
@@ -73,7 +69,7 @@ public LocalContainerEntityManagerFactoryBean getEntityManagerFactory() {
 			new LocalContainerEntityManagerFactoryBean();
 
 		entityManagerFactory.setJpaVendorAdapter(getJpaVendorAdapter());
-		entityManagerFactory.setDataSource(dataSource);
+		entityManagerFactory.setDataSource(dataSourceConfig.getDataSource());
 		entityManagerFactory.setJpaPropertyMap(getJpaProperties());
 
 		return entityManagerFactory;

src/main/java/ru/mystamps/web/config/LiquibaseConfig.java

@@ -18,7 +18,6 @@
 package ru.mystamps.web.config;
 
 import javax.inject.Inject;
-import javax.sql.DataSource;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -29,11 +28,17 @@
 @Configuration
 public class LiquibaseConfig {
 
+	@Inject
+	private Environment env;
+	
+	@Inject
+	private DataSourceConfig dataSourceConfig;
+	
 	@Inject
 	@Bean(name = "liquibase")
-	public SpringLiquibase getSpringLiquibase(DataSource dataSource, Environment env) {
+	public SpringLiquibase getSpringLiquibase() {
 		SpringLiquibase liquibase = new SpringLiquibase();
-		liquibase.setDataSource(dataSource);
+		liquibase.setDataSource(dataSourceConfig.getDataSource());
 		liquibase.setChangeLog("classpath:/liquibase/changelog.xml");
 		liquibase.setContexts(getActiveContexts(env));
 		return liquibase;