add more test case, use jacoco coverage, fix leaf map value not deleted issue

Author: Joey Yang

.github/workflows/gradle.yml

@@ -26,8 +26,14 @@ jobs:
         OSSRHUSERNAME: ${{ secrets.OSSRHUSERNAME }}
         OSSRHPASSWORD: ${{ secrets.OSSRHPASSWORD }}
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-    - uses: codecov/codecov-action@v1
+    - name: codecov report
+      uses: codecov/codecov-action@v1
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         files: build/reports/jacoco/report.xml
-        verbose: true
+        verbose: true
+    - name: jacoco-badge
+      uses: cicirello/jacoco-badge-generator@v2
+      with:
+        generate-branches-badge: true
+        jacoco-csv-file: build/reports/jacoco/test/jacocoTestReport.csv

README-zh.md

@@ -1,6 +1,6 @@
 <p align="center">
 <a href="https://github.com/code2life/spring-boot-dynamic-config"><img src="https://github.com/code2life/spring-boot-dynamic-config/actions/workflows/gradle.yml/badge.svg" /></a>
-<a href="https://codecov.io/gh/code2life/spring-boot-dynamic-config/"><img src="https://img.shields.io/codecov/c/github/code2life/spring-boot-dynamic-config/main.svg" alt="Coverage Status"></a>
+<a href="https://github.com/code2life/spring-boot-dynamic-config/actions/workflows/gradle.yml">coverage<img src=".github/badges/jacoco.svg" /></a>
 <a href="https://codebeat.co/projects/git.colasdn.top-code2life-spring-boot-dynamic-config-main"><img alt="codebeat badge" src="https://codebeat.co/badges/ea7b2127-62f3-45f4-9f38-55f8203c0121" /></a>
 </p>
 
@@ -13,6 +13,7 @@
 - :heart: **无侵入**，完全兼容SpringBoot原生的配置获取方式（@Value / @ConfigurationProperties）
 - :zap: **超轻量，超快响应**, 不依赖SpringBoot核心库以外的任何三方库
 - :grinning: **极易使用**, 只提供一个简单的注解: @DynamicConfig；一个事件：ConfigurationChangedEvent
+- ☸ 在K8S集群中运行SpringBoot/SpringCloud应用，与K8S ConfigMap完美结合的方案
 
 #### 相比于spring-cloud-starter-config：
 
@@ -37,14 +38,14 @@ Maven
 <dependency>
     <groupId>top.code2life</groupId>
     <artifactId>spring-boot-dynamic-config</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.4</version>
 </dependency>
 ```
 
 Gradle
 
 ```groovy
-implementation 'top.code2life:spring-boot-dynamic-config:1.0.1'
+implementation 'top.code2life:spring-boot-dynamic-config:1.0.4'
 ```
 
 ### 步骤二：在代码中添加 @DynamicConfig 注解

README.md

@@ -1,6 +1,6 @@
 <p align="center">
 <a href="https://github.com/code2life/spring-boot-dynamic-config"><img src="https://github.com/code2life/spring-boot-dynamic-config/actions/workflows/gradle.yml/badge.svg" /></a>
-<a href="https://codecov.io/gh/code2life/spring-boot-dynamic-config/"><img src="https://img.shields.io/codecov/c/github/code2life/spring-boot-dynamic-config/main.svg" alt="Coverage Status"></a>
+<a href="https://github.com/code2life/spring-boot-dynamic-config/actions/workflows/gradle.yml">coverage<img src=".github/badges/jacoco.svg" /></a>
 <a href="https://codebeat.co/projects/git.colasdn.top-code2life-spring-boot-dynamic-config-main"><img alt="codebeat badge" src="https://codebeat.co/badges/ea7b2127-62f3-45f4-9f38-55f8203c0121" /></a>
 </p>
 
@@ -13,6 +13,7 @@ Hot-reload your SpringBoot configurations, with just a '@DynamicConfig' annotati
 - :heart: **Non-intrusive**, compatible with SpringBoot native ways (@Value, @ConfigurationProperties)
 - :zap: **Lightweight & Blazing Fast**, depend on nothing but SpringBoot core libs
 - :grinning: **Extremely easy to use**, only provide an annotation: @DynamicConfig, an event: ConfigurationChangedEvent
+- ☸ Perfect solution for running SpringBoot on Kubernetes, combine with K8S ConfigMap
 
 
 #### Compare with spring-cloud-starter-config
@@ -36,14 +37,14 @@ Maven
 <dependency>
     <groupId>top.code2life</groupId>
     <artifactId>spring-boot-dynamic-config</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.4</version>
 </dependency>
 ```
 
 Gradle
 
 ```groovy
-implementation 'top.code2life:spring-boot-dynamic-config:1.0.1'
+implementation 'top.code2life:spring-boot-dynamic-config:1.0.4'
 ```
 
 ### Step2. Add @DynamicConfig Annotation

