Merge pull request #455 from mercyblitz/master

Dubbo Spring Cloud Update

spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestHeadersMatcher.java

@@ -18,6 +18,7 @@ package org.springframework.cloud.alibaba.dubbo.http.matcher;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpRequest;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Collection;
 import java.util.LinkedHashSet;

spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestParamsMatcher.java

@@ -17,6 +17,7 @@
 package org.springframework.cloud.alibaba.dubbo.http.matcher;
 
 import org.springframework.http.HttpRequest;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Collection;
 import java.util.LinkedHashSet;
@@ -44,6 +45,9 @@ public class HttpRequestParamsMatcher extends AbstractHttpRequestMatcher {
 
     @Override
     public boolean match(HttpRequest request) {
+        if (CollectionUtils.isEmpty(expressions)) {
+            return true;
+        }
         for (ParamExpression paramExpression : expressions) {
             if (paramExpression.match(request)) {
                 return true;

spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/AbstractDubboGenericServiceParameterResolver.java

@@ -20,6 +20,7 @@ import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.core.convert.ConversionService;
+import org.springframework.format.support.DefaultFormattingConversionService;
 import org.springframework.format.support.FormattingConversionService;
 
 import static org.springframework.context.ConfigurableApplicationContext.CONVERSION_SERVICE_BEAN_NAME;
@@ -37,7 +38,7 @@ public abstract class AbstractDubboGenericServiceParameterResolver implements Du
 
     @Autowired(required = false)
     @Qualifier(CONVERSION_SERVICE_BEAN_NAME)
-    private ConversionService conversionService = new FormattingConversionService();
+    private ConversionService conversionService = new DefaultFormattingConversionService();
 
     private ClassLoader classLoader;