Use autoconfiguration for datasources.

Author: php-coder

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

@@ -25,7 +25,6 @@
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
@@ -42,7 +41,6 @@
 @EnableTransactionManagement
 @EnableJpaRepositories("ru.mystamps.web.dao")
 @PropertySource("classpath:${spring.profiles.active}/spring/database.properties")
-@Import(DataSourceConfig.class)
 public class DbConfig {
 
 	@Inject

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

@@ -13,11 +13,25 @@ liquibase:
 ---
 spring:
   profiles: test
+  datasource:
+    url: jdbc:h2:mem:mystamps;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=false
+    username: sa
+    password:
+    driver-class-name: org.h2.Driver
+    initialize: false
 liquibase:
   contexts: scheme, init-data, test-data
 ---
 spring:
   profiles: prod
+  datasource:
+    url: jdbc:mysql://localhost:3306/mystamps
+    username: mystamps
+    password: q1
+    driver-class-name: com.mysql.jdbc.Driver
+    initialize: false
+    validation-query: SELECT 1
+    test-on-borrow: false
 liquibase:
   # see also duplicate definition at pom.xml
   contexts: scheme, init-data, prod-data

src/main/resources/application.yml

@@ -1,7 +1,3 @@
-db.driverClassName = com.mysql.jdbc.Driver
-db.url = jdbc:mysql://localhost:3306/mystamps
-db.username = mystamps
-db.password = q1
 jpa.dialectClassName = ru.mystamps.web.support.hibernate.MySql5InnoDbDialect
 jpa.showSql = false
 hibernate.formatSql = true