JavaSDK v1.13.0 (temporalio#313)

Spikhalskiy · web-flow · commit d9994e91932d · 2022-06-28T18:34:09.000-04:00
diff --git a/build.gradle b/build.gradle
@@ -30,8 +30,8 @@ dependencies {
     implementation(platform("io.opentelemetry:opentelemetry-bom:1.15.0"))
     implementation(platform("org.junit:junit-bom:5.8.2"))
 
-    implementation group: 'io.temporal', name: 'temporal-sdk', version: '1.12.0'
-    implementation group: 'io.temporal', name: 'temporal-opentracing', version: '1.12.0'
+    implementation "io.temporal:temporal-sdk:1.13.0"
+    implementation "io.temporal:temporal-opentracing:1.13.0"
 
     implementation "com.fasterxml.jackson.core:jackson-databind"
     implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.11'
@@ -59,7 +59,7 @@ dependencies {
     // we don't update it to 2.1.0 because 2.1.0 requires Java 11
     implementation 'com.codingrodent:jackson-json-crypto:1.1.0'
 
-    testImplementation("io.temporal:temporal-testing:1.12.0")
+    testImplementation("io.temporal:temporal-testing:1.13.0")
 
     testImplementation "junit:junit:4.13.2"
     testImplementation group: 'org.mockito', name: 'mockito-core', version: '4.6.1'
diff --git a/src/main/java/io/temporal/samples/fileprocessing/FileProcessingWorkflowImpl.java b/src/main/java/io/temporal/samples/fileprocessing/FileProcessingWorkflowImpl.java
@@ -37,7 +37,7 @@
 public class FileProcessingWorkflowImpl implements FileProcessingWorkflow {
 
   // Uses the default task queue shared by the pool of workers.
-  private final StoreActivities defaultTaskQueueStore;
+  private final StoreActivities defaultTaskQueueActivities;
 
   public FileProcessingWorkflowImpl() {
     // Create activity clients.
@@ -51,22 +51,19 @@ public FileProcessingWorkflowImpl() {
                     .setDoNotRetry(IllegalArgumentException.class.getName())
                     .build())
             .build();
-    this.defaultTaskQueueStore = Workflow.newActivityStub(StoreActivities.class, ao);
+    this.defaultTaskQueueActivities = Workflow.newActivityStub(StoreActivities.class, ao);
   }
 
   @Override
   public void processFile(URL source, URL destination) {
     RetryOptions retryOptions =
         RetryOptions.newBuilder().setInitialInterval(Duration.ofSeconds(1)).build();
     // Retries the whole sequence on any failure, potentially on a different host.
-    Workflow.retry(
-        retryOptions,
-        Optional.of(Duration.ofSeconds(10)),
-        () -> processFileImpl(source, destination));
+    Workflow.retry(retryOptions, Optional.empty(), () -> processFileImpl(source, destination));
   }
 
   private void processFileImpl(URL source, URL destination) {
-    StoreActivities.TaskQueueFileNamePair downloaded = defaultTaskQueueStore.download(source);
+    StoreActivities.TaskQueueFileNamePair downloaded = defaultTaskQueueActivities.download(source);
 
     // Now initialize stubs that are specific to the returned task queue.
     ActivityOptions hostActivityOptions =
diff --git a/src/main/java/io/temporal/samples/hello/HelloException.java b/src/main/java/io/temporal/samples/hello/HelloException.java
@@ -129,6 +129,7 @@ public static class GreetingChildImpl implements GreetingChild {
             GreetingActivities.class,
             ActivityOptions.newBuilder()
                 .setStartToCloseTimeout(Duration.ofMinutes(1))
+                .setScheduleToStartTimeout(Duration.ofSeconds(5))
                 .setRetryOptions(
                     RetryOptions.newBuilder()
                         .setInitialInterval(Duration.ofSeconds(1))
diff --git a/src/test/java/io/temporal/samples/fileprocessing/FileProcessingTest.java b/src/test/java/io/temporal/samples/fileprocessing/FileProcessingTest.java
@@ -22,16 +22,13 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
-import io.temporal.api.enums.v1.TimeoutType;
 import io.temporal.client.WorkflowOptions;
-import io.temporal.failure.TimeoutFailure;
 import io.temporal.samples.fileprocessing.StoreActivities.TaskQueueFileNamePair;
 import io.temporal.testing.TestWorkflowRule;
 import io.temporal.worker.Worker;
 import java.net.MalformedURLException;
 import java.net.URL;
 import org.junit.*;
-import org.junit.rules.Timeout;
 
 public class FileProcessingTest {
 
@@ -60,8 +57,6 @@ public class FileProcessingTest {
           .setDoNotStart(true)
           .build();
 
-  @Rule public Timeout globalTimeout = Timeout.seconds(5);
-
   // Host specific workers.
   private Worker workerHost1;
   private Worker workerHost2;
@@ -109,7 +104,7 @@ public void testHappyPath() {
     testWorkflowRule.getTestEnvironment().shutdown();
   }
 
-  @Test
+  @Test(timeout = 30_000)
   public void testHostFailover() {
     StoreActivities activities = mock(StoreActivities.class);
     when(activities.download(any()))
@@ -120,7 +115,12 @@ public void testHostFailover() {
 
     StoreActivities activitiesHost1 = mock(StoreActivities.class);
     when(activitiesHost1.process(FILE_NAME_UNPROCESSED))
-        .thenThrow(new TimeoutFailure("simulated", null, TimeoutType.TIMEOUT_TYPE_START_TO_CLOSE));
+        .then(
+            invocation -> {
+              Thread.sleep(Long.MAX_VALUE);
+              return "done";
+            });
+
     workerHost1.registerActivitiesImplementations(activitiesHost1);
 
     StoreActivities activitiesHost2 = mock(StoreActivities.class);
diff --git a/src/test/java/io/temporal/samples/hello/HelloExceptionTest.java b/src/test/java/io/temporal/samples/hello/HelloExceptionTest.java
@@ -32,7 +32,6 @@
 import io.temporal.failure.ApplicationFailure;
 import io.temporal.failure.ChildWorkflowFailure;
 import io.temporal.failure.TimeoutFailure;
-import io.temporal.samples.hello.HelloException.GreetingActivities;
 import io.temporal.samples.hello.HelloException.GreetingChildImpl;
 import io.temporal.samples.hello.HelloException.GreetingWorkflow;
 import io.temporal.samples.hello.HelloException.GreetingWorkflowImpl;
@@ -80,18 +79,14 @@ public void testIOException() {
   }
 
   @Test
-  public void testActivityTimeout() {
+  public void testActivityScheduleToStartTimeout() {
     testWorkflowRule
         .getWorker()
         .registerWorkflowImplementationTypes(
             HelloException.GreetingWorkflowImpl.class, GreetingChildImpl.class);
 
-    // Mock an activity that times out.
-    GreetingActivities activities = mock(GreetingActivities.class);
-    when(activities.composeGreeting(anyString(), anyString()))
-        .thenThrow(
-            new TimeoutFailure("simulated", null, TimeoutType.TIMEOUT_TYPE_SCHEDULE_TO_START));
-    testWorkflowRule.getWorker().registerActivitiesImplementations(activities);
+    // We don't register an activity implementation on the worker and the activity has 5 seconds
+    // schedule to start timeout in GreetingChildImpl
 
     testWorkflowRule.getTestEnvironment().start();
 
