From 5eac7d4935e6b95e2e6bf02c22be4d262bf47df3 Mon Sep 17 00:00:00 2001
From: liaozan <378024053@qq.com>
Date: Thu, 11 May 2023 15:28:19 +0800
Subject: [PATCH] Rename ConfigurableProperties#getDefaultNamespace to
 getNamespace

---
 .../common/util/support/ConfigurableProperties.java       | 2 +-
 .../com/schbrain/common/web/properties/WebProperties.java | 2 +-
 .../apollo/ConfigurablePropertiesLoader.java              | 4 ++--
 .../apollo/ConfigurationPropertiesRegistry.java           | 8 +++++---
 .../autoconfigure/cache/properties/CacheProperties.java   | 2 +-
 .../cache/provider/redis/RedisProperties.java             | 2 +-
 .../autoconfigure/dubbo/properties/DubboProperties.java   | 2 +-
 .../elasticsearch/properties/ElasticsearchProperties.java | 2 +-
 .../autoconfigure/kafka/properties/KafkaProperties.java   | 2 +-
 .../logger/apollo/DynamicLoggerConfiguration.java         | 2 +-
 .../autoconfigure/logger/properties/LoggerProperties.java | 2 +-
 .../mybatis/properties/DataSourceProperties.java          | 2 +-
 .../mybatis/properties/MybatisProperties.java             | 2 +-
 .../autoconfigure/oss/properties/OssProperties.java       | 2 +-
 .../autoconfigure/xxl/properties/XxlJobProperties.java    | 2 +-
 15 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/commons/common-util/src/main/java/com/schbrain/common/util/support/ConfigurableProperties.java b/commons/common-util/src/main/java/com/schbrain/common/util/support/ConfigurableProperties.java
index 0655087..9b846dd 100644
--- a/commons/common-util/src/main/java/com/schbrain/common/util/support/ConfigurableProperties.java
+++ b/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
diff --git a/commons/web-common/src/main/java/com/schbrain/common/web/properties/WebProperties.java b/commons/web-common/src/main/java/com/schbrain/common/web/properties/WebProperties.java
index e6b0838..14fa713 100644
--- a/commons/web-common/src/main/java/com/schbrain/common/web/properties/WebProperties.java
+++ b/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";
     }
 
diff --git a/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/ConfigurablePropertiesLoader.java b/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/ConfigurablePropertiesLoader.java
index 37d92ce..ca8c4b0 100644
--- a/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/ConfigurablePropertiesLoader.java
+++ b/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) {
diff --git a/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/ConfigurationPropertiesRegistry.java b/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/ConfigurationPropertiesRegistry.java
index 4f9fa4a..dab9fe7 100644
--- a/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/ConfigurationPropertiesRegistry.java
+++ b/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
diff --git a/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/properties/CacheProperties.java b/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/properties/CacheProperties.java
index 1478e53..df8ede2 100644
--- a/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/properties/CacheProperties.java
+++ b/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";
     }
 
diff --git a/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/redis/RedisProperties.java b/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/redis/RedisProperties.java
index 2c1d882..a192485 100644
--- a/starters/cache-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/cache/provider/redis/RedisProperties.java
+++ b/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";
     }
 
diff --git a/starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/properties/DubboProperties.java b/starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/properties/DubboProperties.java
index c2cfc04..949a853 100644
--- a/starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/properties/DubboProperties.java
+++ b/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";
     }
 
diff --git a/starters/elasticsearch-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/elasticsearch/properties/ElasticsearchProperties.java b/starters/elasticsearch-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/elasticsearch/properties/ElasticsearchProperties.java
index 0c725f7..ae7f156 100644
--- a/starters/elasticsearch-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/elasticsearch/properties/ElasticsearchProperties.java
+++ b/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";
     }
 
diff --git a/starters/kafka-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/kafka/properties/KafkaProperties.java b/starters/kafka-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/kafka/properties/KafkaProperties.java
index f0b2098..d36b907 100644
--- a/starters/kafka-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/kafka/properties/KafkaProperties.java
+++ b/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";
     }
 
diff --git a/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/apollo/DynamicLoggerConfiguration.java b/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/apollo/DynamicLoggerConfiguration.java
index fce20a6..41ac9e4 100644
--- a/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/apollo/DynamicLoggerConfiguration.java
+++ b/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;
diff --git a/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/properties/LoggerProperties.java b/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/properties/LoggerProperties.java
index ddbb9bc..1765026 100644
--- a/starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/properties/LoggerProperties.java
+++ b/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";
     }
 
diff --git a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/properties/DataSourceProperties.java b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/properties/DataSourceProperties.java
index d332c59..4f72602 100644
--- a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/properties/DataSourceProperties.java
+++ b/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";
     }
 
diff --git a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/properties/MybatisProperties.java b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/properties/MybatisProperties.java
index 0853d46..cc2b729 100644
--- a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/properties/MybatisProperties.java
+++ b/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";
     }
 
diff --git a/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/properties/OssProperties.java b/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/properties/OssProperties.java
index bb15e49..4d8a5c0 100644
--- a/starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/properties/OssProperties.java
+++ b/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";
     }
 
diff --git a/starters/xxl-job-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/xxl/properties/XxlJobProperties.java b/starters/xxl-job-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/xxl/properties/XxlJobProperties.java
index 61e2b1a..9935cd2 100644
--- a/starters/xxl-job-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/xxl/properties/XxlJobProperties.java
+++ b/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";
     }
 
-- 
GitLab