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 6bdea3fe0f8b12973331fb351188c9771606beb0
Merge: 22f0dc273d ff50f916a8
Author: Xin Wang <xin.victorw...@gmail.com>
AuthorDate: Fri May 21 11:35:55 2021 +0800
Merge remote-tracking branch 'dubbo_rem/master'
dubbo-all/pom.xml | 8 +
dubbo-cluster/pom.xml | 6 +
.../org/apache/dubbo/rpc/cluster/RouterChain.java | 4 +-
.../rpc/cluster/directory/AbstractDirectory.java | 4 +-
.../dubbo/rpc/cluster/router/address/Address.java | 35 +-
.../router/address/AddressInvokersSelector.java | 58 +++
.../router/address/AddressRouterFactory.java | 21 +-
.../cluster/router/condition/ConditionRouter.java | 8 +-
.../rpc/cluster/support/BroadcastCluster2.java | 66 +--
.../cluster/support/BroadcastCluster2Invoker.java | 180 +++++++
.../dubbo/rpc/cluster/support/BroadcastResult.java | 99 ++++
.../internal/org.apache.dubbo.rpc.cluster.Cluster | 1 +
.../org.apache.dubbo.rpc.cluster.RouterFactory | 1 +
.../dubbo/rpc/cluster/router/MockInvoker.java | 6 +
.../cluster/router/address/AddressRouterTest.java | 50 ++
.../src/main/java/org/apache/dubbo/common/URL.java | 12 +-
.../java/org/apache/dubbo/common/URLBuilder.java | 4 +-
.../dubbo/common/constants/CommonConstants.java | 2 +
.../dubbo/common/constants/RegistryConstants.java | 2 -
.../extension/support/ActivateComparator.java | 15 +-
.../org/apache/dubbo/config/AbstractConfig.java | 2 +
.../apache/dubbo/config/MetadataReportConfig.java | 14 +
.../java/org/apache/dubbo/config/MethodConfig.java | 26 +-
.../apache/dubbo/rpc/support/ProtocolUtils.java | 7 +
.../org/apache/dubbo/common/URLBuilderTest.java | 44 ++
.../test/java/org/apache/dubbo/common/URLTest.java | 21 +-
.../extension/support/ActivateComparatorTest.java | 26 +
.../common/extension/support/Order0Filter0.java | 30 +-
.../common/extension/support/Order0Filter1.java | 30 +-
.../common/extension/support/Order0Filter2.java | 30 +-
.../java/com/alibaba/dubbo/rpc/RpcInvocation.java | 7 +-
.../org/apache/dubbo/config/ServiceConfig.java | 82 ++-
.../dubbo/config/MetadataReportConfigTest.java | 28 +-
.../org/apache/dubbo/config/MethodConfigTest.java | 15 +-
.../apache/dubbo/config/ReferenceConfigTest.java | 11 +-
.../AnnotatedInterfaceConfigBeanBuilder.java | 7 +
.../ReferenceAnnotationBeanPostProcessor.java | 14 +-
.../factory/annotation/ReferenceBeanBuilder.java | 18 +
.../context/DubboBootstrapApplicationListener.java | 3 +-
...DubboLifecycleComponentApplicationListener.java | 1 -
.../annotation/DubboComponentScanRegistrar.java | 12 +-
.../spring/extension/SpringExtensionFactory.java | 3 +
.../spring/schema/DubboNamespaceHandler.java | 2 +-
.../src/main/resources/META-INF/dubbo.xsd | 5 +
.../dubbo/config/spring/api/MethodCallback.java | 75 ++-
...eferencePostProcessAfterInitializationTest.java | 96 ++++
.../annotation/MethodConfigCallbackTest.java | 81 +++
.../config/spring/impl/MethodCallbackImpl.java | 115 ++---
.../support/nacos/NacosDynamicConfiguration.java | 6 -
.../nacos/NacosDynamicConfigurationFactory.java | 6 +-
.../support/zookeeper/CacheListener.java | 7 +-
dubbo-dependencies-bom/pom.xml | 15 +-
.../dubbo-dependencies-zookeeper/pom.xml | 2 +-
.../dubbo/cache/support/AbstractCacheFactory.java | 25 +-
.../metadata/definition/TypeDefinitionBuilder.java | 5 -
.../definition/builder/DefaultTypeBuilder.java | 18 +-
.../report/support/AbstractMetadataReport.java | 34 +-
.../metadata/store/nacos/NacosMetadataReport.java | 70 ++-
.../store/nacos/NacosMetadataReportFactory.java | 10 +-
.../zookeeper/ZookeeperMetadataReportTest.java | 556 +++++++++++----------
.../registry/client/AbstractServiceDiscovery.java | 4 +-
.../registry/client/DefaultServiceInstance.java | 4 +-
.../client/EventPublishingServiceDiscovery.java | 10 +-
.../dubbo/registry/client/InstanceAddressURL.java | 4 +
.../registry/client/ServiceDiscoveryRegistry.java | 3 +
.../client/ServiceDiscoveryRegistryDirectory.java | 3 +-
.../listener/ServiceInstancesChangedListener.java | 10 +-
.../client/migration/MigrationInvoker.java | 7 +-
.../client/migration/MigrationRuleHandler.java | 2 -
.../registry/integration/DynamicDirectory.java | 7 +-
.../registry/integration/RegistryDirectory.java | 72 +--
.../registry/integration/RegistryProtocol.java | 19 +-
.../dubbo/registry/nacos/NacosRegistryFactory.java | 11 +-
.../nacos/util/NacosNamingServiceUtils.java | 3 +
.../zookeeper/ZookeeperServiceDiscovery.java | 10 +
.../ZookeeperServiceDiscoveryChangeWatcher.java | 2 +-
.../dubbo/remoting/transport/AbstractEndpoint.java | 22 +-
.../dubbo/remoting/transport/AbstractServer.java | 23 +-
.../remoting/transport/netty4/NettyClient.java | 24 +-
dubbo-rpc/dubbo-rpc-api/pom.xml | 6 +
.../java/org/apache/dubbo/rpc/RpcInvocation.java | 9 +-
.../org/apache/dubbo/rpc/filter/GenericFilter.java | 22 +
.../org/apache/dubbo/rpc/support/RpcUtilsTest.java | 120 +++--
.../dubbo/ReferenceCountExchangeClient.java | 14 +-
.../grpc/ReferenceCountManagedChannel.java | 4 +-
.../dubbo/rpc/protocol/http/HttpProtocol.java | 10 +-
.../dubbo/rpc/protocol/injvm/InjvmInvoker.java | 41 +-
.../dubbo/rpc/protocol/injvm/DemoService.java | 3 +-
.../dubbo/rpc/protocol/injvm/DemoServiceImpl.java | 12 +-
.../rpc/protocol/injvm/InjvmProtocolTest.java | 19 +-
.../apache/dubbo/common/serialize/Constants.java | 2 +
.../common/serialize/gson/ExceptionWrapper.java | 32 +-
.../common/serialize/gson/GsonJsonObjectInput.java | 6 +
.../serialize/gson/GsonJsonObjectOutput.java | 8 +
.../serialize/gson/GsonJsonObjectOutputTest.java | 20 +
.../serialize/kryo/optimized/KryoObjectInput2.java | 16 +-
.../dubbo-serialization-msgpack}/pom.xml | 36 +-
.../serialize/msgpack/MsgpackObjectInput.java} | 48 +-
.../serialize/msgpack/MsgpackObjectOutput.java} | 51 +-
.../serialize/msgpack/MsgpackSerialization.java | 46 +-
...org.apache.dubbo.common.serialize.Serialization | 1 +
.../serialize/msgpack/MsgpackObjectOutputTest.java | 273 ++++++++++
.../serialize/kryo/KryoSerialization2Test.java | 100 ++++
dubbo-serialization/pom.xml | 1 +
.../boot/autoconfigure/DubboAutoConfiguration.java | 2 +
pom.xml | 2 +-
106 files changed, 2285 insertions(+), 1000 deletions(-)
