[dubbo] branch master updated: Rename ServiceDescriptor to BaseServiceMetadata (#5512)

[li...@apache.org]

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

liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/master by this push:
     new 5a69cc6  Rename ServiceDescriptor to BaseServiceMetadata (#5512)
5a69cc6 is described below

commit 5a69cc69baef3c2b3d07313f4831f6fe3bef4e1a
Author: ken.lj <ke...@gmail.com>
AuthorDate: Fri Dec 20 22:30:00 2019 +0800

    Rename ServiceDescriptor to BaseServiceMetadata (#5512)
---
 .../common/{ServiceDescriptor.java => BaseServiceMetadata.java}   | 8 ++++----
 dubbo-common/src/main/java/org/apache/dubbo/common/URL.java       | 2 +-
 .../src/main/java/org/apache/dubbo/rpc/model/ServiceMetadata.java | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/ServiceDescriptor.java b/dubbo-common/src/main/java/org/apache/dubbo/common/BaseServiceMetadata.java
similarity index 92%
rename from dubbo-common/src/main/java/org/apache/dubbo/common/ServiceDescriptor.java
rename to dubbo-common/src/main/java/org/apache/dubbo/common/BaseServiceMetadata.java
index 7457df7..44acf42 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/ServiceDescriptor.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/BaseServiceMetadata.java
@@ -21,7 +21,7 @@ import org.apache.dubbo.common.utils.StringUtils;
 /**
  * 2019-10-10
  */
-public class ServiceDescriptor {
+public class BaseServiceMetadata {
     public static final char COLON_SEPERATOR = ':';
 
     protected String serviceKey;
@@ -58,12 +58,12 @@ public class ServiceDescriptor {
      * @param displayKey
      * @return
      */
-    public static ServiceDescriptor revertDisplayServiceKey(String displayKey) {
+    public static BaseServiceMetadata revertDisplayServiceKey(String displayKey) {
         String[] eles = StringUtils.split(displayKey, COLON_SEPERATOR);
         if (eles == null || eles.length < 1 || eles.length > 2) {
-            return new ServiceDescriptor();
+            return new BaseServiceMetadata();
         }
-        ServiceDescriptor serviceDescriptor = new ServiceDescriptor();
+        BaseServiceMetadata serviceDescriptor = new BaseServiceMetadata();
         serviceDescriptor.setServiceInterfaceName(eles[0]);
         if (eles.length == 2) {
             serviceDescriptor.setVersion(eles[1]);
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/URL.java b/dubbo-common/src/main/java/org/apache/dubbo/common/URL.java
index fe3274d..5d396a1 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/URL.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/URL.java
@@ -1438,7 +1438,7 @@ class URL implements Serializable {
     }
 
     public static String buildKey(String path, String group, String version) {
-        return ServiceDescriptor.buildServiceKey(path, group, version);
+        return BaseServiceMetadata.buildServiceKey(path, group, version);
     }
 
     public String toServiceStringWithoutResolving() {
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ServiceMetadata.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ServiceMetadata.java
index 5275030..4ee22e9 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ServiceMetadata.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ServiceMetadata.java
@@ -16,7 +16,7 @@
  */
 package org.apache.dubbo.rpc.model;
 
-import org.apache.dubbo.common.ServiceDescriptor;
+import org.apache.dubbo.common.BaseServiceMetadata;
 import org.apache.dubbo.common.URL;
 
 import java.util.Map;
@@ -28,7 +28,7 @@ import java.util.concurrent.ConcurrentHashMap;
  * data related to service level such as name, version, classloader of business service,
  * security info, etc. Also with a AttributeMap for extension.
  */
-public class ServiceMetadata extends ServiceDescriptor {
+public class ServiceMetadata extends BaseServiceMetadata {
 
     private String defaultGroup;
     private Class<?> serviceType;