This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch 2.7.0-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit c4e9b9de2dd96b2cc13816b08662f1235463070e Author: ken.lj <[email protected]> AuthorDate: Wed Jan 9 14:00:49 2019 +0800 revert router from layered path to flat path: /router/condition -> router-codition --- .../rpc/cluster/router/condition/config/AppRouter.java | 2 +- .../cluster/router/condition/config/ListenableRouter.java | 15 ++++++--------- .../cluster/router/condition/config/ServiceRouter.java | 2 +- .../apache/dubbo/rpc/cluster/router/tag/TagRouter.java | 4 ++-- .../support/zookeeper/ZookeeperDynamicConfiguration.java | 11 ++--------- 5 files changed, 12 insertions(+), 22 deletions(-) diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/AppRouter.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/AppRouter.java index cdf073d..19d48ca 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/AppRouter.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/AppRouter.java @@ -21,7 +21,7 @@ import org.apache.dubbo.common.URL; import org.apache.dubbo.configcenter.DynamicConfiguration; /** - * Application level router, "application.routers.condition" + * Application level router, "application.router-condition" */ public class AppRouter extends ListenableRouter { public static final String NAME = "APP_ROUTER"; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ListenableRouter.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ListenableRouter.java index 63eab90..27f7f30 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ListenableRouter.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ListenableRouter.java @@ -34,16 +34,16 @@ import org.apache.dubbo.rpc.cluster.router.condition.ConditionRouter; import org.apache.dubbo.rpc.cluster.router.condition.config.model.ConditionRouterRule; import org.apache.dubbo.rpc.cluster.router.condition.config.model.ConditionRuleParser; -import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; /** * Abstract router which listens to dynamic configuration */ public abstract class ListenableRouter extends AbstractRouter implements ConfigurationListener { public static final String NAME = "LISTENABLE_ROUTER"; - private static final String RULE_SUFFIX = ".routers.condition"; + private static final String RULE_SUFFIX = ".router-condition"; public static final int DEFAULT_PRIORITY = 200; private static final Logger logger = LoggerFactory.getLogger(ListenableRouter.class); private ConditionRouterRule routerRule; @@ -106,13 +106,10 @@ public abstract class ListenableRouter extends AbstractRouter implements Configu private void generateConditions(ConditionRouterRule rule) { if (rule != null && rule.isValid()) { - List<ConditionRouter> routers = new ArrayList<>(); - rule.getConditions().forEach(condition -> { - // All sub rules have the same force, runtime value. - ConditionRouter subRouter = new ConditionRouter(condition, rule.isForce(), rule.isEnabled()); - routers.add(subRouter); - }); - this.conditionRouters = routers; + this.conditionRouters = rule.getConditions() + .stream() + .map(condition -> new ConditionRouter(condition, rule.isForce(), rule.isEnabled())) + .collect(Collectors.toList()); } } diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ServiceRouter.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ServiceRouter.java index 355d1ae..8a07906 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ServiceRouter.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ServiceRouter.java @@ -20,7 +20,7 @@ import org.apache.dubbo.common.URL; import org.apache.dubbo.configcenter.DynamicConfiguration; /** - * Service level router, "server-unique-name.routers.condition" + * Service level router, "server-unique-name.router-condition" */ public class ServiceRouter extends ListenableRouter { public static final String NAME = "SERVICE_ROUTER"; 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 index 653f192..496ab62 100644 --- 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,13 +42,13 @@ import static org.apache.dubbo.common.Constants.FORCE_USE_TAG; import static org.apache.dubbo.common.Constants.TAG_KEY; /** - * TagRouter, "application.routers.tag" + * TagRouter, "application.router-tag" */ public class TagRouter extends AbstractRouter implements Comparable<Router>, ConfigurationListener { public static final String NAME = "TAG_ROUTER"; private static final int DEFAULT_PRIORITY = 100; private static final Logger logger = LoggerFactory.getLogger(TagRouter.class); - private static final String RULE_SUFFIX = ".routers.tag"; + private static final String RULE_SUFFIX = ".router-tag"; private TagRouterRule tagRouterRule; private String application; 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 ee72219..77f5325 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 @@ -132,18 +132,11 @@ public class ZookeeperDynamicConfiguration implements DynamicConfiguration { /** * when group is null, we are fetching governance rules, for example: * 1. key=org.apache.dubbo.DemoService.configurators - * 2. key = org.apache.dubbo.DemoService.routers.condition + * 2. key = org.apache.dubbo.DemoService.router-condition */ else { int i = key.lastIndexOf("."); - String lastPart = key.substring(i + 1); - key = key.substring(0, i); - int j = key.indexOf(Constants.ROUTERS_SUFFIX); - if (j > 0) { - key = key.substring(0, j) + "/" + key.substring(j + 1) + "/" + lastPart; - } else { - key = key + "/" + lastPart; - } + key = key.substring(0, i) + "/" + key.substring(i + 1); } return (String) getInternalProperty(rootPath + "/" + key);
