Polish apache#4713 : Add Service registration and discovery implement…

…ation for Eureka
mercyblitz · Aug 22, 2019 · b992436 · b992436
1 parent 32365e8
commit b992436
Show file tree

Hide file tree

Showing 11 changed files with 147 additions and 148 deletions.
diff --git a/dubbo-bootstrap/pom.xml b/dubbo-bootstrap/pom.xml
@@ -39,6 +39,12 @@
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-registry-eureka</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

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
@@ -17,7 +17,6 @@
 package org.apache.dubbo.bootstrap;
 
 import org.apache.dubbo.bootstrap.rest.UserService;
-import org.apache.dubbo.config.MetadataReportConfig;
 import org.apache.dubbo.config.ReferenceConfig;
 import org.apache.dubbo.config.context.ConfigManager;
 
@@ -33,12 +32,18 @@ public static void main(String[] args) throws Exception {
         new DubboBootstrap()
                 .application("dubbo-consumer-demo")
                 .protocol(builder -> builder.port(20887).name("dubbo"))
+                // Eureka
+                .registry(builder -> builder.address("eureka://127.0.0.1:8761?registry-type=service&subscribed-services=dubbo-provider-demo"))
+
                 // Zookeeper
-                .registry("zookeeper", builder -> builder.address("zookeeper://127.0.0.1:2181?registry.type=service&subscribed.services=dubbo-provider-demo"))
-                .metadataReport(new MetadataReportConfig("zookeeper://127.0.0.1:2181"))
+                // .registry("zookeeper", builder -> builder.address("zookeeper://127.0.0.1:2181?registry-type=service&subscribed-services=dubbo-provider-demo"))
+                // .metadataReport(new MetadataReportConfig("zookeeper://127.0.0.1:2181"))
+
                 // Nacos
-//                .registry("nacos", builder -> builder.address("nacos://127.0.0.1:8848?registry.type=service&subscribed.services=dubbo-provider-demo"))
-//                .registry("consul", builder -> builder.address("consul://127.0.0.1:8500?registry.type=service&subscribed.services=dubbo-provider-demo").group("namespace1"))
+                // .registry("nacos", builder -> builder.address("nacos://127.0.0.1:8848?registry.type=service&subscribed.services=dubbo-provider-demo"))
+
+                // Consul
+                // .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()

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
@@ -49,7 +49,7 @@ private static void multipleRegistries() {
 
         RegistryConfig serviceRegistry = new RegistryConfig();
         serviceRegistry.setId("serviceRegistry");
-        serviceRegistry.setAddress("zookeeper://127.0.0.1:2181?registry.type=service");
+        serviceRegistry.setAddress("zookeeper://127.0.0.1:2181?registry-type=service");
 
         ServiceConfig<EchoService> echoService = new ServiceConfig<>();
         echoService.setInterface(EchoService.class.getName());

diff --git a/...tstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderMinimumBootstrap.java b/...tstrap/src/test/java/org/apache/dubbo/bootstrap/DubboServiceProviderMinimumBootstrap.java
@@ -25,7 +25,7 @@ public static void main(String[] args) {
         new DubboBootstrap()
                 .application("dubbo-provider-demo")
 //                .registry(builder -> builder.address("zookeeper://127.0.0.1:2181?registry.type=service"))
-                .registry(builder -> builder.address("file://?registry.type=service"))
+                .registry(builder -> builder.address("eureka://127.0.0.1:8761?registry-type=service"))
                 .protocol(builder -> builder.port(-1).name("dubbo"))
                 .service(builder -> builder.interfaceClass(EchoService.class).ref(new EchoServiceImpl()))
                 .start()

diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/RegistryConstants.java b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/RegistryConstants.java
@@ -58,7 +58,7 @@ public interface RegistryConstants {
      *
      * @since 2.7.4
      */
-    String REGISTRY_TYPE_KEY = "registry.type";
+    String REGISTRY_TYPE_KEY = "registry-type";
 
     /**
      * The parameter value of Service-Oriented Registry type
@@ -67,14 +67,19 @@ public interface RegistryConstants {
      */
     String SERVICE_REGISTRY_TYPE = "service";
 
+    /**
+     * The protocol for Service Discovery
+     *
+     * @since 2.7.4
+     */
     String SERVICE_REGISTRY_PROTOCOL = "service-discovery-registry";
 
     /**
      * The parameter key of the subscribed service names for Service-Oriented Registry
      *
      * @since 2.7.4
      */
-    String SUBSCRIBED_SERVICE_NAMES_KEY = "subscribed.services";
+    String SUBSCRIBED_SERVICE_NAMES_KEY = "subscribed-services";
 
 
     /**

diff --git a/...o-registry-api/src/main/java/org/apache/dubbo/registry/client/DefaultServiceInstance.java b/...o-registry-api/src/main/java/org/apache/dubbo/registry/client/DefaultServiceInstance.java
@@ -59,7 +59,7 @@ public DefaultServiceInstance(String id, String serviceName, String host, Intege
     }
 
     public DefaultServiceInstance(String serviceName, String host, Integer port) {
-        this(null, serviceName, host, port);
+        this(host + ":" + port, serviceName, host, port);
     }
 
     public void setId(String id) {