Update Java SDK (#502)

Update Java SDK
temporalio · Jun 27, 2024 · 6d18b3b · 6d18b3b
1 parent fa5255b
commit 6d18b3b
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 20 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -16,7 +16,7 @@ jobs:
     outputs:
       go_latest: '1.26.1'
       typescript_latest: '1.10.0'
-      java_latest: '1.23.0'
+      java_latest: '1.24.0'
       python_latest: '1.6.0'
       csharp_latest: '1.1.2'
     steps:

diff --git a/build.gradle b/build.gradle
@@ -32,7 +32,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.jayway.jsonpath:json-path:2.6.0'
     implementation 'info.picocli:picocli:4.6.2'
-    implementation 'io.temporal:temporal-sdk:1.23.0'
+    implementation 'io.temporal:temporal-sdk:1.24.0'
     implementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
     implementation 'org.reflections:reflections:0.10.2'
 }

diff --git a/features/update/async_accepted/feature.java b/features/update/async_accepted/feature.java
@@ -3,8 +3,8 @@
 import io.temporal.activity.ActivityInterface;
 import io.temporal.client.UpdateHandle;
 import io.temporal.client.UpdateOptions;
-import io.temporal.client.UpdateWaitPolicy;
 import io.temporal.client.WorkflowUpdateException;
+import io.temporal.client.WorkflowUpdateStage;
 import io.temporal.failure.ApplicationFailure;
 import io.temporal.sdkfeatures.Feature;
 import io.temporal.sdkfeatures.Run;
@@ -77,6 +77,7 @@ public Run execute(Runner runner) throws Exception {
                   .setUpdateName("update")
                   .setUpdateId(updateId)
                   .setFirstExecutionRunId(run.execution.getRunId())
+                  .setWaitForStage(WorkflowUpdateStage.ACCEPTED)
                   .build(),
               true);
 
@@ -93,6 +94,7 @@ public Run execute(Runner runner) throws Exception {
                   .setUpdateName("update")
                   .setUpdateId(updateId)
                   .setFirstExecutionRunId(run.execution.getRunId())
+                  .setWaitForStage(WorkflowUpdateStage.ACCEPTED)
                   .build(),
               false);
       try {
@@ -115,7 +117,7 @@ public Run execute(Runner runner) throws Exception {
                   .setUpdateName("update")
                   .setUpdateId(updateId)
                   .setFirstExecutionRunId(run.execution.getRunId())
-                  .setWaitPolicy(UpdateWaitPolicy.ACCEPTED)
+                  .setWaitForStage(WorkflowUpdateStage.ACCEPTED)
                   .build(),
               true);
       // Expect to get a timeout exception

diff --git a/features/update/deduplication/feature.java b/features/update/deduplication/feature.java
@@ -2,7 +2,7 @@
 
 import io.temporal.client.UpdateHandle;
 import io.temporal.client.UpdateOptions;
-import io.temporal.client.UpdateWaitPolicy;
+import io.temporal.client.WorkflowUpdateStage;
 import io.temporal.sdkfeatures.Feature;
 import io.temporal.sdkfeatures.Run;
 import io.temporal.sdkfeatures.Runner;
@@ -72,7 +72,7 @@ public Run execute(Runner runner) throws Exception {
           UpdateOptions.newBuilder(Integer.class)
               .setUpdateName("incrementCount")
               .setUpdateId(REUSED_UPDATE_ID)
-              .setWaitPolicy(UpdateWaitPolicy.ACCEPTED)
+              .setWaitForStage(WorkflowUpdateStage.ACCEPTED)
               .setFirstExecutionRunId(run.execution.getRunId())
               .build();
 

diff --git a/features/update/task_failure/feature.java b/features/update/task_failure/feature.java
@@ -1,6 +1,7 @@
 package update.task_failure;
 
 import io.temporal.activity.ActivityInterface;
+import io.temporal.client.WorkflowOptions;
 import io.temporal.client.WorkflowUpdateException;
 import io.temporal.failure.ApplicationFailure;
 import io.temporal.sdkfeatures.Feature;
@@ -11,7 +12,7 @@
 import io.temporal.workflow.UpdateMethod;
 import io.temporal.workflow.UpdateValidatorMethod;
 import io.temporal.workflow.Workflow;
-import java.util.concurrent.ExecutionException;
+import java.time.Duration;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.jupiter.api.Assertions;
 
@@ -63,6 +64,11 @@ public void finish() {
       this.doFinish = true;
     }
 
+    @Override
+    public void workflowOptions(WorkflowOptions.Builder builder) {
+      builder.setWorkflowTaskTimeout(Duration.ofSeconds(1));
+    }
+
     @Override
     public Run execute(Runner runner) {
       runner.skipIfUpdateNotSupported();
@@ -79,18 +85,6 @@ public Run execute(Runner runner) {
         Assertions.assertEquals("Failure", ((ApplicationFailure) e.getCause()).getType());
         Assertions.assertEquals(
             "message='simulated 3', type='Failure', nonRetryable=false", e.getCause().getMessage());
-      } catch (RuntimeException e) {
-        // TODO(https://github.com/temporalio/sdk-java/issues/1973) The SDK should be unwrapping the
-        // ExecutionException.
-        Assertions.assertTrue(e.getCause() instanceof ExecutionException);
-        ExecutionException ee = (ExecutionException) e.getCause();
-        Assertions.assertTrue(ee.getCause() instanceof WorkflowUpdateException);
-        WorkflowUpdateException wue = (WorkflowUpdateException) ee.getCause();
-        Assertions.assertTrue(wue.getCause() instanceof ApplicationFailure);
-        Assertions.assertEquals("Failure", ((ApplicationFailure) wue.getCause()).getType());
-        Assertions.assertEquals(
-            "message='simulated 3', type='Failure', nonRetryable=false",
-            wue.getCause().getMessage());
       }
 
       // Check an update handle validator will fail on any exception

diff --git a/harness/go/history/history.go b/harness/go/history/history.go
@@ -225,6 +225,8 @@ func scrubRunSpecificScalars(v interface{}) {
 	case *history.ActivityTaskStartedEventAttributes:
 		v.Identity = ""
 		v.RequestId = ""
+		// Disable because cloud may truncate this value
+		v.LastFailure = nil
 		// Because binary checksum will show up in the stamp where it didn't before, ignore unless
 		// versioning was actually turned on.
 		if v.GetWorkerVersion() != nil && !v.GetWorkerVersion().GetUseVersioning() {

diff --git a/harness/java/io/temporal/sdkfeatures/Runner.java b/harness/java/io/temporal/sdkfeatures/Runner.java
@@ -15,6 +15,7 @@
 import io.temporal.api.workflow.v1.WorkflowExecutionInfo;
 import io.temporal.api.workflowservice.v1.DescribeWorkflowExecutionRequest;
 import io.temporal.client.*;
+import io.temporal.client.WorkflowUpdateStage;
 import io.temporal.internal.client.WorkflowClientHelper;
 import io.temporal.internal.common.WorkflowExecutionHistory;
 import io.temporal.serviceclient.WorkflowServiceStubs;
@@ -349,7 +350,9 @@ public void skipIfUpdateNotSupported() {
 
   public void skipIfAsyncAcceptedUpdateNotSupported() {
     try {
-      client.newUntypedWorkflowStub("fake").startUpdate("also_fake", Void.class);
+      client
+          .newUntypedWorkflowStub("fake")
+          .startUpdate("also_fake", WorkflowUpdateStage.ACCEPTED, Void.class);
     } catch (WorkflowNotFoundException exception) {
       return;
     } catch (WorkflowServiceException exception) {