Add null checks to all reference-type setters in CopilotClientOptions

Copilot · edburns · edburns · commit 1721ffc78104 · 2026-03-31T13:42:44.000-04:00
Agent-Logs-Url: https://github.com/github/copilot-sdk-java/sessions/019cc9a8-a29a-49a5-a7ac-aa573931dfb8 Co-authored-by: edburns <75821+edburns@users.noreply.github.com>
diff --git a/src/main/java/com/github/copilot/sdk/json/CopilotClientOptions.java b/src/main/java/com/github/copilot/sdk/json/CopilotClientOptions.java
@@ -6,6 +6,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.function.Supplier;
@@ -121,7 +122,7 @@ public String[] getCliArgs() {
      * @return this options instance for method chaining
      */
     public CopilotClientOptions setCliArgs(String[] cliArgs) {
-        this.cliArgs = cliArgs;
+        this.cliArgs = Objects.requireNonNull(cliArgs, "cliArgs must not be null");
         return this;
     }
 
@@ -138,12 +139,11 @@ public String getCliPath() {
      * Sets the path to the Copilot CLI executable.
      *
      * @param cliPath
-     *            the path to the CLI executable, or {@code null} to use "copilot"
-     *            from PATH
+     *            the path to the CLI executable
      * @return this options instance for method chaining
      */
     public CopilotClientOptions setCliPath(String cliPath) {
-        this.cliPath = cliPath;
+        this.cliPath = Objects.requireNonNull(cliPath, "cliPath must not be null");
         return this;
     }
 
@@ -170,7 +170,7 @@ public String getCliUrl() {
      * @return this options instance for method chaining
      */
     public CopilotClientOptions setCliUrl(String cliUrl) {
-        this.cliUrl = cliUrl;
+        this.cliUrl = Objects.requireNonNull(cliUrl, "cliUrl must not be null");
         return this;
     }
 
@@ -191,7 +191,7 @@ public String getCwd() {
      * @return this options instance for method chaining
      */
     public CopilotClientOptions setCwd(String cwd) {
-        this.cwd = cwd;
+        this.cwd = Objects.requireNonNull(cwd, "cwd must not be null");
         return this;
     }
 
@@ -214,7 +214,7 @@ public Map<String, String> getEnvironment() {
      * @return this options instance for method chaining
      */
     public CopilotClientOptions setEnvironment(Map<String, String> environment) {
-        this.environment = environment;
+        this.environment = Objects.requireNonNull(environment, "environment must not be null");
         return this;
     }
 
@@ -237,11 +237,11 @@ public Executor getExecutor() {
      * onto a dedicated thread pool or integrate with container-managed threading.
      *
      * @param executor
-     *            the executor to use, or {@code null} for the default
+     *            the executor to use
      * @return this options instance for fluent chaining
      */
     public CopilotClientOptions setExecutor(Executor executor) {
-        this.executor = executor;
+        this.executor = Objects.requireNonNull(executor, "executor must not be null");
         return this;
     }
 
@@ -265,7 +265,7 @@ public String getGitHubToken() {
      * @return this options instance for method chaining
      */
     public CopilotClientOptions setGitHubToken(String gitHubToken) {
-        this.gitHubToken = gitHubToken;
+        this.gitHubToken = Objects.requireNonNull(gitHubToken, "gitHubToken must not be null");
         return this;
     }
 
@@ -290,7 +290,7 @@ public String getGithubToken() {
      */
     @Deprecated
     public CopilotClientOptions setGithubToken(String githubToken) {
-        this.gitHubToken = githubToken;
+        this.gitHubToken = Objects.requireNonNull(githubToken, "githubToken must not be null");
         return this;
     }
 
@@ -313,7 +313,7 @@ public String getLogLevel() {
      * @return this options instance for method chaining
      */
     public CopilotClientOptions setLogLevel(String logLevel) {
-        this.logLevel = logLevel;
+        this.logLevel = Objects.requireNonNull(logLevel, "logLevel must not be null");
         return this;
     }
 
@@ -338,7 +338,7 @@ public Supplier<CompletableFuture<List<ModelInfo>>> getOnListModels() {
      * @return this options instance for method chaining
      */
     public CopilotClientOptions setOnListModels(Supplier<CompletableFuture<List<ModelInfo>>> onListModels) {
-        this.onListModels = onListModels;
+        this.onListModels = Objects.requireNonNull(onListModels, "onListModels must not be null");
         return this;
     }
 
@@ -378,16 +378,16 @@ public TelemetryConfig getTelemetry() {
     /**
      * Sets the OpenTelemetry configuration for the CLI server.
      * <p>
-     * When set to a non-{@code null} value, the CLI server is started with
-     * OpenTelemetry instrumentation enabled using the provided settings.
+     * When set, the CLI server is started with OpenTelemetry instrumentation
+     * enabled using the provided settings.
      *
      * @param telemetry
      *            the telemetry configuration
      * @return this options instance for method chaining
      * @since 1.2.0
      */
     public CopilotClientOptions setTelemetry(TelemetryConfig telemetry) {
-        this.telemetry = telemetry;
+        this.telemetry = Objects.requireNonNull(telemetry, "telemetry must not be null");
         return this;
     }
 
diff --git a/src/test/java/com/github/copilot/sdk/CliServerManagerTest.java b/src/test/java/com/github/copilot/sdk/CliServerManagerTest.java
@@ -199,8 +199,8 @@ void startCliServerWithGitHubTokenAndNoExplicitUseLoggedInUser() throws Exceptio
 
     @Test
     void startCliServerWithNullCliPath() throws Exception {
-        // Test the null cliPath branch (defaults to "copilot")
-        var options = new CopilotClientOptions().setCliPath(null).setUseStdio(true);
+        // Test the default cliPath branch (defaults to "copilot" when not set)
+        var options = new CopilotClientOptions().setUseStdio(true);
         var manager = new CliServerManager(options);
 
         // "copilot" likely doesn't exist in the test env — that's fine
