Rename workflow activity context and add an interface

Artur Ciocanu · Artur Ciocanu · commit 59602f16838e · 2024-12-09T23:01:48.000+02:00
Signed-off-by: Artur Ciocanu &lt;ciocanu@adobe.com&gt;
diff --git a/examples/src/main/java/io/dapr/examples/workflows/chain/ToUpperCaseActivity.java b/examples/src/main/java/io/dapr/examples/workflows/chain/ToUpperCaseActivity.java
@@ -14,7 +14,7 @@
 package io.dapr.examples.workflows.chain;
 
 import io.dapr.workflows.WorkflowActivity;
-import io.dapr.workflows.runtime.WorkflowActivityContext;
+import io.dapr.workflows.WorkflowActivityContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/examples/src/main/java/io/dapr/examples/workflows/childworkflow/ReverseActivity.java b/examples/src/main/java/io/dapr/examples/workflows/childworkflow/ReverseActivity.java
@@ -14,7 +14,7 @@
 package io.dapr.examples.workflows.childworkflow;
 
 import io.dapr.workflows.WorkflowActivity;
-import io.dapr.workflows.runtime.WorkflowActivityContext;
+import io.dapr.workflows.WorkflowActivityContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/examples/src/main/java/io/dapr/examples/workflows/continueasnew/CleanUpActivity.java b/examples/src/main/java/io/dapr/examples/workflows/continueasnew/CleanUpActivity.java
@@ -14,7 +14,7 @@
 package io.dapr.examples.workflows.continueasnew;
 
 import io.dapr.workflows.WorkflowActivity;
-import io.dapr.workflows.runtime.WorkflowActivityContext;
+import io.dapr.workflows.WorkflowActivityContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/examples/src/main/java/io/dapr/examples/workflows/externalevent/ApproveActivity.java b/examples/src/main/java/io/dapr/examples/workflows/externalevent/ApproveActivity.java
@@ -14,7 +14,7 @@
 package io.dapr.examples.workflows.externalevent;
 
 import io.dapr.workflows.WorkflowActivity;
-import io.dapr.workflows.runtime.WorkflowActivityContext;
+import io.dapr.workflows.WorkflowActivityContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/examples/src/main/java/io/dapr/examples/workflows/externalevent/DenyActivity.java b/examples/src/main/java/io/dapr/examples/workflows/externalevent/DenyActivity.java
@@ -14,7 +14,7 @@
 package io.dapr.examples.workflows.externalevent;
 
 import io.dapr.workflows.WorkflowActivity;
-import io.dapr.workflows.runtime.WorkflowActivityContext;
+import io.dapr.workflows.WorkflowActivityContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/examples/src/main/java/io/dapr/examples/workflows/faninout/CountWordsActivity.java b/examples/src/main/java/io/dapr/examples/workflows/faninout/CountWordsActivity.java
@@ -14,7 +14,7 @@
 package io.dapr.examples.workflows.faninout;
 
 import io.dapr.workflows.WorkflowActivity;
-import io.dapr.workflows.runtime.WorkflowActivityContext;
+import io.dapr.workflows.WorkflowActivityContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/FirstActivity.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/FirstActivity.java
@@ -14,7 +14,7 @@
 package io.dapr.it.testcontainers;
 
 import io.dapr.workflows.WorkflowActivity;
