This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch dev-metadata in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/dev-metadata by this push: new 719b5a3 reformat code 719b5a3 is described below commit 719b5a3e9511dfb1c313d9d4fa6c3dcc2d37cc05 Author: ken.lj <ken.lj...@gmail.com> AuthorDate: Thu Nov 29 15:15:31 2018 +0800 reformat code --- .../zookeeper/ZookeeperDynamicConfiguration.java | 3 +-- .../zookeeper/ZookeeperDynamicConfigurationTest.java | 14 +++++++------- .../dubbo/registry/integration/RegistryDirectory.java | 18 +++++++++--------- .../dubbo/registry/integration/RegistryProtocol.java | 1 - 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfiguration.java b/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfiguration.java index 6e78079..a9a684e 100644 --- a/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfiguration.java +++ b/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfiguration.java @@ -57,7 +57,7 @@ public class ZookeeperDynamicConfiguration extends AbstractDynamicConfiguration< public void initWith(URL url) { super.initWith(url); - rootPath = "/" + url.getParameter(CONFIG_NAMESPACE_KEY, Constants.DUBBO) + "/config"; + rootPath = "/" + url.getParameter(CONFIG_NAMESPACE_KEY, Constants.DUBBO) + "/config"; RetryPolicy policy = new ExponentialBackoffRetry(1000, 3); int sessionTimeout = 60 * 1000; @@ -111,7 +111,6 @@ public class ZookeeperDynamicConfiguration extends AbstractDynamicConfiguration< } /** - * * @param key e.g., {service}.configurators, {service}.tagrouters, {group}.dubbo.properties * @return */ diff --git a/dubbo-configcenter/dubbo-configcenter-zookeeper/src/test/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfigurationTest.java b/dubbo-configcenter/dubbo-configcenter-zookeeper/src/test/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfigurationTest.java index 382e77d..af9571c 100644 --- a/dubbo-configcenter/dubbo-configcenter-zookeeper/src/test/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfigurationTest.java +++ b/dubbo-configcenter/dubbo-configcenter-zookeeper/src/test/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfigurationTest.java @@ -75,6 +75,13 @@ public class ZookeeperDynamicConfigurationTest { zkServer.stop(); } + private static void setData(String path, String data) throws Exception { + if (client.checkExists().forPath(path) == null) { + client.create().creatingParentsIfNeeded().forPath(path); + } + client.setData().forPath(path, data.getBytes()); + } + @Test public void testGetConfig() throws Exception { Assert.assertEquals("The content from dubbo.properties", configuration.getConfig("dubbo.dubbo.properties")); @@ -113,13 +120,6 @@ public class ZookeeperDynamicConfigurationTest { Assert.assertEquals("new value2", listener4.getValue()); } - private static void setData(String path, String data) throws Exception { - if (client.checkExists().forPath(path) == null) { - client.create().creatingParentsIfNeeded().forPath(path); - } - client.setData().forPath(path, data.getBytes()); - } - private class TestListener implements ConfigurationListener { private CountDownLatch latch; private String value; diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java index bdf7a54..785e41e 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java @@ -125,15 +125,6 @@ public class RegistryDirectory<T> extends AbstractDirectory<T> implements Notify this.serviceMethods = methods == null ? null : Constants.COMMA_SPLIT_PATTERN.split(methods); } - private URL turnRegistryUrlToConsumerUrl(URL url) { - // save any parameter in registry that will be useful to the new url. - String isDefault = url.getParameter(Constants.DEFAULT_KEY); - if (StringUtils.isNotEmpty(isDefault)) { - queryMap.put(Constants.REGISTRY_KEY + "." + Constants.DEFAULT_KEY, isDefault); - } - return url.setPath(url.getServiceInterface()).clearParameters().addParameters(queryMap).removeParameter(Constants.MONITOR_KEY); - } - /** * Convert override urls to map for use when re-refer. * Send all rules every time, the urls will be reassembled and calculated @@ -182,6 +173,15 @@ public class RegistryDirectory<T> extends AbstractDirectory<T> implements Notify return new LinkedList<>(); } + private URL turnRegistryUrlToConsumerUrl(URL url) { + // save any parameter in registry that will be useful to the new url. + String isDefault = url.getParameter(Constants.DEFAULT_KEY); + if (StringUtils.isNotEmpty(isDefault)) { + queryMap.put(Constants.REGISTRY_KEY + "." + Constants.DEFAULT_KEY, isDefault); + } + return url.setPath(url.getServiceInterface()).clearParameters().addParameters(queryMap).removeParameter(Constants.MONITOR_KEY); + } + public void setProtocol(Protocol protocol) { this.protocol = protocol; } diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java index 6bb4402..d07d8a4 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java @@ -51,7 +51,6 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors;