You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by vi...@apache.org on 2019/08/29 08:49:47 UTC
[dubbo] 03/08: Merge branch 'cloud-native' of
github.com:apache/incubator-dubbo into cloud-native
This is an automated email from the ASF dual-hosted git repository.
victory pushed a commit to branch cloud-native
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 4a21c6bb07b533bf76c12aa081b9fdee9a1ed3a3
Merge: 1fa487e a485c15
Author: cvictory <sh...@gmail.com>
AuthorDate: Mon Aug 26 09:44:20 2019 +0800
Merge branch 'cloud-native' of github.com:apache/incubator-dubbo into cloud-native
.../bootstrap/DubboServiceConsumerBootstrap.java | 10 +-
.../DubboServiceProviderMinimumBootstrap.java | 10 +-
.../cluster/loadbalance/AbstractLoadBalance.java | 38 ++-
.../cluster/support/AbstractClusterInvoker.java | 9 -
.../support/RegistryAwareClusterInvoker.java | 61 ----
.../ZoneAwareCluster.java} | 14 +-
.../support/registry/ZoneAwareClusterInvoker.java | 98 ++++++
.../cluster/support/wrapper/AbstractCluster.java | 110 +++++++
.../support/wrapper/MockClusterWrapper.java | 7 +-
.../internal/org.apache.dubbo.rpc.cluster.Cluster | 2 +-
.../dubbo/common/constants/RegistryConstants.java | 4 +
.../dubbo/common/extension/ExtensionLoader.java | 22 +-
.../apache/dubbo/common/infra/InfraAdapter.java | 88 ++---
.../dubbo/common/infra/support/CmdbAdapter.java | 28 +-
.../common/infra/support/EnvironmentAdapter.java | 72 ++++
.../common/infra/support/KubernetesAdapter.java | 26 +-
.../org.apache.dubbo.common.infra.InfraAdapter | 1 +
.../org/apache/dubbo/config/ApplicationConfig.java | 67 ++--
.../org/apache/dubbo/config/ReferenceConfig.java | 8 +-
.../org/apache/dubbo/config/RegistryConfig.java | 34 ++
.../org/apache/dubbo/config/ServiceConfig.java | 1 +
.../dubbo/config/builders/RegistryBuilder.java | 15 +
.../src/main/resources/META-INF/compat/dubbo.xsd | 5 +
.../src/main/resources/META-INF/dubbo.xsd | 5 +
.../client/EventPublishingServiceDiscovery.java | 1 +
.../dubbo/registry/client/ServiceDiscovery.java | 60 +++-
.../registry/client/ServiceDiscoveryRegistry.java | 366 +++++++++++++++------
.../listener/ServiceInstancesChangedListener.java | 13 +
.../CompositeMetadataServiceURLBuilder.java | 4 +-
.../metadata/proxy/MetadataServiceProxy.java | 122 -------
.../selector/RandomServiceInstanceSelector.java | 2 +-
.../dubbo/registry/etcd/EtcdServiceDiscovery.java | 3 +-
.../registry/nacos/NacosServiceDiscovery.java | 3 +-
.../zookeeper/ZookeeperServiceDiscovery.java | 3 +-
.../ZookeeperServiceDiscoveryChangeWatcher.java | 15 +-
.../org/apache/dubbo/rpc/ClusterInterceptor.java | 83 +++--
.../main/java/org/apache/dubbo/rpc/Constants.java | 2 +
.../main/java/org/apache/dubbo/rpc/RpcContext.java | 14 +-
.../java/org/apache/dubbo/rpc/ZoneDetector.java | 22 +-
.../org/apache/dubbo/rpc/filter/ContextFilter.java | 2 +
.../ConsumerContextClusterInterceptor.java} | 134 ++++----
.../interceptors/ZoneAwareClusterInterceptor.java | 61 ++++
.../org.apache.dubbo.rpc.ClusterInterceptor | 2 +
.../dubbo/internal/org.apache.dubbo.rpc.Filter | 1 -
.../rpc/filter/ConsumerContextFilterTest.java | 53 ---
45 files changed, 1067 insertions(+), 634 deletions(-)