Move workflow context implementation to runtime

Signed-off-by: Artur Ciocanu <[email protected]>

Author: Artur Ciocanu

sdk-workflows/src/main/java/io/dapr/workflows/DaprWorkflowContextImpl.java renamed to sdk-workflows/src/main/java/io/dapr/workflows/runtime/DaprWorkflowContext.java

@@ -11,13 +11,14 @@
 limitations under the License.
 */
 
-package io.dapr.workflows;
+package io.dapr.workflows.runtime;
 
 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.workflows.WorkflowContext;
 import io.dapr.workflows.saga.DaprSagaContextImpl;
 import io.dapr.workflows.saga.Saga;
 import io.dapr.workflows.saga.SagaContext;
@@ -32,7 +33,7 @@
 import java.util.List;
 import java.util.UUID;
 
-public class DaprWorkflowContextImpl implements WorkflowContext {
+public class DaprWorkflowContext implements WorkflowContext {
   private final TaskOrchestrationContext innerContext;
   private final Logger logger;
   private final Saga saga;
@@ -43,7 +44,7 @@ public class DaprWorkflowContextImpl implements WorkflowContext {
    * @param context TaskOrchestrationContext
    * @throws IllegalArgumentException if context is null
    */
-  public DaprWorkflowContextImpl(TaskOrchestrationContext context) throws IllegalArgumentException {
+  public DaprWorkflowContext(TaskOrchestrationContext context) throws IllegalArgumentException {
     this(context, LoggerFactory.getLogger(WorkflowContext.class));
   }
 
@@ -54,11 +55,11 @@ public DaprWorkflowContextImpl(TaskOrchestrationContext context) throws IllegalA
    * @param logger  Logger
    * @throws IllegalArgumentException if context or logger is null
    */
-  public DaprWorkflowContextImpl(TaskOrchestrationContext context, Logger logger) throws IllegalArgumentException {
+  public DaprWorkflowContext(TaskOrchestrationContext context, Logger logger) throws IllegalArgumentException {
     this(context, logger, null);
   }
 
-  public DaprWorkflowContextImpl(TaskOrchestrationContext context, Saga saga) throws IllegalArgumentException {
+  public DaprWorkflowContext(TaskOrchestrationContext context, Saga saga) throws IllegalArgumentException {
     this(context, LoggerFactory.getLogger(WorkflowContext.class), saga);
   }
 
@@ -70,7 +71,7 @@ public DaprWorkflowContextImpl(TaskOrchestrationContext context, Saga saga) thro
    * @param saga    saga object, if null, saga is disabled
    * @throws IllegalArgumentException if context or logger is null
    */
-  public DaprWorkflowContextImpl(TaskOrchestrationContext context, Logger logger, Saga saga)
+  public DaprWorkflowContext(TaskOrchestrationContext context, Logger logger, Saga saga)
       throws IllegalArgumentException {
     if (context == null) {
       throw new IllegalArgumentException("Context cannot be null");

sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowWrapper.java

@@ -15,7 +15,6 @@
 
 import com.microsoft.durabletask.TaskOrchestration;
 import com.microsoft.durabletask.TaskOrchestrationFactory;
-import io.dapr.workflows.DaprWorkflowContextImpl;
 import io.dapr.workflows.Workflow;
 import io.dapr.workflows.saga.Saga;
 
@@ -59,9 +58,9 @@ public TaskOrchestration create() {
 
       if (workflow.getSagaOption() != null) {
         Saga saga = new Saga(workflow.getSagaOption());
-        workflow.run(new DaprWorkflowContextImpl(ctx, saga));
+        workflow.run(new DaprWorkflowContext(ctx, saga));
       } else {
-        workflow.run(new DaprWorkflowContextImpl(ctx));
+        workflow.run(new DaprWorkflowContext(ctx));
       }
     };
 

sdk-workflows/src/test/java/io/dapr/workflows/DaprWorkflowContextImplTest.java renamed to sdk-workflows/src/test/java/io/dapr/workflows/DaprWorkflowContextTest.java

@@ -20,6 +20,7 @@
 import com.microsoft.durabletask.TaskOptions;
 import com.microsoft.durabletask.TaskOrchestrationContext;
 
+import io.dapr.workflows.runtime.DaprWorkflowContext;
 import io.dapr.workflows.saga.Saga;
 import io.dapr.workflows.saga.SagaContext;
 
@@ -43,15 +44,15 @@
 import static org.mockito.Mockito.when;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class DaprWorkflowContextImplTest {
-  private DaprWorkflowContextImpl context;
+public class DaprWorkflowContextTest {
+  private DaprWorkflowContext context;
   private TaskOrchestrationContext mockInnerContext;
   private WorkflowContext testWorkflowContext;
 
   @BeforeEach
   public void setUp() {
     mockInnerContext = mock(TaskOrchestrationContext.class);
-    context = new DaprWorkflowContextImpl(mockInnerContext);
+    context = new DaprWorkflowContext(mockInnerContext);
     testWorkflowContext = new WorkflowContext() {
       @Override
       public Logger getLogger() {
@@ -190,13 +191,13 @@ public void callActivityTest() {
   @Test
   public void DaprWorkflowContextWithEmptyInnerContext() {
     assertThrows(IllegalArgumentException.class, () -> {
-      context = new DaprWorkflowContextImpl(mockInnerContext, (Logger)null);
+      context = new DaprWorkflowContext(mockInnerContext, (Logger)null);
     });  }
 
   @Test
   public void DaprWorkflowContextWithEmptyLogger() {
     assertThrows(IllegalArgumentException.class, () -> {
-      context = new DaprWorkflowContextImpl(null, (Logger)null);
+      context = new DaprWorkflowContext(null, (Logger)null);
     });
   }
 
@@ -216,7 +217,7 @@ public void getIsReplayingTest() {
   public void getLoggerReplayingTest() {
     Logger mockLogger = mock(Logger.class);
     when(context.isReplaying()).thenReturn(true);
-    DaprWorkflowContextImpl testContext = new DaprWorkflowContextImpl(mockInnerContext, mockLogger);
+    DaprWorkflowContext testContext = new DaprWorkflowContext(mockInnerContext, mockLogger);
 
     String expectedArg = "test print";
     testContext.getLogger().info(expectedArg);
@@ -228,7 +229,7 @@ public void getLoggerReplayingTest() {
   public void getLoggerFirstTimeTest() {
     Logger mockLogger = mock(Logger.class);
     when(context.isReplaying()).thenReturn(false);
-    DaprWorkflowContextImpl testContext = new DaprWorkflowContextImpl(mockInnerContext, mockLogger);
+    DaprWorkflowContext testContext = new DaprWorkflowContext(mockInnerContext, mockLogger);
 
     String expectedArg = "test print";
     testContext.getLogger().info(expectedArg);
@@ -322,15 +323,15 @@ public void newUuidTestNoImplementationExceptionTest() {
   @Test
   public void getSagaContextTest_sagaEnabled() {
     Saga saga = mock(Saga.class);
-    WorkflowContext context = new DaprWorkflowContextImpl(mockInnerContext, saga);
+    WorkflowContext context = new DaprWorkflowContext(mockInnerContext, saga);
 
     SagaContext sagaContext = context.getSagaContext();
     assertNotNull("SagaContext should not be null", sagaContext);
   }
 
   @Test
   public void getSagaContextTest_sagaDisabled() {
-    WorkflowContext context = new DaprWorkflowContextImpl(mockInnerContext);
+    WorkflowContext context = new DaprWorkflowContext(mockInnerContext);
     assertThrows(UnsupportedOperationException.class, () -> {
       context.getSagaContext();
     });