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/13 12:31:24 UTC

[dubbo] 04/13: 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 0c33f3908bf63c12c9394aa85a3edf09998abb32
Merge: 2eaa132 4549e02
Author: ken.lj <ke...@gmail.com>
AuthorDate: Mon Aug 12 17:00:22 2019 +0800

    Merge branch 'cloud-native' of https://github.com/apache/dubbo into cloud-native

 .../org/apache/dubbo/bootstrap/DubboBootstrap.java |  5 +-
 .../DynamicConfigurationServiceNameMapping.java    |  6 +-
 .../apache/dubbo/metadata/MetadataConstants.java   | 12 ++++
 .../org/apache/dubbo/metadata/MetadataService.java |  4 +-
 .../org/apache/dubbo/metadata/MetadataUtil.java    |  8 +--
 .../dubbo/metadata/WritableMetadataService.java    |  2 +-
 .../dubbo/metadata/report/MetadataReport.java      | 13 ++--
 .../metadata/report/MetadataReportInstance.java    | 53 ++++++++++++++
 .../BaseApplicationMetadataIdentifier.java         | 50 ++++++++++++++
 .../identifier/BaseServiceMetadataIdentifier.java  | 69 +++++++++++++++++++
 .../report/identifier/MetadataIdentifier.java      | 49 ++-----------
 .../identifier/ServiceMetadataIdentifier.java      | 51 ++++++++++++++
 .../identifier/SubscriberMetadataIdentifier.java   | 55 +++++++++++++++
 .../report/support/AbstractMetadataReport.java     | 38 ++++++----
 .../store/InMemoryWritableMetadataService.java     |  4 +-
 .../store/RemoteWritableMetadataService.java       | 80 ++++------------------
 .../report/identifier/MetadataIdentifierTest.java  | 12 ++--
 .../support/AbstractMetadataReportFactoryTest.java | 15 ++--
 .../report/support/AbstractMetadataReportTest.java | 34 ++++++---
 .../store/RemoteWritableMeatadataServiceTest.java  |  3 +-
 .../metadata/test/JTestMetadataReport4Test.java    | 13 +++-
 .../store/consul/ConsulMetadataReport.java         | 13 +++-
 .../metadata/store/etcd/EtcdMetadataReport.java    | 13 +++-
 .../metadata/store/nacos/NacosMetadataReport.java  | 13 +++-
 .../metadata/store/redis/RedisMetadataReport.java  | 17 +++--
 .../store/zookeeper/ZookeeperMetadataReport.java   | 13 +++-
 dubbo-registry/dubbo-registry-api/pom.xml          |  5 --
 .../CompositeMetadataServiceURLBuilder.java        |  1 +
 .../metadata/RefreshServiceMetadataCustomizer.java |  2 +-
 .../proxy/BaseMetadataServiceProxyFactory.java     | 23 +++++++
 .../proxy/DefaultMetadataServiceProxyFactory.java  |  7 +-
 .../metadata/{ => proxy}/MetadataServiceProxy.java | 15 ++--
 .../metadata/proxy/RemoteMetadataServiceProxy.java | 71 +++++++++++++++++++
 .../proxy/RemoteMetadataServiceProxyFactory.java   |  6 +-
 34 files changed, 570 insertions(+), 205 deletions(-)