Polish apache#2301

dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/ReferenceBeanBuilder.java

@@ -16,21 +16,23 @@
  */
 package com.alibaba.dubbo.config.spring.beans.factory.annotation;
 
+import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.dubbo.config.ConsumerConfig;
 import com.alibaba.dubbo.config.annotation.Reference;
 import com.alibaba.dubbo.config.spring.ReferenceBean;
-import com.alibaba.dubbo.config.spring.convert.converter.StringArrayToMapConverter;
-import com.alibaba.dubbo.config.spring.convert.converter.StringArrayToStringConverter;
+import org.springframework.beans.propertyeditors.StringTrimmerEditor;
 import org.springframework.context.ApplicationContext;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.validation.DataBinder;
 
+import java.beans.PropertyEditorSupport;
+import java.util.Map;
+
 import static com.alibaba.dubbo.config.spring.util.BeanFactoryUtils.getOptionalBean;
 import static com.alibaba.dubbo.config.spring.util.ObjectUtils.of;
+import static org.springframework.util.StringUtils.commaDelimitedListToStringArray;
 
 /**
  * {@link ReferenceBean} Builder
@@ -39,6 +41,8 @@
  */
 class ReferenceBeanBuilder extends AbstractAnnotationConfigBeanBuilder<Reference, ReferenceBean> {
 
+    // Ignore those fields
+    static final String[] IGNORE_FIELD_NAMES = of("application", "module", "consumer", "monitor", "registry");
 
     private ReferenceBeanBuilder(Reference annotation, ClassLoader classLoader, ApplicationContext applicationContext) {
         super(annotation, classLoader, applicationContext);
@@ -93,20 +97,30 @@ protected ReferenceBean doBuild() {
     protected void preConfigureBean(Reference reference, ReferenceBean referenceBean) {
         Assert.notNull(interfaceClass, "The interface class must set first!");
         DataBinder dataBinder = new DataBinder(referenceBean);
-        // Set ConversionService
-        dataBinder.setConversionService(getConversionService());
-        // Ignore those fields
-        String[] ignoreAttributeNames = of("application", "module", "consumer", "monitor", "registry");
-//        dataBinder.setDisallowedFields(ignoreAttributeNames);
+        // Register CustomEditors for special fields
+        dataBinder.registerCustomEditor(String.class, "filter", new StringTrimmerEditor(true));
+        dataBinder.registerCustomEditor(String.class, "listener", new StringTrimmerEditor(true));
+        dataBinder.registerCustomEditor(Map.class, "parameters", new PropertyEditorSupport() {
+
+            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;
+                }
+                // 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);
+            }
+        });
+
         // Bind annotation attributes
-        dataBinder.bind(new AnnotationPropertyValuesAdapter(reference, applicationContext.getEnvironment(), ignoreAttributeNames));
-    }
+        dataBinder.bind(new AnnotationPropertyValuesAdapter(reference, applicationContext.getEnvironment(), IGNORE_FIELD_NAMES));
 
-    private ConversionService getConversionService() {
-        DefaultConversionService conversionService = new DefaultConversionService();
-        conversionService.addConverter(new StringArrayToStringConverter());
-        conversionService.addConverter(new StringArrayToMapConverter());
-        return conversionService;
     }
 
 

dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/ReferenceBeanBuilderTest.java

@@ -0,0 +1,124 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.dubbo.config.spring.beans.factory.annotation;
+
+import com.alibaba.dubbo.config.annotation.Reference;
+import com.alibaba.dubbo.config.spring.ReferenceBean;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.springframework.core.annotation.AnnotationUtils.findAnnotation;
+import static org.springframework.util.ReflectionUtils.findField;
+
+/**
+ * {@link ReferenceBeanBuilder} Test
+ *
+ * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
+ * @see ReferenceBeanBuilder
+ * @see Reference
+ * @since 2.6.4
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = ReferenceBeanBuilderTest.class)
+public class ReferenceBeanBuilderTest {
+
+    @Reference(
+            interfaceClass = CharSequence.class,
+            interfaceName = "java.lang.CharSequence",
+            version = "1.0.0", group = "TEST_GROUP", url = "dubbo://localhost:12345",
+            client = "client", generic = true, injvm = true,
+            check = false, init = false, lazy = true,
+            stubevent = true, reconnect = "reconnect", sticky = true,
+            proxy = "javassist", stub = "java.lang.CharSequence", cluster = "failover",
+            connections = 3, callbacks = 1, onconnect = "onconnect", ondisconnect = "ondisconnect",
+            owner = "owner", layer = "layer", retries = 1,
+            loadbalance = "random", async = true, actives = 3,
+            sent = true, mock = "mock", validation = "validation",
+            timeout = 3, cache = "cache", filter = {"echo", "generic", "accesslog"},
+            listener = {"deprecated"}, parameters = {"n1=v1  ", "n2 = v2 ", "  n3 =   v3  "},
+            application = "application",
+            module = "module", consumer = "consumer", monitor = "monitor", registry = {"registry"}
+    )
+    private static final Object TEST_FIELD = new Object();
+
+    @Autowired
+    private ApplicationContext context;
+
+    @Test
+    public void testBuild() throws Exception {
+        Reference reference = findAnnotation(findField(getClass(), "TEST_FIELD"), Reference.class);
+        ReferenceBeanBuilder beanBuilder = ReferenceBeanBuilder.create(reference, context.getClassLoader(), context);
+        beanBuilder.interfaceClass(CharSequence.class);
+        ReferenceBean referenceBean = beanBuilder.build();
+        Assert.assertEquals(CharSequence.class, referenceBean.getInterfaceClass());
+        Assert.assertEquals("1.0.0", referenceBean.getVersion());
+        Assert.assertEquals("TEST_GROUP", referenceBean.getGroup());
+        Assert.assertEquals("dubbo://localhost:12345", referenceBean.getUrl());
+        Assert.assertEquals("client", referenceBean.getClient());
+        Assert.assertEquals(true, referenceBean.isGeneric());
+        Assert.assertEquals(true, referenceBean.isInjvm());
+        Assert.assertEquals(false, referenceBean.isCheck());
+        Assert.assertEquals(null, referenceBean.isInit());
+        Assert.assertEquals(true, referenceBean.getLazy());
+        Assert.assertEquals(true, referenceBean.getStubevent());
+        Assert.assertEquals("reconnect", referenceBean.getReconnect());
+        Assert.assertEquals(true, referenceBean.getSticky());
+        Assert.assertEquals("javassist", referenceBean.getProxy());
+        Assert.assertEquals("java.lang.CharSequence", referenceBean.getStub());
+        Assert.assertEquals("failover", referenceBean.getCluster());
+        Assert.assertEquals(Integer.valueOf(3), referenceBean.getConnections());
+        Assert.assertEquals(Integer.valueOf(1), referenceBean.getCallbacks());
+        Assert.assertEquals("onconnect", referenceBean.getOnconnect());
+        Assert.assertEquals("ondisconnect", referenceBean.getOndisconnect());
+        Assert.assertEquals("owner", referenceBean.getOwner());
+        Assert.assertEquals("layer", referenceBean.getLayer());
+        Assert.assertEquals(Integer.valueOf(1), referenceBean.getRetries());
+        Assert.assertEquals("random", referenceBean.getLoadbalance());
+        Assert.assertEquals(true, referenceBean.isAsync());
+        Assert.assertEquals(Integer.valueOf(3), referenceBean.getActives());
+        Assert.assertEquals(true, referenceBean.getSent());
+        Assert.assertEquals("mock", referenceBean.getMock());
+        Assert.assertEquals("validation", referenceBean.getValidation());
+        Assert.assertEquals(Integer.valueOf(3), referenceBean.getTimeout());
+        Assert.assertEquals("cache", referenceBean.getCache());
+        Assert.assertEquals("echo,generic,accesslog", referenceBean.getFilter());
+        Assert.assertEquals("deprecated", referenceBean.getListener());
+
+        // parameters
+        Map<String, String> parameters = new HashMap<String, String>();
+        parameters.put("n1", "v1");
+        parameters.put("n2", "v2");
+        parameters.put("n3", "v3");
+        Assert.assertEquals(parameters, referenceBean.getParameters());
+
+        // Asserts Null fields
+        Assert.assertNull(referenceBean.getApplication());
+        Assert.assertNull(referenceBean.getModule());
+        Assert.assertNull(referenceBean.getConsumer());
+        Assert.assertNull(referenceBean.getMonitor());
+        Assert.assertEquals(Collections.emptyList(), referenceBean.getRegistries());
+    }
+}