Merge branch 'trunk' into py-network-continue_response-and-data-collectors

navin772 · web-flow · commit 1b4be8b5d95f · 2025-10-21T17:21:14.000+05:30
diff --git a/.bazelrc b/.bazelrc
@@ -87,7 +87,6 @@ test --test_env=FIREFOX_NIGHTLY_BINARY
 test --test_env=GITHUB_ACTIONS
 test --test_env=MOZ_HEADLESS
 test --test_env=SELENIUM_BROWSER
-test --test_env=TRAVIS
 test --test_env=PYTHON_VERSION
 test --test_env=SE_AVOID_STATS=true
 
diff --git a/java/src/org/openqa/selenium/federatedcredentialmanagement/FederatedCredentialManagementAccount.java b/java/src/org/openqa/selenium/federatedcredentialmanagement/FederatedCredentialManagementAccount.java
@@ -18,6 +18,8 @@
 package org.openqa.selenium.federatedcredentialmanagement;
 
 import java.util.Map;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Represents an account displayed in a FedCM account list.
@@ -27,29 +29,30 @@
  * @see <a href="https://w3c-fedid.github.io/FedCM/#webdriver-accountlist">
  *     https://w3c-fedid.github.io/FedCM/#webdriver-accountlist</a>
  */
+@NullMarked
 public class FederatedCredentialManagementAccount {
-  private final String accountId;
-  private final String email;
-  private final String name;
-  private final String givenName;
-  private final String pictureUrl;
+  private final @Nullable String accountId;
+  private final @Nullable String email;
+  private final @Nullable String name;
+  private final @Nullable String givenName;
+  private final @Nullable String pictureUrl;
 
   /**
    * The config URL of the identity provider that provided this account.
    *
    * <p>This allows identifying the IDP in multi-IDP cases.
    */
-  private final String idpConfigUrl;
+  private final @Nullable String idpConfigUrl;
 
   /**
    * The login state for this account.
    *
    * <p>One of LOGIN_STATE_SIGNIN and LOGIN_STATE_SIGNUP.
    */
-  private final String loginState;
+  private final @Nullable String loginState;
 
-  private final String termsOfServiceUrl;
-  private final String privacyPolicyUrl;
+  private final @Nullable String termsOfServiceUrl;
+  private final @Nullable String privacyPolicyUrl;
 
   public static final String LOGIN_STATE_SIGNIN = "SignIn";
   public static final String LOGIN_STATE_SIGNUP = "SignUp";
@@ -66,39 +69,39 @@ public FederatedCredentialManagementAccount(Map<String, String> dict) {
     privacyPolicyUrl = (String) dict.getOrDefault("privacyPolicyUrl", null);
   }
 
-  public String getAccountid() {
+  public @Nullable String getAccountid() {
     return accountId;
   }
 
-  public String getEmail() {
+  public @Nullable String getEmail() {
     return email;
   }
 
-  public String getName() {
+  public @Nullable String getName() {
     return name;
   }
 
-  public String getGivenName() {
+  public @Nullable String getGivenName() {
     return givenName;
   }
 
-  public String getPictureUrl() {
+  public @Nullable String getPictureUrl() {
     return pictureUrl;
   }
 
-  public String getIdpConfigUrl() {
+  public @Nullable String getIdpConfigUrl() {
     return idpConfigUrl;
   }
 
-  public String getLoginState() {
+  public @Nullable String getLoginState() {
     return loginState;
   }
 
-  public String getTermsOfServiceUrl() {
+  public @Nullable String getTermsOfServiceUrl() {
     return termsOfServiceUrl;
   }
 
-  public String getPrivacyPolicyUrl() {
+  public @Nullable String getPrivacyPolicyUrl() {
     return privacyPolicyUrl;
   }
 }
diff --git a/java/src/org/openqa/selenium/federatedcredentialmanagement/FederatedCredentialManagementDialog.java b/java/src/org/openqa/selenium/federatedcredentialmanagement/FederatedCredentialManagementDialog.java
@@ -18,12 +18,15 @@
 package org.openqa.selenium.federatedcredentialmanagement;
 
 import java.util.List;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Represents an open dialog of the Federated Credential Management API.
  *
  * @see <a href="https://w3c-fedid.github.io/FedCM/">https://w3c-fedid.github.io/FedCM/</a>
  */
+@NullMarked
 public interface FederatedCredentialManagementDialog {
 
   String DIALOG_TYPE_ACCOUNT_LIST = "AccountChooser";
@@ -44,13 +47,13 @@ public interface FederatedCredentialManagementDialog {
    *
    * <p>One of DIALOG_TYPE_ACCOUNT_LIST and DIALOG_TYPE_AUTO_REAUTH.
    */
-  String getDialogType();
+  @Nullable String getDialogType();
 
   /** Returns the title of the dialog. */
-  String getTitle();
+  @Nullable String getTitle();
 
   /** Returns the subtitle of the dialog or null if none. */
-  String getSubtitle();
+  @Nullable String getSubtitle();
 
   void clickDialog();
 
diff --git a/java/src/org/openqa/selenium/federatedcredentialmanagement/HasFederatedCredentialManagement.java b/java/src/org/openqa/selenium/federatedcredentialmanagement/HasFederatedCredentialManagement.java
@@ -17,10 +17,13 @@
 
 package org.openqa.selenium.federatedcredentialmanagement;
 
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.Beta;
 
 /** Used by classes to indicate that they can interact with FedCM dialogs. */
 @Beta
+@NullMarked
 public interface HasFederatedCredentialManagement {
   /**
    * Disables the promise rejection delay.
@@ -45,5 +48,5 @@ public interface HasFederatedCredentialManagement {
    * <p>Can be used with WebDriverWait like: wait.until(driver ->
    * ((HasFederatedCredentialManagement) driver). getFederatedCredentialManagementDialog() != null);
    */
-  FederatedCredentialManagementDialog getFederatedCredentialManagementDialog();
+  @Nullable FederatedCredentialManagementDialog getFederatedCredentialManagementDialog();
 }
diff --git a/java/src/org/openqa/selenium/interactions/CompositeAction.java b/java/src/org/openqa/selenium/interactions/CompositeAction.java
@@ -19,9 +19,11 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import org.jspecify.annotations.NullMarked;
 import org.openqa.selenium.internal.Require;
 
 /** An action for aggregating actions and triggering all of them at the same time. */
+@NullMarked
 public class CompositeAction implements Action {
 
   private final List<Action> actionsList = new ArrayList<>();
diff --git a/java/src/org/openqa/selenium/interactions/Interaction.java b/java/src/org/openqa/selenium/interactions/Interaction.java
@@ -17,10 +17,13 @@
 
 package org.openqa.selenium.interactions;
 
+import org.jspecify.annotations.NullMarked;
+
 /**
  * Used as the basis of {@link Sequence}s for the W3C WebDriver spec <a
  * href="https://www.w3.org/TR/webdriver/#actions">Action commands</a>.
  */
+@NullMarked
 public abstract class Interaction {
 
   private final InputSource source;
diff --git a/java/src/org/openqa/selenium/interactions/Locatable.java b/java/src/org/openqa/selenium/interactions/Locatable.java
@@ -17,6 +17,9 @@
 
 package org.openqa.selenium.interactions;
 
+import org.jspecify.annotations.NullMarked;
+
+@NullMarked
 public interface Locatable {
   Coordinates getCoordinates();
 }
diff --git a/java/src/org/openqa/selenium/interactions/MoveTargetOutOfBoundsException.java b/java/src/org/openqa/selenium/interactions/MoveTargetOutOfBoundsException.java
@@ -17,22 +17,25 @@
 
 package org.openqa.selenium.interactions;
 
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.WebDriverException;
 
 /**
  * Indicates that the target provided to the actions move() method is invalid - outside of the size
  * of the window.
  */
+@NullMarked
 public class MoveTargetOutOfBoundsException extends WebDriverException {
-  public MoveTargetOutOfBoundsException(String message) {
+  public MoveTargetOutOfBoundsException(@Nullable String message) {
     super(message);
   }
 
-  public MoveTargetOutOfBoundsException(Throwable cause) {
+  public MoveTargetOutOfBoundsException(@Nullable Throwable cause) {
     super(cause);
   }
 
-  public MoveTargetOutOfBoundsException(String message, Throwable cause) {
+  public MoveTargetOutOfBoundsException(@Nullable String message, @Nullable Throwable cause) {
     super(message, cause);
   }
 }
diff --git a/java/src/org/openqa/selenium/net/LinuxEphemeralPortRangeDetector.java b/java/src/org/openqa/selenium/net/LinuxEphemeralPortRangeDetector.java
@@ -25,7 +25,9 @@
 import java.io.UncheckedIOException;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
+import org.jspecify.annotations.NullMarked;
 
+@NullMarked
 public class LinuxEphemeralPortRangeDetector implements EphemeralPortRangeDetector {
 
   private final int firstEphemeralPort;
diff --git a/java/src/org/openqa/selenium/net/NetworkUtils.java b/java/src/org/openqa/selenium/net/NetworkUtils.java
@@ -28,17 +28,21 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.WebDriverException;
+import org.openqa.selenium.internal.Require;
 
+@NullMarked
 public class NetworkUtils {
 
-  private static InetAddress cachedIp4NonLoopbackAddressOfThisMachine;
-  private static String cachedIp4NonLoopbackAddressHostName;
+  private static @Nullable InetAddress cachedIp4NonLoopbackAddressOfThisMachine;
+  private static @Nullable String cachedIp4NonLoopbackAddressHostName;
 
   private final NetworkInterfaceProvider networkInterfaceProvider;
-  private volatile String hostname;
-  private volatile String address;
+  private volatile @Nullable String hostname;
+  private volatile @Nullable String address;
 
   NetworkUtils(NetworkInterfaceProvider networkInterfaceProvider) {
     this.networkInterfaceProvider = networkInterfaceProvider;
@@ -56,13 +60,13 @@ public NetworkUtils() {
   public String getHostname() {
     determineHostnameAndAddress();
 
-    return hostname;
+    return Require.nonNull("Hostname", hostname);
   }
 
   public String getHostAddress() {
     determineHostnameAndAddress();
 
-    return address;
+    return Require.nonNull("Address", address);
   }
 
   public String getPrivateLocalAddress() {
@@ -81,7 +85,7 @@ public String getPrivateLocalAddress() {
    *
    * @return A String representing the host name or non-loopback IP4 address of this machine.
    */
-  public String getNonLoopbackAddressOfThisMachine() {
+  public @Nullable String getNonLoopbackAddressOfThisMachine() {
     InetAddress ip4NonLoopbackAddressOfThisMachine = getIp4NonLoopbackAddressOfThisMachine();
     if (!Objects.equals(
         cachedIp4NonLoopbackAddressOfThisMachine, ip4NonLoopbackAddressOfThisMachine)) {
@@ -113,10 +117,13 @@ public InetAddress getIp4NonLoopbackAddressOfThisMachine() {
    *
    * @return The address part og such an address
    */
-  public String obtainLoopbackIp4Address() {
+  public @Nullable String obtainLoopbackIp4Address() {
     final NetworkInterface networkInterface = getLoopBackAndIp4Only();
     if (networkInterface != null) {
-      return networkInterface.getIp4LoopbackOnly().getHostName();
+      InetAddress loopback = networkInterface.getIp4LoopbackOnly();
+      if (loopback != null) {
+        return loopback.getHostName();
+      }
     }
 
     final String ipOfIp4LoopBack = getIpOfLoopBackIp4();
@@ -156,7 +163,7 @@ private InetAddress grabFirstNetworkAddress() {
     return firstAddress;
   }
 
-  public String getIpOfLoopBackIp4() {
+  public @Nullable String getIpOfLoopBackIp4() {
     for (NetworkInterface iface : networkInterfaceProvider.getNetworkInterfaces()) {
       final InetAddress netAddress = iface.getIp4LoopbackOnly();
       if (netAddress != null) {
@@ -166,7 +173,7 @@ public String getIpOfLoopBackIp4() {
     return null;
   }
 
-  private NetworkInterface getLoopBackAndIp4Only() {
+  private @Nullable NetworkInterface getLoopBackAndIp4Only() {
     for (NetworkInterface iface : networkInterfaceProvider.getNetworkInterfaces()) {
       if (iface.isIp4AddressBindingOnly() && iface.isLoopBack()) {
         return iface;
diff --git a/java/src/org/openqa/selenium/net/PortProber.java b/java/src/org/openqa/selenium/net/PortProber.java
@@ -26,8 +26,10 @@
 import java.net.SocketTimeoutException;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
+import org.jspecify.annotations.NullMarked;
 import org.openqa.selenium.Platform;
 
+@NullMarked
 public class PortProber {
 
   public static final int HIGHEST_PORT = 65535;
diff --git a/java/src/org/openqa/selenium/net/UrlChecker.java b/java/src/org/openqa/selenium/net/UrlChecker.java
@@ -31,8 +31,10 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Logger;
+import org.jspecify.annotations.NullMarked;
 
 /** Polls a URL until a HTTP 200 response is received. */
+@NullMarked
 public class UrlChecker {
 
   private static final Logger LOG = Logger.getLogger(UrlChecker.class.getName());
diff --git a/java/src/org/openqa/selenium/net/Urls.java b/java/src/org/openqa/selenium/net/Urls.java
@@ -25,8 +25,10 @@
 import java.net.URL;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import org.jspecify.annotations.NullMarked;
 import org.openqa.selenium.internal.Require;
 
+@NullMarked
 public class Urls {
 
   private Urls() {
diff --git a/java/test/org/openqa/selenium/ProxySettingTest.java b/java/test/org/openqa/selenium/ProxySettingTest.java
@@ -110,7 +110,7 @@ public void canConfigureProxyThroughPACFile() throws URISyntaxException, Interru
   @Ignore(SAFARI)
   @NoDriverBeforeTest
   @NoDriverAfterTest
-  @Ignore(value = FIREFOX, travis = true)
+  @Ignore(value = FIREFOX, reason = "Flaky")
   @Ignore(value = CHROME, reason = "Flaky")
   @Ignore(value = EDGE, reason = "Flaky")
   public void canUsePACThatOnlyProxiesCertainHosts()
diff --git a/java/test/org/openqa/selenium/SlowLoadingPageTest.java b/java/test/org/openqa/selenium/SlowLoadingPageTest.java
@@ -45,7 +45,7 @@ void testShouldBlockUntilIFramesAreLoaded() {
   }
 
   @Test
-  @Ignore(value = CHROME, travis = true, gitHubActions = true)
+  @Ignore(value = CHROME, gitHubActions = true)
   @Ignore(value = EDGE)
   public void testRefreshShouldBlockUntilPageLoads() {
     long start = System.currentTimeMillis();
diff --git a/java/test/org/openqa/selenium/WindowTest.java b/java/test/org/openqa/selenium/WindowTest.java
diff --git a/java/test/org/openqa/selenium/interactions/CombinedInputActionsTest.java b/java/test/org/openqa/selenium/interactions/CombinedInputActionsTest.java
diff --git a/java/test/org/openqa/selenium/javascript/ClosureTestStatement.java b/java/test/org/openqa/selenium/javascript/ClosureTestStatement.java
diff --git a/java/test/org/openqa/selenium/testing/Ignore.java b/java/test/org/openqa/selenium/testing/Ignore.java
diff --git a/java/test/org/openqa/selenium/testing/IgnoreComparator.java b/java/test/org/openqa/selenium/testing/IgnoreComparator.java
diff --git a/java/test/org/openqa/selenium/testing/TestUtilities.java b/java/test/org/openqa/selenium/testing/TestUtilities.java
diff --git a/rb/lib/selenium/webdriver/common/platform.rb b/rb/lib/selenium/webdriver/common/platform.rb

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,9 @@`
`17`	`17`
`18`	`18`	`package org.openqa.selenium.interactions;`
`19`	`19`
	`20`	`+import org.jspecify.annotations.NullMarked;`
	`21`	`+`
	`22`	`+@NullMarked`
`20`	`23`	`public interface Locatable {`
`21`	`24`	`Coordinates getCoordinates();`
`22`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,22 +17,25 @@`
`17`	`17`
`18`	`18`	`package org.openqa.selenium.interactions;`
`19`	`19`
	`20`	`+import org.jspecify.annotations.NullMarked;`
	`21`	`+import org.jspecify.annotations.Nullable;`
`20`	`22`	`import org.openqa.selenium.WebDriverException;`
`21`	`23`
`22`	`24`	`/**`
`23`	`25`	`* Indicates that the target provided to the actions move() method is invalid - outside of the size`
`24`	`26`	`* of the window.`
`25`	`27`	`*/`
	`28`	`+@NullMarked`
`26`	`29`	`public class MoveTargetOutOfBoundsException extends WebDriverException {`
`27`		`- public MoveTargetOutOfBoundsException(String message) {`
	`30`	`+ public MoveTargetOutOfBoundsException(@Nullable String message) {`
`28`	`31`	`super(message);`
`29`	`32`	`}`
`30`	`33`
`31`		`- public MoveTargetOutOfBoundsException(Throwable cause) {`
	`34`	`+ public MoveTargetOutOfBoundsException(@Nullable Throwable cause) {`
`32`	`35`	`super(cause);`
`33`	`36`	`}`
`34`	`37`
`35`		`- public MoveTargetOutOfBoundsException(String message, Throwable cause) {`
	`38`	`+ public MoveTargetOutOfBoundsException(@Nullable String message, @Nullable Throwable cause) {`
`36`	`39`	`super(message, cause);`
`37`	`40`	`}`
`38`	`41`	`}`