update springboot version, fix path matching bug in springboot 2.2

Author: Joey Yang

README-zh.md

@@ -42,14 +42,14 @@ Maven
 <dependency>
     <groupId>top.code2life</groupId>
    <artifactId>spring-boot-dynamic-config</artifactId>
-   <version>1.0.7</version>
+   <version>1.0.8</version>
 </dependency>
 ```
 
 Gradle
 
 ```groovy
-implementation 'top.code2life:spring-boot-dynamic-config:1.0.7'
+implementation 'top.code2life:spring-boot-dynamic-config:1.0.8'
 ```
 
 ### 步骤二：在代码中添加 @DynamicConfig 注解

README.md

@@ -42,14 +42,14 @@ Maven
 <dependency>
     <groupId>top.code2life</groupId>
    <artifactId>spring-boot-dynamic-config</artifactId>
-   <version>1.0.7</version>
+   <version>1.0.8</version>
 </dependency>
 ```
 
 Gradle
 
 ```groovy
-implementation 'top.code2life:spring-boot-dynamic-config:1.0.7'
+implementation 'top.code2life:spring-boot-dynamic-config:1.0.8'
 ```
 
 ### Step2. Add @DynamicConfig Annotation

build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        springBootVersion = '2.4.5'
+        springBootVersion = '2.5.4'
     }
 }
 plugins {
@@ -16,7 +16,7 @@ java {
 }
 
 group = 'top.code2life'
-version = '1.0.7'
+version = '1.0.8'
 sourceCompatibility = JavaVersion.VERSION_1_8
 
 repositories {

example/build.gradle

@@ -27,5 +27,5 @@ dependencies {
 	annotationProcessor 'org.projectlombok:lombok:1.18.20'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 
-	implementation 'top.code2life:spring-boot-dynamic-config:1.0.7'
+	implementation 'top.code2life:spring-boot-dynamic-config:1.0.8'
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 #Wed May 19 22:12:06 CST 2021
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

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

@@ -84,7 +84,7 @@ static String trimRelativePathAndReplaceBackSlash(String str) {
         if (beginWithRelative) {
             return str.substring(2).replaceAll("\\\\", "/");
         }
-        return str;
+        return str.replaceAll("\\\\", "/");
     }
 
 

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

@@ -5,10 +5,8 @@
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.ApplicationContext;
 import org.springframework.util.StringUtils;
 
-import javax.annotation.PostConstruct;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -32,30 +30,12 @@ public class DynamicConfigBeanPostProcessor implements BeanPostProcessor {
 
     static final Map<String, List<ValueBeanFieldBinder>> DYNAMIC_FIELD_BINDER_MAP = new ConcurrentHashMap<>(16);
     static final Map<String, ValueBeanFieldBinder> DYNAMIC_CONFIG_PROPS_BINDER_MAP = new ConcurrentHashMap<>(8);
-    static final Map<String, Object> DYNAMIC_BEAN_MAP = new ConcurrentHashMap<>(16);
 
-    private final ApplicationContext applicationContext;
-
-    DynamicConfigBeanPostProcessor(ApplicationContext applicationContext) {
-        this.applicationContext = applicationContext;
-        DYNAMIC_BEAN_MAP.clear();
+    DynamicConfigBeanPostProcessor() {
         DYNAMIC_FIELD_BINDER_MAP.clear();
         DYNAMIC_CONFIG_PROPS_BINDER_MAP.clear();
     }
 
-    /**
-     * Check all beans with DynamicConfig annotation after this PostProcessor being initialized,
-     * this double check mechanism is for a special case: some beans created by other approaches directly, not calling BeanPostProcessor
-     */
-    @PostConstruct
-    public void handleDynamicConfigurationBeans() {
-        Map<String, Object> dynamicBeans = applicationContext.getBeansWithAnnotation(DynamicConfig.class);
-        for (Map.Entry<String, Object> entry : dynamicBeans.entrySet()) {
-            String beanName = entry.getKey();
-            handleDynamicBean(entry.getValue(), beanName);
-        }
-    }
-
     /**
      * Process all beans contains @DynamicConfig annotation, collect metadata for continuous field value binding
      *
@@ -70,11 +50,6 @@ public Object postProcessAfterInitialization(Object bean, String beanName) {
     }
 
     private void handleDynamicBean(Object bean, String beanName) {
-        // avoid duplicate processing after post processor
-        if (DYNAMIC_BEAN_MAP.containsKey(beanName)) {
-            return;
-        }
-        DYNAMIC_BEAN_MAP.putIfAbsent(beanName, bean);
         Class<?> clazz = ConfigurationUtils.getTargetClassOfBean(bean);
         Field[] fields = clazz.getDeclaredFields();
         // handle @ConfigurationProperties beans