build.gradle

@@ -16,7 +16,7 @@ java {
 }
 
 group = 'top.code2life'
-version = '1.0.3'
+version = '1.0.4'
 sourceCompatibility = JavaVersion.VERSION_1_8
 
 repositories {
@@ -111,7 +111,7 @@ jacocoTestReport {
     reports {
         xml.enabled true
         xml.destination file("${buildDir}/reports/jacoco/report.xml")
-        csv.enabled false
+        csv.enabled true
         html.enabled true
         html.destination layout.buildDirectory.dir('jacocoHtml').get().asFile
     }

example/src/main/java/com/example/demo/DemoConfigProperties.java

@@ -7,6 +7,9 @@
 import org.springframework.core.annotation.Order;
 import top.code2life.config.DynamicConfig;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author Code2Life
  **/
@@ -18,4 +21,13 @@ public class DemoConfigProperties {
 
     private String str;
 
+    private Map<String, String> mapVal;
+
+    private List<Integer> listVal;
+
+    private List<DemoConfigProperties> nestedList;
+
+    private Map<String, DemoConfigProperties> nestedMap;
+
+    private DemoConfigProperties nested;
 }

example/src/main/java/com/example/demo/DemoController.java

@@ -30,8 +30,15 @@ public class DemoController {
     private final FeatureGate featureGate;
 
     @RequestMapping(value = "/demo", method = RequestMethod.GET)
-    public String getDemoConfigProps() {
-        return demoConfigProps.getStr();
+    public Object getDemoConfigProps() {
+        DemoConfigProperties resp = new DemoConfigProperties();
+        resp.setStr(demoConfigProps.getStr());
+        resp.setListVal(demoConfigProps.getListVal());
+        resp.setMapVal(demoConfigProps.getMapVal());
+        resp.setNestedList(demoConfigProps.getNestedList());
+        resp.setNestedMap(demoConfigProps.getNestedMap());
+        resp.setNested(demoConfigProps.getNested());
+        return resp;
     }
 
     @RequestMapping(value = "/demo2", method = RequestMethod.GET)

example/src/main/java/com/example/demo/DemoSubConfig.java

@@ -0,0 +1,7 @@
+package com.example.demo;
+
+/**
+ * @author Code2Life
+ **/
+public class DemoSubConfig {
+}

example/src/main/resources/application-another-profile.yml

@@ -1,3 +1,23 @@
 dynamic:
   prop:
-    str: abcdeeffgggaa
+    str: hello
+    map-val:
+      k1: v1
+      k2: v2
+    list-val:
+      - 1
+      - 2
+      - 3
+    nested-list:
+      - str: hello-inner
+        map-val:
+          k2-inner: v1-inner
+    nested_map:
+      m1:
+        str: hello-map
+        list-val: [5,6,7]
+
+    nested:
+      str: hello-recursive-1
+      map-val:
+        x1: y1

src/main/java/top/code2life/config/DynamicConfig.java

@@ -8,6 +8,8 @@
  * The annotation @DynamicConfig could be added on Class or Field level,
  * to indicate that all @Value fields or single @Value field is dynamic loaded,
  * which means the actual value changes upon configuration file changes.
+ * The processor of this annotation is not thread-safe, when configuration changes,
+ * it will modify fields of the corresponding bean, during the period, dirty value could exist.
  *
  * Example:
  *