add properties test

druid-spring-boot-samples/src/main/java/com/github/trang/druid/config/SpringDataSourceConfig.java

@@ -20,7 +20,7 @@ import java.util.Map;
  * @author trang
  */
 @Configuration
-@Profile({"dynamic", "dynamic-dev"})
+@Profile({"dynamic", "dynamic-dev-yaml", "dynamic-dev-props"})
 public class SpringDataSourceConfig {
 
     private static final Logger log = LoggerFactory.getLogger(SpringDataSourceConfig.class);
@@ -31,7 +31,7 @@ public class SpringDataSourceConfig {
      * `spring.datasource.druid.one` 前缀的配置会注入到该 Bean，同时会继承 `spring.datasource.druid`
      * 前缀的配置，若名称相同则会被 `spring.datasource.druid.one` 覆盖
      */
-    @Bean
+    @Bean(initMethod = "init", destroyMethod = "close")
     @ConfigurationProperties("spring.datasource.druid.one")
     public DruidDataSource firstDataSource() {
         log.debug("druid first-data-source init...");
@@ -41,7 +41,7 @@ public class SpringDataSourceConfig {
     /**
      * 第二个数据源，若还有其它数据源可以继续增加
      */
-    @Bean
+    @Bean(initMethod = "init", destroyMethod = "close")
     @ConfigurationProperties("spring.datasource.druid.two")
     public DruidDataSource secondDataSource() {
         log.debug("druid second-data-source init...");

druid-spring-boot-samples/src/main/resources/application.yml

@@ -113,7 +113,7 @@ spring:
 ---
 
 spring:
-  profiles: dev
+  profiles: dev-yaml
   datasource:
     druid:
       min-evictable-idle-time-millis: 100000
@@ -122,7 +122,7 @@ spring:
 ---
 
 spring:
-  profiles: dynamic-dev
+  profiles: dynamic-dev-yaml
   autoconfigure:
     exclude:
       - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
@@ -130,9 +130,9 @@ spring:
     druid:
       one:
         name: one
-        min-evictable-idle-time-millis: 100000
-        max-evictable-idle-time-millis: 200000
+        min-evictable-idle-time-millis: 100001
+        max-evictable-idle-time-millis: 200001
       two:
         name: two
-        min-evictable-idle-time-millis: 100001
+        min-evictable-idle-time-millis: 100002
         max-evictable-idle-time-millis: 200002

druid-spring-boot-samples/src/test/java/com/github/trang/druid/test/DevProfilesTests.java

@@ -12,7 +12,8 @@ import static org.junit.Assert.assertEquals;
  *
  * @author trang
  */
-@ActiveProfiles("dev")
+@ActiveProfiles("dev-yaml")
+//@ActiveProfiles("dev-props")
 public class DevProfilesTests extends BaseTest {
 
     @Autowired

druid-spring-boot-samples/src/test/java/com/github/trang/druid/test/DynamicDevProfilesTests.java

@@ -13,7 +13,8 @@ import static org.junit.Assert.assertEquals;
  *
  * @author trang
  */
-@ActiveProfiles("dynamic-dev")
+@ActiveProfiles("dynamic-dev-yaml")
+//@ActiveProfiles("dynamic-dev-props")
 public class DynamicDevProfilesTests extends BaseTest {
 
     @Autowired
@@ -25,13 +26,13 @@ public class DynamicDevProfilesTests extends BaseTest {
 
     @Test
     public void testFirstDataSource() {
-        assertEquals(100000, firstDataSource.getMinEvictableIdleTimeMillis());
-        assertEquals(200000, firstDataSource.getMaxEvictableIdleTimeMillis());
+        assertEquals(100001, firstDataSource.getMinEvictableIdleTimeMillis());
+        assertEquals(200001, firstDataSource.getMaxEvictableIdleTimeMillis());
     }
 
     @Test
     public void testSecondDataSource() {
-        assertEquals(100001, secondDataSource.getMinEvictableIdleTimeMillis());
+        assertEquals(100002, secondDataSource.getMinEvictableIdleTimeMillis());
         assertEquals(200002, secondDataSource.getMaxEvictableIdleTimeMillis());
     }
 

druid-spring-boot-samples/src/test/resources/application-dynamic-dev-props.properties

@@ -1,5 +1,5 @@
 spring.autoconfigure.exclude=- org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
-spring.datasource.druid.one.min-evictable-idle-time-millis=100000
-spring.datasource.druid.one.max-evictable-idle-time-millis=200000
-spring.datasource.druid.two.min-evictable-idle-time-millis=100001
+spring.datasource.druid.one.min-evictable-idle-time-millis=100001
+spring.datasource.druid.one.max-evictable-idle-time-millis=200001
+spring.datasource.druid.two.min-evictable-idle-time-millis=100002
 spring.datasource.druid.two.max-evictable-idle-time-millis=200002