[incubator-dubbo] Diff for: [GitHub] beiwei30 merged pull request #3227: 2.7.0 , just rename some method and modify commments, import order

[GitBox]

diff --git 
a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/support/AbstractZookeeperTransporter.java
 
b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/support/AbstractZookeeperTransporter.java
index 43d848ae0a..5b58dc7b8c 100644
--- 
a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/support/AbstractZookeeperTransporter.java
+++ 
b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/support/AbstractZookeeperTransporter.java
@@ -52,18 +52,18 @@ public ZookeeperClient connect(URL url) {
         List<String> addressList = getURLBackupAddress(url);
         // The field define the zookeeper server , including protocol, host, 
port, username, password
         if ((zookeeperClient = 
fetchAndUpdateZookeeperClientCache(addressList)) != null && 
zookeeperClient.isConnected()) {
-            logger.info("Get result from map for the first time when invoking 
zookeeperTransporter.connnect .");
+            logger.info("find valid zookeeper client from the cache for 
address: " + url);
             return zookeeperClient;
         }
         // avoid creating too many connections， so add lock
         synchronized (zookeeperClientMap) {
             if ((zookeeperClient = 
fetchAndUpdateZookeeperClientCache(addressList)) != null && 
zookeeperClient.isConnected()) {
-                logger.info("Get result from map for the second time when 
invoking zookeeperTransporter.connnect .");
+                logger.info("find valid zookeeper client from the cache for 
address: " + url);
                 return zookeeperClient;
             }
 
-            zookeeperClient = createZookeeperClient(createServerURL(url));
-            logger.info("Get result by creating new connection when invoking 
zookeeperTransporter.connnect .");
+            zookeeperClient = createZookeeperClient(toClientURL(url));
+            logger.info("No valid zookeeper client found from cache, therefore 
create a new client for url. " + url);
             writeToClientMap(addressList, zookeeperClient);
         }
         return zookeeperClient;
@@ -131,7 +131,7 @@ void writeToClientMap(List<String> addressList, 
ZookeeperClient zookeeperClient)
      * @param url
      * @return
      */
-    URL createServerURL(URL url) {
+    URL toClientURL(URL url) {
         Map<String, String> parameterMap = new HashMap<>();
         // for CuratorZookeeperClient
         if (url.getParameter(Constants.TIMEOUT_KEY) != null) {
diff --git 
a/dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/org/apache/dubbo/remoting/zookeeper/support/AbstractZookeeperTransporterTest.java
 
b/dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/org/apache/dubbo/remoting/zookeeper/support/AbstractZookeeperTransporterTest.java
index 24319365b9..b089e3d42f 100644
--- 
a/dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/org/apache/dubbo/remoting/zookeeper/support/AbstractZookeeperTransporterTest.java
+++ 
b/dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/org/apache/dubbo/remoting/zookeeper/support/AbstractZookeeperTransporterTest.java
@@ -16,13 +16,14 @@
  */
 package org.apache.dubbo.remoting.zookeeper.support;
 
-import org.apache.curator.test.TestingServer;
 import org.apache.dubbo.common.Constants;
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.utils.NetUtils;
 import org.apache.dubbo.remoting.zookeeper.ZookeeperClient;
 import org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter;
 import org.apache.dubbo.remoting.zookeeper.curator.CuratorZookeeperTransporter;
+
+import org.apache.curator.test.TestingServer;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -67,7 +68,7 @@ public void testZookeeperClient() {
     @Test
     public void testCreateServerURL() {
         URL url = URL.valueOf("zookeeper://127.0.0.1:" + zkServerPort + 
"/org.apache.dubbo.registry.RegistryService?application=metadatareport-local-xml-provider2&dubbo=2.0.2&interface=org.apache.dubbo.registry.RegistryService&pid=47418&specVersion=2.7.0-SNAPSHOT&timestamp=1547102428828&timeout=2300");
-        URL newUrl = abstractZookeeperTransporter.createServerURL(url);
+        URL newUrl = abstractZookeeperTransporter.toClientURL(url);
         Assert.assertEquals(newUrl.getProtocol(), "zookeeper");
         Assert.assertEquals(newUrl.getHost(), "127.0.0.1");
         Assert.assertEquals(newUrl.getPort(), zkServerPort);
@@ -80,9 +81,9 @@ public void testCreateServerURL() {
 
 
     @Test
-    public void testCreateServerURLWhenHasUser() {
+    public void testToCreateURLWhenHasUser() {
         URL url = URL.valueOf("zookeeper://us2:pw2@127.0.0.1:" + zkServerPort 
+ 
"/org.apache.dubbo.registry.RegistryService?application=metadatareport-local-xml-provider2&dubbo=2.0.2&interface=org.apache.dubbo.registry.RegistryService&pid=47418&specVersion=2.7.0-SNAPSHOT&timestamp=1547102428828");
-        URL newUrl = abstractZookeeperTransporter.createServerURL(url);
+        URL newUrl = abstractZookeeperTransporter.toClientURL(url);
         Assert.assertEquals(newUrl.getProtocol(), "zookeeper");
         Assert.assertEquals(newUrl.getHost(), "127.0.0.1");
         Assert.assertEquals(newUrl.getPort(), zkServerPort);


With regards,
Apache Git Services