去除abstractRouter

apache · Dec 27, 2018 · 554c91b · 554c91b
1 parent 53a58f8
commit 554c91b
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 45 deletions.
diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/Router.java b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/Router.java
@@ -51,11 +51,4 @@ public interface Router extends Comparable<Router> {
      */
     <T> List<Invoker<T>> route(List<Invoker<T>> invokers, URL url, Invocation invocation) throws RpcException;
 
-    /**
-     * router priority
-     *
-     * @return
-     */
-    int getPriority();
-
 }
diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/AbstractRouter.java b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/AbstractRouter.java
diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/MockInvokersSelector.java b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/MockInvokersSelector.java
@@ -31,7 +31,7 @@
  * If a request is configured to use mock, then this router guarantees that only the invokers with protocol MOCK appear in final the invoker list, all other invokers will be excluded.
  *
  */
-public class MockInvokersSelector extends AbstractRouter {
+public class MockInvokersSelector implements Router {
 
     @Override
     public <T> List<Invoker<T>> route(final List<Invoker<T>> invokers,
@@ -87,12 +87,11 @@ private <T> boolean hasMockProviders(final List<Invoker<T>> invokers) {
         return hasMockProvider;
     }
 
-    /**
-     * Always stay on the top of the list
-     *
-     * @param o
-     * @return
-     */
+    @Override
+    public URL getUrl() {
+        return null;
+    }
+
     @Override
     public int compareTo(Router o) {
         return 1;

diff --git a/...cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/condition/ConditionRouter.java b/...cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/condition/ConditionRouter.java
@@ -26,7 +26,7 @@
 import com.alibaba.dubbo.rpc.Invocation;
 import com.alibaba.dubbo.rpc.Invoker;
 import com.alibaba.dubbo.rpc.RpcException;
-import com.alibaba.dubbo.rpc.cluster.router.AbstractRouter;
+import com.alibaba.dubbo.rpc.cluster.Router;
 
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -42,10 +42,12 @@
  * ConditionRouter
  *
  */
-public class ConditionRouter extends AbstractRouter {
+public class ConditionRouter implements Router, Comparable<Router> {
 
     private static final Logger logger = LoggerFactory.getLogger(ConditionRouter.class);
     private static Pattern ROUTE_PATTERN = Pattern.compile("([&!=,]*)\\s*([^&!=,\\s]+)");
+    private final URL url;
+    private final int priority;
     private final boolean force;
     private final Map<String, MatchPair> whenCondition;
     private final Map<String, MatchPair> thenCondition;
@@ -172,6 +174,20 @@ public <T> List<Invoker<T>> route(List<Invoker<T>> invokers, URL url, Invocation
         return invokers;
     }
 
+    @Override
+    public URL getUrl() {
+        return url;
+    }
+
+    @Override
+    public int compareTo(Router o) {
+        if (o == null || o.getClass() != ConditionRouter.class) {
+            return 1;
+        }
+        ConditionRouter c = (ConditionRouter) o;
+        return this.priority == c.priority ? url.toFullString().compareTo(c.url.toFullString()) : (this.priority > c.priority ? 1 : -1);
+    }
+
     boolean matchWhen(URL url, Invocation invocation) {
         return whenCondition == null || whenCondition.isEmpty() || matchCondition(whenCondition, url, null, invocation);
     }

diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/script/ScriptRouter.java b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/script/ScriptRouter.java
@@ -24,7 +24,7 @@
 import com.alibaba.dubbo.rpc.Invoker;
 import com.alibaba.dubbo.rpc.RpcContext;
 import com.alibaba.dubbo.rpc.RpcException;
-import com.alibaba.dubbo.rpc.cluster.router.AbstractRouter;
+import com.alibaba.dubbo.rpc.cluster.Router;
 
 import javax.script.Bindings;
 import javax.script.Compilable;
@@ -42,16 +42,20 @@
  * ScriptRouter
  *
  */
-public class ScriptRouter extends AbstractRouter {
+public class ScriptRouter implements Router {
 
     private static final Logger logger = LoggerFactory.getLogger(ScriptRouter.class);
 
     private static final Map<String, ScriptEngine> engines = new ConcurrentHashMap<String, ScriptEngine>();
 
     private final ScriptEngine engine;
 
+    private final int priority;
+
     private final String rule;
 
+    private final URL url;
+
     public ScriptRouter(URL url) {
         this.url = url;
         String type = url.getParameter(Constants.TYPE_KEY);
@@ -75,6 +79,11 @@ public ScriptRouter(URL url) {
         this.rule = rule;
     }
 
+    @Override
+    public URL getUrl() {
+        return url;
+    }
+
     @Override
     @SuppressWarnings("unchecked")
     public <T> List<Invoker<T>> route(List<Invoker<T>> invokers, URL url, Invocation invocation) throws RpcException {
@@ -105,4 +114,13 @@ public <T> List<Invoker<T>> route(List<Invoker<T>> invokers, URL url, Invocation
         }
     }
 
+    @Override
+    public int compareTo(Router o) {
+        if (o == null || o.getClass() != ScriptRouter.class) {
+            return 1;
+        }
+        ScriptRouter c = (ScriptRouter) o;
+        return this.priority == c.priority ? rule.compareTo(c.rule) : (this.priority > c.priority ? 1 : -1);
+    }
+
 }
diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/tag/TagRouter.java b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/tag/TagRouter.java
@@ -25,20 +25,23 @@
 import com.alibaba.dubbo.rpc.Invoker;
 import com.alibaba.dubbo.rpc.RpcContext;
 import com.alibaba.dubbo.rpc.RpcException;
-import com.alibaba.dubbo.rpc.cluster.router.AbstractRouter;
+import com.alibaba.dubbo.rpc.cluster.Router;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * TagRouter
  */
-public class TagRouter extends AbstractRouter {
+public class TagRouter implements Router {
 
     private static final Logger logger = LoggerFactory.getLogger(TagRouter.class);
     private static final int DEFAULT_PRIORITY = 100;
     private static final URL ROUTER_URL = new URL("tag", Constants.ANYHOST_VALUE, 0, Constants.ANY_VALUE).addParameters(Constants.RUNTIME_KEY, "true");
 
+    private URL url;
+    private int priority;
+
     public TagRouter(URL url) {
         this.url = url;
         this.priority = url.getParameter(Constants.PRIORITY_KEY, DEFAULT_PRIORITY);
@@ -86,4 +89,12 @@ public <T> List<Invoker<T>> route(List<Invoker<T>> invokers, URL url, Invocation
         return invokers;
     }
 
+    @Override
+    public int compareTo(Router o) {
+        if (o == null || o.getClass() != TagRouter.class) {
+            return 0;
+        }
+        TagRouter c = (TagRouter) o;
+        return this.priority == c.priority ? 0 : (this.priority > c.priority ? 1 : -1);
+    }
 }