format code

apache · Jul 21, 2024 · 94be54b · 94be54b
1 parent 3dcf6bf
commit 94be54b
Show file tree

Hide file tree

Showing 4 changed files with 264 additions and 220 deletions.
diff --git a/...src/main/java/org/apache/dubbo/rpc/cluster/router/condition/MultiDestConditionRouter.java b/...src/main/java/org/apache/dubbo/rpc/cluster/router/condition/MultiDestConditionRouter.java
@@ -64,8 +64,8 @@ public MultiDestConditionRouter(URL url, MultiDestCondition multiDestCondition,
         super(url);
         this.setForce(force);
         this.enabled = enabled;
-        matcherFactories = moduleModel.getExtensionLoader(ConditionMatcherFactory.class)
-                .getActivateExtensions();
+        matcherFactories =
+                moduleModel.getExtensionLoader(ConditionMatcherFactory.class).getActivateExtensions();
         this.init(multiDestCondition.getFrom(), multiDestCondition.getTo());
     }
 
@@ -82,12 +82,15 @@ public void init(Map<String, String> from, List<Map<String, String>> to) {
             List<ConditionSubSet> thenConditions = new ArrayList<>();
             for (Map<String, String> toMap : to) {
                 String thenRule = toMap.get("match");
-                Map<String, ConditionMatcher> then = StringUtils.isBlank(thenRule)
-                        || "false".equals(thenRule) ? new HashMap<>() : parseRule(thenRule);
+                Map<String, ConditionMatcher> then = StringUtils.isBlank(thenRule) || "false".equals(thenRule)
+                        ? new HashMap<>()
+                        : parseRule(thenRule);
                 // NOTE: It should be determined on the business level whether the `When condition` can be empty or not.
 
-                thenConditions.add(new ConditionSubSet(then, Integer.valueOf(toMap.getOrDefault("weight",
-                        String.valueOf(DefaultRouteConditionSubSetWeight)))));
+                thenConditions.add(new ConditionSubSet(
+                        then,
+                        Integer.valueOf(
+                                toMap.getOrDefault("weight", String.valueOf(DefaultRouteConditionSubSetWeight)))));
             }
             this.thenCondition = thenConditions;
         } catch (ParseException e) {
@@ -127,7 +130,8 @@ else if ("=".equals(separator)) {
                 if (matcherPair == null) {
                     throw new ParseException(
                             "Illegal route rule \"" + rule + "\", The error char '" + separator + "' at index "
-                                    + matcher.start() + " before \"" + content + "\".", matcher.start());
+                                    + matcher.start() + " before \"" + content + "\".",
+                            matcher.start());
                 }
 
                 values = matcherPair.getMatches();
@@ -138,7 +142,8 @@ else if ("!=".equals(separator)) {
                 if (matcherPair == null) {
                     throw new ParseException(
                             "Illegal route rule \"" + rule + "\", The error char '" + separator + "' at index "
-                                    + matcher.start() + " before \"" + content + "\".", matcher.start());
+                                    + matcher.start() + " before \"" + content + "\".",
+                            matcher.start());
                 }
 
                 values = matcherPair.getMismatches();
@@ -149,13 +154,15 @@ else if (",".equals(separator)) { // Should be separated by ','
                 if (values == null || values.isEmpty()) {
                     throw new ParseException(
                             "Illegal route rule \"" + rule + "\", The error char '" + separator + "' at index "
-                                    + matcher.start() + " before \"" + content + "\".", matcher.start());
+                                    + matcher.start() + " before \"" + content + "\".",
+                            matcher.start());
                 }
                 values.add(content);
             } else {
                 throw new ParseException(
                         "Illegal route rule \"" + rule + "\", The error char '" + separator + "' at index "
-                                + matcher.start() + " before \"" + content + "\".", matcher.start());
+                                + matcher.start() + " before \"" + content + "\".",
+                        matcher.start());
             }
         }
         return condition;
@@ -167,7 +174,8 @@ private ConditionMatcher getMatcher(String key) {
                 return factory.createMatcher(key, moduleModel);
             }
         }
