[dubbo] branch master updated: Reuse the existing method of generating ServiceKey (#7875)

[albumenj]

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

albumenj 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 a545a60  Reuse the existing method of generating ServiceKey (#7875)
a545a60 is described below

commit a545a6000c78e32876b546edb903f6db154d385a
Author: 灼华 <43363120+burnin...@users.noreply.github.com>
AuthorDate: Fri May 28 17:13:17 2021 +0800

    Reuse the existing method of generating ServiceKey (#7875)
---
 .../java/org/apache/dubbo/common/BaseServiceMetadata.java    |  4 ++--
 .../org/apache/dubbo/config/utils/ReferenceConfigCache.java  | 12 +++---------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git 
a/dubbo-common/src/main/java/org/apache/dubbo/common/BaseServiceMetadata.java 
b/dubbo-common/src/main/java/org/apache/dubbo/common/BaseServiceMetadata.java
index 6bf4491..a2600f0 100644
--- 
a/dubbo-common/src/main/java/org/apache/dubbo/common/BaseServiceMetadata.java
+++ 
b/dubbo-common/src/main/java/org/apache/dubbo/common/BaseServiceMetadata.java
@@ -33,11 +33,11 @@ public class BaseServiceMetadata {
 
     public static String buildServiceKey(String path, String group, String 
version) {
         StringBuilder buf = new StringBuilder();
-        if (group != null && group.length() > 0) {
+        if (StringUtils.isNotEmpty(group)) {
             buf.append(group).append("/");
         }
         buf.append(path);
-        if (version != null && version.length() > 0) {
+        if (StringUtils.isNotEmpty(version)) {
             buf.append(":").append(version);
         }
         return buf.toString();
diff --git 
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ReferenceConfigCache.java
 
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ReferenceConfigCache.java
index 9cc037a..7bad3d5 100644
--- 
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ReferenceConfigCache.java
+++ 
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ReferenceConfigCache.java
@@ -29,6 +29,8 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
+import static org.apache.dubbo.common.BaseServiceMetadata.buildServiceKey;
+
 /**
  * A simple util class for cache {@link ReferenceConfigBase}.
  * <p>
@@ -54,15 +56,7 @@ public class ReferenceConfigCache {
             throw new IllegalArgumentException("No interface info in 
ReferenceConfig" + referenceConfig);
         }
 
-        StringBuilder ret = new StringBuilder();
-        if (!StringUtils.isBlank(referenceConfig.getGroup())) {
-            ret.append(referenceConfig.getGroup()).append("/");
-        }
-        ret.append(iName);
-        if (!StringUtils.isBlank(referenceConfig.getVersion())) {
-            ret.append(":").append(referenceConfig.getVersion());
-        }
-        return ret.toString();
+        return buildServiceKey(iName, referenceConfig.getGroup(), 
referenceConfig.getVersion());
     };
 
     static final ConcurrentMap<String, ReferenceConfigCache> CACHE_HOLDER = 
new ConcurrentHashMap<String, ReferenceConfigCache>();