This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 537682b8cf0fd4ed1f7493478b54047ea3aa40f3
Merge: da504f6462 f9f10ba522
Author: Xin Wang <xin.victorw...@gmail.com>
AuthorDate: Tue Oct 13 11:19:45 2020 +0800
Merge remote-tracking branch 'dubbo_rem/master' into master
.../org/apache/dubbo/config/ProtocolConfig.java | 55 +++++++++++++
.../org/apache/dubbo/config/ProviderConfig.java | 44 ++++++++++
dubbo-config/dubbo-config-spring/pom.xml | 6 --
.../src/main/resources/META-INF/compat/dubbo.xsd | 10 +++
.../src/main/resources/META-INF/dubbo.xsd | 10 +++
.../org/apache/dubbo/config/spring/ConfigTest.java | 32 ++++----
.../AnnotationPropertyValuesAdapterTest.java | 80 +++++++++---------
.../annotation/DubboReferenceGenericTest.java | 11 ++-
.../factory/annotation/MergedAnnotationTest.java | 20 ++---
.../ReferenceAnnotationBeanPostProcessorTest.java | 73 ++++++++--------
.../annotation/ReferenceBeanBuilderTest.java | 96 +++++++++++-----------
.../ServiceAnnotationBeanPostProcessorTest.java | 33 ++++----
.../annotation/ServiceBeanNameBuilderTest.java | 16 ++--
.../annotation/ServiceClassPostProcessorTest.java | 32 ++++----
.../MultipleServicesWithMethodConfigsTest.java | 8 +-
.../config/YamlPropertySourceFactoryTest.java | 22 ++---
.../context/annotation/EnableDubboConfigTest.java | 3 +-
.../properties/DefaultDubboConfigBinderTest.java | 17 ++--
.../registry/nacos/nacos/NacosServiceNameTest.java | 4 +-
.../config/spring/schema/GenericServiceTest.java | 20 ++---
.../spring/status/SpringStatusCheckerTest.java | 4 +-
dubbo-dependencies-bom/pom.xml | 3 +-
.../main/java/org/apache/dubbo/rpc/RpcStatus.java | 17 +++-
.../org/apache/dubbo/rpc/filter/TokenFilter.java | 4 +-
pom.xml | 2 +-
25 files changed, 369 insertions(+), 253 deletions(-)
