From 28278369879c1bc500992e35e7a63ee2a6cd1f06 Mon Sep 17 00:00:00 2001
From: Cassandra Coyle <cassie@diagrid.io>
Date: Wed, 7 May 2025 12:03:36 -0500
Subject: [PATCH 1/8] microsoft durabletask-java -> dapr durabletask-java

Signed-off-by: Cassandra Coyle <cassie@diagrid.io>
---
 .../unittesting/DaprWorkflowExampleTest.java         |  4 ++--
 .../workflows/faninout/DemoFanInOutWorkflow.java     |  2 +-
 sdk-workflows/pom.xml                                |  4 ++--
 .../main/java/io/dapr/workflows/WorkflowContext.java |  8 ++++----
 .../io/dapr/workflows/client/DaprWorkflowClient.java | 10 +++++-----
 .../runtime/DefaultWorkflowActivityContext.java      |  2 +-
 .../workflows/runtime/DefaultWorkflowContext.java    | 12 ++++++------
 .../runtime/DefaultWorkflowFailureDetails.java       |  2 +-
 .../runtime/DefaultWorkflowInstanceStatus.java       |  6 +++---
 .../runtime/WorkflowActivityClassWrapper.java        |  4 ++--
 .../runtime/WorkflowActivityInstanceWrapper.java     |  4 ++--
 .../dapr/workflows/runtime/WorkflowClassWrapper.java |  4 ++--
 .../workflows/runtime/WorkflowInstanceWrapper.java   |  4 ++--
 .../io/dapr/workflows/runtime/WorkflowRuntime.java   |  2 +-
 .../workflows/runtime/WorkflowRuntimeBuilder.java    |  2 +-
 .../runtime/WorkflowRuntimeStatusConverter.java      |  2 +-
 .../dapr/workflows/DefaultWorkflowContextTest.java   | 10 +++++-----
 .../workflows/client/DaprWorkflowClientTest.java     |  8 ++++----
 .../workflows/client/WorkflowInstanceStatusTest.java |  6 +++---
 .../runtime/WorkflowActivityClassWrapperTest.java    |  2 +-
 .../runtime/WorkflowActivityInstanceWrapperTest.java |  2 +-
 .../workflows/runtime/WorkflowClassWrapperTest.java  |  2 +-
 .../runtime/WorkflowInstanceWrapperTest.java         |  2 +-
 .../runtime/WorkflowRuntimeStatusConverterTest.java  |  2 +-
 .../dapr/workflows/runtime/WorkflowRuntimeTest.java  |  4 ++--
 25 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/examples/src/main/java/io/dapr/examples/unittesting/DaprWorkflowExampleTest.java b/examples/src/main/java/io/dapr/examples/unittesting/DaprWorkflowExampleTest.java
index ef0e6702ad..b8ce0ef67c 100644
--- a/examples/src/main/java/io/dapr/examples/unittesting/DaprWorkflowExampleTest.java
+++ b/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;
diff --git a/examples/src/main/java/io/dapr/examples/workflows/faninout/DemoFanInOutWorkflow.java b/examples/src/main/java/io/dapr/examples/workflows/faninout/DemoFanInOutWorkflow.java
index 1760a53b3e..611b1cac67 100644
--- a/examples/src/main/java/io/dapr/examples/workflows/faninout/DemoFanInOutWorkflow.java
+++ b/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;
 
diff --git a/sdk-workflows/pom.xml b/sdk-workflows/pom.xml
index a5c4ae9495..0d04a40f73 100644
--- a/sdk-workflows/pom.xml
+++ b/sdk-workflows/pom.xml
@@ -45,14 +45,14 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.microsoft</groupId>
+      <groupId>io.dapr</groupId>
       <artifactId>durabletask-client</artifactId>
       <version>1.5.0</version>
     </dependency>
     <!--
     manually declare durabletask-client's jackson dependencies
     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
     -->
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowContext.java b/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowContext.java
index 9ed34fdc16..f649f0086d 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowContext.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowContext.java
@@ -13,10 +13,10 @@
 
 package io.dapr.workflows;
 
-import com.microsoft.durabletask.CompositeTaskFailedException;
-import com.microsoft.durabletask.Task;
-import com.microsoft.durabletask.TaskCanceledException;
-import com.microsoft.durabletask.TaskFailedException;
+import io.dapr.durabletask.CompositeTaskFailedException;
+import io.dapr.durabletask.Task;
+import io.dapr.durabletask.TaskCanceledException;
+import io.dapr.durabletask.TaskFailedException;
 import org.slf4j.Logger;
 
 import javax.annotation.Nullable;
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/client/DaprWorkflowClient.java b/sdk-workflows/src/main/java/io/dapr/workflows/client/DaprWorkflowClient.java
index e40d0640ad..c2cad1732b 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/client/DaprWorkflowClient.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/client/DaprWorkflowClient.java
@@ -13,11 +13,11 @@
 
 package io.dapr.workflows.client;
 
