Switch to TemporalNexusServiceClientOptions

Author: Quinn-With-Two-Ns

temporal-sdk/src/main/java/io/temporal/client/TemporalNexusServiceClientOptions.java

@@ -1,9 +1,53 @@
 package io.temporal.client;
 
+import com.google.common.base.Strings;
+
 public class TemporalNexusServiceClientOptions {
   public static Builder newBuilder() {
     return new Builder();
   }
 
-  public static final class Builder {}
+  private final String endpoint;
+  private final String taskQueue;
+
+  TemporalNexusServiceClientOptions(String endpoint, String taskQueue) {
+    this.endpoint = endpoint;
+    this.taskQueue = taskQueue;
+  }
+
+  String getEndpoint() {
+    return endpoint;
+  }
+
+  String getTaskQueue() {
+    return taskQueue;
+  }
+
+  public static final class Builder {
+    private String endpoint;
+    private String taskQueue;
+
+    Builder setTaskQueue(String taskQueue) {
+      this.taskQueue = taskQueue;
+      return this;
+    }
+
+    Builder setEndpoint(String endpoint) {
+      this.endpoint = endpoint;
+      return this;
+    }
+
+    TemporalNexusServiceClientOptions build() {
+      if (Strings.isNullOrEmpty(endpoint) && Strings.isNullOrEmpty(taskQueue)) {
+        throw new IllegalArgumentException("Must provide either a task queue or an endpoint");
+      } else if (!Strings.isNullOrEmpty(endpoint) && !Strings.isNullOrEmpty(taskQueue)) {
+        throw new IllegalArgumentException("Must provide only a task queue or an endpoint");
+      }
+
+
+      return new TemporalNexusServiceClientOptions(
+              endpoint, taskQueue
+      );
+    }
+  }
 }

temporal-sdk/src/main/java/io/temporal/client/WorkflowClient.java

@@ -136,7 +136,7 @@ static WorkflowClient newInstance(WorkflowServiceStubs service, WorkflowClientOp
    * @return A new {@link ServiceClient} instance backed by this {@link WorkflowClient} instance.
    */
   @Experimental
-  <T> ServiceClient<T> newNexusServiceClient(Class<T> nexusServiceInterface, String endpoint);
+  <T> ServiceClient<T> newNexusServiceClient(Class<T> nexusServiceInterface, TemporalNexusServiceClientOptions options);
 
   /**
    * Creates a new {@link CompletionClient} that can be used to complete or fail async operations

temporal-sdk/src/main/java/io/temporal/client/WorkflowClientInternalImpl.java

@@ -107,10 +107,10 @@ public WorkflowServiceStubs getWorkflowServiceStubs() {
 
   @Override
   public <T> ServiceClient<T> newNexusServiceClient(
-      Class<T> nexusServiceInterface, String endpoint) {
+      Class<T> nexusServiceInterface, TemporalNexusServiceClientOptions serviceClientOptions) {
     return new ServiceClient<>(
         ServiceClientOptions.newBuilder(nexusServiceInterface)
-            .setTransport(new workflowServiceNexusTransport(genericClient, endpoint, options))
+            .setTransport(new workflowServiceNexusTransport(genericClient, serviceClientOptions, options))
             .setSerializer(new PayloadSerializer(options.getDataConverter()))
             .build());
   }

temporal-sdk/src/main/java/io/temporal/client/workflowServiceNexusTransport.java

@@ -44,10 +44,16 @@ public class workflowServiceNexusTransport implements Transport {
   private final TaskDispatchTarget dispatchTarget;
 
   public workflowServiceNexusTransport(
-      GenericWorkflowClient client, String endpoint, WorkflowClientOptions options) {
+      GenericWorkflowClient client, TemporalNexusServiceClientOptions serviceClientOptions, WorkflowClientOptions options) {
     this.client = client;
     this.clientOptions = options;
-    this.dispatchTarget = TaskDispatchTarget.newBuilder().setEndpoint(endpoint).build();
+    if (serviceClientOptions.getEndpoint() != null) {
+      this.dispatchTarget = TaskDispatchTarget.newBuilder().setEndpoint(serviceClientOptions.getEndpoint()).build();
+    } else if (serviceClientOptions.getTaskQueue() != null) {
+      this.dispatchTarget = TaskDispatchTarget.newBuilder().setTaskQueue(serviceClientOptions.getTaskQueue()).build();
+    } else {
+      throw new IllegalArgumentException("No target specified");
+    }
   }
 
   private static final JsonFormat.Parser JSON_PARSER = JsonFormat.parser();