Merge branch 'trunk' into java-websocket-port-bidi

Author: diemol

.github/workflows/stale.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/stale@v9
         with:
-          stale-issue-message: 'This issue is stale because it has been open 280 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
+          stale-issue-message: 'This issue is stale because it has been open 180 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
           close-issue-message: 'This issue was closed because it has been stalled for 14 days with no activity.'
           stale-issue-label: 'J-stale'
           stale-pr-label: 'J-stale'

MODULE.bazel

@@ -31,7 +31,7 @@ bazel_dep(name = "rules_ruby", version = "0.19.0")
 # Until `rules_jvm_external` 6.8 ships
 git_override(
     module_name = "rules_jvm_external",
-    commit = "29c451d2a62aa2451f5810c005ecac925b4772b6",
+    commit = "aca619b117c1fe306ffdd20c5f47cc4dbd5effed",
     patch_strip = 1,
     patches = ["//java:rules_jvm_external_javadoc.patch"],
     remote = "https://github.com/bazel-contrib/rules_jvm_external.git",

common/repositories.bzl

@@ -50,8 +50,8 @@ js_library(
 
     http_archive(
         name = "linux_beta_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/141.0b4/linux-x86_64/en-US/firefox-141.0b4.tar.xz",
-        sha256 = "04e66e3e8a7512d2f45b69fe9385c6820182e7b8addfaac218ee10a108a08e6b",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/141.0b6/linux-x86_64/en-US/firefox-141.0b6.tar.xz",
+        sha256 = "24ee93812f5943a940c6fe9231726a2c6dce10e1767204d5127d8cdafdf257b5",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -72,8 +72,8 @@ js_library(
 
     dmg_archive(
         name = "mac_beta_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/141.0b4/mac/en-US/Firefox%20141.0b4.dmg",
-        sha256 = "edcd3074f81a3e318aa672db0ec48f2c57c9eebbe9275e22fd64a42c9eb8d29b",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/141.0b6/mac/en-US/Firefox%20141.0b6.dmg",
+        sha256 = "26ff8ba6534ee8c15a7b55fc4a38bde1e72c515c878b0abbe87b4dd8993f81db",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -123,10 +123,10 @@ js_library(
 
     pkg_archive(
         name = "mac_edge",
-        url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/3c804dbf-368d-489d-8836-9756b2d4b017/MicrosoftEdge-138.0.3351.55.pkg",
-        sha256 = "1ff1aecb62fe10151a4ebfd05b9834a4d94955d7f58ba434b2576468381c0f9b",
+        url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/84bbc955-86c8-45ec-a520-da2c4026e2e1/MicrosoftEdge-138.0.3351.65.pkg",
+        sha256 = "ff125c9e9f5e15372e3a62affa4bb63ada11cb49226c78de1ca5b1b6ffdc3a1b",
         move = {
-            "MicrosoftEdge-138.0.3351.55.pkg/Payload/Microsoft Edge.app": "Edge.app",
+            "MicrosoftEdge-138.0.3351.65.pkg/Payload/Microsoft Edge.app": "Edge.app",
         },
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -143,8 +143,8 @@ js_library(
 
     deb_archive(
         name = "linux_edge",
-        url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_138.0.3351.55-1_amd64.deb",
-        sha256 = "4990ad02387363c06ac0cf48312db4f35456c514fee20420ae3bdeedabccec1a",
+        url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_138.0.3351.65-1_amd64.deb",
+        sha256 = "fbc6d5de9c2862fa787b47891e3e7f352bb5e50885c1526e1b1149912efa8302",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -165,8 +165,8 @@ js_library(
 
     http_archive(
         name = "linux_edgedriver",
-        url = "https://msedgedriver.azureedge.net/138.0.3351.55/edgedriver_linux64.zip",
-        sha256 = "cfa15f718ea556a1bbc845fafe53909eaa2572058f8cb485a5c637df217e9b60",
+        url = "https://msedgedriver.azureedge.net/138.0.3351.65/edgedriver_linux64.zip",
+        sha256 = "48da0a21583fe4cbf5a2d720d344443d22517b2813d9c72a5adcf064e2fa336e",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -182,8 +182,8 @@ js_library(
 
     http_archive(
         name = "mac_edgedriver",
-        url = "https://msedgedriver.azureedge.net/138.0.3351.55/edgedriver_mac64.zip",
-        sha256 = "fd5f5d567e3cc9f3735f496dab08c5f51f555ebf7cc19f16e1a52ebad2082022",
+        url = "https://msedgedriver.azureedge.net/138.0.3351.65/edgedriver_mac64.zip",
+        sha256 = "17307f5a12531c0e3209522ff1887fe37aaf896c27c0148157ba54f347f50492",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])

java/spotbugs-excludes.xml

@@ -63,16 +63,6 @@
     <Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"/>
   </Match>
 
-  <Match>
-    <Class name="org.openqa.selenium.firefox.Executable"/>
-    <Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"/>
-  </Match>
-
-  <Match>
-    <Class name="org.openqa.selenium.firefox.FirefoxBinary"/>
-    <Bug pattern="DMI_HARDCODED_ABSOLUTE_FILENAME,NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"/>
-  </Match>
-
   <Match>
     <Class name="org.openqa.selenium.firefox.FirefoxDriver"/>
     <Bug pattern="NP_BOOLEAN_RETURN_NULL,UUF_UNUSED_PUBLIC_OR_PROTECTED_FIELD"/>

java/src/org/openqa/selenium/BUILD.bazel

@@ -13,7 +13,6 @@ java_export(
     srcs = glob([
         "*.java",
         "federatedcredentialmanagement/*.java",
-        "html5/*.java",
         "internal/*.java",
         "interactions/**/*.java",
         "logging/**/*.java",

java/src/org/openqa/selenium/Keys.java

@@ -119,7 +119,7 @@ public enum Keys implements CharSequence {
   RIGHT_COMMAND('\uE053'),
 
   // Symbolic macOS keys not yet standardized
-  OPTION('\uE050'), // TODO: verify Unicode value with WebDriver spec
+  OPTION('\uE052'),
   FN('\uE051'), // TODO: symbolic only; confirm or remove in future
 
   ZENKAKU_HANKAKU('\uE040');

java/src/org/openqa/selenium/PersistentCapabilities.java

@@ -17,11 +17,9 @@
 
 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;
@@ -58,7 +56,7 @@ public PersistentCapabilities setCapability(String name, Object value) {
   @Override
   public Map<String, Object> asMap() {
     return getCapabilityNames().stream()
-        .collect(toUnmodifiableMap(Function.identity(), this::getCapability));
+        .collect(Collectors.toUnmodifiableMap(Function.identity(), this::getCapability));
   }
 
   @Override
@@ -81,19 +79,7 @@ public Capabilities merge(Capabilities other) {
   public Set<String> getCapabilityNames() {
     return Stream.concat(
             caps.getCapabilityNames().stream(), overrides.getCapabilityNames().stream())
-        .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);
+        .collect(Collectors.toUnmodifiableSet());
   }
 
   @Override

java/src/org/openqa/selenium/chromium/ChromiumDriver.java

@@ -52,20 +52,13 @@
 import org.openqa.selenium.devtools.DevTools;
 import org.openqa.selenium.devtools.HasDevTools;
 import org.openqa.selenium.devtools.noop.NoOpCdpInfo;
-import org.openqa.selenium.html5.LocalStorage;
-import org.openqa.selenium.html5.Location;
-import org.openqa.selenium.html5.LocationContext;
-import org.openqa.selenium.html5.SessionStorage;
-import org.openqa.selenium.html5.WebStorage;
 import org.openqa.selenium.internal.Require;
 import org.openqa.selenium.json.TypeToken;
 import org.openqa.selenium.logging.EventType;
 import org.openqa.selenium.logging.HasLogEvents;
 import org.openqa.selenium.remote.CommandExecutor;
 import org.openqa.selenium.remote.FileDetector;
 import org.openqa.selenium.remote.RemoteWebDriver;
-import org.openqa.selenium.remote.html5.RemoteLocationContext;
-import org.openqa.selenium.remote.html5.RemoteWebStorage;
 import org.openqa.selenium.remote.http.ClientConfig;
 import org.openqa.selenium.remote.http.ConnectionFailedException;
 import org.openqa.selenium.remote.http.HttpClient;
@@ -83,17 +76,13 @@ public class ChromiumDriver extends RemoteWebDriver
         HasLaunchApp,
         HasLogEvents,
         HasNetworkConditions,
-        HasPermissions,
-        LocationContext,
-        WebStorage {
+        HasPermissions {
 
   public static final Predicate<String> IS_CHROMIUM_BROWSER =
       name -> CHROME.is(name) || EDGE.is(name) || OPERA.is(name);
   private static final Logger LOG = Logger.getLogger(ChromiumDriver.class.getName());
 
   private final Capabilities capabilities;
-  private final RemoteLocationContext locationContext;
-  private final RemoteWebStorage webStorage;
   private final HasNetworkConditions networkConditions;
   private final HasPermissions permissions;
   private final HasLaunchApp launch;
@@ -108,8 +97,6 @@ public class ChromiumDriver extends RemoteWebDriver
   protected ChromiumDriver(
       CommandExecutor commandExecutor, Capabilities capabilities, String capabilityKey) {
     super(commandExecutor, capabilities);
-    locationContext = new RemoteLocationContext(getExecuteMethod());
-    webStorage = new RemoteWebStorage(getExecuteMethod());
     permissions = new AddHasPermissions().getImplementation(getCapabilities(), getExecuteMethod());
     networkConditions =
         new AddHasNetworkConditions().getImplementation(getCapabilities(), getExecuteMethod());
@@ -287,31 +274,6 @@ public void register(Predicate<URI> whenThisMatches, Supplier<Credentials> useTh
     getDevTools().getDomains().network().addAuthHandler(whenThisMatches, useTheseCredentials);
   }
 
-  @Override
-  @Deprecated
-  public LocalStorage getLocalStorage() {
-    return webStorage.getLocalStorage();
-  }
-
-  @Override
-  @Deprecated
-  public SessionStorage getSessionStorage() {
-    return webStorage.getSessionStorage();
-  }
-
-  @Override
-  @Deprecated
-  public Location location() {
-    return locationContext.location();
-  }
-
-  @Override
-  @Deprecated
-  public void setLocation(Location location) {
-    Require.nonNull("Location", location);
-    locationContext.setLocation(location);
-  }
-
   @Override
   public void launchApp(String id) {
     Require.nonNull("Launch App ID", id);

java/src/org/openqa/selenium/edge/BUILD.bazel

@@ -21,5 +21,6 @@ java_export(
         "//java/src/org/openqa/selenium/chromium",
         "//java/src/org/openqa/selenium/manager",
         "//java/src/org/openqa/selenium/remote",
+        "@maven//:org_jspecify_jspecify",
     ],
 )

java/src/org/openqa/selenium/edge/EdgeDriverService.java

@@ -29,6 +29,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.chromium.ChromiumDriverLogLevel;
@@ -96,11 +97,11 @@ public class EdgeDriverService extends DriverService {
    * @throws IOException If an I/O error occurs.
    */
   public EdgeDriverService(
-      File executable,
+      @Nullable File executable,
       int port,
-      Duration timeout,
-      List<String> args,
-      Map<String, String> environment)
+      @Nullable Duration timeout,
+      @Nullable List<String> args,
+      @Nullable Map<String, String> environment)
       throws IOException {
     super(executable, port, timeout, List.copyOf(args), Map.copyOf(environment));
   }
@@ -139,13 +140,13 @@ public static EdgeDriverService createDefaultService() {
   @AutoService(DriverService.Builder.class)
   public static class Builder extends DriverService.Builder<EdgeDriverService, Builder> {
 
-    private Boolean disableBuildCheck;
-    private Boolean readableTimestamp;
-    private Boolean appendLog;
-    private Boolean verbose;
-    private Boolean silent;
-    private String allowedListIps;
-    private ChromiumDriverLogLevel logLevel;
+    @Nullable private Boolean disableBuildCheck;
+    @Nullable private Boolean readableTimestamp;
+    @Nullable private Boolean appendLog;
+    @Nullable private Boolean verbose;
+    @Nullable private Boolean silent;
+    @Nullable private String allowedListIps;
+    @Nullable private ChromiumDriverLogLevel logLevel;
 
     @Override
     public int score(Capabilities capabilities) {
@@ -196,7 +197,7 @@ public Builder withBuildCheckDisabled(boolean noBuildCheck) {
      * @param logLevel {@link ChromiumDriverLogLevel} for desired log level output.
      * @return A self reference.
      */
-    public Builder withLoglevel(ChromiumDriverLogLevel logLevel) {
+    public Builder withLoglevel(@Nullable ChromiumDriverLogLevel logLevel) {
       this.logLevel = logLevel;
       this.silent = false;
       this.verbose = false;
@@ -238,7 +239,7 @@ public Builder withVerbose(boolean verbose) {
      * @param allowedListIps Comma-separated list of remote IPv4 addresses.
      * @return A self reference.
      */
-    public Builder withAllowedListIps(String allowedListIps) {
+    public Builder withAllowedListIps(@Nullable String allowedListIps) {
       this.allowedListIps = allowedListIps;
       return this;
     }
@@ -249,7 +250,7 @@ public Builder withAllowedListIps(String allowedListIps) {
      * @param readableTimestamp Whether the timestamp of the log is readable.
      * @return A self reference.
      */
-    public Builder withReadableTimestamp(Boolean readableTimestamp) {
+    public Builder withReadableTimestamp(@Nullable Boolean readableTimestamp) {
       this.readableTimestamp = readableTimestamp;
       return this;
     }
@@ -321,7 +322,11 @@ protected List<String> createArgs() {
 
     @Override
     protected EdgeDriverService createDriverService(
-        File exe, int port, Duration timeout, List<String> args, Map<String, String> environment) {
+        @Nullable File exe,
+        int port,
+        @Nullable Duration timeout,
+        @Nullable List<String> args,
+        @Nullable Map<String, String> environment) {
       try {
         return new EdgeDriverService(exe, port, timeout, args, environment);
       } catch (IOException e) {