[dubbo] branch 2.7.3-release updated: make metadata key contain : when version and group is empty (#4465)

[liujun]

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

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


The following commit(s) were added to refs/heads/2.7.3-release by this push:
     new 2497dcf  make metadata key contain : when version and group is empty 
(#4465)
2497dcf is described below

commit 2497dcf1924335071d2e0f2339fa8ab4a3c34b71
Author: cvictory <shenglic...@gmail.com>
AuthorDate: Thu Jul 4 17:23:26 2019 +0800

    make metadata key contain : when version and group is empty (#4465)
---
 .../org/apache/dubbo/metadata/identifier/MetadataIdentifier.java    | 2 +-
 .../apache/dubbo/metadata/identifier/MetadataIdentifierTest.java    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/identifier/MetadataIdentifier.java
 
b/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/identifier/MetadataIdentifier.java
index f9b7e4c..845de55 100644
--- 
a/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/identifier/MetadataIdentifier.java
+++ 
b/dubbo-metadata-report/dubbo-metadata-report-api/src/main/java/org/apache/dubbo/metadata/identifier/MetadataIdentifier.java
@@ -67,7 +67,7 @@ public class MetadataIdentifier {
     }
 
     public String getIdentifierKey() {
-        return serviceInterface + SEPARATOR + (version == null ? "" : version 
+ SEPARATOR) + (group == null ? "" : group + SEPARATOR) + side + SEPARATOR + 
application;
+        return serviceInterface + SEPARATOR + (version == null ? "" : version) 
+ SEPARATOR + (group == null ? "" : group) + SEPARATOR + side + SEPARATOR + 
application;
     }
 
     private String getFilePathKey() {
diff --git 
a/dubbo-metadata-report/dubbo-metadata-report-api/src/test/java/org/apache/dubbo/metadata/identifier/MetadataIdentifierTest.java
 
b/dubbo-metadata-report/dubbo-metadata-report-api/src/test/java/org/apache/dubbo/metadata/identifier/MetadataIdentifierTest.java
index c660a34..d8fd93c 100644
--- 
a/dubbo-metadata-report/dubbo-metadata-report-api/src/test/java/org/apache/dubbo/metadata/identifier/MetadataIdentifierTest.java
+++ 
b/dubbo-metadata-report/dubbo-metadata-report-api/src/test/java/org/apache/dubbo/metadata/identifier/MetadataIdentifierTest.java
@@ -37,12 +37,12 @@ public class MetadataIdentifierTest {
         
Assertions.assertEquals(providerMetadataIdentifier.getUniqueKey(MetadataIdentifier.KeyTypeEnum.PATH),
                 "metadata" + PATH_SEPARATOR + interfaceName + PATH_SEPARATOR +
                         (version == null ? "" : (version + PATH_SEPARATOR))
-                + (group == null ? "" : (group + PATH_SEPARATOR)) + 
PROVIDER_SIDE
+                        + (group == null ? "" : (group + PATH_SEPARATOR)) + 
PROVIDER_SIDE
                         + PATH_SEPARATOR + application);
         
Assertions.assertEquals(providerMetadataIdentifier.getUniqueKey(MetadataIdentifier.KeyTypeEnum.UNIQUE_KEY),
                 interfaceName + MetadataIdentifier.SEPARATOR +
-                        (version == null ? "" : version + 
MetadataIdentifier.SEPARATOR)
-                        + (group == null ? "" : group + 
MetadataIdentifier.SEPARATOR)
+                        (version == null ? "" : version) + 
MetadataIdentifier.SEPARATOR
+                        + (group == null ? "" : group) + 
MetadataIdentifier.SEPARATOR
                         + PROVIDER_SIDE + MetadataIdentifier.SEPARATOR + 
application);
     }
 }