Merge branch 'trunk' into pinned-browser-updates

Author: titusfortner

.bazelrc.remote

@@ -31,7 +31,7 @@ build:rbe --disk_cache=
 build:rbe --incompatible_enable_cc_toolchain_resolution
 build:rbe --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
 test:rbe --test_env=DISPLAY=:99.0
-test:rbe --test_tag_filters=-skip-rbe,-remote
+test:rbe --test_tag_filters=-skip-rbe
 
 # Env vars we can hard code
 build:rbe --action_env=HOME=/home/dev

Rakefile

@@ -747,9 +747,12 @@ namespace :rb do
 
   desc 'Update generated Ruby files for local development'
   task :local_dev do
+    puts 'installing ruby, this may take a minute'
     Bazel.execute('build', [], '@bundle//:bundle')
     Rake::Task['rb:build'].invoke
     Rake::Task['grid'].invoke
+    # A command like this is required to move ruby binary into working directory
+    Bazel.execute('build', %w[--test_arg --dry-run], '@bundle//bin:rubocop')
   end
 
   desc 'Push Ruby gems to rubygems'

java/src/org/openqa/selenium/remote/HttpSessionId.java

@@ -18,7 +18,9 @@
 package org.openqa.selenium.remote;
 
 import java.util.Optional;
+import org.jspecify.annotations.NullMarked;
 
+@NullMarked
 public class HttpSessionId {
 
   private HttpSessionId() {

java/src/org/openqa/selenium/remote/Response.java

@@ -20,14 +20,17 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 public class Response {
 
-  private volatile Object value;
-  private volatile String sessionId;
+  private volatile @Nullable Object value;
+  private volatile @Nullable String sessionId;
   @Deprecated // (forRemoval = true)
-  private volatile Integer status;
-  private volatile String state;
+  private volatile @Nullable Integer status;
+  private volatile @Nullable String state;
 
   public Response() {}
 
@@ -36,36 +39,36 @@ public Response(SessionId sessionId) {
   }
 
   @Deprecated // (forRemoval = true)
-  public Integer getStatus() {
+  public @Nullable Integer getStatus() {
     return status;
   }
 
   @Deprecated // (forRemoval = true)
-  public void setStatus(Integer status) {
+  public void setStatus(@Nullable Integer status) {
     this.status = status;
   }
 
-  public String getState() {
+  public @Nullable String getState() {
     return state;
   }
 
-  public void setState(String state) {
+  public void setState(@Nullable String state) {
     this.state = state;
   }
 
-  public void setValue(Object value) {
+  public void setValue(@Nullable Object value) {
     this.value = value;
   }
 
-  public Object getValue() {
+  public @Nullable Object getValue() {
     return value;
   }
 
-  public void setSessionId(String sessionId) {
+  public void setSessionId(@Nullable String sessionId) {
     this.sessionId = sessionId;
   }
 
-  public String getSessionId() {
+  public @Nullable String getSessionId() {
     return sessionId;
   }
 
@@ -76,7 +79,7 @@ public String toString() {
   }
 
   @Override
-  public boolean equals(Object o) {
+  public boolean equals(@Nullable Object o) {
     if (!(o instanceof Response)) {
       return false;
     }

java/src/org/openqa/selenium/remote/SessionId.java

@@ -20,9 +20,12 @@
 import java.io.Serializable;
 import java.util.Map;
 import java.util.UUID;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.internal.Require;
 import org.openqa.selenium.json.JsonException;
 
+@NullMarked
 public class SessionId implements Serializable {
 
   private final String opaqueKey;
@@ -46,7 +49,7 @@ public int hashCode() {
   }
 
   @Override
-  public boolean equals(Object obj) {
+  public boolean equals(@Nullable Object obj) {
     return obj instanceof SessionId && opaqueKey.equals(((SessionId) obj).opaqueKey);
   }
 

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

@@ -58,5 +58,6 @@ java_library(
         "//java/src/org/openqa/selenium:core",
         "//java/src/org/openqa/selenium/remote",
         artifact("com.google.guava:guava"),
+        artifact("org.jspecify:jspecify"),
     ],
 )

java/src/org/openqa/selenium/support/ui/ExpectedCondition.java

@@ -18,6 +18,8 @@
 package org.openqa.selenium.support.ui;
 
 import com.google.common.base.Function;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.WebDriver;
 
 /**
@@ -34,5 +36,6 @@
 // NB: this originally extended Guava's Function interface since Java didn't have one. To avoid code
 // such as "com.google.common.base.Function condition = ExpectedConditions.elementFound(By);"
 // breaking at compile time, we continue to extend Guava's Function interface.
-public interface ExpectedCondition<T>
+@NullMarked
+public interface ExpectedCondition<T extends @Nullable Object>
     extends Function<WebDriver, T>, java.util.function.Function<WebDriver, T> {}