fix test

Author: stephanos

core/src/main/java/io/temporal/samples/earlyreturn/EarlyReturnClient.java

@@ -19,6 +19,7 @@
 
 package io.temporal.samples.earlyreturn;
 
+import io.temporal.api.enums.v1.WorkflowIdConflictPolicy;
 import io.temporal.client.*;
 import io.temporal.serviceclient.WorkflowServiceStubs;
 
@@ -80,6 +81,7 @@ private static void runWorkflowWithUpdateWithStart(WorkflowClient client) {
   private static WorkflowOptions buildWorkflowOptions() {
     return WorkflowOptions.newBuilder()
         .setTaskQueue(TASK_QUEUE)
+        .setWorkflowIdConflictPolicy(WorkflowIdConflictPolicy.WORKFLOW_ID_CONFLICT_POLICY_FAIL)
         .setWorkflowId(WORKFLOW_ID_PREFIX + System.currentTimeMillis())
         .build();
   }

core/src/test/java/io/temporal/samples/earlyreturn/TransactionWorkflowTest.java

@@ -23,6 +23,7 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
+import io.temporal.api.enums.v1.WorkflowIdConflictPolicy;
 import io.temporal.client.*;
 import io.temporal.failure.ActivityFailure;
 import io.temporal.failure.ApplicationFailure;
@@ -63,23 +64,22 @@ public void testUpdateWithStartValidAmount() throws Exception {
     TransactionWorkflow workflow =
         workflowClient.newWorkflowStub(
             TransactionWorkflow.class,
-            WorkflowOptions.newBuilder().setTaskQueue(testWorkflowRule.getTaskQueue()).build());
-
-    // Create update operation
-    UpdateWithStartWorkflowOperation<TxResult> updateOp =
-        UpdateWithStartWorkflowOperation.newBuilder(workflow::returnInitResult)
-            .setWaitForStage(WorkflowUpdateStage.COMPLETED)
-            .build();
+            WorkflowOptions.newBuilder()
+                .setWorkflowIdConflictPolicy(
+                    WorkflowIdConflictPolicy.WORKFLOW_ID_CONFLICT_POLICY_FAIL)
+                .setTaskQueue(testWorkflowRule.getTaskQueue())
+                .build());
 
     // Execute UpdateWithStart
-    WorkflowUpdateHandle<TxResult> handle =
-        WorkflowClient.updateWithStart(
-            workflow::processTransaction,
-            new TransactionRequest(SOURCE_ACCOUNT, TARGET_ACCOUNT, VALID_AMOUNT),
-            updateOp);
+    TransactionRequest txRequest =
+        new TransactionRequest(SOURCE_ACCOUNT, TARGET_ACCOUNT, VALID_AMOUNT);
+    TxResult updateResult =
+        WorkflowClient.executeUpdateWithStart(
+            workflow::returnInitResult,
+            UpdateOptions.<TxResult>newBuilder().build(),
+            new WithStartWorkflowOperation<>(workflow::processTransaction, txRequest));
 
     // Verify both update and final results
-    TxResult updateResult = handle.getResultAsync().get();
     assertEquals(TEST_TRANSACTION_ID, updateResult.getTransactionId());
 
     TxResult finalResult = WorkflowStub.fromTyped(workflow).getResult(TxResult.class);
@@ -111,33 +111,29 @@ public void testUpdateWithStartInvalidAmount() throws Exception {
     String workflowId = "test-workflow-" + UUID.randomUUID();
     WorkflowOptions options =
         WorkflowOptions.newBuilder()
+            .setWorkflowIdConflictPolicy(WorkflowIdConflictPolicy.WORKFLOW_ID_CONFLICT_POLICY_FAIL)
             .setTaskQueue(testWorkflowRule.getTaskQueue())
             .setWorkflowId(workflowId)
             .build();
 
     TransactionWorkflow workflow =
         workflowClient.newWorkflowStub(TransactionWorkflow.class, options);
 
-    // Create update operation
-    UpdateWithStartWorkflowOperation<TxResult> updateOp =
-        UpdateWithStartWorkflowOperation.newBuilder(workflow::returnInitResult)
-            .setWaitForStage(WorkflowUpdateStage.COMPLETED)
-            .build();
-
     // Execute UpdateWithStart and expect the exception
-    WorkflowServiceException exception =
+    TransactionRequest txRequest =
+        new TransactionRequest(SOURCE_ACCOUNT, TARGET_ACCOUNT, INVALID_AMOUNT);
+    WorkflowUpdateException exception =
         assertThrows(
-            WorkflowServiceException.class,
+            WorkflowUpdateException.class,
             () ->
-                WorkflowClient.updateWithStart(
-                    workflow::processTransaction,
-                    new TransactionRequest(SOURCE_ACCOUNT, TARGET_ACCOUNT, INVALID_AMOUNT),
-                    updateOp));
+                WorkflowClient.executeUpdateWithStart(
+                    workflow::returnInitResult,
+                    UpdateOptions.<TxResult>newBuilder().build(),
+                    new WithStartWorkflowOperation<>(workflow::processTransaction, txRequest)));
 
     // Verify the exception chain
-    assertTrue(exception.getCause() instanceof WorkflowUpdateException);
-    assertTrue(exception.getCause().getCause() instanceof ActivityFailure);
-    ApplicationFailure appFailure = (ApplicationFailure) exception.getCause().getCause().getCause();
+    assertTrue(exception.getCause() instanceof ActivityFailure);
+    ApplicationFailure appFailure = (ApplicationFailure) exception.getCause().getCause();
     assertEquals("InvalidAmount", appFailure.getType());
     assertTrue(appFailure.getMessage().contains("Invalid Amount"));
 

core/src/test/java/io/temporal/samples/safemessagepassing/ClusterManagerWorkflowWorkerTest.java

@@ -105,9 +105,8 @@ public void testUpdateIdempotency() {
             .newWorkflowStub(
                 ClusterManagerWorkflow.class,
                 WorkflowOptions.newBuilder().setTaskQueue(testWorkflowRule.getTaskQueue()).build());
-    CompletableFuture<ClusterManagerWorkflow.ClusterManagerResult> result =
-        WorkflowClient.execute(
-            cluster::run, new ClusterManagerWorkflow.ClusterManagerInput(Optional.empty(), false));
+    WorkflowClient.execute(
+        cluster::run, new ClusterManagerWorkflow.ClusterManagerInput(Optional.empty(), false));
 
     cluster.startCluster();