Skip to content

[java] Revert workaround for old netty http client (addendum to #12843) #14134

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 5 commits into from
Jul 11, 2024
Merged

[java] Revert workaround for old netty http client (addendum to #12843) #14134

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
49b0344
[java] Revert workaround for old netty http client (addendum to #12843)
kool79 Jun 13, 2024
68d5917
Merge branch 'trunk' into cleanup_deprecated_code
kool79 Jun 13, 2024
db29b33
Merge branch 'trunk' into cleanup_deprecated_code
kool79 Jul 10, 2024
c892b7e
Merge branch 'trunk' into cleanup_deprecated_code
diemol Jul 11, 2024
003f644
Running format script
diemol Jul 11, 2024
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
15 changes: 1 addition & 14 deletions java/src/org/openqa/selenium/chromium/ChromiumOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.TreeMap;
import java.util.stream.Stream;
Expand Down Expand Up @@ -120,24 +119,12 @@ public T addArguments(String... arguments) {
* "allow-outdated-plugins");
* </code></pre>
*
* <p>Each argument may contain an option "--" prefix: "--foo" or "foo". Arguments with an
* <p>Each argument may contain an optional "--" prefix: "--foo" or "foo". Arguments with an
* associated value should be delimited with an "=": "foo=bar".
*
* @param arguments The arguments to use when starting Chrome.
*/
public T addArguments(List<String> arguments) {
/*
--remote-allow-origins is being added by default since Chrome 111. We need to check
if the argument already exists and then remove it.
*/
String remoteAllowOrigins = "remote-allow-origins";
Optional<String> newArg =
arguments.stream().filter(arg -> arg.contains(remoteAllowOrigins)).findFirst();
Optional<String> existingArg =
args.stream().filter(arg -> arg.contains(remoteAllowOrigins)).findFirst();
if (newArg.isPresent() && existingArg.isPresent()) {
args.remove(existingArg.get());
}
args.addAll(arguments);
return (T) this;
}
Expand Down