You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by il...@apache.org on 2019/02/11 02:07:17 UTC
[incubator-dubbo] branch master updated: remove duplicated unused
method and move unit test (#3446)
This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new ba282a8 remove duplicated unused method and move unit test (#3446)
ba282a8 is described below
commit ba282a867f25be6255320088e1519a572e01e04c
Author: kezhenxu94 <ke...@163.com>
AuthorDate: Mon Feb 11 10:07:12 2019 +0800
remove duplicated unused method and move unit test (#3446)
---
.../src/main/java/org/apache/dubbo/common/URL.java | 5 ++---
.../test/java/org/apache/dubbo/common/URLTest.java | 11 +++++++++--
.../dubbo/registry/zookeeper/ZookeeperRegistry.java | 12 ------------
.../registry/zookeeper/ZookeeperRegistryTest.java | 19 +++++--------------
4 files changed, 16 insertions(+), 31 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 6e71e74..31ac91e 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
@@ -436,9 +436,8 @@ class URL implements Serializable {
return urls;
}
- private String appendDefaultPort(String address, int defaultPort) {
- if (address != null && address.length() > 0
- && defaultPort > 0) {
+ static String appendDefaultPort(String address, int defaultPort) {
+ if (address != null && address.length() > 0 && defaultPort > 0) {
int i = address.indexOf(':');
if (i < 0) {
return address + ":" + defaultPort;
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 b4f547c..8061ab2 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
@@ -18,6 +18,7 @@ package org.apache.dubbo.common;
import org.apache.dubbo.common.utils.CollectionUtils;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import java.io.File;
@@ -124,7 +125,7 @@ public class URLTest {
assertEquals("home/user1/router.js", url.getPath());
assertEquals(0, url.getParameters().size());
- // Caution!!
+ // Caution!!
url = URL.valueOf("file://home/user1/router.js");
// ^^ only tow slash!
assertEquals("file", url.getProtocol());
@@ -680,4 +681,10 @@ public class URLTest {
assertEquals("1.0.0", url.getParameter("version"));
assertEquals("morgan", url.getParameter("application"));
}
-}
\ No newline at end of file
+
+ @Test
+ public void testDefaultPort() {
+ Assertions.assertEquals("10.20.153.10:2181", URL.appendDefaultPort("10.20.153.10:0", 2181));
+ Assertions.assertEquals("10.20.153.10:2181", URL.appendDefaultPort("10.20.153.10", 2181));
+ }
+}
diff --git a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistry.java b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistry.java
index 3ead544..14c3304 100644
--- a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistry.java
+++ b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistry.java
@@ -79,18 +79,6 @@ public class ZookeeperRegistry extends FailbackRegistry {
});
}
- static String appendDefaultPort(String address) {
- if (address != null && address.length() > 0) {
- int i = address.indexOf(':');
- if (i < 0) {
- return address + ":" + DEFAULT_ZOOKEEPER_PORT;
- } else if (Integer.parseInt(address.substring(i + 1)) == 0) {
- return address.substring(0, i + 1) + DEFAULT_ZOOKEEPER_PORT;
- }
- }
- return address;
- }
-
@Override
public boolean isAvailable() {
return zkClient.isConnected();
diff --git a/dubbo-registry/dubbo-registry-zookeeper/src/test/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistryTest.java b/dubbo-registry/dubbo-registry-zookeeper/src/test/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistryTest.java
index 7420d83..c2dd231 100644
--- a/dubbo-registry/dubbo-registry-zookeeper/src/test/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistryTest.java
+++ b/dubbo-registry/dubbo-registry-zookeeper/src/test/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistryTest.java
@@ -36,7 +36,9 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.mock;
@@ -66,12 +68,6 @@ public class ZookeeperRegistryTest {
}
@Test
- public void testDefaultPort() {
- Assertions.assertEquals("10.20.153.10:2181", ZookeeperRegistry.appendDefaultPort("10.20.153.10:0"));
- Assertions.assertEquals("10.20.153.10:2181", ZookeeperRegistry.appendDefaultPort("10.20.153.10"));
- }
-
- @Test
public void testAnyHost() {
Assertions.assertThrows(IllegalStateException.class, () -> {
URL errorUrl = URL.valueOf("multicast://0.0.0.0/");
@@ -153,13 +149,8 @@ public class ZookeeperRegistryTest {
public void testSubscribeAnyValue() throws InterruptedException {
final CountDownLatch latch = new CountDownLatch(1);
zookeeperRegistry.register(serviceUrl);
- zookeeperRegistry.subscribe(anyUrl, new NotifyListener() {
- @Override
- public void notify(List<URL> urls) {
- latch.countDown();
- }
- });
+ zookeeperRegistry.subscribe(anyUrl, urls -> latch.countDown());
zookeeperRegistry.register(serviceUrl);
latch.await();
}
-}
\ No newline at end of file
+}