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 2018/11/07 02:06:54 UTC
[incubator-dubbo] 03/03: Merge branch 'dev-metadata' of https://github.com/apache/incubator-dubbo into dev-metadata

This is an automated email from the ASF dual-hosted git repository.

liujun pushed a commit to branch dev-metadata
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git

commit d85550a5fdba7c75e666e5395454d93a0c82335e
Merge: 22599b9 072b51e
Author: ken.lj <ke...@gmail.com>
AuthorDate: Wed Nov 7 10:05:13 2018 +0800

    Merge branch 'dev-metadata' of https://github.com/apache/incubator-dubbo into dev-metadata

 dubbo-compatible/pom.xml                           |   7 +-
 .../apache/dubbo/generic/GenericServiceTest.java   | 181 ++++++++++++-
 .../org/apache/dubbo/service/ComplexObject.java    | 282 +++++++++++++++++++++
 .../java/org/apache/dubbo/service/DemoService.java |   8 +-
 .../org/apache/dubbo/service/DemoServiceImpl.java  |  15 +-
 .../dubbo/config/AbstractInterfaceConfig.java      |   2 +-
 .../META-INF/spring/dubbo-demo-consumer.xml        |   3 +-
 .../META-INF/spring/dubbo-demo-provider.xml        |   2 +-
 .../definition/builder/CollectionTypeBuilder.java  |   3 +-
 .../definition/model/FullServiceDefinition.java    |   8 +
 .../definition/model/MethodDefinition.java         |  18 ++
 .../definition/model/ServiceDefinition.java        |  16 ++
 .../metadata/definition/model/TypeDefinition.java  |  18 ++
 .../dubbo/metadata/definition/util/ClassUtils.java |   4 +-
 .../definition/ServiceDefinitionBuildderTest.java  |  81 ++++++
 .../common/ResultWithRawCollections.java           |   2 +-
 .../metadata/definition/service/ComplexObject.java | 280 ++++++++++++++++++++
 .../metadata/definition/service/DemoService.java}  |  18 +-
 .../dubbo-metadata-report-api/pom.xml              |   9 +-
 .../identifier/ConsumerMetadataIdentifier.java     |   4 +-
 .../metadata/identifier/MetadataIdentifier.java    |   5 +-
 .../identifier/ProviderMetadataIdentifier.java     |   2 +-
 .../integration/MetadataReportService.java         |   1 +
 .../dubbo/metadata/metadata/MethodDescriptor.java  |  54 ----
 .../dubbo/metadata/metadata/ServiceDescriptor.java |  55 ----
 .../dubbo/metadata/metadata/TypeDescriptor.java    |  65 -----
 .../metadata/builder/ArrayTypeBuilder.java         |  36 ---
 .../metadata/builder/CollectionTypeBuilder.java    |  59 -----
 .../metadata/builder/DefaultTypeBuilder.java       | 113 ---------
 .../metadata/metadata/builder/EnumTypeBuilder.java |  45 ----
 .../metadata/metadata/builder/MapTypeBuilder.java  |  60 -----
 .../metadata/builder/ServiceDescriptorBuilder.java |  71 ------
 .../metadata/metadata/builder/TypeBuilder.java     |  23 --
 .../metadata/builder/TypeDescriptorBuilder.java    |  63 -----
 .../metadata/support/AbstractMetadataReport.java   |  13 +-
 .../metadata/integration/RetryTestService.java     |   2 +-
 .../metadata/builder/ArrayTypeBuilderTest.java     |  89 -------
 .../builder/CollectionTypeBuilderTest.java         |  90 -------
 .../metadata/metadata/builder/ComplexEnum.java     |  16 --
 .../metadata/metadata/builder/ComplexObject.java   |  37 ---
 .../metadata/builder/DefaultTypeBuilderTest.java   |  64 -----
 .../metadata/builder/EnumTypeBuilderTest.java      |  84 ------
 .../metadata/builder/MapTypeBuilderTest.java       |  89 -------
 .../builder/ServiceDescriptorBuilderTest.java      |  25 --
 .../metadata/metadata/builder/SingleEnum.java      |   8 -
 .../metadata/metadata/builder/TestService.java     |  45 ----
 .../builder/TypeDescriptorBuilderTest.java         | 101 --------
 .../store/test/JTestMetadataReport4Test.java       |   3 +-
 .../support/AbstractMetadataReportFactoryTest.java |   1 -
 .../support/AbstractMetadataReportTest.java        |  11 +-
 .../store/zookeeper/ZookeeperMetadataReport.java   |  10 +-
 .../zookeeper/ZookeeperMetadataReportTest.java     |  32 +--
 .../java/org/apache/dubbo/registry/ZKTools.java    |   4 +-
 .../dubbo/remoting/zookeeper/ZookeeperClient.java  |   4 +
 .../zookeeper/curator/CuratorZookeeperClient.java  |  40 +++
 .../zookeeper/support/AbstractZookeeperClient.java |  28 ++
 .../zookeeper/zkclient/ZkClientWrapper.java        |  15 ++
 .../zkclient/ZkclientZookeeperClient.java          |  25 ++
 .../curator/CuratorZookeeperClientTest.java        |  30 ++-
 .../zkclient/ZkclientZookeeperClientTest.java      |  30 ++-
 .../webservice/WebserviceProtocolTest.java         |   4 +-
 61 files changed, 1144 insertions(+), 1369 deletions(-)