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:34 UTC
[dubbo] 02/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 ffd98a559ed5ee7e2b897c5ac9ce059ab2a01676
Merge: 4efee13 d6d0bec
Author: ken.lj <ke...@gmail.com>
AuthorDate: Fri Aug 16 11:13:02 2019 +0800
Merge branch 'cloud-native' of https://github.com/apache/dubbo into cloud-native
.../org/apache/dubbo/bootstrap/DubboBootstrap.java | 165 +++++++++++++--------
.../bootstrap/DubboServiceConsumerBootstrap.java | 9 +-
.../bootstrap/DubboServiceProvider2Bootstrap.java | 9 +-
.../file/FileSystemDynamicConfiguration.java | 4 +
.../dubbo/common/constants/RegistryConstants.java | 2 +-
.../org/apache/dubbo/common/context/Lifecycle.java | 2 +-
.../dubbo/common/extension/ExtensionLoader.java | 14 ++
.../dubbo/common/function/ThrowableAction.java | 33 +++--
.../org/apache/dubbo/common/lang/Prioritized.java | 3 +-
.../org/apache/dubbo/config/DubboShutdownHook.java | 2 +-
.../ConfigurableMetadataServiceExporter.java | 59 ++++----
.../dubbo/config/DubboProviderBootstrap.java | 13 +-
.../ConfigurableMetadataServiceExporterTest.java | 2 +-
.../org/apache/dubbo/metadata/MetadataService.java | 2 +-
.../dubbo/metadata/MetadataServiceExporter.java | 23 ++-
.../dubbo/metadata/WritableMetadataService.java | 28 +++-
.../client/AbstractServiceDiscoveryFactory.java | 16 +-
.../client/DefaultServiceDiscoveryFactory.java | 54 +++++++
.../client/EventPublishingServiceDiscovery.java | 125 +++++++++-------
.../client/FileSystemServiceDiscovery.java | 22 +--
.../dubbo/registry/client/ServiceDiscovery.java | 19 ++-
.../registry/client/ServiceDiscoveryFactory.java | 29 +++-
.../ServiceDiscoveryRegistry.java} | 84 ++++++-----
.../ServiceDiscoveryRegistryFactory.java} | 6 +-
.../ServiceDiscoveryRegistryProtocol.java} | 4 +-
...nt.java => ServiceDiscoveryDestroyedEvent.java} | 17 +--
...t.java => ServiceDiscoveryDestroyingEvent.java} | 17 +--
...toppedEvent.java => ServiceDiscoveryEvent.java} | 17 ++-
...nt.java => ServiceDiscoveryExceptionEvent.java} | 28 ++--
....java => ServiceDiscoveryInitializedEvent.java} | 19 +--
...java => ServiceDiscoveryInitializingEvent.java} | 19 +--
.../event/listener/LoggingEventListener.java | 20 +--
...ExportedServicesRevisionMetadataCustomizer.java | 11 +-
...MetadataServiceURLParamsMetadataCustomizer.java | 9 +-
.../metadata/RefreshServiceMetadataCustomizer.java | 7 +-
.../metadata/ServiceInstanceMetadataUtils.java | 43 ++++--
.../SpringCloudMetadataServiceURLBuilder.java | 4 +-
...bscribedServicesRevisionMetadataCustomizer.java | 11 +-
.../org.apache.dubbo.registry.RegistryFactory | 2 +-
...g.apache.dubbo.registry.client.ServiceDiscovery | 1 +
...e.dubbo.registry.client.ServiceDiscoveryFactory | 1 +
.../dubbo/internal/org.apache.dubbo.rpc.Protocol | 2 +-
.../EventPublishingServiceDiscoveryTest.java | 44 +++---
.../registry/client/InMemoryServiceDiscovery.java | 5 +-
.../client/InMemoryServiceDiscoveryFactory.java | 33 -----
.../registry/client/ServiceDiscoveryTest.java | 8 +-
.../event/listener/LoggingEventListenerTest.java | 23 +--
.../support/ServiceOrientedRegistryTest.java | 10 +-
....apache.dubbo.registry.client.ServiceDiscovery} | 2 +-
.../registry/consul/ConsulServiceDiscovery.java | 23 ++-
.../consul/ConsulServiceDiscoveryFactory.java | 31 ----
...g.apache.dubbo.registry.client.ServiceDiscovery | 1 +
...e.dubbo.registry.client.ServiceDiscoveryFactory | 1 -
.../dubbo/registry/etcd/EtcdServiceDiscovery.java | 36 ++---
.../registry/etcd/EtcdServiceDiscoveryFactory.java | 39 -----
...g.apache.dubbo.registry.client.ServiceDiscovery | 1 +
...e.dubbo.registry.client.ServiceDiscoveryFactory | 1 -
.../registry/nacos/NacosServiceDiscovery.java | 16 +-
.../nacos/NacosServiceDiscoveryFactory.java | 36 -----
...g.apache.dubbo.registry.client.ServiceDiscovery | 1 +
...e.dubbo.registry.client.ServiceDiscoveryFactory | 1 -
.../zookeeper/ZookeeperServiceDiscovery.java | 34 ++---
.../zookeeper/util/CuratorFrameworkUtils.java | 5 -
....apache.dubbo.registry.client.ServiceDiscovery} | 2 +-
...e.dubbo.registry.client.ServiceDiscoveryFactory | 1 -
.../zookeeper/ZookeeperServiceDiscoveryTest.java | 10 +-
66 files changed, 679 insertions(+), 642 deletions(-)