simplify, fix

Author: THardy98

temporal-serviceclient/src/main/java/io/temporal/serviceclient/ServiceStubsOptions.java

@@ -418,7 +418,8 @@ public String toString() {
   public static class Builder<T extends Builder<T>> {
     private ManagedChannel channel;
     private SslContext sslContext;
-    private Boolean enableHttps;
+    private boolean enableHttps;
+    private boolean enableHttpsExplicitlySet;
     private String target;
     private Consumer<ManagedChannelBuilder<?>> channelInitializer;
     private Duration healthCheckAttemptTimeout;
@@ -435,6 +436,7 @@ public static class Builder<T extends Builder<T>> {
     private Collection<GrpcMetadataProvider> grpcMetadataProviders;
     private Collection<ClientInterceptor> grpcClientInterceptors;
     private Scope metricsScope;
+    private boolean apiKeyProvided;
 
     protected Builder() {}
 
@@ -443,6 +445,7 @@ protected Builder(ServiceStubsOptions options) {
       this.target = options.target;
       this.channelInitializer = options.channelInitializer;
       this.enableHttps = options.enableHttps;
+      this.enableHttpsExplicitlySet = true;
       this.sslContext = options.sslContext;
       this.healthCheckAttemptTimeout = options.healthCheckAttemptTimeout;
       this.healthCheckTimeout = options.healthCheckTimeout;
@@ -542,6 +545,7 @@ public T setSslContext(SslContext sslContext) {
      */
     public T setEnableHttps(boolean enableHttps) {
       this.enableHttps = enableHttps;
+      this.enableHttpsExplicitlySet = true;
       return self();
     }
 
@@ -613,6 +617,7 @@ public T addGrpcMetadataProvider(GrpcMetadataProvider grpcMetadataProvider) {
      * @return {@code this}
      */
     public T addApiKey(AuthorizationTokenSupplier apiKey) {
+      this.apiKeyProvided = true;
       addGrpcMetadataProvider(
           new AuthorizationGrpcMetadataProvider(() -> "Bearer " + apiKey.supply()));
       return self();
@@ -852,15 +857,11 @@ public ServiceStubsOptions validateAndBuildWithDefaults() {
           MoreObjects.firstNonNull(this.grpcClientInterceptors, Collections.emptyList());
 
       // Auto-enable TLS when API key is provided and TLS is not explicitly set
-      boolean enableHttps = this.enableHttps != null ? this.enableHttps : false;
-      if (this.enableHttps == null && this.sslContext == null) {
-        // Check if an API key provider was added
-        boolean hasApiKey =
-            grpcMetadataProviders.stream()
-                .anyMatch(provider -> provider instanceof AuthorizationGrpcMetadataProvider);
-        if (hasApiKey) {
-          enableHttps = true;
-        }
+      boolean enableHttps;
+      if (this.enableHttpsExplicitlySet) {
+        enableHttps = this.enableHttps;
+      } else {
+        enableHttps = this.apiKeyProvided;
       }
 
       Scope metricsScope = this.metricsScope != null ? this.metricsScope : new NoopScope();

temporal-serviceclient/src/test/java/io/temporal/serviceclient/ServiceStubsOptionsTest.java

@@ -8,7 +8,6 @@ public class ServiceStubsOptionsTest {
 
   @Test
   public void testTLSEnabledByDefaultWhenAPIKeyProvided() {
-    // Test that TLS is enabled by default when API key is provided and TLS is not configured
     ServiceStubsOptions options =
         WorkflowServiceStubsOptions.newBuilder()
             .setTarget("localhost:7233")
@@ -21,7 +20,6 @@ public void testTLSEnabledByDefaultWhenAPIKeyProvided() {
 
   @Test
   public void testTLSCanBeExplicitlyDisabledWithAPIKey() {
-    // Test that TLS can be explicitly disabled even when API key is provided
     ServiceStubsOptions options =
         WorkflowServiceStubsOptions.newBuilder()
             .setTarget("localhost:7233")
@@ -33,18 +31,6 @@ public void testTLSCanBeExplicitlyDisabledWithAPIKey() {
     assertFalse(options.getEnableHttps());
   }
 
-  @Test
-  public void testTLSDisabledByDefaultWithoutAPIKey() {
-    // Test that TLS is disabled by default when no API key is provided
-    ServiceStubsOptions options =
-        WorkflowServiceStubsOptions.newBuilder()
-            .setTarget("localhost:7233")
-            .validateAndBuildWithDefaults();
-
-    // TLS should remain disabled when no api_key is provided
-    assertFalse(options.getEnableHttps());
-  }
-
   @Test
   public void testExplicitTLSConfigPreservedWithAPIKey() {
     // Test that explicit TLS configuration is preserved when API key is provided