[java] use .anyMatch to return after the first match

SeleniumHQ · Aug 14, 2023 · 15541eb · 15541eb
1 parent 16a5059
commit 15541eb
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 24 deletions.
diff --git a/java/src/org/openqa/selenium/firefox/GeckoDriverInfo.java b/java/src/org/openqa/selenium/firefox/GeckoDriverInfo.java
@@ -50,9 +50,7 @@ public boolean isSupporting(Capabilities capabilities) {
     }
 
     return capabilities.asMap().keySet().stream()
-        .map(key -> key.startsWith("moz:"))
-        .reduce(Boolean::logicalOr)
-        .orElse(false);
+        .anyMatch(key -> key.startsWith("moz:"));
   }
 
   @Override

diff --git a/java/src/org/openqa/selenium/grid/data/DistributorStatus.java b/java/src/org/openqa/selenium/grid/data/DistributorStatus.java
@@ -41,9 +41,7 @@ public DistributorStatus(Collection<NodeStatus> allNodes) {
 
   public boolean hasCapacity() {
     return getNodes().stream()
-        .map(node -> node.getAvailability().equals(Availability.UP) && node.hasCapacity())
-        .reduce(Boolean::logicalOr)
-        .orElse(false);
+        .anyMatch(node -> node.getAvailability().equals(Availability.UP) && node.hasCapacity());
   }
 
   public Set<NodeStatus> getNodes() {

diff --git a/java/src/org/openqa/selenium/grid/web/CombinedHandler.java b/java/src/org/openqa/selenium/grid/web/CombinedHandler.java
@@ -43,9 +43,7 @@ public boolean test(HttpRequest request) {
   @Override
   public boolean matches(HttpRequest req) {
     return handlers.keySet().stream()
-        .map(p -> p.matches(req))
-        .reduce(Boolean::logicalOr)
-        .orElse(false);
+        .anyMatch(p -> p.matches(req));
   }
 
   @Override

diff --git a/java/src/org/openqa/selenium/grid/web/PathResource.java b/java/src/org/openqa/selenium/grid/web/PathResource.java
@@ -49,9 +49,7 @@ public PathResource limit(String... subpaths) {
         base,
         path ->
             Arrays.stream(subpaths)
-                .map(subpath -> Files.exists(base.resolve(subpath)))
-                .reduce(Boolean::logicalOr)
-                .orElse(false));
+                .anyMatch(subpath -> Files.exists(base.resolve(subpath))));
   }
 
   @Override

diff --git a/java/src/org/openqa/selenium/internal/Debug.java b/java/src/org/openqa/selenium/internal/Debug.java
@@ -28,9 +28,7 @@ public class Debug {
   static {
     boolean debugFlag =
         ManagementFactory.getRuntimeMXBean().getInputArguments().stream()
-            .map(str -> str.contains("-agentlib:jdwp"))
-            .reduce(Boolean::logicalOr)
-            .orElse(false);
+            .anyMatch(str -> str.contains("-agentlib:jdwp"));
     boolean simpleProperty = Boolean.getBoolean("selenium.debug");
     boolean longerProperty = Boolean.getBoolean("selenium.webdriver.verbose");
 

diff --git a/java/src/org/openqa/selenium/safari/SafariDriverInfo.java b/java/src/org/openqa/selenium/safari/SafariDriverInfo.java
@@ -49,10 +49,8 @@ public boolean isSupporting(Capabilities capabilities) {
       return true;
     }
 
-    return capabilities.asMap().keySet().parallelStream()
-        .map(key -> key.startsWith("safari:"))
-        .reduce(Boolean::logicalOr)
-        .orElse(false);
+    return capabilities.asMap().keySet().stream()
+        .anyMatch(key -> key.startsWith("safari:"));
   }
 
   @Override

diff --git a/java/src/org/openqa/selenium/safari/SafariTechPreviewDriverInfo.java b/java/src/org/openqa/selenium/safari/SafariTechPreviewDriverInfo.java
@@ -50,10 +50,8 @@ public boolean isSupporting(Capabilities capabilities) {
       return true;
     }
 
-    return capabilities.asMap().keySet().parallelStream()
-        .map(key -> key.startsWith("safari:"))
-        .reduce(Boolean::logicalOr)
-        .orElse(false);
+    return capabilities.asMap().keySet().stream()
+        .anyMatch(key -> key.startsWith("safari:"));
   }
 
   @Override

diff --git a/java/test/org/openqa/selenium/build/DevMode.java b/java/test/org/openqa/selenium/build/DevMode.java
@@ -53,6 +53,6 @@ public class DevMode {
           () -> Boolean.getBoolean("selenium.dev-mode"));
 
   public static boolean isInDevMode() {
-    return DEV_MODE_CHECKS.stream().map(Supplier::get).reduce(Boolean::logicalOr).orElse(false);
+    return DEV_MODE_CHECKS.stream().anyMatch(Supplier::get);
   }
 }