From 6b295a66eeda0a4dbd616e037db04ba35f9def8e Mon Sep 17 00:00:00 2001
From: Alex Popov <iampopovich@gmail.com>
Date: Sun, 6 Jul 2025 04:48:48 +0700
Subject: [PATCH 1/2] Add JSpecify nullable annotations to ChromeDriverService
 parameters

---
 .../org/openqa/selenium/chrome/BUILD.bazel    |  1 +
 .../selenium/chrome/ChromeDriverService.java  | 35 +++++++++++--------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/java/src/org/openqa/selenium/chrome/BUILD.bazel b/java/src/org/openqa/selenium/chrome/BUILD.bazel
index 7c536fc96351d..27b34f123f956 100644
--- a/java/src/org/openqa/selenium/chrome/BUILD.bazel
+++ b/java/src/org/openqa/selenium/chrome/BUILD.bazel
@@ -20,5 +20,6 @@ java_export(
         "//java/src/org/openqa/selenium/json",
         "//java/src/org/openqa/selenium/manager",
         "//java/src/org/openqa/selenium/remote",
+        "@maven//:org_jspecify_jspecify",
     ],
 )
diff --git a/java/src/org/openqa/selenium/chrome/ChromeDriverService.java b/java/src/org/openqa/selenium/chrome/ChromeDriverService.java
index 700faaf90652c..44e477e81930a 100644
--- a/java/src/org/openqa/selenium/chrome/ChromeDriverService.java
+++ b/java/src/org/openqa/selenium/chrome/ChromeDriverService.java
@@ -31,6 +31,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.chromium.ChromiumDriverLogLevel;
@@ -102,11 +103,11 @@ public class ChromeDriverService extends DriverService {
    * @throws IOException If an I/O error occurs.
    */
   public ChromeDriverService(
-      File executable,
+      @Nullable File executable,
       int port,
-      Duration timeout,
-      List<String> args,
-      Map<String, String> environment)
+      @Nullable Duration timeout,
+      @Nullable List<String> args,
+      @Nullable Map<String, String> environment)
       throws IOException {
     super(
         executable,
@@ -151,13 +152,13 @@ public static ChromeDriverService createDefaultService() {
   public static class Builder
       extends DriverService.Builder<ChromeDriverService, ChromeDriverService.Builder> {
 
-    private Boolean disableBuildCheck;
-    private Boolean readableTimestamp;
-    private Boolean appendLog;
-    private Boolean verbose;
-    private Boolean silent;
-    private String allowedListIps;
-    private ChromiumDriverLogLevel logLevel;
+    private @Nullable Boolean disableBuildCheck;
+    private @Nullable Boolean readableTimestamp;
+    private @Nullable Boolean appendLog;
+    private @Nullable Boolean verbose;
+    private @Nullable Boolean silent;
+    private @Nullable String allowedListIps;
+    private @Nullable ChromiumDriverLogLevel logLevel;
 
     @Override
     public int score(Capabilities capabilities) {
@@ -202,7 +203,7 @@ public Builder withBuildCheckDisabled(boolean noBuildCheck) {
      * @param logLevel {@link ChromiumDriverLogLevel} for desired log level output.
      * @return A self reference.
      */
-    public Builder withLogLevel(ChromiumDriverLogLevel logLevel) {
+    public Builder withLogLevel(@Nullable ChromiumDriverLogLevel logLevel) {
       this.logLevel = logLevel;
       this.silent = false;
       this.verbose = false;
@@ -244,7 +245,7 @@ public Builder withVerbose(boolean verbose) {
      * @param allowedListIps Comma-separated list of remote IPv4 addresses.
      * @return A self reference.
      */
-    public Builder withAllowedListIps(String allowedListIps) {
+    public Builder withAllowedListIps(@Nullable String allowedListIps) {
       this.allowedListIps = allowedListIps;
       return this;
     }
@@ -255,7 +256,7 @@ public Builder withAllowedListIps(String allowedListIps) {
      * @param readableTimestamp Whether the timestamp of the log is readable.
      * @return A self reference.
      */
-    public Builder withReadableTimestamp(Boolean readableTimestamp) {
+    public Builder withReadableTimestamp(@Nullable Boolean readableTimestamp) {
       this.readableTimestamp = readableTimestamp;
       return this;
     }
@@ -321,7 +322,11 @@ protected List<String> createArgs() {
 
     @Override
     protected ChromeDriverService createDriverService(
-        File exe, int port, Duration timeout, List<String> args, Map<String, String> environment) {
+        @Nullable File exe, 
+        int port, 
+        @Nullable Duration timeout, 
+        @Nullable List<String> args, 
+        @Nullable Map<String, String> environment) {
       try {
         return new ChromeDriverService(exe, port, timeout, args, environment);
       } catch (IOException e) {

From 21d4b89763c99f6500c80e80ff76ac2f16115e96 Mon Sep 17 00:00:00 2001
From: Alex Popov <iampopovich@gmail.com>
Date: Sun, 6 Jul 2025 04:51:03 +0700
Subject: [PATCH 2/2] applied format.sh

---
 .../org/openqa/selenium/chrome/ChromeDriverService.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/src/org/openqa/selenium/chrome/ChromeDriverService.java b/java/src/org/openqa/selenium/chrome/ChromeDriverService.java
index 44e477e81930a..5ab2d37844b73 100644
--- a/java/src/org/openqa/selenium/chrome/ChromeDriverService.java
+++ b/java/src/org/openqa/selenium/chrome/ChromeDriverService.java
@@ -322,10 +322,10 @@ protected List<String> createArgs() {
 
     @Override
     protected ChromeDriverService createDriverService(
-        @Nullable File exe, 
-        int port, 
-        @Nullable Duration timeout, 
-        @Nullable List<String> args, 
+        @Nullable File exe,
+        int port,
+        @Nullable Duration timeout,
+        @Nullable List<String> args,
         @Nullable Map<String, String> environment) {
       try {
         return new ChromeDriverService(exe, port, timeout, args, environment);