You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by vi...@apache.org on 2019/08/29 08:49:49 UTC
[dubbo] 05/08: merge
This is an automated email from the ASF dual-hosted git repository.
victory pushed a commit to branch cloud-native
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 3cc498191ce1ee65d7bb9b020143ddd2c0311755
Merge: e41963b 4cf629d
Author: cvictory <sh...@gmail.com>
AuthorDate: Tue Aug 27 14:57:14 2019 +0800
merge
.../org/apache/dubbo/bootstrap/DubboBootstrap.java | 38 +++++-
.../bootstrap/DubboServiceConsumerBootstrap.java | 11 +-
.../NacosDubboServiceConsumerBootstrap.java | 13 +-
.../cluster/loadbalance/AbstractLoadBalance.java | 3 +-
.../support/registry/ZoneAwareClusterInvoker.java | 6 +-
.../file/FileSystemDynamicConfiguration.java | 11 +-
.../dubbo/common/constants/CommonConstants.java | 2 +-
.../dubbo/common/constants/QosConstants.java | 6 -
.../dubbo/common/constants/RegistryConstants.java | 2 +
.../org/apache/dubbo/common/utils/StringUtils.java | 83 ++++++++++++
.../org/apache/dubbo/config/AbstractConfig.java | 6 +-
.../org/apache/dubbo/config/ApplicationConfig.java | 9 +-
.../org/apache/dubbo/config/RegistryConfig.java | 2 +-
.../apache/dubbo/config/context/ConfigManager.java | 68 +++++-----
...DubboLifecycleComponentApplicationListener.java | 9 +-
.../zookeeper/ZookeeperDynamicConfiguration.java | 2 +-
.../dubbo/metadata/WritableMetadataService.java | 14 +-
...g.apache.dubbo.metadata.WritableMetadataService | 2 +-
.../client/DefaultServiceDiscoveryFactory.java | 2 +-
.../registry/client/ServiceDiscoveryRegistry.java | 150 ++++++++++++++++-----
.../client/event/ServiceInstancesChangedEvent.java | 1 +
.../listener/ServiceInstancesChangedListener.java | 8 +-
.../RestProtocolSubscribedURLsSynthesizer.java | 91 +++++++++++++
.../metadata/ServiceInstanceMetadataUtils.java | 31 +++--
.../StandardMetadataServiceURLBuilder.java | 6 +
.../client/metadata/SubscribedURLsSynthesizer.java | 53 ++++++++
...istry.client.metadata.SubscribedURLsSynthesizer | 1 +
.../ServiceInstancesChangedListenerTest.java | 2 +-
.../registry/consul/ConsulServiceDiscovery.java | 84 ++++++++++--
.../registry/eureka/EurekaServiceDiscovery.java | 4 +-
.../zookeeper/ZookeeperServiceDiscoveryTest.java | 3 +-
.../java/org/apache/dubbo/rpc/ZoneDetector.java | 2 +-
32 files changed, 563 insertions(+), 162 deletions(-)
diff --cc dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/NacosDubboServiceConsumerBootstrap.java
index 551a46d,22a2a39..c298f9d
--- a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/NacosDubboServiceConsumerBootstrap.java
+++ b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/NacosDubboServiceConsumerBootstrap.java
@@@ -35,13 -35,8 +35,11 @@@ public class NacosDubboServiceConsumerB
// applicationConfig.setMetadataType("remote");
new DubboBootstrap()
.application(applicationConfig)
+ // Zookeeper
+// .registry("nacos", builder -> builder.address("nacos://127.0.0.1:8848?registry.type=service&subscribed.services=dubbo-nacos-provider-demo"))
- .registry("nacos", builder -> builder.address("nacos://127.0.0.1:8848?registry-type=service&subscribed-services=dubbo-nacos-provider-demo"))
++// .registry("nacos", builder -> builder.address("nacos://127.0.0.1:8848?registry-type=service&subscribed-services=dubbo-nacos-provider-demo"))
+ .registry("nacos", builder -> builder.address("nacos://127.0.0.1:8848?registry-type=service&subscribed-services=service-provider"))
.metadataReport(new MetadataReportConfig("nacos://127.0.0.1:8848"))
- // Nacos
- // .registry("consul", builder -> builder.address("consul://127.0.0.1:8500?registry.type=service&subscribed.services=dubbo-provider-demo").group("namespace1"))
- .reference("echo", builder -> builder.interfaceClass(EchoService.class).protocol("dubbo"))
.reference("user", builder -> builder.interfaceClass(UserService.class).protocol("rest"))
.start()
.await();