Rename ConfigurableProperties#getDefaultNamespace to getNamespace

commons/common-util/src/main/java/com/schbrain/common/util/support/ConfigurableProperties.java

@@ -17,7 +17,7 @@ public abstract class ConfigurableProperties implements Ordered {
     /**
      * get the namespace of remote config
      */
-    public abstract String getDefaultNamespace();
+    public abstract String getNamespace();
 
     /**
      * bind properties

commons/web-common/src/main/java/com/schbrain/common/web/properties/WebProperties.java

@@ -42,7 +42,7 @@ public class WebProperties extends ConfigurableProperties {
     private String authenticationVariableName = "token";
 
     @Override
-    public String getDefaultNamespace() {
+    public String getNamespace() {
         return "web-common";
     }
 

starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/ConfigurablePropertiesLoader.java

@@ -32,7 +32,7 @@ class ConfigurablePropertiesLoader {
     /**
      * the name of properties propertySource
      */
-    private static final String PROPERTIES_PROPERTY_SOURCE = "ConfigurablePropertiesPropertySource";
+    public static final String PROPERTIES_PROPERTY_SOURCE = "ConfigurablePropertiesPropertySource";
 
     private final Log log;
 
@@ -63,7 +63,7 @@ class ConfigurablePropertiesLoader {
         }
 
         configurableProperties.forEach(properties -> {
-            String namespace = properties.getDefaultNamespace();
+            String namespace = properties.getNamespace();
             Config config = ConfigService.getConfig(namespace);
             OrderedMapPropertySource propertySource = ConfigUtils.toPropertySource(namespace, config);
             if (propertySource == null) {

starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/ConfigurationPropertiesRegistry.java

@@ -41,9 +41,7 @@ public class ConfigurationPropertiesRegistry implements SmartInitializingSinglet
         beanMap.forEach((beanName, propertiesBean) -> {
             String prefix = propertiesBean.getAnnotation().prefix();
             Object instance = propertiesBean.getInstance();
-            ReflectionUtils.doWithFields(instance.getClass(),
-                    field -> register(beanName, prefix, instance, field),
-                    field -> !Modifier.isFinal(field.getModifiers()));
+            ReflectionUtils.doWithFields(instance.getClass(), field -> register(beanName, prefix, instance, field), this::isNotFinalField);
         });
     }
 
@@ -66,4 +64,8 @@ public class ConfigurationPropertiesRegistry implements SmartInitializingSinglet
         return DEFAULT_PLACEHOLDER_PREFIX + key + DEFAULT_VALUE_SEPARATOR + DEFAULT_PLACEHOLDER_SUFFIX;
     }
 
+    private boolean isNotFinalField(Field field) {
+        return !Modifier.isFinal(field.getModifiers());
+    }
+
 }
\ No newline at end of file

starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/properties/CacheProperties.java

@@ -30,7 +30,7 @@ public class CacheProperties extends ConfigurableProperties {
     private boolean appendPrefix = true;
 
     @Override
-    public String getDefaultNamespace() {
+    public String getNamespace() {
         return "cache-common";
     }
 

starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/redis/RedisProperties.java

@@ -15,7 +15,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 public class RedisProperties extends ConfigurableProperties {
 
     @Override
-    public String getDefaultNamespace() {
+    public String getNamespace() {
         return "redis-common";
     }
 

starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/properties/DubboProperties.java

@@ -59,7 +59,7 @@ public class DubboProperties extends ConfigurableProperties {
     private TracingConfig tracing = new TracingConfig();
 
     @Override
-    public String getDefaultNamespace() {
+    public String getNamespace() {
         return "dubbo-common";
     }
 

starters/elasticsearch-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/elasticsearch/properties/ElasticsearchProperties.java

@@ -15,7 +15,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 public class ElasticsearchProperties extends ConfigurableProperties {
 
     @Override
-    public String getDefaultNamespace() {
+    public String getNamespace() {
         return "elasticsearch-common";
     }
 

starters/kafka-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/kafka/properties/KafkaProperties.java

@@ -15,7 +15,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 public class KafkaProperties extends ConfigurableProperties {
 
     @Override
-    public String getDefaultNamespace() {
+    public String getNamespace() {
         return "kafka-common";
     }
 

starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/apollo/DynamicLoggerConfiguration.java

@@ -22,7 +22,7 @@ public class DynamicLoggerConfiguration {
     }
 
     private void listenToLoggingLevelChange(LoggingSystem loggingSystem, LoggerProperties loggerProperties) {
-        String loggerNamespace = loggerProperties.getDefaultNamespace();
+        String loggerNamespace = loggerProperties.getNamespace();
         if (!StringUtils.hasText(loggerNamespace)) {
             log.debug("logger level reload is disabled");
             return;

starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/properties/LoggerProperties.java

@@ -34,7 +34,7 @@ public class LoggerProperties extends ConfigurableProperties implements Priority
     private int maxHistory = (int) Duration.ofDays(30).toDays();
 
     @Override
-    public String getDefaultNamespace() {
+    public String getNamespace() {
         return "logger-common";
     }
 

starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/properties/DataSourceProperties.java

@@ -15,7 +15,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 public class DataSourceProperties extends ConfigurableProperties {
 
     @Override
-    public String getDefaultNamespace() {
+    public String getNamespace() {
         return "jdbc-common";
     }
 

starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/properties/MybatisProperties.java

@@ -35,7 +35,7 @@ public class MybatisProperties extends ConfigurableProperties {
     private boolean convertInstantToLong = true;
 
     @Override
-    public String getDefaultNamespace() {
+    public String getNamespace() {
         return "mybatis-common";
     }
 

starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/properties/OssProperties.java

@@ -35,7 +35,7 @@ public class OssProperties extends ConfigurableProperties {
     }
 
     @Override
-    public String getDefaultNamespace() {
+    public String getNamespace() {
         return "oss-common";
     }
 

starters/xxl-job-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/xxl/properties/XxlJobProperties.java

@@ -28,7 +28,7 @@ public class XxlJobProperties extends ConfigurableProperties {
     private boolean register = false;
 
     @Override
-    public String getDefaultNamespace() {
+    public String getNamespace() {
         return "xxl-job-common";
     }