This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch 3.0-to-master in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 994f272e92e460151809a4c973084df66c26cde0 Merge: e550cd3 3124dd8 Author: ken.lj <[email protected]> AuthorDate: Tue Jul 21 13:57:02 2020 +0800 Merge branch '3.0' of https://github.com/apache/dubbo into 3.0 .../org.apache.dubbo.rpc.cluster.RouterFactory | 1 - .../rpc/cluster/directory/MockDirInvocation.java | 5 + .../router/condition/ConditionRouterTest.java | 2 +- .../support/AbstractClusterInvokerTest.java | 6 +- .../org/apache/dubbo/common/ConfigurationURL.java | 10 +- .../src/main/java/org/apache/dubbo/common/URL.java | 302 +++++++++++++++++++-- .../dubbo/common/config/ConfigurationUtils.java | 4 + .../dubbo/config/bootstrap/DubboBootstrap.java | 58 ++-- .../org/apache/dubbo/config/cache/CacheTest.java | 2 +- .../apache/dubbo/metadata/MetadataConstants.java | 4 + .../org/apache/dubbo/metadata/MetadataInfo.java | 178 ++++++++++-- .../dubbo/monitor/support/MonitorFilterTest.java | 8 +- .../dubbo/qos/command/impl/PublishMetadata.java | 63 +++++ .../org.apache.dubbo.qos.command.BaseCommand | 1 + .../registry/client/DefaultServiceInstance.java | 35 ++- .../client/EventPublishingServiceDiscovery.java | 5 + .../client/FileSystemServiceDiscovery.java | 8 + .../dubbo/registry/client/InstanceAddressURL.java | 270 +++++++++++++++--- .../dubbo/registry/client/ServiceDiscovery.java | 2 + .../registry/client/ServiceDiscoveryRegistry.java | 4 +- .../client/ServiceDiscoveryRegistryDirectory.java | 137 ++++++---- .../dubbo/registry/client/ServiceInstance.java | 2 + .../listener/ServiceInstancesChangedListener.java | 28 +- .../registry/client/metadata/MetadataUtils.java | 3 +- .../metadata/ServiceInstanceMetadataUtils.java | 55 ++-- .../StandardMetadataServiceURLBuilder.java | 7 +- .../store/InMemoryWritableMetadataService.java | 12 + .../metadata/store/RemoteMetadataServiceImpl.java | 20 +- .../registry/integration/DynamicDirectory.java | 9 +- .../registry/integration/RegistryDirectory.java | 2 +- .../registry/support/AbstractRegistryFactory.java | 12 + .../registry/client/InMemoryServiceDiscovery.java | 8 + .../zookeeper/ZookeeperServiceDiscovery.java | 18 +- .../apache/dubbo/remoting/exchange/Exchangers.java | 2 +- .../dubbo/remoting/transport/AbstractEndpoint.java | 2 +- .../main/java/org/apache/dubbo/rpc/Invocation.java | 2 + .../main/java/org/apache/dubbo/rpc/RpcContext.java | 66 ++--- .../java/org/apache/dubbo/rpc/RpcInvocation.java | 32 ++- .../org/apache/dubbo/rpc/filter/GenericFilter.java | 2 +- .../apache/dubbo/rpc/protocol/AbstractInvoker.java | 2 +- .../dubbo/rpc/proxy/AbstractProxyInvoker.java | 2 +- .../dubbo/rpc/proxy/InvokerInvocationHandler.java | 10 +- .../dubbo/rpc/filter/ExceptionFilterTest.java | 8 +- .../apache/dubbo/rpc/filter/GenericFilterTest.java | 8 +- .../dubbo/rpc/filter/GenericImplFilterTest.java | 8 +- .../apache/dubbo/rpc/proxy/AbstractProxyTest.java | 4 +- .../apache/dubbo/rpc/support/MockInvocation.java | 5 + .../org/apache/dubbo/rpc/support/RpcUtilsTest.java | 48 ++-- .../rpc/protocol/dubbo/CallbackServiceCodec.java | 10 +- .../dubbo/rpc/protocol/dubbo/DubboProtocol.java | 2 +- .../dubbo/ReferenceCountExchangeClient.java | 9 +- .../dubbo/rpc/protocol/thrift/ThriftProtocol.java | 2 +- 52 files changed, 1147 insertions(+), 358 deletions(-)
