From 8a8097ce005febf265df9ec949c3d1908a563b29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E9=A9=AC=E5=93=A5?= Date: Sat, 16 Mar 2019 00:38:06 +0800 Subject: [PATCH] Bugfix --- .../alibaba/dubbo/http/matcher/HttpRequestHeadersMatcher.java | 1 + .../alibaba/dubbo/http/matcher/HttpRequestParamsMatcher.java | 4 ++++ .../AbstractDubboGenericServiceParameterResolver.java | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestHeadersMatcher.java b/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestHeadersMatcher.java index 83577bb5a..beb05ccd0 100644 --- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestHeadersMatcher.java +++ b/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; diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestParamsMatcher.java b/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestParamsMatcher.java index 22f784b2a..22a1ce4ad 100644 --- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestParamsMatcher.java +++ b/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; diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/AbstractDubboGenericServiceParameterResolver.java b/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/AbstractDubboGenericServiceParameterResolver.java index 5ad1be1b3..8f4f1ad3a 100644 --- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/AbstractDubboGenericServiceParameterResolver.java +++ b/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;