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

Author: navin772

.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,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/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.

java/src/org/openqa/selenium/ImmutableCapabilities.java

@@ -22,8 +22,11 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.TreeMap;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.internal.Require;
 
+@NullMarked
 public class ImmutableCapabilities implements Capabilities {
 
   private final Map<String, Object> delegate;
@@ -145,18 +148,17 @@ public ImmutableCapabilities(Map<?, ?> capabilities) {
     capabilities.forEach(
         (key, value) -> {
           Require.argument("Capability key", key).instanceOf(String.class);
-          Object v = capabilities.get(key);
           Require.nonNull("Capability value", value);
 
-          setCapability(delegate, (String) key, v);
+          setCapability(delegate, (String) key, value);
         });
 
     this.delegate = Collections.unmodifiableMap(delegate);
     this.hashCode = SharedCapabilitiesMethods.hashCode(this);
   }
 
   @Override
-  public Object getCapability(String capabilityName) {
+  public @Nullable Object getCapability(String capabilityName) {
     Require.nonNull("Capability name", capabilityName);
     return delegate.get(capabilityName);
   }
@@ -172,7 +174,7 @@ public int hashCode() {
   }
 
   @Override
-  public boolean equals(Object o) {
+  public boolean equals(@Nullable Object o) {
     if (!(o instanceof Capabilities)) {
       return false;
     }

java/src/org/openqa/selenium/MutableCapabilities.java

@@ -22,8 +22,11 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.internal.Require;
 
+@NullMarked
 public class MutableCapabilities implements Capabilities {
 
   private static final Set<String> OPTION_KEYS;
@@ -81,7 +84,7 @@ public void setCapability(String capabilityName, Platform value) {
     setCapability(capabilityName, (Object) value);
   }
 
-  public void setCapability(String key, Object value) {
+  public void setCapability(String key, @Nullable Object value) {
     Require.nonNull("Capability name", key);
 
     // We have to special-case some keys and values because of the popular idiom of calling
@@ -107,7 +110,7 @@ public Map<String, Object> asMap() {
   }
 
   @Override
-  public Object getCapability(String capabilityName) {
+  public @Nullable Object getCapability(String capabilityName) {
     return caps.get(capabilityName);
   }
 
@@ -126,7 +129,7 @@ public int hashCode() {
   }
 
   @Override
-  public boolean equals(Object o) {
+  public boolean equals(@Nullable Object o) {
     if (!(o instanceof Capabilities)) {
       return false;
     }

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

@@ -22,8 +22,11 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.internal.Require;
 
+@NullMarked
 public class PersistentCapabilities implements Capabilities {
 
   private final ImmutableCapabilities caps;
@@ -60,7 +63,7 @@ public Map<String, Object> asMap() {
   }
 
   @Override
-  public Object getCapability(String capabilityName) {
+  public @Nullable Object getCapability(String capabilityName) {
     Require.nonNull("Capability name", capabilityName);
     Object capability = overrides.getCapability(capabilityName);
     if (capability != null) {
@@ -93,7 +96,7 @@ public int hashCode() {
   }
 
   @Override
-  public boolean equals(Object o) {
+  public boolean equals(@Nullable Object o) {
     if (!(o instanceof Capabilities)) {
       return false;
     }

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