-import com.microsoft.durabletask.DurableTaskClient;
-import com.microsoft.durabletask.DurableTaskGrpcClientBuilder;
-import com.microsoft.durabletask.NewOrchestrationInstanceOptions;
-import com.microsoft.durabletask.OrchestrationMetadata;
-import com.microsoft.durabletask.PurgeResult;
+import io.dapr.durabletask.DurableTaskClient;
+import io.dapr.durabletask.DurableTaskGrpcClientBuilder;
+import io.dapr.durabletask.NewOrchestrationInstanceOptions;
+import io.dapr.durabletask.OrchestrationMetadata;
+import io.dapr.durabletask.PurgeResult;
 import io.dapr.config.Properties;
 import io.dapr.utils.NetworkUtils;
 import io.dapr.workflows.Workflow;
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowActivityContext.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowActivityContext.java
index 4a16d45f44..551c21a373 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowActivityContext.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowActivityContext.java
@@ -13,7 +13,7 @@
 
 package io.dapr.workflows.runtime;
 
-import com.microsoft.durabletask.TaskActivityContext;
+import io.dapr.durabletask.TaskActivityContext;
 import io.dapr.workflows.WorkflowActivityContext;
 
 /**
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java
index 20572995ce..a6c09fe768 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java
@@ -13,12 +13,12 @@
 
 package io.dapr.workflows.runtime;
 
-import com.microsoft.durabletask.CompositeTaskFailedException;
-import com.microsoft.durabletask.RetryPolicy;
-import com.microsoft.durabletask.Task;
-import com.microsoft.durabletask.TaskCanceledException;
-import com.microsoft.durabletask.TaskOptions;
-import com.microsoft.durabletask.TaskOrchestrationContext;
+import io.dapr.durabletask.CompositeTaskFailedException;
+import io.dapr.durabletask.RetryPolicy;
+import io.dapr.durabletask.Task;
+import io.dapr.durabletask.TaskCanceledException;
+import io.dapr.durabletask.TaskOptions;
+import io.dapr.durabletask.TaskOrchestrationContext;
 import io.dapr.workflows.WorkflowContext;
 import io.dapr.workflows.WorkflowTaskOptions;
 import io.dapr.workflows.WorkflowTaskRetryPolicy;
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowFailureDetails.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowFailureDetails.java
index 6919a510e7..c51fe7c3a7 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowFailureDetails.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowFailureDetails.java
@@ -13,7 +13,7 @@
 
 package io.dapr.workflows.runtime;
 
-import com.microsoft.durabletask.FailureDetails;
+import io.dapr.durabletask.FailureDetails;
 import io.dapr.workflows.client.WorkflowFailureDetails;
 
 /**
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowInstanceStatus.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowInstanceStatus.java
index d1082adb8a..392357bc32 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowInstanceStatus.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowInstanceStatus.java
@@ -13,9 +13,9 @@
 
 package io.dapr.workflows.runtime;
 
-import com.microsoft.durabletask.FailureDetails;
-import com.microsoft.durabletask.OrchestrationMetadata;
-import com.microsoft.durabletask.OrchestrationRuntimeStatus;
+import io.dapr.durabletask.FailureDetails;
+import io.dapr.durabletask.OrchestrationMetadata;
+import io.dapr.durabletask.OrchestrationRuntimeStatus;
 import io.dapr.workflows.client.WorkflowFailureDetails;
 import io.dapr.workflows.client.WorkflowInstanceStatus;
 import io.dapr.workflows.client.WorkflowRuntimeStatus;
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowActivityClassWrapper.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowActivityClassWrapper.java
index 3dcb8ef6b6..0bbfd4beb9 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowActivityClassWrapper.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowActivityClassWrapper.java
@@ -13,8 +13,8 @@
 
 package io.dapr.workflows.runtime;
 
-import com.microsoft.durabletask.TaskActivity;
-import com.microsoft.durabletask.TaskActivityFactory;
+import io.dapr.durabletask.TaskActivity;
+import io.dapr.durabletask.TaskActivityFactory;
 import io.dapr.workflows.WorkflowActivity;
 
 import java.lang.reflect.Constructor;
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowActivityInstanceWrapper.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowActivityInstanceWrapper.java
index 17d509924e..537427318b 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowActivityInstanceWrapper.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowActivityInstanceWrapper.java
@@ -13,8 +13,8 @@
 
 package io.dapr.workflows.runtime;
 
-import com.microsoft.durabletask.TaskActivity;
-import com.microsoft.durabletask.TaskActivityFactory;
+import io.dapr.durabletask.TaskActivity;
+import io.dapr.durabletask.TaskActivityFactory;
 import io.dapr.workflows.WorkflowActivity;
 
 /**
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowClassWrapper.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowClassWrapper.java
index 4fab3f9cdf..10b5248748 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowClassWrapper.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowClassWrapper.java
@@ -13,8 +13,8 @@
 
 package io.dapr.workflows.runtime;
 
-import com.microsoft.durabletask.TaskOrchestration;
-import com.microsoft.durabletask.TaskOrchestrationFactory;
+import io.dapr.durabletask.TaskOrchestration;
+import io.dapr.durabletask.TaskOrchestrationFactory;
 import io.dapr.workflows.Workflow;
 
 import java.lang.reflect.Constructor;
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowInstanceWrapper.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowInstanceWrapper.java
index ad3159406d..f803c49de7 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowInstanceWrapper.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowInstanceWrapper.java
@@ -13,8 +13,8 @@
 
 package io.dapr.workflows.runtime;
 
-import com.microsoft.durabletask.TaskOrchestration;
-import com.microsoft.durabletask.TaskOrchestrationFactory;
+import io.dapr.durabletask.TaskOrchestration;
+import io.dapr.durabletask.TaskOrchestrationFactory;
 import io.dapr.workflows.Workflow;
 
 /**
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntime.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntime.java
index 6754f675bd..b2fd4335e5 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntime.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntime.java
@@ -13,7 +13,7 @@
 
 package io.dapr.workflows.runtime;
 
-import com.microsoft.durabletask.DurableTaskGrpcWorker;
+import io.dapr.durabletask.DurableTaskGrpcWorker;
 
 /**
  * Contains methods to register workflows and activities.
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntimeBuilder.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntimeBuilder.java
index 397e58b30f..1524d28026 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntimeBuilder.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntimeBuilder.java
@@ -13,7 +13,7 @@
 
 package io.dapr.workflows.runtime;
 
-import com.microsoft.durabletask.DurableTaskGrpcWorkerBuilder;
+import io.dapr.durabletask.DurableTaskGrpcWorkerBuilder;
 import io.dapr.config.Properties;
 import io.dapr.utils.NetworkUtils;
 import io.dapr.workflows.Workflow;
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntimeStatusConverter.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntimeStatusConverter.java
index 198a1215c7..2900916aaf 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntimeStatusConverter.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntimeStatusConverter.java
@@ -13,7 +13,7 @@
 
 package io.dapr.workflows.runtime;
 
-import com.microsoft.durabletask.OrchestrationRuntimeStatus;
+import io.dapr.durabletask.OrchestrationRuntimeStatus;
 import io.dapr.workflows.client.WorkflowRuntimeStatus;
 
 public class WorkflowRuntimeStatusConverter {
diff --git a/sdk-workflows/src/test/java/io/dapr/workflows/DefaultWorkflowContextTest.java b/sdk-workflows/src/test/java/io/dapr/workflows/DefaultWorkflowContextTest.java
index 61d153484c..0de864c887 100644
--- a/sdk-workflows/src/test/java/io/dapr/workflows/DefaultWorkflowContextTest.java
+++ b/sdk-workflows/src/test/java/io/dapr/workflows/DefaultWorkflowContextTest.java
@@ -13,11 +13,11 @@
 
 package io.dapr.workflows;
 
-import com.microsoft.durabletask.CompositeTaskFailedException;
-import com.microsoft.durabletask.Task;
-import com.microsoft.durabletask.TaskCanceledException;
-import com.microsoft.durabletask.TaskOptions;
-import com.microsoft.durabletask.TaskOrchestrationContext;
+import io.dapr.durabletask.CompositeTaskFailedException;
+import io.dapr.durabletask.Task;
+import io.dapr.durabletask.TaskCanceledException;
+import io.dapr.durabletask.TaskOptions;
+import io.dapr.durabletask.TaskOrchestrationContext;
 
 import io.dapr.workflows.runtime.DefaultWorkflowContext;
 
diff --git a/sdk-workflows/src/test/java/io/dapr/workflows/client/DaprWorkflowClientTest.java b/sdk-workflows/src/test/java/io/dapr/workflows/client/DaprWorkflowClientTest.java
index 4b2b7ec520..3ad66877c5 100644
--- a/sdk-workflows/src/test/java/io/dapr/workflows/client/DaprWorkflowClientTest.java
+++ b/sdk-workflows/src/test/java/io/dapr/workflows/client/DaprWorkflowClientTest.java
@@ -13,10 +13,10 @@
 
 package io.dapr.workflows.client;
 
-import com.microsoft.durabletask.DurableTaskClient;
-import com.microsoft.durabletask.NewOrchestrationInstanceOptions;
-import com.microsoft.durabletask.OrchestrationMetadata;
-import com.microsoft.durabletask.OrchestrationRuntimeStatus;
+import io.dapr.durabletask.DurableTaskClient;
+import io.dapr.durabletask.NewOrchestrationInstanceOptions;
+import io.dapr.durabletask.OrchestrationMetadata;
+import io.dapr.durabletask.OrchestrationRuntimeStatus;
 import io.dapr.workflows.Workflow;
 import io.dapr.workflows.WorkflowContext;
 import io.dapr.workflows.WorkflowStub;
diff --git a/sdk-workflows/src/test/java/io/dapr/workflows/client/WorkflowInstanceStatusTest.java b/sdk-workflows/src/test/java/io/dapr/workflows/client/WorkflowInstanceStatusTest.java
index f4f40d0564..776e070812 100644
--- a/sdk-workflows/src/test/java/io/dapr/workflows/client/WorkflowInstanceStatusTest.java
+++ b/sdk-workflows/src/test/java/io/dapr/workflows/client/WorkflowInstanceStatusTest.java
@@ -13,9 +13,9 @@
 
 package io.dapr.workflows.client;
 
-import com.microsoft.durabletask.FailureDetails;
-import com.microsoft.durabletask.OrchestrationMetadata;
-import com.microsoft.durabletask.OrchestrationRuntimeStatus;
+import io.dapr.durabletask.FailureDetails;
+import io.dapr.durabletask.OrchestrationMetadata;
+import io.dapr.durabletask.OrchestrationRuntimeStatus;
 import io.dapr.workflows.runtime.DefaultWorkflowInstanceStatus;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowActivityClassWrapperTest.java b/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowActivityClassWrapperTest.java
index 0783176051..76a7e07af1 100644
--- a/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowActivityClassWrapperTest.java
+++ b/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowActivityClassWrapperTest.java
@@ -1,6 +1,6 @@
 package io.dapr.workflows.runtime;
 
-import com.microsoft.durabletask.TaskActivityContext;
+import io.dapr.durabletask.TaskActivityContext;
 import io.dapr.workflows.WorkflowActivity;
 import io.dapr.workflows.WorkflowActivityContext;
 import org.junit.Test;
diff --git a/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowActivityInstanceWrapperTest.java b/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowActivityInstanceWrapperTest.java
index bd8788bbdd..0c680ea51e 100644
--- a/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowActivityInstanceWrapperTest.java
+++ b/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowActivityInstanceWrapperTest.java
@@ -1,6 +1,6 @@
 package io.dapr.workflows.runtime;
 
-import com.microsoft.durabletask.TaskActivityContext;
+import io.dapr.durabletask.TaskActivityContext;
 import io.dapr.workflows.WorkflowActivity;
 import io.dapr.workflows.WorkflowActivityContext;
 import org.junit.Test;
diff --git a/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowClassWrapperTest.java b/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowClassWrapperTest.java
index a73b616bc2..fd76cadaf4 100644
--- a/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowClassWrapperTest.java
+++ b/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowClassWrapperTest.java
@@ -13,7 +13,7 @@
 
 package io.dapr.workflows.runtime;
 
-import com.microsoft.durabletask.TaskOrchestrationContext;
+import io.dapr.durabletask.TaskOrchestrationContext;
 import io.dapr.workflows.Workflow;
 import io.dapr.workflows.WorkflowContext;
 import io.dapr.workflows.WorkflowStub;
diff --git a/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowInstanceWrapperTest.java b/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowInstanceWrapperTest.java
index 22f315aa53..85849af212 100644
--- a/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowInstanceWrapperTest.java
+++ b/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowInstanceWrapperTest.java
@@ -13,7 +13,7 @@
 
 package io.dapr.workflows.runtime;
 
-import com.microsoft.durabletask.TaskOrchestrationContext;
+import io.dapr.durabletask.TaskOrchestrationContext;
 import io.dapr.workflows.Workflow;
 import io.dapr.workflows.WorkflowContext;
 import io.dapr.workflows.WorkflowStub;
diff --git a/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowRuntimeStatusConverterTest.java b/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowRuntimeStatusConverterTest.java
index 04783d961a..9e2d4f9835 100644
--- a/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowRuntimeStatusConverterTest.java
+++ b/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowRuntimeStatusConverterTest.java
@@ -13,7 +13,7 @@
 
 package io.dapr.workflows.runtime;
 
-import com.microsoft.durabletask.OrchestrationRuntimeStatus;
+import io.dapr.durabletask.OrchestrationRuntimeStatus;
 import io.dapr.workflows.client.WorkflowRuntimeStatus;
 import org.junit.jupiter.api.Test;
 
diff --git a/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowRuntimeTest.java b/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowRuntimeTest.java
index d3bd40a437..5a70b23c9b 100644
--- a/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowRuntimeTest.java
+++ b/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowRuntimeTest.java
@@ -14,8 +14,8 @@
 package io.dapr.workflows.runtime;
 
 
-import com.microsoft.durabletask.DurableTaskGrpcWorker;
-import com.microsoft.durabletask.DurableTaskGrpcWorkerBuilder;
+import io.dapr.durabletask.DurableTaskGrpcWorker;
+import io.dapr.durabletask.DurableTaskGrpcWorkerBuilder;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;

From 007ef1651e6da89ffca8b638958268080896d933 Mon Sep 17 00:00:00 2001
From: Cassandra Coyle <cassie@diagrid.io>
Date: Wed, 7 May 2025 12:09:29 -0500
Subject: [PATCH 2/8] update another ref

Signed-off-by: Cassandra Coyle <cassie@diagrid.io>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 51f5070027..19842bf1cf 100644
--- a/pom.xml
+++ b/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>

From 0675cf588dafa680536a7a1515b2cd15f1d3a7d4 Mon Sep 17 00:00:00 2001
From: Cassandra Coyle <cassie@diagrid.io>
Date: Wed, 7 May 2025 16:59:36 -0500
Subject: [PATCH 3/8] 1.5.2 release

Signed-off-by: Cassandra Coyle <cassie@diagrid.io>
---
 sdk-workflows/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk-workflows/pom.xml b/sdk-workflows/pom.xml
index 0d04a40f73..d8c7ada903 100644
--- a/sdk-workflows/pom.xml
+++ b/sdk-workflows/pom.xml
@@ -47,7 +47,7 @@
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>durabletask-client</artifactId>
-      <version>1.5.0</version>
+      <version>1.5.2</version>
     </dependency>
     <!--
     manually declare durabletask-client's jackson dependencies

From 46ba7f4e971aab0969c1dc12548c686d21d3f947 Mon Sep 17 00:00:00 2001
From: Cassandra Coyle <cassie@diagrid.io>
Date: Thu, 8 May 2025 09:00:28 -0500
Subject: [PATCH 4/8] fix import order

Signed-off-by: Cassandra Coyle <cassie@diagrid.io>
---
 .../main/java/io/dapr/workflows/client/DaprWorkflowClient.java  | 2 +-
 .../java/io/dapr/workflows/runtime/WorkflowRuntimeBuilder.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/client/DaprWorkflowClient.java b/sdk-workflows/src/main/java/io/dapr/workflows/client/DaprWorkflowClient.java
index c2cad1732b..ab46dff796 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/client/DaprWorkflowClient.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/client/DaprWorkflowClient.java
@@ -13,12 +13,12 @@
 
 package io.dapr.workflows.client;
 
+import io.dapr.config.Properties;
 import io.dapr.durabletask.DurableTaskClient;
 import io.dapr.durabletask.DurableTaskGrpcClientBuilder;
 import io.dapr.durabletask.NewOrchestrationInstanceOptions;
 import io.dapr.durabletask.OrchestrationMetadata;
 import io.dapr.durabletask.PurgeResult;
-import io.dapr.config.Properties;
 import io.dapr.utils.NetworkUtils;
 import io.dapr.workflows.Workflow;
 import io.dapr.workflows.internal.ApiTokenClientInterceptor;
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntimeBuilder.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntimeBuilder.java
index 1524d28026..6799ce8639 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntimeBuilder.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntimeBuilder.java
@@ -13,8 +13,8 @@
 
 package io.dapr.workflows.runtime;
 
-import io.dapr.durabletask.DurableTaskGrpcWorkerBuilder;
 import io.dapr.config.Properties;
+import io.dapr.durabletask.DurableTaskGrpcWorkerBuilder;
 import io.dapr.utils.NetworkUtils;
 import io.dapr.workflows.Workflow;
 import io.dapr.workflows.WorkflowActivity;

From 70a10646c0b6818f378035156c793cd703fb6004 Mon Sep 17 00:00:00 2001
From: siri-varma <siri.varma@outlook.com>
Date: Wed, 7 May 2025 12:49:41 -0700
Subject: [PATCH 5/8] Sdk new changes

Signed-off-by: siri-varma <siri.varma@outlook.com>
---
 .../config/DaprWorkflowsConfiguration.java      |  7 +++----
 .../workflows/chain/DemoChainWorker.java        |  7 +++----
 .../childworkflow/DemoChildWorkflowWorker.java  |  6 ++----
 .../continueasnew/DemoContinueAsNewWorker.java  | 14 +++++++++-----
 .../externalevent/DemoExternalEventWorker.java  |  7 +++----
 .../workflows/faninout/DemoFanInOutWorker.java  |  7 +++----
 .../faninout/DemoFanInOutWorkflow.java          |  5 +++++
 .../dapr/workflows/runtime/WorkflowRuntime.java | 13 +------------
 .../runtime/WorkflowRuntimeBuilder.java         | 17 ++++++++++++++++-
 .../runtime/WorkflowRuntimeBuilderTest.java     | 15 +++++++--------
 .../workflows/runtime/WorkflowRuntimeTest.java  | 13 ++-----------
 11 files changed, 54 insertions(+), 57 deletions(-)

diff --git a/dapr-spring/dapr-spring-workflows/src/main/java/io/dapr/spring/workflows/config/DaprWorkflowsConfiguration.java b/dapr-spring/dapr-spring-workflows/src/main/java/io/dapr/spring/workflows/config/DaprWorkflowsConfiguration.java
index 8629982a90..18e4024142 100644
--- a/dapr-spring/dapr-spring-workflows/src/main/java/io/dapr/spring/workflows/config/DaprWorkflowsConfiguration.java
+++ b/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
diff --git a/examples/src/main/java/io/dapr/examples/workflows/chain/DemoChainWorker.java b/examples/src/main/java/io/dapr/examples/workflows/chain/DemoChainWorker.java
index 61b1572bda..51fb9ae6aa 100644
--- a/examples/src/main/java/io/dapr/examples/workflows/chain/DemoChainWorker.java
+++ b/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();
   }
 }
diff --git a/examples/src/main/java/io/dapr/examples/workflows/childworkflow/DemoChildWorkflowWorker.java b/examples/src/main/java/io/dapr/examples/workflows/childworkflow/DemoChildWorkflowWorker.java
index 81a9b4973c..0e692551e5 100644
--- a/examples/src/main/java/io/dapr/examples/workflows/childworkflow/DemoChildWorkflowWorker.java
+++ b/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");
   }
 }
diff --git a/examples/src/main/java/io/dapr/examples/workflows/continueasnew/DemoContinueAsNewWorker.java b/examples/src/main/java/io/dapr/examples/workflows/continueasnew/DemoContinueAsNewWorker.java
index 0ca050e874..18849e9f80 100644
--- a/examples/src/main/java/io/dapr/examples/workflows/continueasnew/DemoContinueAsNewWorker.java
+++ b/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();
   }
 }
diff --git a/examples/src/main/java/io/dapr/examples/workflows/externalevent/DemoExternalEventWorker.java b/examples/src/main/java/io/dapr/examples/workflows/externalevent/DemoExternalEventWorker.java
index aaa1e7c819..f7d0c8ebf5 100644
--- a/examples/src/main/java/io/dapr/examples/workflows/externalevent/DemoExternalEventWorker.java
+++ b/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();
   }
 }
diff --git a/examples/src/main/java/io/dapr/examples/workflows/faninout/DemoFanInOutWorker.java b/examples/src/main/java/io/dapr/examples/workflows/faninout/DemoFanInOutWorker.java
index d5c6d14e7a..4c691dbc35 100644
--- a/examples/src/main/java/io/dapr/examples/workflows/faninout/DemoFanInOutWorker.java
+++ b/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);
   }
 }
diff --git a/examples/src/main/java/io/dapr/examples/workflows/faninout/DemoFanInOutWorkflow.java b/examples/src/main/java/io/dapr/examples/workflows/faninout/DemoFanInOutWorkflow.java
index 611b1cac67..7f86b2ab78 100644
--- a/examples/src/main/java/io/dapr/examples/workflows/faninout/DemoFanInOutWorkflow.java
+++ b/examples/src/main/java/io/dapr/examples/workflows/faninout/DemoFanInOutWorkflow.java
@@ -37,8 +37,13 @@ public WorkflowStub create() {
           .map(input -> ctx.callActivity(CountWordsActivity.class.getName(), input.toString(), Integer.class))
           .collect(Collectors.toList());
 
+      List<Task<Integer>> tasks2 = inputs.stream()
+              .map(input -> ctx.callActivity(CountWordsActivity2.class.getName(), input.toString(), Integer.class))
+              .collect(Collectors.toList());
+
       // Fan-in to get the total word count from all the individual activity results.
       List<Integer> allWordCountResults = ctx.allOf(tasks).await();
+      List<Integer> allWordCountResults2 = ctx.allOf(tasks2).await();
       int totalWordCount = allWordCountResults.stream().mapToInt(Integer::intValue).sum();
 
       ctx.getLogger().info("Workflow finished with result: " + totalWordCount);
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntime.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntime.java
index b2fd4335e5..b5b82f169e 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntime.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntime.java
@@ -18,7 +18,7 @@
 /**
  * Contains methods to register workflows and activities.
  */
