Skip to content

Commit

Permalink
fix #8378 parameter convert error
Browse files Browse the repository at this point in the history
  • Loading branch information
@24kpure
24kpure committed Jul 30, 2021
1 parent ca794b6 commit 4d689fc
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 36 deletions.
19 changes: 5 additions & 14 deletions ...in/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceBeanBuilder.java
View file
Expand Up @@ -16,12 +16,12 @@
*/
package org.apache.dubbo.config.spring.beans.factory.annotation;

import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.config.ConsumerConfig;
import org.apache.dubbo.config.MethodConfig;
import org.apache.dubbo.config.annotation.Method;
import org.apache.dubbo.config.annotation.Reference;
import org.apache.dubbo.config.spring.ReferenceBean;
import org.apache.dubbo.config.spring.util.DubboAnnotationUtils;
import org.springframework.beans.propertyeditors.StringTrimmerEditor;
import org.springframework.context.ApplicationContext;
import org.springframework.core.annotation.AnnotationAttributes;
Expand All @@ -39,7 +39,6 @@
import static org.apache.dubbo.config.spring.util.DubboAnnotationUtils.resolveServiceInterfaceClass;
import static org.apache.dubbo.config.spring.util.DubboBeanUtils.getOptionalBean;
import static org.springframework.core.annotation.AnnotationAttributes.fromMap;
import static org.springframework.util.StringUtils.commaDelimitedListToStringArray;

/**
* {@link ReferenceBean} Builder
Expand Down Expand Up @@ -124,19 +123,11 @@ protected void preConfigureBean(AnnotationAttributes attributes, ReferenceBean r
dataBinder.registerCustomEditor(String.class, "listener", new StringTrimmerEditor(true));
dataBinder.registerCustomEditor(Map.class, "parameters", new PropertyEditorSupport() {
@Override
public void setAsText(String text) throws java.lang.IllegalArgumentException {
// Trim all whitespace
String content = StringUtils.trimAllWhitespace(text);
if (!StringUtils.hasText(content)) { // No content , ignore directly
return;
public void setValue(Object value) {
if (value instanceof String[]) {
value = DubboAnnotationUtils.convertParameters((String[]) value);
}
// replace "=" to ","
content = StringUtils.replace(content, "=", ",");
// replace ":" to ","
content = StringUtils.replace(content, ":", ",");
// String[] to Map
Map<String, String> parameters = CollectionUtils.toStringMap(commaDelimitedListToStringArray(content));
setValue(parameters);
super.setValue(value);
}
});

Expand Down
23 changes: 2 additions & 21 deletions ...va/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceClassPostProcessor.java
View file
Expand Up @@ -18,7 +18,6 @@

import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.utils.ArrayUtils;
import org.apache.dubbo.config.MethodConfig;
import org.apache.dubbo.config.annotation.DubboService;
import org.apache.dubbo.config.annotation.Method;
Expand All @@ -27,7 +26,7 @@
import org.apache.dubbo.config.spring.context.DubboBootstrapApplicationListener;
import org.apache.dubbo.config.spring.context.annotation.DubboClassPathBeanDefinitionScanner;
import org.apache.dubbo.config.spring.schema.AnnotationBeanDefinitionParser;

import org.apache.dubbo.config.spring.util.DubboAnnotationUtils;
import org.springframework.beans.BeansException;
import org.springframework.beans.MutablePropertyValues;
import org.springframework.beans.factory.BeanClassLoaderAware;
Expand Down Expand Up @@ -62,10 +61,8 @@
import java.lang.annotation.Annotation;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;

Expand Down Expand Up @@ -414,7 +411,7 @@ private AbstractBeanDefinition buildServiceBeanDefinition(Annotation serviceAnno
// Set interface
builder.addPropertyValue("interface", interfaceClass.getName());
// Convert parameters into map
builder.addPropertyValue("parameters", convertParameters(serviceAnnotationAttributes.getStringArray("parameters")));
builder.addPropertyValue("parameters", DubboAnnotationUtils.convertParameters(serviceAnnotationAttributes.getStringArray("parameters")));
// Add methods parameters
List<MethodConfig> methodConfigs = convertMethodConfigs(serviceAnnotationAttributes.get("methods"));
if (!methodConfigs.isEmpty()) {
Expand Down Expand Up @@ -511,22 +508,6 @@ private void addPropertyReference(BeanDefinitionBuilder builder, String property
builder.addPropertyReference(propertyName, resolvedBeanName);
}

private Map<String, String> convertParameters(String[] parameters) {
if (ArrayUtils.isEmpty(parameters)) {
return null;
}

if (parameters.length % 2 != 0) {
throw new IllegalArgumentException("parameter attribute must be paired with key followed by value");
}

Map<String, String> map = new HashMap<>();
for (int i = 0; i < parameters.length; i += 2) {
map.put(parameters[i], parameters[i + 1]);
}
return map;
}

@Override
public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {

Expand Down
43 changes: 42 additions & 1 deletion ...config-spring/src/main/java/org/apache/dubbo/config/spring/util/DubboAnnotationUtils.java
View file
Expand Up @@ -16,13 +16,20 @@
*/
package org.apache.dubbo.config.spring.util;

import org.apache.dubbo.common.utils.ArrayUtils;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.config.annotation.Reference;
import org.apache.dubbo.config.annotation.Service;

import org.springframework.core.annotation.AnnotationAttributes;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import static com.alibaba.spring.util.AnnotationUtils.getAttribute;
import static org.springframework.util.ClassUtils.getAllInterfacesForClass;
import static org.springframework.util.ClassUtils.resolveClassName;
Expand Down Expand Up @@ -147,4 +154,38 @@ public static String resolveInterfaceName(Reference reference, Class<?> defaultI

return interfaceName;
}

public static Map<String, String> convertParameters(String[] parameters) {
if (ArrayUtils.isEmpty(parameters)) {
return null;
}

List<String> compatibleParameterArray = Arrays.stream(parameters)
.map(String::trim)
.reduce(new ArrayList<>(parameters.length), (list, parameter) ->
{
if (list.size() % 2 == 1) {
//value doesn't split
list.add(parameter);
return list;
}

String[] sp1 = parameter.split(":");
if (sp1.length > 0 && sp1.length % 2 == 0) {
//key split
list.addAll(Arrays.stream(sp1).collect(Collectors.toList()));
return list;
}
sp1 = parameter.split("=");
if (sp1.length > 0 && sp1.length % 2 == 0) {
list.addAll(Arrays.stream(sp1).collect(Collectors.toList()));
return list;
}
list.add(parameter);
return list;
}
, (a, b) -> a);

return CollectionUtils.toStringMap(compatibleParameterArray.toArray(new String[0]));
}
}

0 comments on commit 4d689fc

Please sign in to comment.