-import io.dapr.workflows.runtime.WorkflowActivityContext;
+import io.dapr.workflows.WorkflowActivityContext;
 
 public class FirstActivity implements WorkflowActivity {
 
diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/SecondActivity.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/SecondActivity.java
@@ -14,7 +14,7 @@
 package io.dapr.it.testcontainers;
 
 import io.dapr.workflows.WorkflowActivity;
-import io.dapr.workflows.runtime.WorkflowActivityContext;
+import io.dapr.workflows.WorkflowActivityContext;
 
 public class SecondActivity implements WorkflowActivity {
 
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowActivity.java b/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowActivity.java
@@ -13,8 +13,6 @@
 
 package io.dapr.workflows;
 
-import io.dapr.workflows.runtime.WorkflowActivityContext;
-
 /**
  * Common interface for task activity implementations.
  *
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowActivityContext.java b/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowActivityContext.java
@@ -0,0 +1,7 @@
+package io.dapr.workflows;
+
+public interface WorkflowActivityContext {
+  String getName();
+
+  <T> T getInput(Class<T> targetType);
+}
diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DaprWorkflowActivityContext.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DaprWorkflowActivityContext.java
@@ -14,11 +14,12 @@
 package io.dapr.workflows.runtime;
 
 import com.microsoft.durabletask.TaskActivityContext;
+import io.dapr.workflows.WorkflowActivityContext;
 
 /**
  * Wrapper for Durable Task Framework {@link TaskActivityContext}.
  */
-public class WorkflowActivityContext implements TaskActivityContext {
+public class DaprWorkflowActivityContext implements WorkflowActivityContext {
   private final TaskActivityContext innerContext;
 
   /**
@@ -27,7 +28,7 @@ public class WorkflowActivityContext implements TaskActivityContext {
    * @param context TaskActivityContext
    * @throws IllegalArgumentException if context is null
    */
-  public WorkflowActivityContext(TaskActivityContext context) throws IllegalArgumentException {
+  public DaprWorkflowActivityContext(TaskActivityContext context) throws IllegalArgumentException {
     if (context == null) {
       throw new IllegalArgumentException("Context cannot be null");
     }
@@ -39,6 +40,7 @@ public WorkflowActivityContext(TaskActivityContext context) throws IllegalArgume
    *
    * @return the name of the current activity
    */
+  @Override
   public String getName() {
     return this.innerContext.getName();
   }
@@ -50,6 +52,7 @@ public String getName() {
    * @param targetType targetType of the input
    * @return the input of the current activity
    */
+  @Override
   public <T> T getInput(Class<T> targetType) {
     return this.innerContext.getInput(targetType);
   }
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
@@ -63,7 +63,7 @@ public TaskActivity create() {
         );
       }
 
-      result = activity.run(new WorkflowActivityContext(ctx));
+      result = activity.run(new DaprWorkflowActivityContext(ctx));
       return result;
     };
   }
diff --git a/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowActivityWrapperTest.java b/sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowActivityWrapperTest.java
@@ -2,6 +2,7 @@
 
 import com.microsoft.durabletask.TaskActivityContext;
 import io.dapr.workflows.WorkflowActivity;
+import io.dapr.workflows.WorkflowActivityContext;
 import org.junit.Assert;
 import org.junit.Test;
 
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
@@ -15,6 +15,7 @@
 
 import io.dapr.workflows.Workflow;
 import io.dapr.workflows.WorkflowActivity;
+import io.dapr.workflows.WorkflowActivityContext;
 import io.dapr.workflows.WorkflowStub;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
diff --git a/sdk-workflows/src/test/java/io/dapr/workflows/saga/SagaIntegrationTest.java b/sdk-workflows/src/test/java/io/dapr/workflows/saga/SagaIntegrationTest.java
@@ -2,12 +2,13 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import io.dapr.workflows.runtime.DaprWorkflowActivityContext;
 import org.junit.Test;
 
 import com.microsoft.durabletask.TaskActivityContext;
 
 import io.dapr.workflows.WorkflowActivity;
-import io.dapr.workflows.runtime.WorkflowActivityContext;
+import io.dapr.workflows.WorkflowActivityContext;
 
 public class SagaIntegrationTest {
 
@@ -125,7 +126,7 @@ private <V> V callActivity(String activityClassName, Object input, Class<V> retu
     try {
       Class<?> activityClass = Class.forName(activityClassName);
       WorkflowActivity activity = (WorkflowActivity) activityClass.getDeclaredConstructor().newInstance();
-      WorkflowActivityContext ctx = new WorkflowActivityContext(new TaskActivityContext() {
+      WorkflowActivityContext ctx = new DaprWorkflowActivityContext(new TaskActivityContext() {
 
         @Override
         public java.lang.String getName() {
diff --git a/sdk-workflows/src/test/java/io/dapr/workflows/saga/SagaTest.java b/sdk-workflows/src/test/java/io/dapr/workflows/saga/SagaTest.java
@@ -32,6 +32,7 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
+import io.dapr.workflows.WorkflowActivityContext;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
@@ -42,7 +43,6 @@
 
 import io.dapr.workflows.WorkflowContext;
 import io.dapr.workflows.WorkflowActivity;
-import io.dapr.workflows.runtime.WorkflowActivityContext;
 
 public class SagaTest {
 

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,6 @@`
`13`	`13`
`14`	`14`	`package io.dapr.workflows;`
`15`	`15`
`16`		`-import io.dapr.workflows.runtime.WorkflowActivityContext;`
`17`		`-`
`18`	`16`	`/**`
`19`	`17`	`* Common interface for task activity implementations.`
`20`	`18`	`*`