From f9ca95d225a9c64dc51d370fc72a462e91be5a29 Mon Sep 17 00:00:00 2001 From: MZR <1149963750@qq.com> Date: Mon, 9 Oct 2023 14:40:37 +0800 Subject: [PATCH] Use configuration and constants exist in PolarisRefresherHandler --- .../refresher/PolarisRefresherHandler.java | 24 +++++++++++++++---- threadpool/core/pom.xml | 5 ++++ .../core/enable/BeforeCheckConfiguration.java | 24 +++++++------------ 3 files changed, 33 insertions(+), 20 deletions(-) diff --git a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/PolarisRefresherHandler.java b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/PolarisRefresherHandler.java index 3f2a3f8b..31c875b3 100644 --- a/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/PolarisRefresherHandler.java +++ b/starters/threadpool/config/src/main/java/cn/hippo4j/config/springboot/starter/refresher/PolarisRefresherHandler.java @@ -36,13 +36,13 @@ public class PolarisRefresherHandler extends AbstractConfigThreadPoolDynamicRefr private final ConfigFileService configFileService; - private static final String POLARIS_NAMESPACE = "${spring.dynamic.thread-pool.polaris.namespace:dev}"; + private static final String POLARIS_NAMESPACE = "${spring.dynamic.thread-pool.polaris.namespace}"; - private static final String POLARIS_FILE_GROUP = "${spring.dynamic.thread-pool.polaris.file.group:dynamic}"; + private static final String POLARIS_FILE_GROUP = "${spring.dynamic.thread-pool.polaris.file.group}"; - private static final String POLARIS_FILE_NAME = "${spring.dynamic.thread-pool.polaris.file.name:root/bootstrap.yaml}"; + private static final String POLARIS_FILE_NAME = "${spring.dynamic.thread-pool.polaris.file.name}"; - private static final String POLARIS_FILE_TYPE = "${spring.dynamic.thread-pool.polaris.file.type:properties}"; + private static final String POLARIS_FILE_TYPE = "${spring.dynamic.thread-pool.polaris.file.type}"; @Value(POLARIS_NAMESPACE) private String namespace; @@ -71,4 +71,20 @@ public class PolarisRefresherHandler extends AbstractConfigThreadPoolDynamicRefr return Objects.equals(POLARIS_FILE_TYPE, "yaml") ? configFileService.getConfigYamlFile(namespace, fileGroup, fileName) : configFileService.getConfigPropertiesFile(namespace, fileGroup, fileName); } + + public static String getPolarisNamespace() { + return POLARIS_NAMESPACE; + } + + public static String getPolarisFileGroup() { + return POLARIS_FILE_GROUP; + } + + public static String getPolarisFileName() { + return POLARIS_FILE_NAME; + } + + public static String getPolarisFileType() { + return POLARIS_FILE_TYPE; + } } diff --git a/threadpool/core/pom.xml b/threadpool/core/pom.xml index 903c73de..79182b81 100644 --- a/threadpool/core/pom.xml +++ b/threadpool/core/pom.xml @@ -34,6 +34,11 @@ hippo4j-threadpool-kernel-monitor ${project.version} + + cn.hippo4j + hippo4j-threadpool-config-spring-boot-starter + ${project.version} + org.springframework.boot spring-boot-starter-test diff --git a/threadpool/core/src/main/java/cn/hippo4j/core/enable/BeforeCheckConfiguration.java b/threadpool/core/src/main/java/cn/hippo4j/core/enable/BeforeCheckConfiguration.java index 50b48455..8a6bb428 100644 --- a/threadpool/core/src/main/java/cn/hippo4j/core/enable/BeforeCheckConfiguration.java +++ b/threadpool/core/src/main/java/cn/hippo4j/core/enable/BeforeCheckConfiguration.java @@ -40,24 +40,16 @@ public class BeforeCheckConfiguration { private final String bootstrapPropertiesClassName = "cn.hippo4j.springboot.starter.config.BootstrapProperties"; private final String bootstrapConfigPropertiesClassName = "cn.hippo4j.threadpool.dynamic.mode.config.properties.BootstrapConfigProperties"; - private static final String POLARIS_NAMESPACE = "${spring.dynamic.thread-pool.polaris.namespace}"; - - private static final String POLARIS_FILE_GROUP = "${spring.dynamic.thread-pool.polaris.file.group}"; - - private static final String POLARIS_FILE_NAME = "${spring.dynamic.thread-pool.polaris.file.name}"; - - private static final String POLARIS_FILE_TYPE = "${spring.dynamic.thread-pool.polaris.file.type}"; - - @Value(POLARIS_NAMESPACE) + @Value("#{T(cn.hippo4j.config.springboot.starter.refresher.PolarisRefresherHandler).getPolarisNamespace()}") private String polarisNamespace; - @Value(POLARIS_FILE_GROUP) + @Value("#{T(cn.hippo4j.config.springboot.starter.refresher.PolarisRefresherHandler).getPolarisFileGroup()}") private String polarisFileGroup; - @Value(POLARIS_FILE_NAME) + @Value("#{T(cn.hippo4j.config.springboot.starter.refresher.PolarisRefresherHandler).getPolarisFileName()}") private String polarisFileName; - @Value(POLARIS_FILE_TYPE) + @Value("#{T(cn.hippo4j.config.springboot.starter.refresher.PolarisRefresherHandler).getPolarisFileType()}") private String polarisFileType; @Bean @@ -167,22 +159,22 @@ public class BeforeCheckConfiguration { if (StringUtil.isBlank(polarisNamespace)) { throw new ConfigEmptyException( - "Web server maybe fail to start. The dynamic thread pool polaris namespace is empty.", + "Web server failed to start. The dynamic thread pool polaris namespace is empty.", "Please check whether the [spring.dynamic.thread-pool.polaris.namespace] configuration is empty or an empty string."); } if (StringUtil.isBlank(polarisFileGroup)) { throw new ConfigEmptyException( - "Web server maybe fail to start. The dynamic thread pool polaris file group is empty.", + "Web server failed to start. The dynamic thread pool polaris file group is empty.", "Please check whether the [spring.dynamic.thread-pool.polaris.file.group] configuration is empty or an empty string."); } if (StringUtil.isBlank(polarisFileName)) { throw new ConfigEmptyException( - "Web server maybe fail to start. The dynamic thread pool polaris file name is empty.", + "Web server failed to start. The dynamic thread pool polaris file name is empty.", "Please check whether the [spring.dynamic.thread-pool.polaris.file.name] configuration is empty or an empty string."); } if (StringUtil.isBlank(polarisFileType)) { throw new ConfigEmptyException( - "Web server maybe fail to start. The dynamic thread pool polaris file type is empty.", + "Web server failed to start. The dynamic thread pool polaris file type is empty.", "Please check whether the [spring.dynamic.thread-pool.polaris.file.type] configuration is empty or an empty string."); } break;