Merge pull request #9 from apache/master

Master sync
khanimteyaz · Dec 28, 2018 · a868472 · a868472
2 parents 5b67c0f + 09cbf8f
commit a868472
Show file tree

Hide file tree

Showing 37 changed files with 374 additions and 244 deletions.
diff --git a/.../src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ListenableRouter.java b/.../src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ListenableRouter.java
@@ -20,8 +20,8 @@
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.logger.Logger;
 import org.apache.dubbo.common.logger.LoggerFactory;
-import org.apache.dubbo.common.utils.Assert;
 import org.apache.dubbo.common.utils.CollectionUtils;
+import org.apache.dubbo.common.utils.StringUtils;
 import org.apache.dubbo.configcenter.ConfigChangeEvent;
 import org.apache.dubbo.configcenter.ConfigChangeType;
 import org.apache.dubbo.configcenter.ConfigurationListener;
@@ -125,12 +125,14 @@ private void generateConditions(ConditionRouterRule rule, List<ConditionRouter>
     }
 
     private synchronized void init(String ruleKey) {
-        Assert.notEmptyString(ruleKey, "router rule's key cannot be null");
-        String router = ruleKey + Constants.ROUTERS_SUFFIX;
-        configuration.addListener(router, this);
-        String rule = configuration.getConfig(router);
+        if (StringUtils.isEmpty(ruleKey)) {
+            return;
+        }
+        String routerKey = ruleKey + Constants.ROUTERS_SUFFIX;
+        configuration.addListener(routerKey, this);
+        String rule = configuration.getConfig(routerKey);
         if (rule != null) {
-            this.process(new ConfigChangeEvent(router, rule));
+            this.process(new ConfigChangeEvent(routerKey, rule));
         }
     }
 }
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/file/FileRouterFactory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/file/FileRouterFactory.java
@@ -53,8 +53,11 @@ public Router getRouter(URL url) {
             }
             String rule = IOUtils.read(new FileReader(new File(url.getAbsolutePath())));
 
+            // FIXME: this code looks useless
             boolean runtime = url.getParameter(Constants.RUNTIME_KEY, false);