-public class WorkflowRuntime implements AutoCloseable {
+public class WorkflowRuntime {
 
   private DurableTaskGrpcWorker worker;
 
@@ -46,15 +46,4 @@ public void start(boolean block) {
       this.worker.start();
     }
   }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public void close() {
-    if (this.worker != null) {
-      this.worker.close();
-      this.worker = null;
-    }
-  }
 }
\ No newline at end of file
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntimeBuilder.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntimeBuilder.java
index 6799ce8639..9bc7cda530 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntimeBuilder.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntimeBuilder.java
@@ -26,6 +26,8 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 public class WorkflowRuntimeBuilder {
   private static final ClientInterceptor WORKFLOW_INTERCEPTOR = new ApiTokenClientInterceptor();
@@ -59,7 +61,9 @@ public WorkflowRuntimeBuilder(Logger logger) {
 
   private WorkflowRuntimeBuilder(Properties properties, Logger logger) {
     ManagedChannel managedChannel = NetworkUtils.buildGrpcManagedChannel(properties, WORKFLOW_INTERCEPTOR);
-    this.builder = new DurableTaskGrpcWorkerBuilder().grpcChannel(managedChannel);
+    this.builder = new DurableTaskGrpcWorkerBuilder()
+            .withExecutorService(Executors.newCachedThreadPool())
+            .grpcChannel(managedChannel);
     this.logger = logger;
   }
 
@@ -84,6 +88,17 @@ public WorkflowRuntime build() {
     return instance;
   }
 
+  /**
+   * Register Executor Service to use with workflow.
+   *
+   * @param executorService to be used.
+   * @return {@link WorkflowRuntimeBuilder}.
+   */
+  public WorkflowRuntimeBuilder withExecutorService(ExecutorService executorService) {
+    this.builder.withExecutorService(executorService);
+    return this;
+  }
+
   /**
    * Registers a Workflow object.
    *
diff --git a/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowRuntimeBuilderTest.java b/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowRuntimeBuilderTest.java
index c159930b91..2b3341fbf3 100644
--- a/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowRuntimeBuilderTest.java
+++ b/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowRuntimeBuilderTest.java
@@ -67,7 +67,8 @@ public void registerValidWorkflowActivityInstance() {
   @Test
   public void buildTest() {
     assertDoesNotThrow(() -> {
-      try (WorkflowRuntime runtime = new WorkflowRuntimeBuilder().build()) {
+      try {
+        WorkflowRuntime runtime = new WorkflowRuntimeBuilder().build();
         System.out.println("WorkflowRuntime created");
       } catch (Exception e) {
         throw new RuntimeException(e);
@@ -88,13 +89,11 @@ public void loggingOutputTest() {
 
     WorkflowRuntimeBuilder workflowRuntimeBuilder = new WorkflowRuntimeBuilder();
 
-    try (WorkflowRuntime runtime = workflowRuntimeBuilder.build()) {
-      verify(testLogger, times(1))
-          .info(eq("Registered Workflow: {}"), eq("TestWorkflow"));
+    WorkflowRuntime runtime = workflowRuntimeBuilder.build();
+    verify(testLogger, times(1))
+        .info(eq("Registered Workflow: {}"), eq("TestWorkflow"));
 
-      verify(testLogger, times(1))
-          .info(eq("Registered Activity: {}"), eq("TestActivity"));
-    }
+    verify(testLogger, times(1))
+        .info(eq("Registered Activity: {}"), eq("TestActivity"));
   }
-
 }
diff --git a/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowRuntimeTest.java b/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowRuntimeTest.java
index 5a70b23c9b..5b1578aaa5 100644
--- a/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowRuntimeTest.java
+++ b/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowRuntimeTest.java
@@ -25,16 +25,7 @@ public class WorkflowRuntimeTest {
   @Test
   public void startTest() {
     DurableTaskGrpcWorker worker = new DurableTaskGrpcWorkerBuilder().build();
-    try (WorkflowRuntime runtime = new WorkflowRuntime(worker)) {
-      assertDoesNotThrow(() -> runtime.start(false));
-    }
-  }
-
-  @Test
-  public void closeWithoutStarting() {
-    DurableTaskGrpcWorker worker = new DurableTaskGrpcWorkerBuilder().build();
-    try (WorkflowRuntime runtime = new WorkflowRuntime(worker)) {
-      assertDoesNotThrow(runtime::close);
-    }
+    WorkflowRuntime runtime = new WorkflowRuntime(worker);
+    assertDoesNotThrow(() -> runtime.start(false));
   }
 }

From 24edfa2f85bc59256361061a13eeac39c7a85f2e Mon Sep 17 00:00:00 2001
From: siri-varma <siri.varma@outlook.com>
Date: Wed, 7 May 2025 15:37:21 -0700
Subject: [PATCH 6/8] Refine workflows

Signed-off-by: siri-varma <siri.varma@outlook.com>
---
 .../faninout/DemoFanInOutWorkflow.java        |  5 --
 .../workflows/runtime/WorkflowRuntime.java    | 54 +++++++++++++++++--
 .../runtime/WorkflowRuntimeBuilder.java       | 14 +++--
 .../runtime/WorkflowRuntimeTest.java          | 17 +++++-
 4 files changed, 76 insertions(+), 14 deletions(-)

diff --git a/examples/src/main/java/io/dapr/examples/workflows/faninout/DemoFanInOutWorkflow.java b/examples/src/main/java/io/dapr/examples/workflows/faninout/DemoFanInOutWorkflow.java
index 7f86b2ab78..611b1cac67 100644
--- a/examples/src/main/java/io/dapr/examples/workflows/faninout/DemoFanInOutWorkflow.java
+++ b/examples/src/main/java/io/dapr/examples/workflows/faninout/DemoFanInOutWorkflow.java
@@ -37,13 +37,8 @@ public WorkflowStub create() {
           .map(input -> ctx.callActivity(CountWordsActivity.class.getName(), input.toString(), Integer.class))
           .collect(Collectors.toList());
 
-      List<Task<Integer>> tasks2 = inputs.stream()
-              .map(input -> ctx.callActivity(CountWordsActivity2.class.getName(), input.toString(), Integer.class))
-              .collect(Collectors.toList());
-
       // Fan-in to get the total word count from all the individual activity results.
       List<Integer> allWordCountResults = ctx.allOf(tasks).await();
-      List<Integer> allWordCountResults2 = ctx.allOf(tasks2).await();
       int totalWordCount = allWordCountResults.stream().mapToInt(Integer::intValue).sum();
 
       ctx.getLogger().info("Workflow finished with result: " + totalWordCount);
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntime.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntime.java
index b5b82f169e..7ac44e0001 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntime.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntime.java
@@ -14,16 +14,33 @@
 package io.dapr.workflows.runtime;
 
 import io.dapr.durabletask.DurableTaskGrpcWorker;
+import io.grpc.ManagedChannel;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Contains methods to register workflows and activities.
  */
-public class WorkflowRuntime {
+public class WorkflowRuntime implements AutoCloseable {
 
-  private DurableTaskGrpcWorker worker;
+  private final DurableTaskGrpcWorker worker;
+  private final ManagedChannel managedChannel;
+  private final ExecutorService executorService;
 
-  public WorkflowRuntime(DurableTaskGrpcWorker worker) {
+  /**
+   * Constructor.
+   *
+   * @param worker grpcWorker processing activities.
+   * @param managedChannel grpc channel.
+   * @param executorService executor service responsible for running the threads.
+   */
+  public WorkflowRuntime(DurableTaskGrpcWorker worker,
+                         ManagedChannel managedChannel,
+                         ExecutorService executorService) {
     this.worker = worker;
+    this.managedChannel = managedChannel;
+    this.executorService = executorService;
   }
 
   /**
@@ -46,4 +63,35 @@ public void start(boolean block) {
       this.worker.start();
     }
   }
+
+  /**
+   * {@inheritDoc}
+   */
+  public void close() {
+    this.shutDownWorkerPool();
+    this.closeSideCarChannel();
+  }
+
+  private void closeSideCarChannel() {
+    this.managedChannel.shutdown();
+
+    try {
+      if (!this.managedChannel.awaitTermination(60, TimeUnit.SECONDS)) {
+        this.managedChannel.shutdownNow();
+      }
+    } catch (InterruptedException ex) {
+      Thread.currentThread().interrupt();
+    }
+  }
+
+  private void shutDownWorkerPool() {
+    this.executorService.shutdown();
+    try {
+      if (!this.executorService.awaitTermination(60, TimeUnit.SECONDS)) {
+        this.executorService.shutdownNow();
+      }
+    } catch (InterruptedException ex) {
+      Thread.currentThread().interrupt();
+    }
+  }
 }
\ No newline at end of file
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntimeBuilder.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntimeBuilder.java
index 9bc7cda530..7f1147a0d7 100644
--- a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntimeBuilder.java
+++ b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntimeBuilder.java
@@ -38,6 +38,8 @@ public class WorkflowRuntimeBuilder {
   private final Set<String> activitySet = Collections.synchronizedSet(new HashSet<>());
   private final Set<String> workflowSet = Collections.synchronizedSet(new HashSet<>());
   private final DurableTaskGrpcWorkerBuilder builder;
+  private final ManagedChannel managedChannel;
+  private ExecutorService executorService;
 
   /**
    * Constructs the WorkflowRuntimeBuilder.
@@ -60,10 +62,8 @@ public WorkflowRuntimeBuilder(Logger logger) {
   }
 
   private WorkflowRuntimeBuilder(Properties properties, Logger logger) {
-    ManagedChannel managedChannel = NetworkUtils.buildGrpcManagedChannel(properties, WORKFLOW_INTERCEPTOR);
-    this.builder = new DurableTaskGrpcWorkerBuilder()
-            .withExecutorService(Executors.newCachedThreadPool())
-            .grpcChannel(managedChannel);
+    this.managedChannel = NetworkUtils.buildGrpcManagedChannel(properties, WORKFLOW_INTERCEPTOR);
+    this.builder = new DurableTaskGrpcWorkerBuilder().grpcChannel(this.managedChannel);
     this.logger = logger;
   }
 
@@ -75,8 +75,11 @@ private WorkflowRuntimeBuilder(Properties properties, Logger logger) {
   public WorkflowRuntime build() {
     if (instance == null) {
       synchronized (WorkflowRuntime.class) {
+        this.executorService = this.executorService == null ? Executors.newCachedThreadPool() : this.executorService;
         if (instance == null) {
-          instance = new WorkflowRuntime(this.builder.build());
+          instance = new WorkflowRuntime(
+                  this.builder.withExecutorService(this.executorService).build(),
+                  this.managedChannel, this.executorService);
         }
       }
     }
@@ -95,6 +98,7 @@ public WorkflowRuntime build() {
    * @return {@link WorkflowRuntimeBuilder}.
    */
   public WorkflowRuntimeBuilder withExecutorService(ExecutorService executorService) {
+    this.executorService = executorService;
     this.builder.withExecutorService(executorService);
     return this;
   }
diff --git a/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowRuntimeTest.java b/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowRuntimeTest.java
index 5b1578aaa5..9ee2710e79 100644
--- a/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowRuntimeTest.java
+++ b/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowRuntimeTest.java
@@ -16,8 +16,13 @@
 
 import io.dapr.durabletask.DurableTaskGrpcWorker;
 import io.dapr.durabletask.DurableTaskGrpcWorkerBuilder;
+import io.dapr.config.Properties;
+import io.dapr.utils.NetworkUtils;
 import org.junit.jupiter.api.Test;
 
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
 public class WorkflowRuntimeTest {
@@ -25,7 +30,17 @@ public class WorkflowRuntimeTest {
   @Test
   public void startTest() {
     DurableTaskGrpcWorker worker = new DurableTaskGrpcWorkerBuilder().build();
-    WorkflowRuntime runtime = new WorkflowRuntime(worker);
+    WorkflowRuntime runtime = new WorkflowRuntime(worker, NetworkUtils.buildGrpcManagedChannel(new Properties()),
+            Executors.newCachedThreadPool());
     assertDoesNotThrow(() -> runtime.start(false));
   }
+
+  @Test
+  public void closeWithoutStarting() {
+    DurableTaskGrpcWorker worker = new DurableTaskGrpcWorkerBuilder().build();
+    try (WorkflowRuntime runtime = new WorkflowRuntime(worker, NetworkUtils.buildGrpcManagedChannel(new Properties()),
+            Executors.newCachedThreadPool())) {
+      assertDoesNotThrow(runtime::close);
+    }
+  }
 }

From 49232d830f00d3f509f1b68406ae3718d744a10a Mon Sep 17 00:00:00 2001
From: Cassandra Coyle <cassie@diagrid.io>
Date: Thu, 8 May 2025 10:07:48 -0500
Subject: [PATCH 7/8] add ;

Signed-off-by: Cassandra Coyle <cassie@diagrid.io>
---
 .../workflows/continueasnew/DemoContinueAsNewWorker.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/src/main/java/io/dapr/examples/workflows/continueasnew/DemoContinueAsNewWorker.java b/examples/src/main/java/io/dapr/examples/workflows/continueasnew/DemoContinueAsNewWorker.java
index 18849e9f80..43ef176a2e 100644
--- a/examples/src/main/java/io/dapr/examples/workflows/continueasnew/DemoContinueAsNewWorker.java
+++ b/examples/src/main/java/io/dapr/examples/workflows/continueasnew/DemoContinueAsNewWorker.java
@@ -34,7 +34,7 @@ public static void main(String[] args) throws Exception {
     builder.registerActivity(CleanUpActivity.class);
 
     // Build and then start the workflow runtime pulling and executing tasks
-    WorkflowRuntime runtime = builder.build()
+    WorkflowRuntime runtime = builder.build();
     System.out.println("Start workflow runtime");
     runtime.start();
   }

From f349093269f24d49b4e40354d124e8997e56a48e Mon Sep 17 00:00:00 2001
From: Cassandra Coyle <cassie@diagrid.io>
Date: Thu, 8 May 2025 11:33:47 -0500
Subject: [PATCH 8/8] rm try

Signed-off-by: Cassandra Coyle <cassie@diagrid.io>
---
 .../java/io/dapr/it/testcontainers/DaprWorkflowsIT.java    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprWorkflowsIT.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprWorkflowsIT.java
index ca8678e2d7..5c6a360c8a 100644
--- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprWorkflowsIT.java
+++ b/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