diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DaprWorkflowActivityContext.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowActivityContext.java similarity index 90% rename from sdk-workflows/src/main/java/io/dapr/workflows/runtime/DaprWorkflowActivityContext.java rename to sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowActivityContext.java index 7ff987f8f..4a16d45f4 100644 --- a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DaprWorkflowActivityContext.java +++ b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowActivityContext.java @@ -19,7 +19,7 @@ /** * Wrapper for Durable Task Framework {@link TaskActivityContext}. */ -class DaprWorkflowActivityContext implements WorkflowActivityContext { +class DefaultWorkflowActivityContext implements WorkflowActivityContext { private final TaskActivityContext innerContext; /** @@ -28,7 +28,7 @@ class DaprWorkflowActivityContext implements WorkflowActivityContext { * @param context TaskActivityContext * @throws IllegalArgumentException if context is null */ - public DaprWorkflowActivityContext(TaskActivityContext context) throws IllegalArgumentException { + public DefaultWorkflowActivityContext(TaskActivityContext context) throws IllegalArgumentException { if (context == null) { throw new IllegalArgumentException("Context cannot be null"); } diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DaprWorkflowContext.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java similarity index 91% rename from sdk-workflows/src/main/java/io/dapr/workflows/runtime/DaprWorkflowContext.java rename to sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java index 1e41a919e..fea7ea396 100644 --- a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DaprWorkflowContext.java +++ b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java @@ -19,7 +19,7 @@ import com.microsoft.durabletask.TaskOptions; import com.microsoft.durabletask.TaskOrchestrationContext; import io.dapr.workflows.WorkflowContext; -import io.dapr.workflows.runtime.saga.DaprSagaContext; +import io.dapr.workflows.runtime.saga.DefaultSagaContext; import io.dapr.workflows.saga.Saga; import io.dapr.workflows.saga.SagaContext; import org.slf4j.Logger; @@ -33,7 +33,7 @@ import java.util.List; import java.util.UUID; -public class DaprWorkflowContext implements WorkflowContext { +public class DefaultWorkflowContext implements WorkflowContext { private final TaskOrchestrationContext innerContext; private final Logger logger; private final Saga saga; @@ -44,7 +44,7 @@ public class DaprWorkflowContext implements WorkflowContext { * @param context TaskOrchestrationContext * @throws IllegalArgumentException if context is null */ - public DaprWorkflowContext(TaskOrchestrationContext context) throws IllegalArgumentException { + public DefaultWorkflowContext(TaskOrchestrationContext context) throws IllegalArgumentException { this(context, LoggerFactory.getLogger(WorkflowContext.class)); } @@ -55,11 +55,11 @@ public DaprWorkflowContext(TaskOrchestrationContext context) throws IllegalArgum * @param logger Logger * @throws IllegalArgumentException if context or logger is null */ - public DaprWorkflowContext(TaskOrchestrationContext context, Logger logger) throws IllegalArgumentException { + public DefaultWorkflowContext(TaskOrchestrationContext context, Logger logger) throws IllegalArgumentException { this(context, logger, null); } - public DaprWorkflowContext(TaskOrchestrationContext context, Saga saga) throws IllegalArgumentException { + public DefaultWorkflowContext(TaskOrchestrationContext context, Saga saga) throws IllegalArgumentException { this(context, LoggerFactory.getLogger(WorkflowContext.class), saga); } @@ -71,7 +71,7 @@ public DaprWorkflowContext(TaskOrchestrationContext context, Saga saga) throws I * @param saga saga object, if null, saga is disabled * @throws IllegalArgumentException if context or logger is null */ - public DaprWorkflowContext(TaskOrchestrationContext context, Logger logger, Saga saga) + public DefaultWorkflowContext(TaskOrchestrationContext context, Logger logger, Saga saga) throws IllegalArgumentException { if (context == null) { throw new IllegalArgumentException("Context cannot be null"); @@ -249,6 +249,6 @@ public SagaContext getSagaContext() { throw new UnsupportedOperationException("Saga is not enabled"); } - return new DaprSagaContext(this.saga, this); + return new DefaultSagaContext(this.saga, this); } } diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowActivityWrapper.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowActivityWrapper.java index 9cd58cb70..18f4eb55d 100644 --- a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowActivityWrapper.java +++ b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowActivityWrapper.java @@ -63,7 +63,7 @@ public TaskActivity create() { ); } - result = activity.run(new DaprWorkflowActivityContext(ctx)); + result = activity.run(new DefaultWorkflowActivityContext(ctx)); return result; }; } diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowWrapper.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowWrapper.java index b75f9a65a..91f1dd8bc 100644 --- a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowWrapper.java +++ b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowWrapper.java @@ -58,9 +58,9 @@ public TaskOrchestration create() { if (workflow.getSagaOption() != null) { Saga saga = new Saga(workflow.getSagaOption()); - workflow.run(new DaprWorkflowContext(ctx, saga)); + workflow.run(new DefaultWorkflowContext(ctx, saga)); } else { - workflow.run(new DaprWorkflowContext(ctx)); + workflow.run(new DefaultWorkflowContext(ctx)); } }; diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/saga/DaprSagaContext.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/saga/DefaultSagaContext.java similarity index 92% rename from sdk-workflows/src/main/java/io/dapr/workflows/runtime/saga/DaprSagaContext.java rename to sdk-workflows/src/main/java/io/dapr/workflows/runtime/saga/DefaultSagaContext.java index 18375e79a..78d72b73d 100644 --- a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/saga/DaprSagaContext.java +++ b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/saga/DefaultSagaContext.java @@ -20,7 +20,7 @@ /** * Dapr Saga Context implementation. */ -public class DaprSagaContext implements SagaContext { +public class DefaultSagaContext implements SagaContext { private final Saga saga; private final WorkflowContext workflowContext; @@ -32,7 +32,7 @@ public class DaprSagaContext implements SagaContext { * @param workflowContext Workflow context. * @throws IllegalArgumentException if saga or workflowContext is null. */ - public DaprSagaContext(Saga saga, WorkflowContext workflowContext) { + public DefaultSagaContext(Saga saga, WorkflowContext workflowContext) { if (saga == null) { throw new IllegalArgumentException("Saga should not be null"); } diff --git a/sdk-workflows/src/test/java/io/dapr/workflows/DaprWorkflowContextTest.java b/sdk-workflows/src/test/java/io/dapr/workflows/DefaultWorkflowContextTest.java similarity index 93% rename from sdk-workflows/src/test/java/io/dapr/workflows/DaprWorkflowContextTest.java rename to sdk-workflows/src/test/java/io/dapr/workflows/DefaultWorkflowContextTest.java index 6a8ed9b1f..abbbae491 100644 --- a/sdk-workflows/src/test/java/io/dapr/workflows/DaprWorkflowContextTest.java +++ b/sdk-workflows/src/test/java/io/dapr/workflows/DefaultWorkflowContextTest.java @@ -20,7 +20,7 @@ import com.microsoft.durabletask.TaskOptions; import com.microsoft.durabletask.TaskOrchestrationContext; -import io.dapr.workflows.runtime.DaprWorkflowContext; +import io.dapr.workflows.runtime.DefaultWorkflowContext; import io.dapr.workflows.saga.Saga; import io.dapr.workflows.saga.SagaContext; @@ -44,15 +44,15 @@ import static org.mockito.Mockito.when; import static org.junit.jupiter.api.Assertions.assertThrows; -public class DaprWorkflowContextTest { - private DaprWorkflowContext context; +public class DefaultWorkflowContextTest { + private DefaultWorkflowContext context; private TaskOrchestrationContext mockInnerContext; private WorkflowContext testWorkflowContext; @BeforeEach public void setUp() { mockInnerContext = mock(TaskOrchestrationContext.class); - context = new DaprWorkflowContext(mockInnerContext); + context = new DefaultWorkflowContext(mockInnerContext); testWorkflowContext = new WorkflowContext() { @Override public Logger getLogger() { @@ -191,13 +191,13 @@ public void callActivityTest() { @Test public void DaprWorkflowContextWithEmptyInnerContext() { assertThrows(IllegalArgumentException.class, () -> { - context = new DaprWorkflowContext(mockInnerContext, (Logger)null); + context = new DefaultWorkflowContext(mockInnerContext, (Logger)null); }); } @Test public void DaprWorkflowContextWithEmptyLogger() { assertThrows(IllegalArgumentException.class, () -> { - context = new DaprWorkflowContext(null, (Logger)null); + context = new DefaultWorkflowContext(null, (Logger)null); }); } @@ -217,7 +217,7 @@ public void getIsReplayingTest() { public void getLoggerReplayingTest() { Logger mockLogger = mock(Logger.class); when(context.isReplaying()).thenReturn(true); - DaprWorkflowContext testContext = new DaprWorkflowContext(mockInnerContext, mockLogger); + DefaultWorkflowContext testContext = new DefaultWorkflowContext(mockInnerContext, mockLogger); String expectedArg = "test print"; testContext.getLogger().info(expectedArg); @@ -229,7 +229,7 @@ public void getLoggerReplayingTest() { public void getLoggerFirstTimeTest() { Logger mockLogger = mock(Logger.class); when(context.isReplaying()).thenReturn(false); - DaprWorkflowContext testContext = new DaprWorkflowContext(mockInnerContext, mockLogger); + DefaultWorkflowContext testContext = new DefaultWorkflowContext(mockInnerContext, mockLogger); String expectedArg = "test print"; testContext.getLogger().info(expectedArg); @@ -323,7 +323,7 @@ public void newUuidTestNoImplementationExceptionTest() { @Test public void getSagaContextTest_sagaEnabled() { Saga saga = mock(Saga.class); - WorkflowContext context = new DaprWorkflowContext(mockInnerContext, saga); + WorkflowContext context = new DefaultWorkflowContext(mockInnerContext, saga); SagaContext sagaContext = context.getSagaContext(); assertNotNull("SagaContext should not be null", sagaContext); @@ -331,7 +331,7 @@ public void getSagaContextTest_sagaEnabled() { @Test public void getSagaContextTest_sagaDisabled() { - WorkflowContext context = new DaprWorkflowContext(mockInnerContext); + WorkflowContext context = new DefaultWorkflowContext(mockInnerContext); assertThrows(UnsupportedOperationException.class, () -> { context.getSagaContext(); }); diff --git a/sdk-workflows/src/test/java/io/dapr/workflows/saga/DaprSagaContextTest.java b/sdk-workflows/src/test/java/io/dapr/workflows/saga/DefaultSagaContextTest.java similarity index 80% rename from sdk-workflows/src/test/java/io/dapr/workflows/saga/DaprSagaContextTest.java rename to sdk-workflows/src/test/java/io/dapr/workflows/saga/DefaultSagaContextTest.java index dd96caa64..4f92c4f9e 100644 --- a/sdk-workflows/src/test/java/io/dapr/workflows/saga/DaprSagaContextTest.java +++ b/sdk-workflows/src/test/java/io/dapr/workflows/saga/DefaultSagaContextTest.java @@ -6,12 +6,12 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import io.dapr.workflows.runtime.saga.DaprSagaContext; +import io.dapr.workflows.runtime.saga.DefaultSagaContext; import org.junit.Test; import io.dapr.workflows.WorkflowContext; -public class DaprSagaContextTest { +public class DefaultSagaContextTest { @Test public void testDaprSagaContextImpl_IllegalArgumentException() { @@ -19,11 +19,11 @@ public void testDaprSagaContextImpl_IllegalArgumentException() { WorkflowContext workflowContext = mock(WorkflowContext.class); assertThrows(IllegalArgumentException.class, () -> { - new DaprSagaContext(saga, null); + new DefaultSagaContext(saga, null); }); assertThrows(IllegalArgumentException.class, () -> { - new DaprSagaContext(null, workflowContext); + new DefaultSagaContext(null, workflowContext); }); } @@ -31,7 +31,7 @@ public void testDaprSagaContextImpl_IllegalArgumentException() { public void test_registerCompensation() { Saga saga = mock(Saga.class); WorkflowContext workflowContext = mock(WorkflowContext.class); - DaprSagaContext ctx = new DaprSagaContext(saga, workflowContext); + DefaultSagaContext ctx = new DefaultSagaContext(saga, workflowContext); String activityClassName = "name1"; Object activityInput = new Object(); @@ -45,7 +45,7 @@ public void test_registerCompensation() { public void test_compensate() { Saga saga = mock(Saga.class); WorkflowContext workflowContext = mock(WorkflowContext.class); - DaprSagaContext ctx = new DaprSagaContext(saga, workflowContext); + DefaultSagaContext ctx = new DefaultSagaContext(saga, workflowContext); doNothing().when(saga).compensate(workflowContext);