-        return moduleModel.getExtensionLoader(ConditionMatcherFactory.class)
+        return moduleModel
+                .getExtensionLoader(ConditionMatcherFactory.class)
                 .getExtension("param")
                 .createMatcher(key, moduleModel);
     }
@@ -179,7 +187,8 @@ protected BitList<Invoker<T>> doRoute(
             Invocation invocation,
             boolean needToPrintMessage,
             Holder<RouterSnapshotNode<T>> routerSnapshotNodeHolder,
-            Holder<String> messageHolder) throws RpcException {
+            Holder<String> messageHolder)
+            throws RpcException {
 
         if (!enabled) {
             if (needToPrintMessage) {
@@ -203,7 +212,10 @@ protected BitList<Invoker<T>> doRoute(
                 return invokers;
             }
             if (thenCondition == null || thenCondition.size() == 0) {
-                logger.warn(CLUSTER_CONDITIONAL_ROUTE_LIST_EMPTY, "condition state router thenCondition is empty", "",
+                logger.warn(
+                        CLUSTER_CONDITIONAL_ROUTE_LIST_EMPTY,
+                        "condition state router thenCondition is empty",
+                        "",
                         "The current consumer in the service blocklist. consumer: " + NetUtils.getLocalHost()
                                 + ", service: " + url.getServiceKey());
                 if (needToPrintMessage) {
@@ -222,18 +234,22 @@ protected BitList<Invoker<T>> doRoute(
                     }
                 }
                 if (!res.isEmpty()) {
-                    destinations.addDestination(condition.getSubSetWeight()
-                            == null ? DefaultRouteConditionSubSetWeight : condition.getSubSetWeight(), res.clone());
+                    destinations.addDestination(
+                            condition.getSubSetWeight() == null
+                                    ? DefaultRouteConditionSubSetWeight
+                                    : condition.getSubSetWeight(),
+                            res.clone());
                 }
             }
 
-            if (!destinations.getDestinations()
-                    .isEmpty()) {
+            if (!destinations.getDestinations().isEmpty()) {
                 BitList<Invoker<T>> res = destinations.randDestination();
                 return res;
             } else if (this.isForce()) {
-                logger.warn(CLUSTER_CONDITIONAL_ROUTE_LIST_EMPTY, "execute condition state router result list is "
-                                + "empty. and force=true", "",
+                logger.warn(
+                        CLUSTER_CONDITIONAL_ROUTE_LIST_EMPTY,
+                        "execute condition state router result list is " + "empty. and force=true",
+                        "",
                         "The route result is empty and force execute. consumer: " + NetUtils.getLocalHost()
                                 + ", service: " + url.getServiceKey() + ", router: "
                                 + url.getParameterAndDecoded(RULE_KEY));

diff --git a/...main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ListenableStateRouter.java b/...main/java/org/apache/dubbo/rpc/cluster/router/condition/config/ListenableStateRouter.java
@@ -125,7 +125,7 @@ public BitList<Invoker<T>> doRoute(
         List<? extends AbstractStateRouter<T>> routers;
         if (routerRule instanceof MultiDestConditionRouterRule) {
             routers = multiDestConditionRouters;
-        }else {
+        } else {
             routers = conditionRouters;
         }
 
@@ -170,7 +170,8 @@ private void generateConditions(AbstractRouterRule rule) {
         } else if (rule instanceof MultiDestConditionRouterRule) {
             this.multiDestConditionRouters = ((MultiDestConditionRouterRule) rule)
                     .getConditions().stream()
-                            .map(condition -> new MultiDestConditionRouter<T>(getUrl(), condition,rule.isForce(), rule.isEnabled()))
+                            .map(condition -> new MultiDestConditionRouter<T>(
+                                    getUrl(), condition, rule.isForce(), rule.isEnabled()))
                             .collect(Collectors.toList());
 
             for (MultiDestConditionRouter<T> conditionRouter : this.multiDestConditionRouters) {

diff --git a/.../apache/dubbo/rpc/cluster/router/condition/config/model/MultiDestConditionRouterRule.java b/.../apache/dubbo/rpc/cluster/router/condition/config/model/MultiDestConditionRouterRule.java
@@ -20,7 +20,6 @@
 import org.apache.dubbo.rpc.cluster.router.AbstractRouterRule;
 
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Map;