Merge branch 'trunk' into py-support-ipv6-only-systems

Author: cgoldberg

MODULE.bazel

@@ -24,7 +24,7 @@ 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")
 

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
 

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;
     }
@@ -342,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;
@@ -354,7 +357,7 @@ public String using() {
         return using;
       }
 
-      public Object value() {
+      public @Nullable Object value() {
         return value;
       }
 
@@ -364,7 +367,7 @@ public String toString() {
       }
 
       @Override
-      public boolean equals(Object o) {
+      public boolean equals(@Nullable Object o) {
         if (!(o instanceof Parameters)) {
           return false;
         }
@@ -377,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);
@@ -410,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();
     }
   }
@@ -441,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/support/BUILD.bazel

@@ -1,4 +1,4 @@
-load("//java:defs.bzl", "java_export", "java_library")
+load("//java:defs.bzl", "artifact", "java_export", "java_library")
 load("//java:version.bzl", "SE_VERSION")
 
 java_export(
@@ -57,5 +57,6 @@ java_library(
     deps = [
         "//java/src/org/openqa/selenium:core",
         "//java/src/org/openqa/selenium/support/ui:components",
+        artifact("org.jspecify:jspecify"),
     ],
 )

java/src/org/openqa/selenium/support/ByIdOrName.java

@@ -20,11 +20,13 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
+import org.jspecify.annotations.NullMarked;
 import org.openqa.selenium.By;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.SearchContext;
 import org.openqa.selenium.WebElement;
 
+@NullMarked
 public class ByIdOrName extends By implements Serializable {
 
   private static final long serialVersionUID = 3986638402799576701L;

java/src/org/openqa/selenium/support/pagefactory/ByAll.java

@@ -20,6 +20,7 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
+import org.jspecify.annotations.NullMarked;
 import org.openqa.selenium.By;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.SearchContext;
@@ -36,6 +37,7 @@
  * will find all elements that match <var>by1</var> and then all elements that match <var>by2</var>.
  * This means that the list of elements returned may not be in document order.
  */
+@NullMarked
 public class ByAll extends By implements Serializable {
 
   private static final long serialVersionUID = 4573668832699497306L;

java/src/org/openqa/selenium/support/pagefactory/ByChained.java

@@ -22,6 +22,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import org.jspecify.annotations.NullMarked;
 import org.openqa.selenium.By;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.SearchContext;
@@ -38,6 +39,7 @@
  * will find all elements that match <var>by2</var> and appear under an element that matches
  * <var>by1</var>.
  */
+@NullMarked
 public class ByChained extends By implements Serializable {
 
   private static final long serialVersionUID = 1563769051170172451L;

py/CHANGES

@@ -684,7 +684,7 @@ Selenium 4.0 Alpha 7
 * Add debugpy to requirements
 * Fix uploading multiple files on remote driver (#7472) (#8734)
 * Correct docstring around find_element and find_elements. Fixes #8806
-* Add the ability to ignore local proxys that are available
+* Add the ability to ignore local proxies that are available
 * add script pinning to python bindings
 * Deprecate desired_capabilities property in favour of capabilities property
 * Update tests to use requirements file

py/docs/README.rst

@@ -66,7 +66,7 @@ Contributing to Python docs
 
 First it is recommended that you read the main `CONTRIBUTING.md <https://github.com/SeleniumHQ/selenium/blob/trunk/CONTRIBUTING.md>`_.
 
-Some steps for contibuting to the Python documentation ...
+Some steps for contributing to the Python documentation ...
 
 - Check out changes locally using instructions above.
 - Try to resolve any warnings/errors.

py/selenium/webdriver/common/virtual_authenticator.py

@@ -94,7 +94,7 @@ def __init__(
             - rp_id (str): Relying party identifier.
             - user_handle (bytes): userHandle associated to the credential. Must be Base64 encoded string. Can be None.
             - private_key (bytes): Base64 encoded PKCS#8 private key.
-            - sign_count (int): intital value for a signature counter.
+            - sign_count (int): initial value for a signature counter.
         """
         self._id = credential_id
         self._is_resident_credential = is_resident_credential
@@ -137,7 +137,7 @@ def create_non_resident_credential(cls, id: bytes, rp_id: str, private_key: byte
           - id (bytes): Unique base64 encoded string.
           - rp_id (str): Relying party identifier.
           - private_key (bytes): Base64 encoded PKCS
-          - sign_count (int): intital value for a signature counter.
+          - sign_count (int): initial value for a signature counter.
 
         :Returns:
           - Credential: A non-resident credential.
@@ -155,7 +155,7 @@ def create_resident_credential(
           - rp_id (str): Relying party identifier.
           - user_handle (bytes): userHandle associated to the credential. Must be Base64 encoded string.
           - private_key (bytes): Base64 encoded PKCS
-          - sign_count (int): intital value for a signature counter.
+          - sign_count (int): initial value for a signature counter.
 
         :returns:
           - Credential: A resident credential.