support consumer routers config

sofastack · May 17, 2024 · 796518e · 796518e
1 parent 27603ea
commit 796518e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/core/api/src/main/java/com/alipay/sofa/rpc/client/RouterChain.java b/core/api/src/main/java/com/alipay/sofa/rpc/client/RouterChain.java
@@ -143,7 +143,7 @@ public static RouterChain buildConsumerChain(ConsumerBootstrap consumerBootstrap
         List<ExtensionClass<Router>> extensionRouters = new ArrayList<ExtensionClass<Router>>();
         List<String> routerAliases = consumerConfig.getRouter();
         if (CommonUtils.isNotEmpty(routerAliases)) {
-            for (String routerAlias : routerAliases) {
+            routerAliases.stream().distinct().forEach(routerAlias -> {
                 if (startsWithExcludePrefix(routerAlias)) { // 排除用的特殊字符
                     excludes.add(routerAlias.substring(1));
                 } else {
@@ -152,7 +152,7 @@ public static RouterChain buildConsumerChain(ConsumerBootstrap consumerBootstrap
                         extensionRouters.add(extensionRouter);
                     }
                 }
-            }
+            });
         }
         // 解析自动加载的router
         if (!excludes.contains(StringUtils.ALL) && !excludes.contains(StringUtils.DEFAULT)) { // 配了-*和-default表示不加载内置
@@ -162,7 +162,6 @@ public static RouterChain buildConsumerChain(ConsumerBootstrap consumerBootstrap
                 }
             }
         }
-        excludes = null; // 不需要了
         // 按order从小到大排序
         if (extensionRouters.size() > 1) {
             extensionRouters.sort(Comparator.comparingInt(ExtensionClass::getOrder));

diff --git a/core/api/src/main/java/com/alipay/sofa/rpc/filter/FilterChain.java b/core/api/src/main/java/com/alipay/sofa/rpc/filter/FilterChain.java
@@ -193,7 +193,7 @@ private static List<Filter> selectActualFilters(AbstractInterfaceConfig config,
         List<ExtensionClass<Filter>> extensionFilters = new LinkedList<ExtensionClass<Filter>>();
         List<String> filterAliases = config.getFilter(); //
         if (CommonUtils.isNotEmpty(filterAliases)) {
-            for (String filterAlias : filterAliases) {
+            filterAliases.stream().distinct().forEach(filterAlias -> {
                 if (startsWithExcludePrefix(filterAlias)) { // 排除用的特殊字符
                     excludes.add(filterAlias.substring(1));
                 } else {
@@ -202,7 +202,7 @@ private static List<Filter> selectActualFilters(AbstractInterfaceConfig config,
                         extensionFilters.add(filter);
                     }
                 }
-            }
+            });
         }
         // 解析自动加载的过滤器
         if (!excludes.contains(StringUtils.ALL) && !excludes.contains(StringUtils.DEFAULT)) { // 配了-*和-default表示不加载内置

diff --git a/core/api/src/test/resources/sofa-rpc/rpc-config.json b/core/api/src/test/resources/sofa-rpc/rpc-config.json
@@ -1,6 +1,6 @@
 {
   "rpc.config.order": 999,
   "logger.impl": "com.alipay.sofa.rpc.log.SystemLogger",
-  "default.filters" : ["testChainFilter0", "-testChainFilter8"],
-  "consumer.routers" : ["testChainRouter0", "-testChainRouter8", "notExistChainRouter"]
+  "default.filters" : ["testChainFilter0", "-testChainFilter8", "testChainFilter0"],
+  "consumer.routers" : ["testChainRouter0", "-testChainRouter8", "notExistChainRouter", "testChainRouter0"]
 }