dromara/dynamic-tp
dromara/dynamic-tp
1
0
Fork 0
mirror of https://github.com/dromara/dynamic-tp.git synced 2024-10-23 08:34:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

optimize global config related

Browse Source
This commit is contained in:
yanhom 2024-09-25 20:01:10 +08:00
parent 6fc414c5e8
commit d2c430553b
5 changed files with 54 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/main/java/org/dromara/dynamictp/common/entity/NotifyItem.java
View File

@ -82,8 +82,10 @@ public class NotifyItem {
val defaultItems = getAllNotifyItems().stream()
.filter(t -> !StringUtil.containsIgnoreCase(t.getType(), configuredTypes))
.collect(Collectors.toList());
source.addAll(defaultItems);
return source;
List<NotifyItem> notifyItems = new ArrayList<>(6);
notifyItems.addAll(defaultItems);
notifyItems.addAll(source);
return notifyItems;
}
}

79
common/src/main/java/org/dromara/dynamictp/common/util/DtpPropertiesBinderUtil.java
View File

@ -70,19 +70,15 @@ public final class DtpPropertiesBinderUtil {
private static void tryResetCusExecutors(DtpProperties dtpProperties, Object source) {
val dtpPropsFields = ReflectionUtil.getAllFields(DtpExecutorProps.class);
val globalExecutorProps = dtpProperties.getGlobalExecutorProps();
int[] idx = {0};
dtpProperties.getExecutors().forEach(executor -> {
dtpPropsFields.forEach(field -> {
String executorFieldKey = EXECUTORS_CONFIG_PREFIX + idx[0] + "]." + field.getName();
setBasicField(source, field, executor, executorFieldKey);
String propKey = EXECUTORS_CONFIG_PREFIX + idx[0] + "]." + field.getName();
setBasicField(source, field, executor, propKey);
});
String executorPropKeyPrefix = EXECUTORS_CONFIG_PREFIX + idx[0] + "]";
setListField(dtpProperties, executor, executorPropKeyPrefix, source);
val globalExecutorProps = dtpProperties.getGlobalExecutorProps();
if (!contains(executorPropKeyPrefix + ".pluginNames[0]", source) &&
CollectionUtils.isNotEmpty(globalExecutorProps.getPluginNames())) {
ReflectUtil.setFieldValue(executor, PLUGIN_NAMES, globalExecutorProps.getPluginNames());
}
String executorFieldNamePrefix = EXECUTORS_CONFIG_PREFIX + idx[0] + "]";
setCollectionField(source, globalExecutorProps, executor, executorFieldNamePrefix);
idx[0]++;
});
}
@ -90,28 +86,30 @@ public final class DtpPropertiesBinderUtil {
private static void tryResetAdapterExecutors(DtpProperties dtpProperties, Object source) {
val dtpPropertiesFields = ReflectionUtil.getAllFields(DtpProperties.class);
val tpExecutorPropFields = ReflectionUtil.getAllFields(TpExecutorProps.class);
val globalExecutorProps = dtpProperties.getGlobalExecutorProps();
dtpPropertiesFields.forEach(dtpPropertiesField -> {
val targetObj = ReflectUtil.getFieldValue(dtpProperties, dtpPropertiesField);
if (Objects.isNull(targetObj)) {
val candidateExecutor = ReflectUtil.getFieldValue(dtpProperties, dtpPropertiesField);
if (Objects.isNull(candidateExecutor)) {
return;
}
String candidateExecutorFieldName = dtpPropertiesField.getName();
if (dtpPropertiesField.getType().isAssignableFrom(TpExecutorProps.class)) {
tpExecutorPropFields.forEach(tpField -> setBasicField(source, tpField, dtpPropertiesField.getName(), targetObj));
String prefix = MAIN_PROPERTIES_PREFIX + "." + dtpPropertiesField.getName();
setListField(dtpProperties, targetObj, prefix, source);
tpExecutorPropFields.forEach(field -> setBasicField(source, field, candidateExecutorFieldName, candidateExecutor));
String executorFieldNamePrefix = MAIN_PROPERTIES_PREFIX + "." + dtpPropertiesField.getName();
setCollectionField(source, globalExecutorProps, candidateExecutor, executorFieldNamePrefix);
} else if (dtpPropertiesField.getGenericType() instanceof ParameterizedType) {
ParameterizedType paramType = (ParameterizedType) dtpPropertiesField.getGenericType();
Type[] argTypes = paramType.getActualTypeArguments();
if (argTypes.length == 1 && argTypes[0].equals(TpExecutorProps.class)) {
List<TpExecutorProps> tpExecutorProps = (List<TpExecutorProps>) targetObj;
if (CollectionUtils.isEmpty(tpExecutorProps)) {
List<TpExecutorProps> executors = (List<TpExecutorProps>) candidateExecutor;
if (CollectionUtils.isEmpty(executors)) {
return;
}
int[] idx = {0};
tpExecutorProps.forEach(tpProp -> {
tpExecutorPropFields.forEach(tpField -> setBasicField(source, tpField, dtpPropertiesField.getName(), tpProp, idx));
String prefix = MAIN_PROPERTIES_PREFIX + "." + dtpPropertiesField.getName() + "[" + idx[0] + "]";
setListField(dtpProperties, tpProp, prefix, source);
executors.forEach(executor -> {
tpExecutorPropFields.forEach(field -> setBasicField(source, field, candidateExecutorFieldName, executor, idx));
String executorFieldNamePrefix = MAIN_PROPERTIES_PREFIX + "." + candidateExecutorFieldName + "[" + idx[0] + "]";
setCollectionField(source, globalExecutorProps, executor, executorFieldNamePrefix);
idx[0]++;
});
}
@ -141,45 +139,52 @@ public final class DtpPropertiesBinderUtil {
return false;
}
private static void setBasicField(Object source, Field tpPropField, String targetObjName, Object targetObj, int[] idx) {
String executorFieldKey = MAIN_PROPERTIES_PREFIX + "." + targetObjName + "[" + idx[0] + "]." + tpPropField.getName();
setBasicField(source, tpPropField, targetObj, executorFieldKey);
private static void setBasicField(Object source, Field field, String executorFieldName, Object executor, int[] idx) {
String propKey = MAIN_PROPERTIES_PREFIX + "." + executorFieldName + "[" + idx[0] + "]." + field.getName();
setBasicField(source, field, executor, propKey);
}
private static void setBasicField(Object source, Field tpPropField, String targetObjName, Object targetObj) {
String executorFieldKey = MAIN_PROPERTIES_PREFIX + "." + targetObjName + "." + tpPropField.getName();
setBasicField(source, tpPropField, targetObj, executorFieldKey);
private static void setBasicField(Object source, Field field, String executorFieldName, Object executor) {
String propKey = MAIN_PROPERTIES_PREFIX + "." + executorFieldName + "." + field.getName();
setBasicField(source, field, executor, propKey);
}
private static void setBasicField(Object source, Field tpPropField, Object targetObj, String executorFieldKey) {
Object executorFieldVal = getProperty(executorFieldKey, source);
if (Objects.nonNull(executorFieldVal)) {
private static void setBasicField(Object source, Field field, Object executor, String propKey) {
Object propVal = getProperty(propKey, source);
if (Objects.nonNull(propVal)) {
return;
}
Object globalFieldVal = getProperty(GLOBAL_CONFIG_PREFIX + tpPropField.getName(), source);
Object globalFieldVal = getProperty(GLOBAL_CONFIG_PREFIX + field.getName(), source);
if (Objects.isNull(globalFieldVal)) {
return;
}
ReflectUtil.setFieldValue(targetObj, tpPropField.getName(), globalFieldVal);
ReflectUtil.setFieldValue(executor, field.getName(), globalFieldVal);
}
private static void setListField(DtpProperties dtpProperties, Object fieldVal, String prefix, Object source) {
val globalExecutorProps = dtpProperties.getGlobalExecutorProps();
private static void setCollectionField(Object source, DtpExecutorProps globalExecutorProps, Object executor, String prefix) {
if (!contains(prefix + ".taskWrapperNames[0]", source) &&
CollectionUtils.isNotEmpty(globalExecutorProps.getTaskWrapperNames())) {
ReflectUtil.setFieldValue(fieldVal, "taskWrapperNames", globalExecutorProps.getTaskWrapperNames());
ReflectUtil.setFieldValue(executor, "taskWrapperNames", globalExecutorProps.getTaskWrapperNames());
}
if (!contains(prefix + ".platformIds[0]", source) &&
CollectionUtils.isNotEmpty(globalExecutorProps.getPlatformIds())) {
ReflectUtil.setFieldValue(fieldVal, PLATFORM_IDS, globalExecutorProps.getPlatformIds());
ReflectUtil.setFieldValue(executor, PLATFORM_IDS, globalExecutorProps.getPlatformIds());
}
if (!contains(prefix + ".notifyItems[0].type", source) &&
CollectionUtils.isNotEmpty(globalExecutorProps.getNotifyItems())) {
ReflectUtil.setFieldValue(fieldVal, NOTIFY_ITEMS, globalExecutorProps.getNotifyItems());
ReflectUtil.setFieldValue(executor, NOTIFY_ITEMS, globalExecutorProps.getNotifyItems());
}
if (!contains(prefix + ".awareNames[0]", source) &&
CollectionUtils.isNotEmpty(globalExecutorProps.getAwareNames())) {
ReflectUtil.setFieldValue(fieldVal, AWARE_NAMES, globalExecutorProps.getAwareNames());
ReflectUtil.setFieldValue(executor, AWARE_NAMES, globalExecutorProps.getAwareNames());
}
try {
if (!contains(prefix + ".pluginNames[0]", source) &&
CollectionUtils.isNotEmpty(globalExecutorProps.getPluginNames())) {
ReflectUtil.setFieldValue(executor, PLUGIN_NAMES, globalExecutorProps.getPluginNames());
}
} catch (Exception e) {
// ignore
}
}
}

10
core/src/main/java/org/dromara/dynamictp/core/DtpRegistry.java
View File

@ -299,10 +299,12 @@ public class DtpRegistry extends OnceApplicationContextEventListener {
}
private static void updateWrapper(ExecutorWrapper executorWrapper, DtpExecutorProps props) {
executorWrapper.setThreadPoolAliasName(props.getThreadPoolAliasName());
executorWrapper.setNotifyItems(props.getNotifyItems());
executorWrapper.setPlatformIds(props.getPlatformIds());
executorWrapper.setNotifyEnabled(props.isNotifyEnabled());
if (executorWrapper.isDtpExecutor()) {
executorWrapper.setThreadPoolAliasName(props.getThreadPoolAliasName());
executorWrapper.setNotifyItems(((DtpExecutor) executorWrapper.getExecutor()).getNotifyItems());
executorWrapper.setPlatformIds(props.getPlatformIds());
executorWrapper.setNotifyEnabled(props.isNotifyEnabled());
}
executorWrapper.setPreStartAllCoreThreads(props.isPreStartAllCoreThreads());
executorWrapper.setRejectEnhanced(props.isRejectEnhanced());
executorWrapper.setWaitForTasksToCompleteOnShutdown(props.isWaitForTasksToCompleteOnShutdown());

2
dependencies/pom.xml vendored
View File

@ -12,7 +12,7 @@
<url>https://github.com/yanhom1314/dynamic-tp</url>
<properties>
<revision>1.1.8.1</revision>
<revision>1.1.9</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<lombok.version>1.18.24</lombok.version>

2
pom.xml
View File

@ -13,7 +13,7 @@
<url>https://github.com/yanhom1314/dynamic-tp</url>
<properties>
<revision>1.1.8.1</revision>
<revision>1.1.9</revision>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>