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/13 03:34:04 UTC
[dubbo] 01/03: metadata refactor
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 f2296bedde4cbc50d040b1033bd7da48b388071b
Author: cvictory <sh...@gmail.com>
AuthorDate: Tue Aug 13 09:41:47 2019 +0800
metadata refactor
---
.../java/org/apache/dubbo/bootstrap/DubboServiceConsumerBootstrap.java | 2 ++
.../java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java | 3 +++
.../registry/client/metadata/RefreshServiceMetadataCustomizer.java | 3 ++-
.../org/apache/dubbo/registry/support/ServiceOrientedRegistry.java | 2 ++
4 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceConsumerBootstrap.java b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceConsumerBootstrap.java
index 0f7a958..25012e5 100644
--- a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceConsumerBootstrap.java
+++ b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceConsumerBootstrap.java
@@ -16,6 +16,7 @@
*/
package org.apache.dubbo.bootstrap;
+import org.apache.dubbo.config.MetadataReportConfig;
import org.apache.dubbo.config.ReferenceConfig;
import org.apache.dubbo.config.context.ConfigManager;
@@ -35,6 +36,7 @@ public class DubboServiceConsumerBootstrap {
// Nacos
// .registry("nacos", builder -> builder.address("nacos://127.0.0.1:8848?registry-type=service&subscribed-services=dubbo-provider-demo"))
.reference("ref", builder -> builder.interfaceClass(EchoService.class))
+ .metadataReport(new MetadataReportConfig("zookeeper://127.0.0.1:2181"))
.onlyRegisterProvider(true)
.start()
.await();
diff --git a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java
index 15d1628..0641d05 100644
--- a/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java
+++ b/dubbo-bootstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderBootstrap.java
@@ -16,6 +16,8 @@
*/
package org.apache.dubbo.bootstrap;
+import org.apache.dubbo.config.MetadataReportConfig;
+
/**
* Dubbo Provider Bootstrap
*
@@ -33,6 +35,7 @@ public class DubboServiceProviderBootstrap {
// .registry(RegistryBuilder.newBuilder().address("etcd3://127.0.0.1:2379?registry-type=service").build())
.protocol(builder -> builder.port(-1).name("dubbo"))
.protocol(builder -> builder.port(-1).name("hessian"))
+ .metadataReport(new MetadataReportConfig("zookeeper://127.0.0.1:2181"))
.service(builder -> builder.id("test").interfaceClass(EchoService.class).ref(new EchoServiceImpl()))
.start()
.await();
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/RefreshServiceMetadataCustomizer.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/RefreshServiceMetadataCustomizer.java
index 5b2622e..e2617b0 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/RefreshServiceMetadataCustomizer.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/RefreshServiceMetadataCustomizer.java
@@ -6,6 +6,7 @@ import org.apache.dubbo.registry.client.ServiceInstanceCustomizer;
import org.apache.dubbo.registry.client.ServiceInstanceMetadataCustomizer;
import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_KEY;
+import static org.apache.dubbo.common.constants.CommonConstants.REVISION_KEY;
import static org.apache.dubbo.registry.client.metadata.ServiceInstanceMetadataUtils.EXPORTED_SERVICES_REVISION_KEY;
/**
@@ -18,7 +19,7 @@ public class RefreshServiceMetadataCustomizer implements ServiceInstanceCustomiz
public void customize(ServiceInstance serviceInstance) {
// FIXME to define the constant
WritableMetadataService remoteWritableMetadataService =
- WritableMetadataService.getExtension(serviceInstance.getMetadata().getOrDefault("", DEFAULT_KEY));
+ WritableMetadataService.getExtension(serviceInstance.getMetadata().getOrDefault(REVISION_KEY, DEFAULT_KEY));
remoteWritableMetadataService.refreshMetadata(serviceInstance.getMetadata().get(EXPORTED_SERVICES_REVISION_KEY));
}
}
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/ServiceOrientedRegistry.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/ServiceOrientedRegistry.java
index 32d03cd..6d06cf2 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/ServiceOrientedRegistry.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/ServiceOrientedRegistry.java
@@ -102,6 +102,8 @@ public class ServiceOrientedRegistry extends FailbackRegistry {
this.serviceNameMapping = ServiceNameMapping.getDefaultExtension();
String metadata = registryURL.getParameter(METADATA_REPORT_KEY, METADATA_DEFAULT);
+ // FIXME
+ metadata = "remote";
this.writableMetadataService = WritableMetadataService.getExtension(metadata);
this.metadataServiceProxyFactory = MetadataServiceProxyFactory.getExtension(metadata);
}