Rename orchestrator and activity wrapper

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

Author: Artur Ciocanu

sdk-workflows/src/main/java/io/dapr/workflows/runtime/ActivityWrapper.java renamed to sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowActivityWrapper.java

@@ -22,16 +22,16 @@
 /**
  * Wrapper for Durable Task Framework task activity factory.
  */
-public class ActivityWrapper<T extends WorkflowActivity> implements TaskActivityFactory {
+public class WorkflowActivityWrapper<T extends WorkflowActivity> implements TaskActivityFactory {
   private final Constructor<T> activityConstructor;
   private final String name;
 
   /**
-   * Constructor for ActivityWrapper.
+   * Constructor for WorkflowActivityWrapper.
    *
    * @param clazz Class of the activity to wrap.
    */
-  public ActivityWrapper(Class<T> clazz) {
+  public WorkflowActivityWrapper(Class<T> clazz) {
     this.name = clazz.getCanonicalName();
     try {
       this.activityConstructor = clazz.getDeclaredConstructor();

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

@@ -91,7 +91,7 @@ public WorkflowRuntime build() {
    * @return the WorkflowRuntimeBuilder
    */
   public <T extends Workflow> WorkflowRuntimeBuilder registerWorkflow(Class<T> clazz) {
-    this.builder.addOrchestration(new OrchestratorWrapper<>(clazz));
+    this.builder.addOrchestration(new WorkflowWrapper<>(clazz));
     this.workflowSet.add(clazz.getCanonicalName());
     this.workflows.add(clazz.getSimpleName());
 
@@ -108,7 +108,7 @@ public <T extends Workflow> WorkflowRuntimeBuilder registerWorkflow(Class<T> cla
    * @return the WorkflowRuntimeBuilder
    */
   public <T extends WorkflowActivity> WorkflowRuntimeBuilder registerActivity(Class<T> clazz) {
-    this.builder.addActivity(new ActivityWrapper<>(clazz));
+    this.builder.addActivity(new WorkflowActivityWrapper<>(clazz));
     this.activitySet.add(clazz.getCanonicalName());
     this.activities.add(clazz.getSimpleName());
 

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

@@ -25,11 +25,11 @@
 /**
  * Wrapper for Durable Task Framework orchestration factory.
  */
-class OrchestratorWrapper<T extends Workflow> implements TaskOrchestrationFactory {
+class WorkflowWrapper<T extends Workflow> implements TaskOrchestrationFactory {
   private final Constructor<T> workflowConstructor;
   private final String name;
 
-  public OrchestratorWrapper(Class<T> clazz) {
+  public WorkflowWrapper(Class<T> clazz) {
     this.name = clazz.getCanonicalName();
     try {
       this.workflowConstructor = clazz.getDeclaredConstructor();

sdk-workflows/src/test/java/io/dapr/workflows/runtime/ActivityWrapperTest.java renamed to sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowActivityWrapperTest.java

@@ -10,7 +10,7 @@
 import static org.mockito.Mockito.when;
 
 
-public class ActivityWrapperTest {
+public class WorkflowActivityWrapperTest {
   public static class TestActivity implements WorkflowActivity {
     @Override
     public Object run(WorkflowActivityContext ctx) {
@@ -21,19 +21,19 @@ public Object run(WorkflowActivityContext ctx) {
 
   @Test
   public void getName() throws NoSuchMethodException {
-    ActivityWrapper<ActivityWrapperTest.TestActivity> wrapper = new ActivityWrapper<>(
-        ActivityWrapperTest.TestActivity.class);
+    WorkflowActivityWrapper<TestActivity> wrapper = new WorkflowActivityWrapper<>(
+        WorkflowActivityWrapperTest.TestActivity.class);
     Assert.assertEquals(
-        "io.dapr.workflows.runtime.ActivityWrapperTest.TestActivity",
+        "io.dapr.workflows.runtime.WorkflowActivityWrapperTest.TestActivity",
         wrapper.getName()
     );
   }
 
   @Test
   public void createWithClass() throws NoSuchMethodException {
     TaskActivityContext mockContext = mock(TaskActivityContext.class);
-    ActivityWrapper<ActivityWrapperTest.TestActivity> wrapper = new ActivityWrapper<>(
-        ActivityWrapperTest.TestActivity.class);
+    WorkflowActivityWrapper<TestActivity> wrapper = new WorkflowActivityWrapper<>(
+        WorkflowActivityWrapperTest.TestActivity.class);
     when(mockContext.getInput(String.class)).thenReturn("Hello");
     when(mockContext.getName()).thenReturn("TestActivityContext");
     Object result = wrapper.create().run(mockContext);

sdk-workflows/src/test/java/io/dapr/workflows/runtime/OrchestratorWrapperTest.java renamed to sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowWrapperTest.java

@@ -26,7 +26,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-public class OrchestratorWrapperTest {
+public class WorkflowWrapperTest {
   public static class TestWorkflow extends Workflow {
     @Override
     public WorkflowStub create() {
@@ -36,17 +36,17 @@ public WorkflowStub create() {
 
   @Test
   public void getName() {
-    OrchestratorWrapper<TestWorkflow> wrapper = new OrchestratorWrapper<>(TestWorkflow.class);
+    WorkflowWrapper<TestWorkflow> wrapper = new WorkflowWrapper<>(TestWorkflow.class);
     Assertions.assertEquals(
-        "io.dapr.workflows.runtime.OrchestratorWrapperTest.TestWorkflow",
+        "io.dapr.workflows.runtime.WorkflowWrapperTest.TestWorkflow",
         wrapper.getName()
     );
   }
 
   @Test
   public void createWithClass() {
     TaskOrchestrationContext mockContext = mock(TaskOrchestrationContext.class);
-    OrchestratorWrapper<TestWorkflow> wrapper = new OrchestratorWrapper<>(TestWorkflow.class);
+    WorkflowWrapper<TestWorkflow> wrapper = new WorkflowWrapper<>(TestWorkflow.class);
     when(mockContext.getInstanceId()).thenReturn("uuid");
     wrapper.create().run(mockContext);
     verify(mockContext, times(1)).getInstanceId();