You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2019/08/21 07:10:38 UTC
[dubbo] 06/07: Merge branch 'cloud-native' of
https://github.com/apache/dubbo into cloud-native
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch cloud-native
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 851594b2f60e2a3924eb17f96b453fd24911080c
Merge: 1d554d3 346e744
Author: ken.lj <ke...@gmail.com>
AuthorDate: Wed Aug 21 14:47:57 2019 +0800
Merge branch 'cloud-native' of https://github.com/apache/dubbo into cloud-native
.../bootstrap/DubboServiceConsumerBootstrap.java | 1 -
.../DubboServiceProviderMinimumBootstrap.java | 25 ++--
.../router/condition/config/ListenableRouter.java | 12 +-
.../dubbo/rpc/cluster/router/tag/TagRouter.java | 10 +-
.../config/configcenter/ConfigChangeEvent.java | 64 ---------
.../config/configcenter/ConfigChangedEvent.java | 90 ++++++++++++
.../config/configcenter/ConfigurationListener.java | 2 +-
.../file/FileSystemDynamicConfiguration.java | 68 ++++++---
.../dubbo/common/function/ThrowableAction.java | 6 +-
.../dubbo/common/lang/ShutdownHookCallbacks.java | 69 +++++++++
.../common/lang/ShutdownHookCallbacksTest.java} | 18 +--
.../org/apache/dubbo/config/DubboShutdownHook.java | 40 +-----
.../apache/dubbo/config/DubboShutdownHookTest.java | 17 +--
.../ConfigurableSourceBeanMetadataElement.java | 32 ++---
.../annotation/DubboConfigBindingRegistrar.java | 9 +-
.../spring/schema/DubboNamespaceHandler.java | 32 ++++-
.../support/apollo/ApolloDynamicConfiguration.java | 4 +-
.../consul/ConsulDynamicConfiguration.java | 30 ++--
.../support/etcd/EtcdDynamicConfiguration.java | 21 +--
.../support/etcd/EtcdDynamicConfigurationTest.java | 6 +-
.../support/nacos/NacosDynamicConfiguration.java | 4 +-
.../nacos/NacosDynamicConfigurationTest.java | 6 +-
.../support/zookeeper/CacheListener.java | 17 ++-
.../ZookeeperDynamicConfigurationTest.java | 6 +-
.../dubbo/event/AbstractEventDispatcher.java | 7 +
.../dubbo/event/ConditionalEventListener.java | 20 +--
.../dubbo/event/ConditionalEventListenerTest.java | 57 +++++---
dubbo-registry/dubbo-registry-api/pom.xml | 6 -
.../registry/client/DefaultServiceInstance.java | 23 ++-
.../client/EventPublishingServiceDiscovery.java | 6 +-
.../client/FileSystemServiceDiscovery.java | 154 ++++++++++++++++++---
.../dubbo/registry/client/ServiceDiscovery.java | 15 +-
.../registry/client/ServiceDiscoveryRegistry.java | 10 +-
.../dubbo/registry/client/ServiceInstance.java | 3 +-
.../event/ServiceDiscoveryExceptionEvent.java | 8 +-
.../listener/ServiceInstancesChangedListener.java | 30 +++-
.../integration/AbstractConfiguratorListener.java | 8 +-
.../client/DefaultServiceInstanceTest.java | 3 +-
.../client/FileSystemServiceDiscoveryTest.java | 40 +++---
.../registry/client/InMemoryServiceDiscovery.java | 6 -
.../ServiceInstancesChangedListenerTest.java | 7 +-
.../DefaultServiceInstanceDeserializerTest.java | 58 ++++++++
.../registry/consul/ConsulServiceDiscovery.java | 6 -
.../dubbo/registry/etcd/EtcdServiceDiscovery.java | 6 +-
.../registry/nacos/NacosServiceDiscovery.java | 4 +-
.../zookeeper/ZookeeperServiceDiscovery.java | 4 +-
.../zookeeper/ZookeeperServiceDiscoveryTest.java | 11 +-
47 files changed, 722 insertions(+), 359 deletions(-)