Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Config value supports arrays. #14813

Merged
merged 2 commits into from
Oct 22, 2024
Merged

Config value supports arrays. #14813

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
069fcf0
Fix #14779
oxsean Oct 20, 2024
b591ac7
Merge branch '3.3' into 1022-array-value
oxsean Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 65 additions & 6 deletions dubbo-common/src/main/java/org/apache/dubbo/config/AbstractConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import org.apache.dubbo.config.support.Nested;
import org.apache.dubbo.config.support.Parameter;
import org.apache.dubbo.rpc.model.ApplicationModel;
import org.apache.dubbo.rpc.model.FrameworkModel;
import org.apache.dubbo.rpc.model.ModuleModel;
import org.apache.dubbo.rpc.model.ScopeModel;
import org.apache.dubbo.rpc.model.ScopeModelUtil;
Expand All @@ -49,6 +50,7 @@
import java.beans.Transient;
import java.io.Serializable;
import java.lang.annotation.Annotation;
import java.lang.reflect.Array;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
Expand Down Expand Up @@ -325,6 +327,23 @@ private static boolean isParametersGetter(Method method) {
&& method.getReturnType() == Map.class);
}

private static boolean isPropertySetter(Method method) {
String name = method.getName();
if (name.startsWith("set")
&& name.length() > 3
&& Modifier.isPublic(method.getModifiers())
&& method.getParameterCount() == 1) {
Class<?> paramType = method.getParameterTypes()[0];
if (paramType.isArray()) {
Class<?> componentType = paramType.getComponentType();
return componentType.isPrimitive() || isSimpleType(componentType);
} else {
return paramType.isPrimitive() || isSimpleType(paramType);
}
}
return false;
}

private static boolean isParametersSetter(Method method) {
return ("setParameters".equals(method.getName())
&& Modifier.isPublic(method.getModifiers())
Expand Down Expand Up @@ -770,11 +789,13 @@ private void assignProperties(
// even if old one (this) contains non-null value, do override
boolean overrideAll = configMode == ConfigMode.OVERRIDE_ALL;

FrameworkModel frameworkModel = ScopeModelUtil.getFrameworkModel(getScopeModel());

// loop methods, get override value and set the new value back to method
List<Method> methods =
MethodUtils.getMethods(obj.getClass(), method -> method.getDeclaringClass() != Object.class);
for (Method method : methods) {
if (MethodUtils.isSetter(method)) {
if (isPropertySetter(method)) {
String propertyName = extractPropertyName(method.getName());

// if config mode is OVERRIDE_IF_ABSENT and property has set, skip
Expand All @@ -787,17 +808,55 @@ private void assignProperties(

try {
String value = StringUtils.trim(configuration.getString(kebabPropertyName));

Class<?> paramType = method.getParameterTypes()[0];
if (paramType.isArray()) {
if (isIgnoredAttribute(obj.getClass(), propertyName)) {
continue;
}

Class<?> itemType = paramType.getComponentType();
List<Object> items = new ArrayList<>();
if (StringUtils.hasText(value)) {
value = environment.resolvePlaceholders(value);
if (StringUtils.hasText(value)) {
for (String item : StringUtils.tokenize(value, ',')) {
items.add(ClassUtils.convertPrimitive(frameworkModel, itemType, item));
}
}
} else {
for (int i = 0; ; i++) {
value = StringUtils.trim(configuration.getString(kebabPropertyName + '[' + i + ']'));
if (value == null) {
break;
}
if (StringUtils.hasText(value)) {
value = environment.resolvePlaceholders(value);
if (StringUtils.hasText(value)) {
items.add(ClassUtils.convertPrimitive(frameworkModel, itemType, value));
}
}
}
}
int len = items.size();
if (len > 0) {
Object array = Array.newInstance(itemType, len);
for (int i = 0; i < len; i++) {
Array.set(array, i, items.get(i));
}
method.invoke(obj, array);
}
continue;
}

// isTypeMatch() is called to avoid duplicate and incorrect update, for example, we have two
// 'setGeneric' methods in ReferenceConfig.
if (StringUtils.hasText(value)
&& ClassUtils.isTypeMatch(method.getParameterTypes()[0], value)
&& ClassUtils.isTypeMatch(paramType, value)
&& !isIgnoredAttribute(obj.getClass(), propertyName)) {
value = environment.resolvePlaceholders(value);
if (StringUtils.hasText(value)) {
Object arg = ClassUtils.convertPrimitive(
ScopeModelUtil.getFrameworkModel(getScopeModel()),
method.getParameterTypes()[0],
value);
Object arg = ClassUtils.convertPrimitive(frameworkModel, paramType, value);
if (arg != null) {
method.invoke(obj, arg);
}
Expand Down
Loading