Add new constructor for WorkflowStub to target correct execution

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

@@ -158,9 +158,21 @@ static WorkflowClient newInstance(WorkflowServiceStubs service, WorkflowClientOp
    * @param workflowId Workflow id.
    * @param runId Run id of the workflow execution.
    * @return Stub that implements workflowInterface and can be used to signal, update, or query it.
+   * @deprecated Use {@link #newWorkflowStub(Class, WorkflowTargetOptions)} instead.
    */
+  @Deprecated
   <T> T newWorkflowStub(Class<T> workflowInterface, String workflowId, Optional<String> runId);
 
+  /**
+   * Creates workflow client stub for a known execution. Use it to send signals or queries to a
+   * running workflow. Do not call methods annotated with @WorkflowMethod.
+   *
+   * @param workflowInterface interface that given workflow implements.
+   * @param workflowTargetOptions options that specify target workflow execution.
+   * @return Stub that implements workflowInterface and can be used to signal or query it.
+   */
+  <T> T newWorkflowStub(Class<T> workflowInterface, WorkflowTargetOptions workflowTargetOptions);
+
   /**
    * Creates workflow untyped client stub that can be used to start a single workflow execution. Use
    * it to send signals or queries to a running workflow. Do not call methods annotated
@@ -191,7 +203,9 @@ static WorkflowClient newInstance(WorkflowServiceStubs service, WorkflowClientOp
    *     workflowId is assumed.
    * @param workflowType type of the workflow. Optional as it is used for error reporting only.
    * @return Stub that can be used to start workflow and later to signal or query it.
+   * @deprecated Use {@link #newUntypedWorkflowStub(WorkflowTargetOptions, Optional)} instead.
    */
+  @Deprecated
   WorkflowStub newUntypedWorkflowStub(
       String workflowId, Optional<String> runId, Optional<String> workflowType);
 
@@ -202,9 +216,30 @@ WorkflowStub newUntypedWorkflowStub(
    * @param execution workflow id and optional run id for execution
    * @param workflowType type of the workflow. Optional as it is used for error reporting only.
    * @return Stub that can be used to start workflow and later to signal or query it.
+   * @deprecated Use {@link #newUntypedWorkflowStub(WorkflowTargetOptions, Optional)} instead.
    */
   WorkflowStub newUntypedWorkflowStub(WorkflowExecution execution, Optional<String> workflowType);
 
+  /**
+   * Creates workflow untyped client stub for a known execution. Use it to send signals or queries
+   * to a running workflow. Do not call methods annotated with @WorkflowMethod.
+   *
+   * @param workflowTargetOptions options that specify target workflow execution.
+   * @return Stub that can be used to start workflow and later to signal or query it.
+   */
+  WorkflowStub newUntypedWorkflowStub(WorkflowTargetOptions workflowTargetOptions);
+
+  /**
+   * Creates workflow untyped client stub for a known execution. Use it to send signals or queries
+   * to a running workflow. Do not call methods annotated with @WorkflowMethod.
+   *
+   * @param workflowTargetOptions options that specify target workflow execution.
+   * @param workflowType type of the workflow. Optional as it is used for error reporting only.
+   * @return Stub that can be used to start workflow and later to signal or query it.
+   */
+  WorkflowStub newUntypedWorkflowStub(
+      WorkflowTargetOptions workflowTargetOptions, Optional<String> workflowType);
+
   /**
    * Creates new {@link ActivityCompletionClient} that can be used to complete activities
    * asynchronously. Only relevant for activity implementations that called {@link

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

@@ -149,24 +149,51 @@ public <T> T newWorkflowStub(Class<T> workflowInterface, String workflowId) {
     return newWorkflowStub(workflowInterface, workflowId, Optional.empty());
   }
 
+  public <T> T newWorkflowStub(
+      Class<T> workflowInterface, WorkflowTargetOptions workflowTargetOptions) {
+    return newWorkflowStub(workflowInterface, workflowTargetOptions, false);
+  }
+
   @Override
+  @SuppressWarnings("deprecation")
   public <T> T newWorkflowStub(
       Class<T> workflowInterface, String workflowId, Optional<String> runId) {
+    return newWorkflowStub(
+        workflowInterface,
+        WorkflowTargetOptions.newBuilder()
+            .setWorkflowId(workflowId)
+            .setRunId(runId.orElse(null))
+            .build(),
+        true);
+  }
+
+  public <T> T newWorkflowStub(
+      Class<T> workflowInterface,
+      WorkflowTargetOptions workflowTargetOptions,
+      boolean legacyTargeting) {
     checkAnnotation(
         workflowInterface,
         WorkflowMethod.class,
         QueryMethod.class,
         SignalMethod.class,
         UpdateMethod.class);
-    if (Strings.isNullOrEmpty(workflowId)) {
+    if (Strings.isNullOrEmpty(workflowTargetOptions.getWorkflowId())) {
       throw new IllegalArgumentException("workflowId is null or empty");
     }
-    WorkflowExecution execution =
-        WorkflowExecution.newBuilder().setWorkflowId(workflowId).setRunId(runId.orElse("")).build();
+    WorkflowExecution.Builder execution =
+        WorkflowExecution.newBuilder().setWorkflowId(workflowTargetOptions.getWorkflowId());
+    if (!Strings.isNullOrEmpty(workflowTargetOptions.getRunId())) {
+      execution.setRunId(workflowTargetOptions.getRunId());
+    }
 
     WorkflowInvocationHandler invocationHandler =
         new WorkflowInvocationHandler(
-            workflowInterface, this.getOptions(), workflowClientCallsInvoker, execution);
+            workflowInterface,
+            this.getOptions(),
+            workflowClientCallsInvoker,
+            execution.build(),
+            legacyTargeting,
+            workflowTargetOptions.getFirstExecutionRunId());
     @SuppressWarnings("unchecked")
     T result =
         (T)
@@ -194,6 +221,7 @@ public WorkflowStub newUntypedWorkflowStub(String workflowType, WorkflowOptions
   }
 
   @Override
+  @SuppressWarnings("deprecation")
   public WorkflowStub newUntypedWorkflowStub(
       String workflowId, Optional<String> runId, Optional<String> workflowType) {
     WorkflowExecution execution =
@@ -205,10 +233,46 @@ public WorkflowStub newUntypedWorkflowStub(
   @SuppressWarnings("deprecation")
   public WorkflowStub newUntypedWorkflowStub(
       WorkflowExecution execution, Optional<String> workflowType) {
+    return newUntypedWorkflowStub(
+        workflowType,
+        true,
+        WorkflowTargetOptions.newBuilder()
+            .setWorkflowId(execution.getWorkflowId())
+            .setRunId(execution.getRunId())
+            .build());
+  }
+
+  @Override
+  public WorkflowStub newUntypedWorkflowStub(WorkflowTargetOptions workflowTargetOptions) {
+    return newUntypedWorkflowStub(Optional.empty(), false, workflowTargetOptions);
+  }
+
+  @Override
+  public WorkflowStub newUntypedWorkflowStub(
+      WorkflowTargetOptions workflowTargetOptions, Optional<String> workflowType) {
+    return newUntypedWorkflowStub(workflowType, false, workflowTargetOptions);
+  }
+
+  @SuppressWarnings("deprecation")
+  WorkflowStub newUntypedWorkflowStub(
+      Optional<String> workflowType,
+      boolean legacyTargeting,
+      WorkflowTargetOptions workflowTargetOptions) {
+    WorkflowExecution.Builder execution =
+        WorkflowExecution.newBuilder().setWorkflowId(workflowTargetOptions.getWorkflowId());
+    if (!Strings.isNullOrEmpty(workflowTargetOptions.getRunId())) {
+      execution.setRunId(workflowTargetOptions.getRunId());
+    }
     WorkflowStub result =
-        new WorkflowStubImpl(options, workflowClientCallsInvoker, workflowType, execution);
+        new WorkflowStubImpl(
+            options,
+            workflowClientCallsInvoker,
+            workflowType,
+            execution.build(),
+            legacyTargeting,
+            workflowTargetOptions.getFirstExecutionRunId());
     for (WorkflowClientInterceptor i : interceptors) {
-      result = i.newUntypedWorkflowStub(execution, workflowType, result);
+      result = i.newUntypedWorkflowStub(execution.build(), workflowType, result);
     }
     return result;
   }

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

@@ -20,6 +20,7 @@
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.util.*;
+import javax.annotation.Nullable;
 
 /**
  * Dynamic implementation of a strongly typed workflow interface that can be used to start, signal
@@ -107,11 +108,19 @@ static void closeAsyncInvocation() {
       Class<?> workflowInterface,
       WorkflowClientOptions clientOptions,
       WorkflowClientCallsInterceptor workflowClientCallsInvoker,
-      WorkflowExecution execution) {
+      WorkflowExecution execution,
+      boolean legacyTargeting,
+      @Nullable String firstExecutionRunId) {
     workflowMetadata = POJOWorkflowInterfaceMetadata.newInstance(workflowInterface, false);
     Optional<String> workflowType = workflowMetadata.getWorkflowType();
     WorkflowStub stub =
-        new WorkflowStubImpl(clientOptions, workflowClientCallsInvoker, workflowType, execution);
+        new WorkflowStubImpl(
+            clientOptions,
+            workflowClientCallsInvoker,
+            workflowType,
+            execution,
+            legacyTargeting,
+            firstExecutionRunId);
     for (WorkflowClientInterceptor i : clientOptions.getInterceptors()) {
       stub = i.newUntypedWorkflowStub(execution, workflowType, stub);
     }

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

@@ -160,10 +160,25 @@ <R> WorkflowUpdateHandle<R> startUpdateWithStart(
   <R> R executeUpdateWithStart(
       UpdateOptions<R> updateOptions, Object[] updateArgs, Object[] startArgs);
 
+  /**
+   * Sends a signal to a workflow, starting the workflow if it is not already running.
+   *
+   * @param signalName name of the signal handler. Usually it is a method name.
+   * @param signalArgs signal method arguments
+   * @param startArgs workflow start arguments
+   * @return workflow execution
+   */
   WorkflowExecution signalWithStart(String signalName, Object[] signalArgs, Object[] startArgs);
 
+  /**
+   * @return workflow type name if it was provided when the stub was created.
+   */
   Optional<String> getWorkflowType();
 
+  /**
+   * @return current workflow execution. Returns null if the workflow has not been started yet.
+   */
+  @Nullable
   WorkflowExecution getExecution();
 
   /**
@@ -406,6 +421,9 @@ <R> CompletableFuture<R> getResultAsync(
    */
   WorkflowExecutionDescription describe();
 
+  /**
+   * @return workflow options if they were provided when the stub was created.
+   */
   Optional<WorkflowOptions> getOptions();
 
   /**

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

@@ -35,19 +35,25 @@ class WorkflowStubImpl implements WorkflowStub {
   // if null, this stub is created to bound to an existing execution.
   // This stub is created to bound to an existing execution otherwise.
   private final @Nullable WorkflowOptions options;
+  private final boolean legacyTargeting;
+  private final @Nullable String firstExecutionRunId;
 
   WorkflowStubImpl(
       WorkflowClientOptions clientOptions,
       WorkflowClientCallsInterceptor workflowClientInvoker,
       Optional<String> workflowType,
-      WorkflowExecution execution) {
+      WorkflowExecution execution,
+      boolean legacyTargeting,
+      @Nullable String firstExecutionRunId) {
     this.clientOptions = clientOptions;
     this.workflowClientInvoker = workflowClientInvoker;
     this.workflowType = workflowType;
     if (execution == null || execution.getWorkflowId().isEmpty()) {
       throw new IllegalArgumentException("null or empty workflowId");
     }
     this.execution.set(execution);
+    this.legacyTargeting = legacyTargeting;
+    this.firstExecutionRunId = firstExecutionRunId;
     this.options = null;
   }
 
@@ -60,12 +66,14 @@ class WorkflowStubImpl implements WorkflowStub {
     this.workflowClientInvoker = workflowClientInvoker;
     this.workflowType = Optional.of(workflowType);
     this.options = options;
+    this.legacyTargeting = false;
+    this.firstExecutionRunId = null;
   }
 
   @Override
   public void signal(String signalName, Object... args) {
     checkStarted();
-    WorkflowExecution targetExecution = currentExecutionWithoutRunId();
+    WorkflowExecution targetExecution = currentExecutionCheckLegacy();
     try {
       workflowClientInvoker.signal(
           new WorkflowClientCallsInterceptor.WorkflowSignalInput(
@@ -338,6 +346,7 @@ public <R> R update(String updateName, Class<R> resultClass, Object... args) {
               .setUpdateName(updateName)
               .setWaitForStage(WorkflowUpdateStage.COMPLETED)
               .setResultClass(resultClass)
+              .setFirstExecutionRunId(firstExecutionRunId)
               .build();
       return startUpdate(options, args).getResultAsync().get();
     } catch (InterruptedException e) {
@@ -385,21 +394,17 @@ private <R> WorkflowClientCallsInterceptor.StartUpdateInput<R> startUpdateInput(
         Strings.isNullOrEmpty(options.getUpdateId())
             ? UUID.randomUUID().toString()
             : options.getUpdateId();
-    WorkflowClientCallsInterceptor.StartUpdateInput<R> input =
-        new WorkflowClientCallsInterceptor.StartUpdateInput<>(
-            targetExecution,
-            workflowType,
-            options.getUpdateName(),
-            Header.empty(),
-            updateId,
-            args,
-            options.getResultClass(),
-            options.getResultType(),
-            options.getFirstExecutionRunId(),
-            WaitPolicy.newBuilder()
-                .setLifecycleStage(options.getWaitForStage().getProto())
-                .build());
-    return input;
+    return new WorkflowClientCallsInterceptor.StartUpdateInput<>(
+        targetExecution,
+        workflowType,
+        options.getUpdateName(),
+        Header.empty(),
+        updateId,
+        args,
+        options.getResultClass(),
+        options.getResultType(),
+        options.getFirstExecutionRunId(),
+        WaitPolicy.newBuilder().setLifecycleStage(options.getWaitForStage().getProto()).build());
   }
 
   @Override
@@ -435,10 +440,11 @@ public void cancel() {
   @Override
   public void cancel(@Nullable String reason) {
     checkStarted();
-    WorkflowExecution targetExecution = currentExecutionWithoutRunId();
+    WorkflowExecution targetExecution = currentExecutionCheckLegacy();
     try {
       workflowClientInvoker.cancel(
-          new WorkflowClientCallsInterceptor.CancelInput(targetExecution, reason));
+          new WorkflowClientCallsInterceptor.CancelInput(
+              targetExecution, firstExecutionRunId, reason));
     } catch (Exception e) {
       Throwable failure = throwAsWorkflowFailureException(e, targetExecution);
       throw new WorkflowServiceException(targetExecution, workflowType.orElse(null), failure);
@@ -448,10 +454,11 @@ public void cancel(@Nullable String reason) {
   @Override
   public void terminate(@Nullable String reason, Object... details) {
     checkStarted();
-    WorkflowExecution targetExecution = currentExecutionWithoutRunId();
+    WorkflowExecution targetExecution = currentExecutionCheckLegacy();
     try {
       workflowClientInvoker.terminate(
-          new WorkflowClientCallsInterceptor.TerminateInput(targetExecution, reason, details));
+          new WorkflowClientCallsInterceptor.TerminateInput(
+              targetExecution, firstExecutionRunId, reason, details));
     } catch (Exception e) {
       Throwable failure = throwAsWorkflowFailureException(e, targetExecution);
       throw new WorkflowServiceException(targetExecution, workflowType.orElse(null), failure);
@@ -532,6 +539,14 @@ private WorkflowExecution currentExecutionWithoutRunId() {
     }
   }
 
+  private WorkflowExecution currentExecutionCheckLegacy() {
+    if (legacyTargeting) {
+      return currentExecutionWithoutRunId();
+    } else {
+      return execution.get();
+    }
+  }
+
   private <R> R throwAsWorkflowFailureExceptionForQuery(
       Throwable failure,
       @SuppressWarnings("unused") Class<R> returnType,
@@ -589,6 +604,7 @@ private Throwable throwAsWorkflowFailureException(
 
   private void populateExecutionAfterStart(WorkflowExecution startedExecution) {
     this.startedExecution.set(startedExecution);
+    // this.firstExecutionRunId.set(startedExecution.getRunId());
     // bind to an execution without a runId, so queries follow runId chains by default
     this.execution.set(WorkflowExecution.newBuilder(startedExecution).setRunId("").build());
   }