[dubbo] branch 2.7.5-release updated: Revert "fix getColonSeparatedKey() does not work in 'registry.simplified=true' mode. (#5465)"

[mercyblitz]

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

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


The following commit(s) were added to refs/heads/2.7.5-release by this push:
     new 964e92b  Revert "fix getColonSeparatedKey() does not work in 
'registry.simplified=true' mode. (#5465)"
     new 283a54e  Merge branch '2.7.5-release' of github.com:apache/dubbo into 
2.7.5-release
964e92b is described below

commit 964e92be421fbc7a716f53cc1fc2318aeff568f5
Author: mercyblitz <mercybl...@gmail.com>
AuthorDate: Fri Dec 13 10:49:07 2019 +0800

    Revert "fix getColonSeparatedKey() does not work in 
'registry.simplified=true' mode. (#5465)"
    
    This reverts commit 6fc6494da1a1f4ed3be4de3d836b3ee1eafae84c.
---
 dubbo-common/src/main/java/org/apache/dubbo/common/URL.java     | 2 +-
 dubbo-common/src/test/java/org/apache/dubbo/common/URLTest.java | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

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 5c29cda..eac2e7b 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
@@ -1375,7 +1375,7 @@ class URL implements Serializable {
      */
     public String getColonSeparatedKey() {
         StringBuilder serviceNameBuilder = new StringBuilder();
-        serviceNameBuilder.append(this.getServiceInterface());
+        append(serviceNameBuilder, INTERFACE_KEY, true);
         append(serviceNameBuilder, VERSION_KEY, false);
         append(serviceNameBuilder, GROUP_KEY, false);
         return serviceNameBuilder.toString();
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/URLTest.java 
b/dubbo-common/src/test/java/org/apache/dubbo/common/URLTest.java
index a5c0d98..2f99f84 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/URLTest.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/URLTest.java
@@ -719,12 +719,6 @@ public class URLTest {
 
         URL url4 = 
URL.valueOf("10.20.130.230:20880/context/path?interface=org.apache.dubbo.test.interfaceName");
         Assertions.assertEquals("org.apache.dubbo.test.interfaceName::", 
url4.getColonSeparatedKey());
-
-        URL url5 = 
URL.valueOf("10.20.130.230:20880/org.apache.dubbo.test.interfaceName");
-        Assertions.assertEquals("org.apache.dubbo.test.interfaceName::", 
url5.getColonSeparatedKey());
-
-        URL url6 = 
URL.valueOf("10.20.130.230:20880/org.apache.dubbo.test.interfaceName?interface=org.apache.dubbo.test.interfaceName1");
-        Assertions.assertEquals("org.apache.dubbo.test.interfaceName1::", 
url6.getColonSeparatedKey());
     }
 
     @Test