Merge branch 'trunk' into java_cookie

VietND96 · web-flow · commit d4a247c73969 · 2025-01-20T11:11:56.000+07:00
diff --git a/java/src/org/openqa/selenium/PageLoadStrategy.java b/java/src/org/openqa/selenium/PageLoadStrategy.java
@@ -17,6 +17,10 @@
 
 package org.openqa.selenium;
 
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
+@NullMarked
 public enum PageLoadStrategy {
   NONE("none"),
   EAGER("eager"),
@@ -33,7 +37,7 @@ public String toString() {
     return String.valueOf(text);
   }
 
-  public static PageLoadStrategy fromString(String text) {
+  public static @Nullable PageLoadStrategy fromString(@Nullable String text) {
     if (text != null) {
       for (PageLoadStrategy b : PageLoadStrategy.values()) {
         if (text.equalsIgnoreCase(b.text)) {
diff --git a/java/src/org/openqa/selenium/UnexpectedAlertBehaviour.java b/java/src/org/openqa/selenium/UnexpectedAlertBehaviour.java
@@ -17,6 +17,10 @@
 
 package org.openqa.selenium;
 
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
+@NullMarked
 public enum UnexpectedAlertBehaviour {
   ACCEPT("accept"),
   DISMISS("dismiss"),
@@ -35,7 +39,7 @@ public String toString() {
     return String.valueOf(text);
   }
 
-  public static UnexpectedAlertBehaviour fromString(String text) {
+  public static @Nullable UnexpectedAlertBehaviour fromString(@Nullable String text) {
     if (text != null) {
       for (UnexpectedAlertBehaviour b : UnexpectedAlertBehaviour.values()) {
         if (text.equalsIgnoreCase(b.text)) {
diff --git a/java/src/org/openqa/selenium/WindowType.java b/java/src/org/openqa/selenium/WindowType.java
@@ -17,7 +17,11 @@
 
 package org.openqa.selenium;
 
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
 /** Represents the type of new browser window that may be created. */
+@NullMarked
 public enum WindowType {
   WINDOW("window"),
   TAB("tab"),
@@ -34,7 +38,7 @@ public String toString() {
     return String.valueOf(text);
   }
 
-  public static WindowType fromString(String text) {
+  public static @Nullable WindowType fromString(@Nullable String text) {
     if (text != null) {
       for (WindowType b : WindowType.values()) {
         if (text.equalsIgnoreCase(b.text)) {
diff --git a/java/src/org/openqa/selenium/interactions/Actions.java b/java/src/org/openqa/selenium/interactions/Actions.java
@@ -30,6 +30,8 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.function.IntConsumer;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.PointerInput.Origin;
@@ -44,16 +46,17 @@
  *
  * <p>Call {@link #perform()} at the end of the method chain to actually perform the actions.
  */
+@NullMarked
 public class Actions {
 
   private final WebDriver driver;
 
   // W3C
   private final Map<InputSource, Sequence> sequences = new HashMap<>();
 
-  private PointerInput activePointer;
-  private KeyInput activeKeyboard;
-  private WheelInput activeWheel;
+  private @Nullable PointerInput activePointer;
+  private @Nullable KeyInput activeKeyboard;
+  private @Nullable WheelInput activeWheel;
   private Duration actionDuration;
 
   public Actions(WebDriver driver) {
@@ -537,21 +540,21 @@ public KeyInput getActiveKeyboard() {
     if (this.activeKeyboard == null) {
       setActiveKeyboard("default keyboard");
     }
-    return this.activeKeyboard;
+    return Require.nonNull("ActiveKeyboard", this.activeKeyboard);
   }
 
   public PointerInput getActivePointer() {
     if (this.activePointer == null) {
       setActivePointer(PointerInput.Kind.MOUSE, "default mouse");
     }
-    return this.activePointer;
+    return Require.nonNull("ActivePointer", this.activePointer);
   }
 
   public WheelInput getActiveWheel() {
     if (this.activeWheel == null) {
       setActiveWheel("default wheel");
     }
-    return this.activeWheel;
+    return Require.nonNull("ActiveWheel", this.activeWheel);
   }
 
   public Duration getActionDuration() {
diff --git a/java/src/org/openqa/selenium/interactions/Pause.java b/java/src/org/openqa/selenium/interactions/Pause.java
@@ -22,8 +22,10 @@
 import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;
+import org.jspecify.annotations.NullMarked;
 
 /** Indicates that a given {@link InputSource} should pause for a given duration. */
+@NullMarked
 public class Pause extends Interaction implements Encodable {
 
   private final Duration duration;
diff --git a/java/src/org/openqa/selenium/interactions/Sequence.java b/java/src/org/openqa/selenium/interactions/Sequence.java
@@ -22,6 +22,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A sequence of action objects for a given {@link InputSource} for use with the W3C <a
@@ -30,6 +31,7 @@
  * Interaction}s, with the first item in each sequence being executed at the same time, then the
  * second, and so on, until all interactions in all sequences have been executed.
  */
+@NullMarked
 public class Sequence implements Encodable {
 
   private final List<Encodable> actions = new LinkedList<>();
diff --git a/java/src/org/openqa/selenium/interactions/WheelInput.java b/java/src/org/openqa/selenium/interactions/WheelInput.java
@@ -24,6 +24,8 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.Point;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.WrapsElement;
@@ -33,11 +35,12 @@
  * Models a <a href="https://www.w3.org/TR/webdriver/#dfn-wheel-input-source">wheel input
  * source</a>.
  */
+@NullMarked
 public class WheelInput implements InputSource, Encodable {
 
   private final String name;
 
-  public WheelInput(String name) {
+  public WheelInput(@Nullable String name) {
     this.name = Optional.ofNullable(name).orElse(UUID.randomUUID().toString());
   }
 
diff --git a/java/src/org/openqa/selenium/logging/LogEntries.java b/java/src/org/openqa/selenium/logging/LogEntries.java
@@ -23,13 +23,15 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.stream.StreamSupport;
+import org.jspecify.annotations.NullMarked;
 import org.openqa.selenium.Beta;
 
 /**
  * Represent a pool of {@link LogEntry}. This class also provides filtering mechanisms based on
  * levels.
  */
 @Beta
+@NullMarked
 public class LogEntries implements Iterable<LogEntry> {
 
   private final List<LogEntry> entries;
diff --git a/java/src/org/openqa/selenium/logging/LogEntry.java b/java/src/org/openqa/selenium/logging/LogEntry.java
@@ -22,8 +22,10 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
+import org.jspecify.annotations.NullMarked;
 
 /** Represents a single log statement. */
+@NullMarked
 public class LogEntry {
 
   private final Level level;
diff --git a/java/src/org/openqa/selenium/logging/LogLevelMapping.java b/java/src/org/openqa/selenium/logging/LogLevelMapping.java
@@ -20,13 +20,20 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.logging.Level;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 public class LogLevelMapping {
 
   /** WebDriver log level DEBUG which is mapped to Level.FINE. */
   private static final String DEBUG = "DEBUG";
 
+  // Default the log level to info.
+  private static final Level DEFAULT_LEVEL = Level.INFO;
+
   private static final Map<Integer, Level> levelMap;
 
   static {
@@ -70,15 +77,15 @@ public static String getName(Level level) {
     return normalized == Level.FINE ? DEBUG : normalized.getName();
   }
 
-  public static Level toLevel(String logLevelName) {
+  public static Level toLevel(@Nullable String logLevelName) {
     if (logLevelName == null || logLevelName.isEmpty()) {
-      // Default the log level to info.
-      return Level.INFO;
+      return DEFAULT_LEVEL;
     }
 
     if (logLevelName.equals(DEBUG)) {
       return Level.FINE;
     }
-    return levelMap.get(Level.parse(logLevelName).intValue());
+    return Optional.ofNullable(levelMap.get(Level.parse(logLevelName).intValue()))
+        .orElse(DEFAULT_LEVEL);
   }
 }
diff --git a/java/src/org/openqa/selenium/logging/SessionLogs.java b/java/src/org/openqa/selenium/logging/SessionLogs.java
@@ -24,10 +24,13 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import org.jspecify.annotations.NullMarked;
 import org.openqa.selenium.Beta;
+import org.openqa.selenium.internal.Require;
 
 /** Contains the logs for a session divided by supported log types. */
 @Beta
+@NullMarked
 public class SessionLogs {
   private final Map<String, LogEntries> logTypeToEntriesMap;
 
@@ -66,7 +69,7 @@ public static SessionLogs fromJSON(Map<String, Object> rawSessionLogs) {
         logEntries.add(
             new LogEntry(
                 LogLevelMapping.toLevel(String.valueOf(rawEntry.get("level"))),
-                ((Number) rawEntry.get("timestamp")).longValue(),
+                Require.nonNull("timestamp", (Number) rawEntry.get("timestamp")).longValue(),
                 String.valueOf(rawEntry.get("message"))));
       }
       sessionLogs.addLog(logType, new LogEntries(logEntries));
diff --git a/java/src/org/openqa/selenium/remote/service/DriverService.java b/java/src/org/openqa/selenium/remote/service/DriverService.java
@@ -508,10 +508,10 @@ public DS build() {
       if (Locale.getDefault(Locale.Category.FORMAT).getLanguage().equals("ar")) {
         throw new NumberFormatException(
             String.format(
-                "Couldn't format the port numbers because the System Language is arabic:"
-                    + " \"--port=%d\", please make sure to add the required arguments"
-                    + " \"-Duser.language=en -Duser.region=US\" to your JVM, for more info please"
-                    + " visit :%n"
+                "Couldn't format the port numbers because the System Language is arabic: \""
+                    + String.format("--port=%d", port)
+                    + "\", please make sure to add the required arguments \"-Duser.language=en"
+                    + " -Duser.region=US\" to your JVM, for more info please visit :\n"
                     + "  https://www.selenium.dev/documentation/webdriver/browsers/",
                 getPort()));
       }
diff --git a/java/test/org/openqa/selenium/logging/LoggingTest.java b/java/test/org/openqa/selenium/logging/LoggingTest.java
@@ -40,6 +40,7 @@ void testLogLevelConversions() {
     assertThat(toLevel("WARNING")).isEqualTo(WARNING);
     assertThat(toLevel("SEVERE")).isEqualTo(SEVERE);
     assertThat(toLevel("OFF")).isEqualTo(OFF);
+    assertThat(toLevel(null)).isEqualTo(INFO);
   }
 
   @Test
diff --git a/scripts/pinned_browsers.py b/scripts/pinned_browsers.py
@@ -416,7 +416,12 @@ def firefox_version_data():
 
 
 def firefox_linux(version):
-    return "https://ftp.mozilla.org/pub/firefox/releases/%s/linux-x86_64/en-US/firefox-%s.tar.bz2" % (version, version)
+    if int(version.split(".")[0]) < 135:
+        return "https://ftp.mozilla.org/pub/firefox/releases/%s/linux-x86_64/en-US/firefox-%s.tar.bz2" % (
+        version, version)
+    else:
+        return "https://ftp.mozilla.org/pub/firefox/releases/%s/linux-x86_64/en-US/firefox-%s.tar.xz" % (
+        version, version)
 
 
 def firefox_mac(version):
