Use dapr/durabletask-java (#1336)

* microsoft durabletask-java -> dapr durabletask-java

Signed-off-by: Cassandra Coyle <[email protected]>

* update another ref

Signed-off-by: Cassandra Coyle <[email protected]>

* 1.5.2 release

Signed-off-by: Cassandra Coyle <[email protected]>

* fix import order

Signed-off-by: Cassandra Coyle <[email protected]>

* Sdk new changes

Signed-off-by: siri-varma <[email protected]>

* Refine workflows

Signed-off-by: siri-varma <[email protected]>

* add ;

Signed-off-by: Cassandra Coyle <[email protected]>

* rm try

Signed-off-by: Cassandra Coyle <[email protected]>

---------

Signed-off-by: Cassandra Coyle <[email protected]>
Signed-off-by: siri-varma <[email protected]>
Co-authored-by: siri-varma <[email protected]>

Author: cicoyle

dapr-spring/dapr-spring-workflows/src/main/java/io/dapr/spring/workflows/config/DaprWorkflowsConfiguration.java

@@ -46,10 +46,9 @@ private void registerWorkflowsAndActivities(ApplicationContext applicationContex
       workflowRuntimeBuilder.registerActivity(activity);
     }
 
-    try (WorkflowRuntime runtime = workflowRuntimeBuilder.build()) {
-      LOGGER.info("Starting workflow runtime ... ");
-      runtime.start(false);
-    }
+    WorkflowRuntime runtime = workflowRuntimeBuilder.build();
+    LOGGER.info("Starting workflow runtime ... ");
+    runtime.start(false);
   }
 
   @Override

examples/src/main/java/io/dapr/examples/unittesting/DaprWorkflowExampleTest.java

@@ -13,8 +13,8 @@
 
 package io.dapr.examples.unittesting;
 
-import com.microsoft.durabletask.Task;
-import com.microsoft.durabletask.TaskCanceledException;
+import io.dapr.durabletask.Task;
+import io.dapr.durabletask.TaskCanceledException;
 import io.dapr.workflows.Workflow;
 import io.dapr.workflows.WorkflowContext;
 import io.dapr.workflows.WorkflowStub;

examples/src/main/java/io/dapr/examples/workflows/chain/DemoChainWorker.java

@@ -29,9 +29,8 @@ public static void main(String[] args) throws Exception {
     builder.registerActivity(ToUpperCaseActivity.class);
 
     // Build and then start the workflow runtime pulling and executing tasks
-    try (WorkflowRuntime runtime = builder.build()) {
-      System.out.println("Start workflow runtime");
-      runtime.start();
-    }
+    WorkflowRuntime runtime = builder.build();
+    System.out.println("Start workflow runtime");
+    runtime.start();
   }
 }

examples/src/main/java/io/dapr/examples/workflows/childworkflow/DemoChildWorkflowWorker.java

@@ -31,9 +31,7 @@ public static void main(String[] args) throws Exception {
     builder.registerActivity(ReverseActivity.class);
 
     // Build and then start the workflow runtime pulling and executing tasks
-    try (WorkflowRuntime runtime = builder.build()) {
-      System.out.println("Start workflow runtime");
-      runtime.start();
-    }
+    WorkflowRuntime runtime = builder.build();
+    System.out.println("Start workflow runtime");
   }
 }

examples/src/main/java/io/dapr/examples/workflows/continueasnew/DemoContinueAsNewWorker.java

@@ -16,6 +16,9 @@
 import io.dapr.workflows.runtime.WorkflowRuntime;
 import io.dapr.workflows.runtime.WorkflowRuntimeBuilder;
 
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
 public class DemoContinueAsNewWorker {
   /**
    * The main method of this app.
@@ -25,13 +28,14 @@ public class DemoContinueAsNewWorker {
    */
   public static void main(String[] args) throws Exception {
     // Register the Workflow with the builder.
-    WorkflowRuntimeBuilder builder = new WorkflowRuntimeBuilder().registerWorkflow(DemoContinueAsNewWorkflow.class);
+    WorkflowRuntimeBuilder builder = new WorkflowRuntimeBuilder().
+            registerWorkflow(DemoContinueAsNewWorkflow.class)
+            .withExecutorService(Executors.newFixedThreadPool(3));
     builder.registerActivity(CleanUpActivity.class);
 
     // Build and then start the workflow runtime pulling and executing tasks
-    try (WorkflowRuntime runtime = builder.build()) {
-      System.out.println("Start workflow runtime");
-      runtime.start();
-    }
+    WorkflowRuntime runtime = builder.build();
+    System.out.println("Start workflow runtime");
+    runtime.start();
   }
 }

examples/src/main/java/io/dapr/examples/workflows/externalevent/DemoExternalEventWorker.java

@@ -30,9 +30,8 @@ public static void main(String[] args) throws Exception {
     builder.registerActivity(DenyActivity.class);
 
     // Build and then start the workflow runtime pulling and executing tasks
-    try (WorkflowRuntime runtime = builder.build()) {
-      System.out.println("Start workflow runtime");
-      runtime.start();
-    }
+    WorkflowRuntime runtime = builder.build();
+    System.out.println("Start workflow runtime");
+    runtime.start();
   }
 }

examples/src/main/java/io/dapr/examples/workflows/faninout/DemoFanInOutWorker.java

@@ -29,9 +29,8 @@ public static void main(String[] args) throws Exception {
     builder.registerActivity(CountWordsActivity.class);
 
     // Build and then start the workflow runtime pulling and executing tasks
-    try (WorkflowRuntime runtime = builder.build()) {
-      System.out.println("Start workflow runtime");
-      runtime.start();
-    }
+    WorkflowRuntime runtime = builder.build();
+    System.out.println("Start workflow runtime");
+    runtime.start(false);
   }
 }

examples/src/main/java/io/dapr/examples/workflows/faninout/DemoFanInOutWorkflow.java

@@ -13,7 +13,7 @@
 
 package io.dapr.examples.workflows.faninout;
 
-import com.microsoft.durabletask.Task;
+import io.dapr.durabletask.Task;
 import io.dapr.workflows.Workflow;
 import io.dapr.workflows.WorkflowStub;
 

pom.xml

@@ -36,7 +36,7 @@
     <!--
         manually declare durabletask-client's jackson dependencies for workflows sdk
         which conflict with dapr-sdk's jackson dependencies
-        https://github.com/microsoft/durabletask-java/blob/main/client/build.gradle#L16
+        https://github.com/dapr/durabletask-java/blob/main/client/build.gradle#L16
         -->
     <jackson.version>2.16.1</jackson.version>
     <gpg.skip>true</gpg.skip>

sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprWorkflowsIT.java

@@ -91,10 +91,9 @@ static void daprProperties(DynamicPropertyRegistry registry) {
    */
   @BeforeEach
   public void init() {
-    try (WorkflowRuntime runtime = workflowRuntimeBuilder.build()) {
-      System.out.println("Start workflow runtime");
-      runtime.start(false);
-    }
+    WorkflowRuntime runtime = workflowRuntimeBuilder.build();
+    System.out.println("Start workflow runtime");
+    runtime.start(false);
   }
 
   @Test