-            URL script = url.setProtocol(protocol).addParameter(Constants.TYPE_KEY, type).addParameter(Constants.RUNTIME_KEY, runtime).addParameterAndEncoded(Constants.RULE_KEY, rule);
+            URL script = url.setProtocol(protocol).addParameter(Constants.TYPE_KEY, type)
+                    .addParameter(Constants.RUNTIME_KEY, runtime)
+                    .addParameterAndEncoded(Constants.RULE_KEY, rule);
 
             return routerFactory.getRouter(script);
         } catch (IOException e) {

diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/script/ScriptRouter.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/script/ScriptRouter.java
@@ -45,7 +45,7 @@ public class ScriptRouter extends AbstractRouter {
     public static final String NAME = "SCRIPT_ROUTER";
     private static final Logger logger = LoggerFactory.getLogger(ScriptRouter.class);
 
-    private static final Map<String, ScriptEngine> engines = new ConcurrentHashMap<String, ScriptEngine>();
+    private static final Map<String, ScriptEngine> engines = new ConcurrentHashMap<>();
 
     private final ScriptEngine engine;
 
@@ -62,13 +62,13 @@ public ScriptRouter(URL url) {
             type = Constants.DEFAULT_SCRIPT_TYPE_KEY;
         }
         if (rule == null || rule.length() == 0) {
-            throw new IllegalStateException(new IllegalStateException("route rule can not be empty. rule:" + rule));
+            throw new IllegalStateException("route rule can not be empty. rule:" + rule);
         }
         ScriptEngine engine = engines.get(type);
         if (engine == null) {
             engine = new ScriptEngineManager().getEngineByName(type);
             if (engine == null) {
-                throw new IllegalStateException(new IllegalStateException("Unsupported route rule type: " + type + ", rule: " + rule));
+                throw new IllegalStateException("unsupported route rule type: " + type + ", rule: " + rule);
             }
             engines.put(type, engine);
         }
@@ -85,7 +85,7 @@ public URL getUrl() {
     @SuppressWarnings("unchecked")
     public <T> List<Invoker<T>> route(List<Invoker<T>> invokers, URL url, Invocation invocation) throws RpcException {
         try {
-            List<Invoker<T>> invokersCopy = new ArrayList<Invoker<T>>(invokers);
+            List<Invoker<T>> invokersCopy = new ArrayList<>(invokers);
             Compilable compilable = (Compilable) engine;
             Bindings bindings = engine.createBindings();
             bindings.put("invokers", invokersCopy);
@@ -105,8 +105,8 @@ public <T> List<Invoker<T>> route(List<Invoker<T>> invokers, URL url, Invocation
             }
             return invokersCopy;
         } catch (ScriptException e) {
-            //fail then ignore rule .invokers.
-            logger.error("route error , rule has been ignored. rule: " + rule + ", method:" + invocation.getMethodName() + ", url: " + RpcContext.getContext().getUrl(), e);
+            logger.error("route error, rule has been ignored. rule: " + rule + ", method:" +
+                    invocation.getMethodName() + ", url: " + RpcContext.getContext().getUrl(), e);
             return invokers;
         }
     }

diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/tag/TagRouter.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/tag/TagRouter.java
@@ -42,7 +42,7 @@
 import static org.apache.dubbo.common.Constants.TAG_KEY;
 
 /**
- *
+ * TagRouter
  */
 public class TagRouter extends AbstractRouter implements Comparable<Router>, ConfigurationListener {
     public static final String NAME = "TAG_ROUTER";
@@ -117,10 +117,9 @@ public <T> List<Invoker<T>> route(List<Invoker<T>> invokers, URL url, Invocation
             }
             // FAILOVER: return all Providers without any tags.
             else {
-                List<Invoker<T>> tmp = filterInvoker(invokers, invoker -> addressNotMatches(invoker.getUrl(), tagRouterRule
-                        .getAddresses()));
-                return filterInvoker(tmp, invoker -> StringUtils.isEmpty(invoker.getUrl()
-                        .getParameter(TAG_KEY)));
+                List<Invoker<T>> tmp = filterInvoker(invokers, invoker -> addressNotMatches(invoker.getUrl(),
+                        tagRouterRule.getAddresses()));
+                return filterInvoker(tmp, invoker -> StringUtils.isEmpty(invoker.getUrl().getParameter(TAG_KEY)));
             }
         } else {
             // List<String> addresses = tagRouterRule.filter(providerApp);
@@ -137,10 +136,7 @@ public <T> List<Invoker<T>> route(List<Invoker<T>> invokers, URL url, Invocation
             }
             return filterInvoker(result, invoker -> {
                 String localTag = invoker.getUrl().getParameter(TAG_KEY);
-                if (StringUtils.isEmpty(localTag) || !tagRouterRule.getTagNames().contains(localTag)) {
-                    return true;
-                }
-                return false;
+                return StringUtils.isEmpty(localTag) || !tagRouterRule.getTagNames().contains(localTag);
             });
         }
     }

diff --git a/...onfig/spring/beans/factory/annotation/CompatibleReferenceAnnotationBeanPostProcessor.java b/...onfig/spring/beans/factory/annotation/CompatibleReferenceAnnotationBeanPostProcessor.java
@@ -19,6 +19,7 @@
 import org.apache.dubbo.config.spring.ReferenceBean;
 
 import com.alibaba.dubbo.config.annotation.Reference;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.BeanUtils;

diff --git a/...g/apache/dubbo/config/spring/beans/factory/annotation/CompatibleReferenceBeanBuilder.java b/...g/apache/dubbo/config/spring/beans/factory/annotation/CompatibleReferenceBeanBuilder.java
@@ -22,6 +22,7 @@
 import org.apache.dubbo.config.spring.convert.converter.StringArrayToStringConverter;
 
 import com.alibaba.dubbo.config.annotation.Reference;
+
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.DefaultConversionService;

diff --git a/.../config/spring/beans/factory/annotation/CompatibleServiceAnnotationBeanPostProcessor.java b/.../config/spring/beans/factory/annotation/CompatibleServiceAnnotationBeanPostProcessor.java
@@ -22,6 +22,7 @@
 import org.apache.dubbo.config.spring.context.annotation.DubboClassPathBeanDefinitionScanner;
 
 import com.alibaba.dubbo.config.annotation.Service;
+
 import org.springframework.beans.BeansException;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.factory.BeanClassLoaderAware;

diff --git a/dubbo-compatible/src/test/java/org/apache/dubbo/cache/CacheTest.java b/dubbo-compatible/src/test/java/org/apache/dubbo/cache/CacheTest.java
@@ -17,13 +17,14 @@
 
 package org.apache.dubbo.cache;
 
+import org.apache.dubbo.rpc.RpcInvocation;
+
 import com.alibaba.dubbo.cache.Cache;
 import com.alibaba.dubbo.cache.CacheFactory;
 import com.alibaba.dubbo.common.URL;
 import com.alibaba.dubbo.rpc.Invocation;
 import com.alibaba.dubbo.rpc.Invoker;
 
-import org.apache.dubbo.rpc.RpcInvocation;
 import org.junit.Assert;
 import org.junit.Test;
 

diff --git a/dubbo-compatible/src/test/java/org/apache/dubbo/config/ApplicationConfigTest.java b/dubbo-compatible/src/test/java/org/apache/dubbo/config/ApplicationConfigTest.java
@@ -21,6 +21,7 @@
 import com.alibaba.dubbo.config.ApplicationConfig;
 import com.alibaba.dubbo.config.MonitorConfig;
 import com.alibaba.dubbo.config.RegistryConfig;
+
 import org.junit.Test;
 
 import java.util.Collections;

diff --git a/dubbo-compatible/src/test/java/org/apache/dubbo/config/ArgumentConfigTest.java b/dubbo-compatible/src/test/java/org/apache/dubbo/config/ArgumentConfigTest.java
@@ -17,13 +17,13 @@
 
 package org.apache.dubbo.config;
 
+import com.alibaba.dubbo.config.ArgumentConfig;
+
 import org.junit.Test;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import com.alibaba.dubbo.config.ArgumentConfig;
-
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasEntry;
 import static org.hamcrest.Matchers.is;

diff --git a/dubbo-compatible/src/test/java/org/apache/dubbo/config/ConfigTest.java b/dubbo-compatible/src/test/java/org/apache/dubbo/config/ConfigTest.java
@@ -24,6 +24,7 @@
 import com.alibaba.dubbo.config.ReferenceConfig;
 import com.alibaba.dubbo.config.RegistryConfig;
 import com.alibaba.dubbo.config.ServiceConfig;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/dubbo-compatible/src/test/java/org/apache/dubbo/config/ConsumerConfigTest.java b/dubbo-compatible/src/test/java/org/apache/dubbo/config/ConsumerConfigTest.java
@@ -17,10 +17,10 @@
 
 package org.apache.dubbo.config;
 
-import org.junit.Test;
-
 import com.alibaba.dubbo.config.ConsumerConfig;
 
+import org.junit.Test;
+
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;

diff --git a/dubbo-compatible/src/test/java/org/apache/dubbo/config/MethodConfigTest.java b/dubbo-compatible/src/test/java/org/apache/dubbo/config/MethodConfigTest.java
@@ -17,12 +17,13 @@
 
 package org.apache.dubbo.config;
 
+import org.apache.dubbo.rpc.model.ConsumerMethodModel;
+import org.apache.dubbo.service.Person;
+
 import com.alibaba.dubbo.common.Constants;
-import com.alibaba.dubbo.config.MethodConfig;
 import com.alibaba.dubbo.config.ArgumentConfig;
+import com.alibaba.dubbo.config.MethodConfig;
 
-import org.apache.dubbo.rpc.model.ConsumerMethodModel;
-import org.apache.dubbo.service.Person;
 import org.hamcrest.Matchers;
 import org.junit.Test;
 

diff --git a/dubbo-compatible/src/test/java/org/apache/dubbo/config/ProtocolConfigTest.java b/dubbo-compatible/src/test/java/org/apache/dubbo/config/ProtocolConfigTest.java
@@ -17,10 +17,9 @@
 
 package org.apache.dubbo.config;
 
-import com.alibaba.dubbo.rpc.Protocol;
 import com.alibaba.dubbo.config.ProtocolConfig;
+
 import org.junit.Test;
-import org.mockito.Mockito;
 
 import java.util.Collections;
 import java.util.HashMap;

diff --git a/dubbo-compatible/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java b/dubbo-compatible/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java
@@ -21,10 +21,10 @@
 import org.apache.dubbo.service.DemoServiceImpl;
 
 import com.alibaba.dubbo.config.ApplicationConfig;
-import com.alibaba.dubbo.config.RegistryConfig;
 import com.alibaba.dubbo.config.ProtocolConfig;
-import com.alibaba.dubbo.config.ServiceConfig;
 import com.alibaba.dubbo.config.ReferenceConfig;
+import com.alibaba.dubbo.config.RegistryConfig;
+import com.alibaba.dubbo.config.ServiceConfig;
 
 import org.junit.Test;
 

diff --git a/dubbo-compatible/src/test/java/org/apache/dubbo/config/RegistryConfigTest.java b/dubbo-compatible/src/test/java/org/apache/dubbo/config/RegistryConfigTest.java
@@ -19,6 +19,7 @@
 
 import com.alibaba.dubbo.common.Constants;
 import com.alibaba.dubbo.config.RegistryConfig;
+
 import org.junit.Test;
 
 import java.util.Collections;

diff --git a/dubbo-compatible/src/test/java/org/apache/dubbo/config/RegistryDataConfigTest.java b/dubbo-compatible/src/test/java/org/apache/dubbo/config/RegistryDataConfigTest.java
diff --git a/dubbo-compatible/src/test/java/org/apache/dubbo/echo/EchoServiceTest.java b/dubbo-compatible/src/test/java/org/apache/dubbo/echo/EchoServiceTest.java
@@ -17,16 +17,16 @@
 
 package org.apache.dubbo.echo;
 
-import com.alibaba.dubbo.rpc.service.EchoService;
-
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.extension.ExtensionLoader;
-import org.apache.dubbo.service.DemoService;
-import org.apache.dubbo.service.DemoServiceImpl;
 import org.apache.dubbo.rpc.Exporter;
 import org.apache.dubbo.rpc.Invoker;
 import org.apache.dubbo.rpc.Protocol;
 import org.apache.dubbo.rpc.ProxyFactory;
+import org.apache.dubbo.service.DemoService;
+import org.apache.dubbo.service.DemoServiceImpl;
+
+import com.alibaba.dubbo.rpc.service.EchoService;
 
 import org.junit.Assert;
 import org.junit.Test;

diff --git a/dubbo-compatible/src/test/java/org/apache/dubbo/filter/FilterTest.java b/dubbo-compatible/src/test/java/org/apache/dubbo/filter/FilterTest.java
@@ -17,12 +17,12 @@
 
 package org.apache.dubbo.filter;
 
-import org.apache.dubbo.service.MockInvocation;
 import org.apache.dubbo.rpc.Filter;
 import org.apache.dubbo.rpc.Invocation;
 import org.apache.dubbo.rpc.Invoker;
 import org.apache.dubbo.rpc.Result;
 import org.apache.dubbo.rpc.RpcException;
+import org.apache.dubbo.service.MockInvocation;
 
 import org.junit.AfterClass;
 import org.junit.Assert;

diff --git a/dubbo-compatible/src/test/java/org/apache/dubbo/filter/MyInvoker.java b/dubbo-compatible/src/test/java/org/apache/dubbo/filter/MyInvoker.java
@@ -17,12 +17,12 @@
 package org.apache.dubbo.filter;
 
 import org.apache.dubbo.common.URL;
-import org.apache.dubbo.service.DemoService;
 import org.apache.dubbo.rpc.Invocation;
 import org.apache.dubbo.rpc.Invoker;
 import org.apache.dubbo.rpc.Result;
 import org.apache.dubbo.rpc.RpcException;
 import org.apache.dubbo.rpc.RpcResult;
+import org.apache.dubbo.service.DemoService;
 
 public class MyInvoker<T> implements Invoker<T> {