feature: hippo4j config model in nacos config before check (#1438)

pull/1440/head
2084276225 1 year ago committed by GitHub
parent 8cf9b80010
commit 651cc909e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -17,6 +17,8 @@
package cn.hippo4j.threadpool.dynamic.api; package cn.hippo4j.threadpool.dynamic.api;
import java.util.Map;
/** /**
* Bootstrap properties interface. * Bootstrap properties interface.
*/ */
@ -70,4 +72,11 @@ public interface BootstrapPropertiesInterface {
default Boolean getBanner() { default Boolean getBanner() {
return null; return null;
} }
/**
* Get nacos.
*/
default Map<String, String> getNacos() {
return null;
}
} }

@ -17,6 +17,7 @@
package cn.hippo4j.core.enable; package cn.hippo4j.core.enable;
import cn.hippo4j.common.toolkit.MapUtil;
import cn.hippo4j.common.toolkit.StringUtil; import cn.hippo4j.common.toolkit.StringUtil;
import cn.hippo4j.core.config.ConfigEmptyException; import cn.hippo4j.core.config.ConfigEmptyException;
import cn.hippo4j.threadpool.dynamic.api.BootstrapPropertiesInterface; import cn.hippo4j.threadpool.dynamic.api.BootstrapPropertiesInterface;
@ -26,6 +27,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.ConfigurableEnvironment;
import java.util.Map;
import java.util.Objects; import java.util.Objects;
/** /**
@ -36,36 +38,62 @@ import java.util.Objects;
public class BeforeCheckConfiguration { public class BeforeCheckConfiguration {
private final String bootstrapPropertiesClassName = "cn.hippo4j.springboot.starter.config.BootstrapProperties"; private final String bootstrapPropertiesClassName = "cn.hippo4j.springboot.starter.config.BootstrapProperties";
private final String bootstrapConfigPropertiesClassName = "cn.hippo4j.threadpool.dynamic.mode.config.properties.BootstrapConfigProperties";
@Bean @Bean
public BeforeCheckConfiguration.BeforeCheck dynamicThreadPoolBeforeCheckBean(@Autowired(required = false) BootstrapPropertiesInterface properties, public BeforeCheckConfiguration.BeforeCheck dynamicThreadPoolBeforeCheckBean(@Autowired(required = false) BootstrapPropertiesInterface properties,
ConfigurableEnvironment environment) { ConfigurableEnvironment environment) {
// TODO test // TODO test
boolean checkFlag = properties != null && Objects.equals(bootstrapPropertiesClassName, properties.getClass().getName()) && properties.getEnable(); boolean checkFlag = properties != null && properties.getEnable();
if (checkFlag) { if (checkFlag) {
String namespace = properties.getNamespace(); String propertiesClassName = properties.getClass().getName();
if (StringUtil.isBlank(namespace)) { switch (propertiesClassName) {
throw new ConfigEmptyException( case bootstrapPropertiesClassName: {
"Web server failed to start. The dynamic thread pool namespace is empty.", String namespace = properties.getNamespace();
"Please check whether the [spring.dynamic.thread-pool.namespace] configuration is empty or an empty string."); if (StringUtil.isBlank(namespace)) {
} throw new ConfigEmptyException(
String itemId = properties.getItemId(); "Web server failed to start. The dynamic thread pool namespace is empty.",
if (StringUtil.isBlank(itemId)) { "Please check whether the [spring.dynamic.thread-pool.namespace] configuration is empty or an empty string.");
throw new ConfigEmptyException( }
"Web server failed to start. The dynamic thread pool item id is empty.", String itemId = properties.getItemId();
"Please check whether the [spring.dynamic.thread-pool.item-id] configuration is empty or an empty string."); if (StringUtil.isBlank(itemId)) {
} throw new ConfigEmptyException(
String serverAddr = properties.getServerAddr(); "Web server failed to start. The dynamic thread pool item id is empty.",
if (StringUtil.isBlank(serverAddr)) { "Please check whether the [spring.dynamic.thread-pool.item-id] configuration is empty or an empty string.");
throw new ConfigEmptyException( }
"Web server failed to start. The dynamic thread pool server addr is empty.", String serverAddr = properties.getServerAddr();
"Please check whether the [spring.dynamic.thread-pool.server-addr] configuration is empty or an empty string."); if (StringUtil.isBlank(serverAddr)) {
} throw new ConfigEmptyException(
String applicationName = environment.getProperty("spring.application.name"); "Web server failed to start. The dynamic thread pool server addr is empty.",
if (StringUtil.isBlank(applicationName)) { "Please check whether the [spring.dynamic.thread-pool.server-addr] configuration is empty or an empty string.");
throw new ConfigEmptyException( }
"Web server failed to start. The dynamic thread pool application name is empty.", String applicationName = environment.getProperty("spring.application.name");
"Please check whether the [spring.application.name] configuration is empty or an empty string."); if (StringUtil.isBlank(applicationName)) {
throw new ConfigEmptyException(
"Web server failed to start. The dynamic thread pool application name is empty.",
"Please check whether the [spring.application.name] configuration is empty or an empty string.");
}
break;
}
case bootstrapConfigPropertiesClassName: {
Map<String, String> nacos = properties.getNacos();
if (MapUtil.isNotEmpty(nacos)) {
String group = nacos.get("group");
if (StringUtil.isBlank(group)) {
throw new ConfigEmptyException(
"Web server failed to start. The dynamic thread pool nacos group is empty.",
"Please check whether the [spring.dynamic.thread-pool.nacos.group] configuration is empty or an empty string.");
}
String dataId = nacos.get("data-id");
if (StringUtil.isBlank(dataId)) {
throw new ConfigEmptyException(
"Web server failed to start. The dynamic thread pool nacos data-id is empty.",
"Please check whether the [spring.dynamic.thread-pool.nacos.data-id] configuration is empty or an empty string.");
}
}
break;
}
default:
} }
} }
return new BeforeCheckConfiguration.BeforeCheck(); return new BeforeCheckConfiguration.BeforeCheck();

Loading…
Cancel
Save