Merge branch 'trunk' into py-bidi-emulation

Author: navin772

.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'

.mailmap

@@ -16,7 +16,7 @@ Brandon Walderman <[email protected]> <[email protected]>
 Brian Burg <[email protected]> <[email protected]>
 Chethana Paniyadi  <[email protected]> <[email protected]>
 Craig Nishina <[email protected]> <[email protected]>
-Corey Goldberg <[email protected]> <[email protected]>
+Corey Goldberg <[email protected].com> <cgoldberg@gmail.com>
 Dan Fabulich <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
 Daniel P. Purkhús <[email protected]>

MODULE.bazel

@@ -24,14 +24,14 @@ bazel_dep(name = "rules_multitool", version = "1.3.0")
 bazel_dep(name = "rules_nodejs", version = "6.3.2")
 bazel_dep(name = "rules_oci", version = "1.8.0")
 bazel_dep(name = "rules_pkg", version = "1.0.1")
-bazel_dep(name = "rules_python", version = "1.1.0")
+bazel_dep(name = "rules_python", version = "1.5.0")
 bazel_dep(name = "rules_proto", version = "7.0.2")
 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",

README.md

@@ -266,7 +266,7 @@ you can configure it use Bazel artifacts:
 1. Open `rb/` as a main project directory.
 2. Run `bundle exec rake update` as necessary to create up-to-date artifacts. If this does not work, run `./go rb:update` from the `selenium` (parent) directory.
 3. In <kbd>Settings / Languages & Frameworks / Ruby SDK and Gems</kbd> add new <kbd>Interpreter</kbd> pointing to `../bazel-selenium/external/rules_ruby_dist/dist/bin/ruby`.
-4. You should now be able to run and debug any spec. It uses Chrome by default, but you can alter it using environment variables secified in [Ruby Testing](#ruby-2) section below.
+4. You should now be able to run and debug any spec. It uses Chrome by default, but you can alter it using environment variables specified in [Ruby Testing](#ruby-2) section below.
 
 ### Rust
 

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"])

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/By.java

@@ -23,6 +23,8 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.regex.Pattern;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.internal.Require;
 
 /**
@@ -40,6 +42,7 @@
  * }
  * </code></pre>
  */
+@NullMarked
 public abstract class By {
   /**
    * @param id The value of the "id" attribute to search for.
@@ -158,7 +161,7 @@ protected JavascriptExecutor getJavascriptExecutor(SearchContext context) {
   }
 
   @Override
-  public boolean equals(Object o) {
+  public boolean equals(@Nullable Object o) {
     if (!(o instanceof By)) {
       return false;
     }
@@ -296,6 +299,7 @@ public String toString() {
 
   public static class ByClassName extends PreW3CLocator {
 
+    private static final Pattern AT_LEAST_ONE_WHITESPACE = Pattern.compile(".*\\s.*");
     private final String className;
 
     public ByClassName(String className) {
@@ -305,7 +309,7 @@ public ByClassName(String className) {
               .nonNull("Cannot find elements when the class name expression is null."),
           ".%s");
 
-      if (className.matches(".*\\s.*")) {
+      if (AT_LEAST_ONE_WHITESPACE.matcher(className).matches()) {
         throw new InvalidSelectorException("Compound class names not permitted");
       }
 
@@ -341,9 +345,9 @@ public interface Remotable {
 
     class Parameters {
       private final String using;
-      private final Object value;
+      private final @Nullable Object value;
 
-      public Parameters(String using, Object value) {
+      public Parameters(String using, @Nullable Object value) {
         this.using = Require.nonNull("Search mechanism", using);
         // There may be subclasses where the value is optional. Allow for this.
         this.value = value;
@@ -353,7 +357,7 @@ public String using() {
         return using;
       }
 
-      public Object value() {
+      public @Nullable Object value() {
         return value;
       }
 
@@ -363,7 +367,7 @@ public String toString() {
       }
 
       @Override
-      public boolean equals(Object o) {
+      public boolean equals(@Nullable Object o) {
         if (!(o instanceof Parameters)) {
           return false;
         }
@@ -376,8 +380,8 @@ public int hashCode() {
         return Objects.hash(using, value);
       }
 
-      private Map<String, Object> toJson() {
-        Map<String, Object> params = new HashMap<>();
+      private Map<String, @Nullable Object> toJson() {
+        Map<String, @Nullable Object> params = new HashMap<>();
         params.put("using", using);
         params.put("value", value);
         return Collections.unmodifiableMap(params);
@@ -409,7 +413,7 @@ public final Parameters getRemoteParameters() {
       return params;
     }
 
-    protected final Map<String, Object> toJson() {
+    protected final Map<String, @Nullable Object> toJson() {
       return getRemoteParameters().toJson();
     }
   }
@@ -440,7 +444,7 @@ public final Parameters getRemoteParameters() {
       return remoteParams;
     }
 
-    protected final Map<String, Object> toJson() {
+    protected final Map<String, @Nullable Object> toJson() {
       return fallback.toJson();
     }
 

java/src/org/openqa/selenium/Capabilities.java

@@ -24,15 +24,18 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Stream;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /** Describes a series of key/value pairs that encapsulate aspects of a browser. */
+@NullMarked
 public interface Capabilities extends Serializable {
 
   default String getBrowserName() {
     return String.valueOf(Optional.ofNullable(getCapability("browserName")).orElse(""));
   }
 
-  default Platform getPlatformName() {
+  default @Nullable Platform getPlatformName() {
     return Stream.of("platformName")
         .map(this::getCapability)
         .filter(Objects::nonNull)
@@ -67,7 +70,7 @@ default String getBrowserVersion() {
    * @return The value, or null if not set.
    * @see org.openqa.selenium.remote.CapabilityType
    */
-  Object getCapability(String capabilityName);
+  @Nullable Object getCapability(String capabilityName);
 
   /**
    * @param capabilityName The capability to check.

java/src/org/openqa/selenium/HasCapabilities.java

@@ -17,10 +17,13 @@
 
 package org.openqa.selenium;
 
+import org.jspecify.annotations.NullMarked;
+
 /**
  * Used by classes to indicate that they can describe the {@link org.openqa.selenium.Capabilities}
  * they possess. This can be used for run-time detection of features.
  */
+@NullMarked
 public interface HasCapabilities {
   /**
    * @return The capabilities of the current driver.