diff --git a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/PolarisConfigAutoConfiguration.java b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/PolarisConfigAutoConfiguration.java index 0c0c68200..0d5855b86 100644 --- a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/PolarisConfigAutoConfiguration.java +++ b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/PolarisConfigAutoConfiguration.java @@ -18,16 +18,6 @@ package com.tencent.cloud.polaris.config; -import org.springframework.boot.autoconfigure.AutoConfigureBefore; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.autoconfigure.condition.SearchStrategy; -import org.springframework.cloud.context.properties.ConfigurationPropertiesBeans; -import org.springframework.cloud.context.properties.ConfigurationPropertiesRebinder; -import org.springframework.cloud.context.refresh.ContextRefresher; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Primary; - import com.tencent.cloud.polaris.config.adapter.AffectedConfigurationPropertiesRebinder; import com.tencent.cloud.polaris.config.adapter.PolarisConfigPropertyRefresher; import com.tencent.cloud.polaris.config.adapter.PolarisConfigRefreshScopeAnnotationDetector; @@ -44,6 +34,16 @@ import com.tencent.cloud.polaris.config.spring.annotation.SpringValueProcessor; import com.tencent.cloud.polaris.config.spring.property.PlaceholderHelper; import com.tencent.cloud.polaris.config.spring.property.SpringValueRegistry; +import org.springframework.boot.autoconfigure.AutoConfigureBefore; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.condition.SearchStrategy; +import org.springframework.cloud.context.properties.ConfigurationPropertiesBeans; +import org.springframework.cloud.context.properties.ConfigurationPropertiesRebinder; +import org.springframework.cloud.context.refresh.ContextRefresher; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; + /** * polaris config module auto configuration at init application context phase. * @@ -62,11 +62,11 @@ public class PolarisConfigAutoConfiguration { public PolarisConfigChangeEventListener polarisConfigChangeEventListener() { return new PolarisConfigChangeEventListener(); } - + @Bean - public PolarisConfigLoggerApplicationListener polarisConfigLoggerApplicationListener() { - return new PolarisConfigLoggerApplicationListener(); - } + public PolarisConfigLoggerApplicationListener polarisConfigLoggerApplicationListener() { + return new PolarisConfigLoggerApplicationListener(); + } @Bean diff --git a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/adapter/PolarisConfigPropertyAutoRefresher.java b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/adapter/PolarisConfigPropertyAutoRefresher.java index e1e3aae71..f79c01fd6 100644 --- a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/adapter/PolarisConfigPropertyAutoRefresher.java +++ b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/adapter/PolarisConfigPropertyAutoRefresher.java @@ -22,17 +22,19 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; +import com.tencent.cloud.polaris.config.config.PolarisConfigProperties; +import com.tencent.cloud.polaris.config.logger.PolarisConfigLoggerContext; +import com.tencent.polaris.configuration.api.core.ConfigKVFileChangeListener; +import com.tencent.polaris.configuration.api.core.ConfigPropertyChangeInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.ApplicationListener; import org.springframework.lang.NonNull; import org.springframework.util.CollectionUtils; -import com.tencent.cloud.polaris.config.config.PolarisConfigProperties; -import com.tencent.cloud.polaris.config.logger.PolarisConfigLoggerContext; -import com.tencent.polaris.configuration.api.core.ConfigKVFileChangeListener; -import com.tencent.polaris.configuration.api.core.ConfigPropertyChangeInfo; + /** * 1. Listen to the Polaris server configuration publishing event 2. Write the changed @@ -99,16 +101,16 @@ public abstract class PolarisConfigPropertyAutoRefresher // 新增动态改变日志级别的能力 try { - if(changedKey.startsWith("logging.level") && changedKey.length() >= 14) { + if (changedKey.startsWith("logging.level") && changedKey.length() >= 14) { String loggerName = changedKey.substring(14); String newValue = configPropertyChangeInfo.getNewValue(); LOGGER.info("[SCT Config] set logging.level loggerName:{}, newValue:{}", loggerName, newValue); PolarisConfigLoggerContext.setLevel(loggerName, newValue); - } - } catch(Exception e) { - LOGGER.error("[SCT Config] set logging.level exception,", e); + } + } + catch (Exception e) { + LOGGER.error("[SCT Config] set logging.level exception,", e); } - switch (configPropertyChangeInfo.getChangeType()) { case MODIFIED: case ADDED: diff --git a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/config/PolarisConfigProperties.java b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/config/PolarisConfigProperties.java index b3e44abe6..6a014aa04 100644 --- a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/config/PolarisConfigProperties.java +++ b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/config/PolarisConfigProperties.java @@ -15,15 +15,15 @@ * specific language governing permissions and limitations under the License. * */ - package com.tencent.cloud.polaris.config.config; import java.util.List; +import com.tencent.cloud.polaris.config.enums.RefreshType; + import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; -import com.tencent.cloud.polaris.config.enums.RefreshType; /** * polaris config module bootstrap configs. @@ -32,11 +32,10 @@ import com.tencent.cloud.polaris.config.enums.RefreshType; */ @ConfigurationProperties("spring.cloud.polaris.config") public class PolarisConfigProperties { - /** * Whether to open the configuration center. */ - @Value("${spring.cloud.polaris.config.enabled:#{'true'}}") + @Value("${spring.cloud.polaris.config.enabled:#{'true'}}") private boolean enabled = true; /** diff --git a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/listener/PolarisConfigRefreshOptimizationListener.java b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/listener/PolarisConfigRefreshOptimizationListener.java index bc2119adc..95c3798de 100644 --- a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/listener/PolarisConfigRefreshOptimizationListener.java +++ b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/listener/PolarisConfigRefreshOptimizationListener.java @@ -18,12 +18,16 @@ package com.tencent.cloud.polaris.config.listener; -import static com.tencent.cloud.polaris.config.condition.ReflectRefreshTypeCondition.POLARIS_CONFIG_REFRESH_TYPE; - import java.util.Collections; +import com.tencent.cloud.polaris.config.adapter.PolarisConfigRefreshScopeAnnotationDetector; +import com.tencent.cloud.polaris.config.adapter.PolarisPropertySourceManager; +import com.tencent.cloud.polaris.config.adapter.PolarisRefreshEntireContextRefresher; +import com.tencent.cloud.polaris.config.config.PolarisConfigProperties; +import com.tencent.cloud.polaris.config.enums.RefreshType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.beans.factory.config.ConstructorArgumentValues; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; @@ -36,11 +40,7 @@ import org.springframework.core.env.MapPropertySource; import org.springframework.core.env.MutablePropertySources; import org.springframework.lang.NonNull; -import com.tencent.cloud.polaris.config.adapter.PolarisConfigRefreshScopeAnnotationDetector; -import com.tencent.cloud.polaris.config.adapter.PolarisPropertySourceManager; -import com.tencent.cloud.polaris.config.adapter.PolarisRefreshEntireContextRefresher; -import com.tencent.cloud.polaris.config.config.PolarisConfigProperties; -import com.tencent.cloud.polaris.config.enums.RefreshType; +import static com.tencent.cloud.polaris.config.condition.ReflectRefreshTypeCondition.POLARIS_CONFIG_REFRESH_TYPE; /** * When {@link com.tencent.cloud.polaris.config.adapter.PolarisConfigRefreshScopeAnnotationDetector} detects that @@ -72,21 +72,18 @@ public class PolarisConfigRefreshOptimizationListener implements ApplicationList .getBean(PolarisConfigRefreshScopeAnnotationDetector.class); boolean isRefreshScopeAnnotationUsed = detector.isRefreshScopeAnnotationUsed(); String annotatedRefreshScopeBeanName = detector.getAnnotatedRefreshScopeBeanName(); - // using System.setProperty to set spring.cloud.polaris.config.refresh-type String value = System.getProperty("spring.cloud.polaris.config.refresh-type"); boolean isSystemSetRefreshType = RefreshType.REFRESH_CONTEXT.toString().equalsIgnoreCase(value); - // a bean is using @RefreshScope, but the config refresh type is still [reflect], switch automatically if (isRefreshScopeAnnotationUsed || isSystemSetRefreshType) { - if(isRefreshScopeAnnotationUsed) { - LOGGER.warn("Detected that the bean [{}] is using @RefreshScope annotation, but the config refresh type is still [reflect]. " - + "[SCT] will automatically switch to [refresh_context].", annotatedRefreshScopeBeanName); + if (isRefreshScopeAnnotationUsed) { + LOGGER.warn("Detected that the bean [{}] is using @RefreshScope annotation, but the config refresh type is still [reflect]. " + + "[SCT] will automatically switch to [refresh_context].", annotatedRefreshScopeBeanName); } - - if(isSystemSetRefreshType) { - LOGGER.warn("Detected that using System.setProperty to set spring.cloud.polaris.config.refresh-type = refresh_context, but the config refresh type is still [reflect]. " - + "[SCT] will automatically switch to [refresh_context]."); + if (isSystemSetRefreshType) { + LOGGER.warn("Detected that using System.setProperty to set spring.cloud.polaris.config.refresh-type = refresh_context, but the config refresh type is still [reflect]. " + + "[SCT] will automatically switch to [refresh_context]."); } switchConfigRefreshTypeProperty(applicationContext); modifyPolarisConfigPropertiesBean(applicationContext); diff --git a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/logger/Level.java b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/logger/Level.java index 818219a51..17babf0a7 100644 --- a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/logger/Level.java +++ b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/logger/Level.java @@ -5,25 +5,24 @@ package com.tencent.cloud.polaris.config.logger; */ public enum Level { - TRACE("TRACE"), DEBUG("DEBUG"), INFO("INFO"), WARN("WARN"), ERROR("ERROR"),FATAL("FATAL"),OFF("OFF"); + /** 日志级别. */ + TRACE("TRACE"), DEBUG("DEBUG"), INFO("INFO"), WARN("WARN"), ERROR("ERROR"), FATAL("FATAL"), OFF("OFF"); - private String level; + private String level; - Level(String level) { - this.level = level; - } + Level(String level) { + this.level = level; + } + public String getLevel() { + return level; + } - public String getLevel() { - return level; - } - - - public static Level levelOf(String level) { - for (Level l : Level.values()) { - if (l.level.equalsIgnoreCase(level)) { - return l; - } - } - return null; - } + public static Level levelOf(String level) { + for (Level l : Level.values()) { + if (l.level.equalsIgnoreCase(level)) { + return l; + } + } + return null; + } } diff --git a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/logger/PolarisConfigLoggerApplicationListener.java b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/logger/PolarisConfigLoggerApplicationListener.java index b81adcd79..f834b2c50 100644 --- a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/logger/PolarisConfigLoggerApplicationListener.java +++ b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/logger/PolarisConfigLoggerApplicationListener.java @@ -2,6 +2,7 @@ package com.tencent.cloud.polaris.config.logger; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.boot.context.event.ApplicationStartedEvent; import org.springframework.boot.logging.LoggingSystem; import org.springframework.context.ApplicationEvent; @@ -11,25 +12,24 @@ import org.springframework.context.ApplicationListener; * @author juanyinyang */ public class PolarisConfigLoggerApplicationListener implements ApplicationListener { - - private static final Logger LOGGER = LoggerFactory.getLogger(PolarisConfigLoggerApplicationListener.class); - - /** - * @see org.springframework.context.ApplicationListener#onApplicationEvent(org.springframework.context.ApplicationEvent) - */ - @Override - public void onApplicationEvent(ApplicationEvent event) { - try { - // Initialize application loggingSystem. - if (event instanceof ApplicationStartedEvent) { - ApplicationStartedEvent startedEvent = (ApplicationStartedEvent) event; - ClassLoader classLoader = startedEvent.getSpringApplication().getClassLoader(); - LoggingSystem loggingSystem = LoggingSystem.get(classLoader); - LOGGER.info("PolarisConfigLoggerApplicationListener onApplicationEvent init loggingSystem:{}", loggingSystem); - PolarisConfigLoggerContext.setLogSystem(loggingSystem); - } - } catch (Exception e) { - LOGGER.error("PolarisConfigLoggerApplicationListener onApplicationEvent exception:", e); - } - } + private static final Logger LOGGER = LoggerFactory.getLogger(PolarisConfigLoggerApplicationListener.class); + /** + * @see org.springframework.context.ApplicationListener#onApplicationEvent(org.springframework.context.ApplicationEvent) + */ + @Override + public void onApplicationEvent(ApplicationEvent event) { + try { + // Initialize application loggingSystem. + if (event instanceof ApplicationStartedEvent) { + ApplicationStartedEvent startedEvent = (ApplicationStartedEvent) event; + ClassLoader classLoader = startedEvent.getSpringApplication().getClassLoader(); + LoggingSystem loggingSystem = LoggingSystem.get(classLoader); + LOGGER.info("PolarisConfigLoggerApplicationListener onApplicationEvent init loggingSystem:{}", loggingSystem); + PolarisConfigLoggerContext.setLogSystem(loggingSystem); + } + } + catch (Exception e) { + LOGGER.error("PolarisConfigLoggerApplicationListener onApplicationEvent exception:", e); + } + } } diff --git a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/logger/PolarisConfigLoggerContext.java b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/logger/PolarisConfigLoggerContext.java index e1c686713..9bda215f8 100644 --- a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/logger/PolarisConfigLoggerContext.java +++ b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/logger/PolarisConfigLoggerContext.java @@ -9,90 +9,89 @@ package com.tencent.cloud.polaris.config.logger; -import static org.springframework.boot.logging.LoggingSystem.ROOT_LOGGER_NAME; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.boot.logging.LogLevel; import org.springframework.boot.logging.LoggingSystem; import org.springframework.util.Assert; +import static org.springframework.boot.logging.LoggingSystem.ROOT_LOGGER_NAME; /** * @author juanyinyang */ public final class PolarisConfigLoggerContext { - private static LoggingSystem loggingSystem; - - private PolarisConfigLoggerContext() { - - } + private static LoggingSystem loggingSystem; - protected static void setLogSystem(LoggingSystem logSystem) { - Assert.notNull(logSystem,"Logging System should not be null"); - PolarisConfigLoggerContext.loggingSystem = logSystem; - } + private PolarisConfigLoggerContext() { - public static void setLevel(String loggerName, String level) { - if (loggingSystem == null) { - printLog("[SCT Config] PolarisConfigLoggerContext logger: ["+loggerName+"] change to target level fail. caused by internal exception:" + level,Level.WARN); - return; - } - Level loggerLevel = Level.levelOf(level); - if (loggerLevel == null) { - printLog("[SCT Config] PolarisConfigLoggerContext logger: ["+loggerName+"] change to target level fail. caused by level is not support, level:" + level,Level.WARN); - return; - } - LogLevel logLevel = null; - switch (loggerLevel) { - case TRACE: - logLevel = LogLevel.TRACE; - break; - case DEBUG: - logLevel = LogLevel.DEBUG; - break; - case OFF: - logLevel = LogLevel.OFF; - break; - case INFO: - logLevel = LogLevel.INFO; - break; - case WARN: - logLevel = LogLevel.WARN; - break; - case ERROR: - logLevel = LogLevel.ERROR; - break; - case FATAL: - logLevel = LogLevel.FATAL; - break; - default: - printLog("[SCT Config] PolarisConfigLoggerContext logger: ["+loggerName+"] setLevel fail. caused by level is not support, level: " + level,Level.WARN); - } - loggingSystem.setLogLevel(loggerName,logLevel); - printLog("[SCT Config] PolarisConfigLoggerContext logger: ["+loggerName+"] changed to level:" + level,Level.INFO); - } + } + protected static void setLogSystem(LoggingSystem logSystem) { + Assert.notNull(logSystem, "Logging System should not be null"); + PolarisConfigLoggerContext.loggingSystem = logSystem; + } - /** - * 打印日志 - * @param message - * @param level - */ - private static void printLog(String message, Level level){ - Logger logger = LoggerFactory.getLogger(ROOT_LOGGER_NAME); - if (level.ordinal() <= Level.INFO.ordinal() ) { - if (logger != null) { - logger.info(message); - } else { - StdLog.info(message); - } - } else { - if (logger != null) { - logger.warn(message); - } else { - StdLog.warn(message); - } - } - } + public static void setLevel(String loggerName, String level) { + if (loggingSystem == null) { + printLog("[SCT Config] PolarisConfigLoggerContext logger: [" + loggerName + "] change to target level fail. caused by internal exception:" + level, Level.WARN); + return; + } + Level loggerLevel = Level.levelOf(level); + if (loggerLevel == null) { + printLog("[SCT Config] PolarisConfigLoggerContext logger: [" + loggerName + "] change to target level fail. caused by level is not support, level:" + level, Level.WARN); + return; + } + LogLevel logLevel = null; + switch (loggerLevel) { + case TRACE: + logLevel = LogLevel.TRACE; + break; + case DEBUG: + logLevel = LogLevel.DEBUG; + break; + case OFF: + logLevel = LogLevel.OFF; + break; + case INFO: + logLevel = LogLevel.INFO; + break; + case WARN: + logLevel = LogLevel.WARN; + break; + case ERROR: + logLevel = LogLevel.ERROR; + break; + case FATAL: + logLevel = LogLevel.FATAL; + break; + default: + printLog("[SCT Config] PolarisConfigLoggerContext logger: [" + loggerName + "] setLevel fail. caused by level is not support, level: " + level, Level.WARN); + } + loggingSystem.setLogLevel(loggerName, logLevel); + printLog("[SCT Config] PolarisConfigLoggerContext logger: [" + loggerName + "] changed to level:" + level, Level.INFO); + } + /** + * 打印日志. + */ + private static void printLog(String message, Level level) { + Logger logger = LoggerFactory.getLogger(ROOT_LOGGER_NAME); + if (level.ordinal() <= Level.INFO.ordinal()) { + if (logger != null) { + logger.info(message); + } + else { + StdLog.info(message); + } + } + else { + if (logger != null) { + logger.warn(message); + } + else { + StdLog.warn(message); + } + } + } } diff --git a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/logger/StdLog.java b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/logger/StdLog.java index ebaba29ca..df9eddafd 100644 --- a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/logger/StdLog.java +++ b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/logger/StdLog.java @@ -4,76 +4,76 @@ import java.io.PrintStream; import java.util.Calendar; /** - * internal output logger + * internal output logger. * @author juanyinyang */ -public class StdLog { +public final class StdLog { - private static final String CLASS_INFO = StdLog.class.getName(); + private static final String CLASS_INFO = StdLog.class.getName(); - protected static boolean debugEnabled = false; + protected static boolean debugEnabled = false; - /** - * enable info level log - */ - protected static boolean infoEnabled = true; + /** + * *enable info level log. + */ + protected static boolean infoEnabled = true; - /** - * quite mode will out put nothing - */ - protected static boolean quietMode = false; + /** + * quite mode will out put nothing. + */ + protected static boolean quietMode = false; + private static final String DEBUG_FIX = "StdLog:DEBUG: "; - private static final String DEBUG_FIX = "StdLog:DEBUG: "; + private static final String INFO_FIX = "StdLog:INFO: "; - private static final String INFO_FIX = "StdLog:INFO: "; + private static final String WARN_FIX = "StdLog:WARN: "; - private static final String WARN_FIX = "StdLog:WARN: "; + private StdLog() { + } - public static void setQuietMode(boolean quietMode) { - StdLog.quietMode = quietMode; - } + public static void setQuietMode(boolean quietMode) { + StdLog.quietMode = quietMode; + } - public static void setInfoEnabled(boolean infoEnabled ){ - StdLog.infoEnabled = infoEnabled; - } + public static void setInfoEnabled(boolean infoEnabled) { + StdLog.infoEnabled = infoEnabled; + } - public static void setDebugEnabled(boolean debugEnabled) { - StdLog.debugEnabled = debugEnabled; - } + public static void setDebugEnabled(boolean debugEnabled) { + StdLog.debugEnabled = debugEnabled; + } - public static void debug(String msg) { + public static void debug(String msg) { + if (debugEnabled && !quietMode) { + println(System.out, DEBUG_FIX + msg); + } + } - if (debugEnabled && !quietMode) { - println(System.out,DEBUG_FIX + msg); - } - } + public static void info(String msg) { + if (infoEnabled && !quietMode) { + println(System.out, INFO_FIX + msg); + } + } - public static void info(String msg) { - if (infoEnabled && !quietMode) { - println(System.out,INFO_FIX + msg); - } - } + public static void warn(String msg) { + if (infoEnabled && !quietMode) { + println(System.err, WARN_FIX + msg); + } + } - public static void warn(String msg) { - if (infoEnabled && !quietMode) { - println(System.err,WARN_FIX + msg); - } - } - - public static void warn(String msg, Throwable t) { - if (quietMode) { - return; - } - println(System.err,WARN_FIX + msg); - if (t != null) { - t.printStackTrace(); - } - } - - private static void println(PrintStream out, String msg) { - out.println(Calendar.getInstance().getTime().toString() + " " + CLASS_INFO + " " + msg); - } + public static void warn(String msg, Throwable t) { + if (quietMode) { + return; + } + println(System.err, WARN_FIX + msg); + if (t != null) { + t.printStackTrace(); + } + } + private static void println(PrintStream out, String msg) { + out.println(Calendar.getInstance().getTime().toString() + " " + CLASS_INFO + " " + msg); + } } diff --git a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/PolarisContextProperties.java b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/PolarisContextProperties.java index e4544e3a0..498af60d1 100644 --- a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/PolarisContextProperties.java +++ b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/PolarisContextProperties.java @@ -24,16 +24,16 @@ import java.util.List; import java.util.function.Supplier; import java.util.stream.Collectors; -import org.apache.commons.lang.StringUtils; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.util.CollectionUtils; - import com.tencent.cloud.polaris.context.PolarisConfigModifier; import com.tencent.polaris.api.config.ConfigProvider; import com.tencent.polaris.api.config.Configuration; import com.tencent.polaris.factory.ConfigAPIFactory; import com.tencent.polaris.factory.config.ConfigurationImpl; +import org.apache.commons.lang.StringUtils; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.util.CollectionUtils; /** * Properties for Polaris {@link com.tencent.polaris.client.api.SDKContext}. @@ -46,13 +46,13 @@ public class PolarisContextProperties { /** * polaris server address. */ - @Value("${spring.cloud.polaris.address:}") + @Value("${spring.cloud.polaris.address:}") private String address; /** * current server local ip address. */ - @Value("${spring.cloud.polaris.localIpAddress:}") + @Value("${spring.cloud.polaris.localIpAddress:}") private String localIpAddress; /**