Skip to content

Commit 15541eb

Browse files
committed
[java] use .anyMatch to return after the first match
1 parent 16a5059 commit 15541eb

File tree

8 files changed

+10
-24
lines changed

8 files changed

+10
-24
lines changed

java/src/org/openqa/selenium/firefox/GeckoDriverInfo.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,7 @@ public boolean isSupporting(Capabilities capabilities) {
5050
}
5151

5252
return capabilities.asMap().keySet().stream()
53-
.map(key -> key.startsWith("moz:"))
54-
.reduce(Boolean::logicalOr)
55-
.orElse(false);
53+
.anyMatch(key -> key.startsWith("moz:"));
5654
}
5755

5856
@Override

java/src/org/openqa/selenium/grid/data/DistributorStatus.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@ public DistributorStatus(Collection<NodeStatus> allNodes) {
4141

4242
public boolean hasCapacity() {
4343
return getNodes().stream()
44-
.map(node -> node.getAvailability().equals(Availability.UP) && node.hasCapacity())
45-
.reduce(Boolean::logicalOr)
46-
.orElse(false);
44+
.anyMatch(node -> node.getAvailability().equals(Availability.UP) && node.hasCapacity());
4745
}
4846

4947
public Set<NodeStatus> getNodes() {

java/src/org/openqa/selenium/grid/web/CombinedHandler.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,7 @@ public boolean test(HttpRequest request) {
4343
@Override
4444
public boolean matches(HttpRequest req) {
4545
return handlers.keySet().stream()
46-
.map(p -> p.matches(req))
47-
.reduce(Boolean::logicalOr)
48-
.orElse(false);
46+
.anyMatch(p -> p.matches(req));
4947
}
5048

5149
@Override

java/src/org/openqa/selenium/grid/web/PathResource.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@ public PathResource limit(String... subpaths) {
4949
base,
5050
path ->
5151
Arrays.stream(subpaths)
52-
.map(subpath -> Files.exists(base.resolve(subpath)))
53-
.reduce(Boolean::logicalOr)
54-
.orElse(false));
52+
.anyMatch(subpath -> Files.exists(base.resolve(subpath))));
5553
}
5654

5755
@Override

java/src/org/openqa/selenium/internal/Debug.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ public class Debug {
2828
static {
2929
boolean debugFlag =
3030
ManagementFactory.getRuntimeMXBean().getInputArguments().stream()
31-
.map(str -> str.contains("-agentlib:jdwp"))
32-
.reduce(Boolean::logicalOr)
33-
.orElse(false);
31+
.anyMatch(str -> str.contains("-agentlib:jdwp"));
3432
boolean simpleProperty = Boolean.getBoolean("selenium.debug");
3533
boolean longerProperty = Boolean.getBoolean("selenium.webdriver.verbose");
3634

java/src/org/openqa/selenium/safari/SafariDriverInfo.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,8 @@ public boolean isSupporting(Capabilities capabilities) {
4949
return true;
5050
}
5151

52-
return capabilities.asMap().keySet().parallelStream()
53-
.map(key -> key.startsWith("safari:"))
54-
.reduce(Boolean::logicalOr)
55-
.orElse(false);
52+
return capabilities.asMap().keySet().stream()
53+
.anyMatch(key -> key.startsWith("safari:"));
5654
}
5755

5856
@Override

java/src/org/openqa/selenium/safari/SafariTechPreviewDriverInfo.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,8 @@ public boolean isSupporting(Capabilities capabilities) {
5050
return true;
5151
}
5252

53-
return capabilities.asMap().keySet().parallelStream()
54-
.map(key -> key.startsWith("safari:"))
55-
.reduce(Boolean::logicalOr)
56-
.orElse(false);
53+
return capabilities.asMap().keySet().stream()
54+
.anyMatch(key -> key.startsWith("safari:"));
5755
}
5856

5957
@Override

java/test/org/openqa/selenium/build/DevMode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ public class DevMode {
5353
() -> Boolean.getBoolean("selenium.dev-mode"));
5454

5555
public static boolean isInDevMode() {
56-
return DEV_MODE_CHECKS.stream().map(Supplier::get).reduce(Boolean::logicalOr).orElse(false);
56+
return DEV_MODE_CHECKS.stream().anyMatch(Supplier::get);
5757
}
5858
}

0 commit comments

Comments
 (0)