Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[java] Use static Patterns for regex-matching #15499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jul 6, 2025
Merged

[java] Use static Patterns for regex-matching #15499

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
561a93b
[java] Use static Patterns for regex-matching
zodac Mar 24, 2025
0cf7965
Merge branch 'trunk' into pattern_improvements
zodac Mar 24, 2025
e8bd4d3
[java] Running formatter
zodac Mar 24, 2025
b504bb3
Merge branch 'trunk' into pattern_improvements
pujagani Mar 26, 2025
f1bace1
Merge branch 'SeleniumHQ:trunk' into pattern_improvements
zodac Mar 27, 2025
a5d9b14
[java] Undoing removal of Java 8 code
zodac Mar 27, 2025
9d23f88
[java] Fixing formatting
zodac Mar 27, 2025
17a30a5
Merge branch 'trunk' into pattern_improvements
diemol Jul 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[java] Undoing removal of Java 8 code 
Will submit separate PR
  • Loading branch information
@zodac
zodac committed Mar 27, 2025
commit a5d9b14acddcb28d5ab2592c4f8d848312ceb9d3
18 changes: 16 additions & 2 deletions java/src/org/openqa/selenium/PersistentCapabilities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@

package org.openqa.selenium;

import java.util.Collections;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collector;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.openqa.selenium.internal.Require;
Expand Down Expand Up @@ -56,7 +58,7 @@ public PersistentCapabilities setCapability(String name, Object value) {
@Override
public Map<String, Object> asMap() {
return getCapabilityNames().stream()
.collect(Collectors.toUnmodifiableMap(Function.identity(), this::getCapability));
.collect(toUnmodifiableMap(Function.identity(), this::getCapability));
}

@Override
Expand All @@ -79,7 +81,19 @@ public Capabilities merge(Capabilities other) {
public Set<String> getCapabilityNames() {
return Stream.concat(
caps.getCapabilityNames().stream(), overrides.getCapabilityNames().stream())
.collect(Collectors.toUnmodifiableSet());
.collect(toUnmodifiableSet());
}

// Needed, since we're dependent on Java 8 as a minimum version
private <T, K, U> Collector<T, ?, Map<K, U>> toUnmodifiableMap(
Function<? super T, ? extends K> keyMapper, Function<? super T, ? extends U> valueMapper) {
return Collectors.collectingAndThen(
Collectors.toMap(keyMapper, valueMapper), Collections::unmodifiableMap);
}

// Needed, since we're dependent on Java 8 as a minimum version
private <T> Collector<T, ?, Set<T>> toUnmodifiableSet() {
return Collectors.collectingAndThen(Collectors.toSet(), Collections::unmodifiableSet);
}

@Override
Expand Down