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 06550872c33d9624ff9712f2ebdef5cca1884602..9b846dd4c51c499be34de0f8818f3be23243b098 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 e6b0838b08590fb519ff3454f28efd5bbec202db..14fa71361b09d82135a5fee70419ac27fbad1e1f 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 37d92cebfc1223e14c39640e397db2842e7d04fc..ca8c4b0dea62373635d09d2e6210b471ec540a07 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 4f9fa4aaeb8e21bb9acce21d79f1087858705fb3..dab9fe77f35664ed35fa936be28ab4f1c073c0c6 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 1478e5336864021cac07e12bb67a2f95ff02a9db..df8ede2cc0d6b3ce63725c4fe2dcbdc220960ffd 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 2c1d8821890816baa8846d7e5a3c4d4aed9d1d29..a19248517ab655720aa1a2535dd31bc01491c562 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 c2cfc042619eeb7c60afa03f20eb0b3caacc224e..949a8534a95735b0a9c1cb761ee3a4f0c557a994 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 0c725f73d1065d675821f9a686c7af52d7281e33..ae7f1563f784356ec6df65d1b6d33cf6493ee98a 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 f0b2098187e942a0738fab1d8192eaeab50057b7..d36b907d5a206884428922dcf1c463b953d0018d 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 fce20a6ddd377a11ba1f64d6bdddf50c09eb5b75..41ac9e43e4be57ebde90d3f1153f59d3325a3526 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 ddbb9bc2fdd6e933b11975e32542f49a0bc3b081..1765026a431a528e787366bb645b2681ddda3653 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 d332c59ec122b29be948510311eb8ec1790f40a6..4f7260222be2c8ffe63153044d068f8b043c3a5b 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 0853d4602212b16bd8fd44edcf65fedae0b0d78d..cc2b729fbe27ddf4975e5558a238c57a0d911261 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 bb15e49abe05f08cb243171b2ab5a3e61520deee..4d8a5c00d2832a5c3db0dfb1f8e1e8c8ac36ca51 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 61e2b1a86f45236f6c20bdbba34f0a6864735e9e..9935cd22d20a69e5bcce20245a6a3c03b5d54d53 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"; }