fix(iot-dev): fix bug where client options was overridden (#1749)

If a user provides a client options instance, but without an SSLContext, we should still keep all the settings they provided while adding the SSLContext generated by the SDK
Azure · Oct 18, 2023 · 87a7792 · 87a7792
1 parent c6bb05a
commit 87a7792
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/...ice/iot-device-client/src/main/java/com/microsoft/azure/sdk/iot/device/ClientOptions.java b/...ice/iot-device-client/src/main/java/com/microsoft/azure/sdk/iot/device/ClientOptions.java
@@ -13,7 +13,7 @@
 /**
  * Options that allow configuration of the device client instance during initialization.
  */
-@Builder
+@Builder(toBuilder = true)
 public final class ClientOptions
 {
     private static final int DEFAULT_HTTPS_CONNECT_TIMEOUT_MILLISECONDS = 0;

diff --git a/...vice/iot-device-client/src/main/java/com/microsoft/azure/sdk/iot/device/ModuleClient.java b/...vice/iot-device-client/src/main/java/com/microsoft/azure/sdk/iot/device/ModuleClient.java
@@ -224,9 +224,15 @@ public static ModuleClient createFromEnvironment(UnixDomainSocketChannel unixDom
                 sslContext = new IotHubSSLContext().getSSLContext();
             }
 
-            if (clientOptions == null || clientOptions.getSslContext() == null)
+            if (clientOptions != null && clientOptions.getSslContext() == null)
             {
-                // only override the SSLContext if the user didn't set it
+                // Clone the existing client options, but with the new SSLContext
+                clientOptions = clientOptions.toBuilder().sslContext(sslContext)
+                        .build();
+            }
+            else if (clientOptions == null)
+            {
+                // only override the client options completely if the user didn't provide any
                 clientOptions = ClientOptions.builder().sslContext(sslContext).build();
             }
             else