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 ab2b7361df36b20647460b1e4865f076de8c4bb7
Merge: 44fb07f 59dd98a
Author: ken.lj <[email protected]>
AuthorDate: Wed Oct 17 14:07:30 2018 +0800

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

 .../java/org/apache/dubbo/common/Constants.java    |   2 +
 .../src/main/java/org/apache/dubbo/common/URL.java |  10 +-
 .../dubbo/config/AbstractInterfaceConfig.java      |   3 +-
 dubbo-servicedata/dubbo-servicedata-api/pom.xml    |  17 +-
 .../integration/ServiceStoreService.java           |  85 ++++++++--
 .../servicedata/metadata/MethodDescriptor.java     |  54 ++++++
 .../servicedata/metadata/ServiceDescriptor.java    |  55 +++++++
 .../dubbo/servicedata/metadata/TypeDescriptor.java |  65 ++++++++
 .../metadata/builder/ArrayTypeBuilder.java         |  36 ++++
 .../metadata/builder/CollectionTypeBuilder.java    |  59 +++++++
 .../metadata/builder/DefaultTypeBuilder.java       | 113 +++++++++++++
 .../metadata/builder/EnumTypeBuilder.java          |  45 +++++
 .../metadata/builder/MapTypeBuilder.java           |  60 +++++++
 .../metadata/builder/ServiceDescriptorBuilder.java |  71 ++++++++
 .../servicedata/metadata/builder/TypeBuilder.java  |  23 +++
 .../metadata/builder/TypeDescriptorBuilder.java    |  63 +++++++
 .../servicedata/{ => store}/ServiceStore.java      |   2 +-
 .../{ => store}/ServiceStoreFactory.java           |   2 +-
 .../servicedata/support/AbstractServiceStore.java  |   4 +-
 .../support/AbstractServiceStoreFactory.java       |   4 +-
 .../integration/InterfaceNameTestService.java      |   9 +
 .../integration/InterfaceNameTestService2.java     |   9 +
 .../integration/ServiceStoreServiceTest.java       | 179 +++++++++++++++++++-
 .../metadata/builder/ArrayTypeBuilderTest.java     |  91 ++++++++++
 .../builder/CollectionTypeBuilderTest.java         |  91 ++++++++++
 .../servicedata/metadata/builder/ComplexEnum.java  |  16 ++
 .../metadata/builder/ComplexObject.java            |  37 +++++
 .../metadata/builder/DefaultTypeBuilderTest.java   |  64 +++++++
 .../metadata/builder/EnumTypeBuilderTest.java      |  85 ++++++++++
 .../metadata/builder/MapTypeBuilderTest.java       |  90 ++++++++++
 .../builder/ServiceDescriptorBuilderTest.java      |  25 +++
 .../servicedata/metadata/builder/SingleEnum.java   |   8 +
 .../servicedata/metadata/builder/TestService.java  |  45 +++++
 .../builder/TypeDescriptorBuilderTest.java         | 101 ++++++++++++
 .../store/test/JTestServiceStore4Test.java}        |  42 ++---
 .../store/test/JTestServiceStoreFactory4Test.java} |   8 +-
 .../support/AbstractServiceStoreFactoryTest.java   |   4 +-
 .../support/AbstractServiceStoreTest.java          |   8 +-
 ...che.dubbo.servicedata.store.ServiceStoreFactory |   1 +
 dubbo-servicedata/dubbo-servicedata-redis/pom.xml  |  22 ++-
 .../{ => store}/redis/RedisServiceStore.java       |  20 ++-
 .../redis/RedisServiceStoreFactory.java            |   5 +-
 ...rg.apache.dubbo.servicedata.ServiceStoreFactory |   1 -
 ...che.dubbo.servicedata.store.ServiceStoreFactory |   1 +
 .../store/redis/RedisServiceStoreTest.java         | 101 ++++++++++++
 .../dubbo-servicedata-zookeeper/pom.xml            |  17 +-
 .../zookeeper/ZookeeperServiceStore.java           |  21 ++-
 .../zookeeper/ZookeeperServiceStoreFactory.java    |   4 +-
 ...rg.apache.dubbo.servicedata.ServiceStoreFactory |   1 -
 ...che.dubbo.servicedata.store.ServiceStoreFactory |   1 +
 .../store/zookeeper/ZookeeperServiceStoreTest.java | 183 +++++++++++++++++++++
 dubbo-servicedata/pom.xml                          |  17 +-
 52 files changed, 1991 insertions(+), 89 deletions(-)


Reply via email to