fix apache#7315 redundant box for boolean and refactor method filterI…

…nvoker (apache#7316)
AlbumenJ · Mar 11, 2021 · 44e754b · 44e754b
1 parent fab59fc
commit 44e754b
Showing 1 changed file with 3 additions and 11 deletions.
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
@@ -160,7 +160,7 @@ public <T> List<Invoker<T>> route(List<Invoker<T>> invokers, URL url, Invocation
      * @return
      */
     private <T> List<Invoker<T>> filterUsingStaticTag(List<Invoker<T>> invokers, URL url, Invocation invocation) {
-        List<Invoker<T>> result = invokers;
+        List<Invoker<T>> result;
         // Dynamic param
         String tag = StringUtils.isEmpty(invocation.getAttachment(TAG_KEY)) ? url.getParameter(TAG_KEY) :
                 invocation.getAttachment(TAG_KEY);
@@ -188,19 +188,11 @@ public boolean isForce() {
     }
 
     private boolean isForceUseTag(Invocation invocation) {
-        return Boolean.valueOf(invocation.getAttachment(FORCE_USE_TAG, url.getParameter(FORCE_USE_TAG, "false")));
+        return Boolean.parseBoolean(invocation.getAttachment(FORCE_USE_TAG, url.getParameter(FORCE_USE_TAG, "false")));
     }
 
     private <T> List<Invoker<T>> filterInvoker(List<Invoker<T>> invokers, Predicate<Invoker<T>> predicate) {
-        boolean filter = false;
-        for (int i = 0; i < invokers.size(); ++i) {
-            Invoker<T> invoker = invokers.get(i);
-            if (!predicate.test(invoker)) {
-                filter = true;
-                break;
-            }
-        }
-        if (!filter) {
+        if (invokers.stream().allMatch(predicate)) {
             return invokers;
         }