chore: Use latest durabletask-java version

Signed-off-by: Javier Aliaga <[email protected]>

Author: javier-aliaga

sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/DaprWorkflowsIT.java

@@ -16,8 +16,6 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import io.dapr.it.testcontainers.KeyStore;
-import io.dapr.it.testcontainers.TestExecutionKeysWorkflow;
 import io.dapr.testcontainers.Component;
 import io.dapr.testcontainers.DaprContainer;
 import io.dapr.testcontainers.DaprLogLevel;
@@ -157,7 +155,7 @@ public void testNamedActivitiesWorkflows() throws Exception {
     String instanceId = workflowClient.scheduleNewWorkflow(TestNamedActivitiesWorkflow.class, payload);
 
     workflowClient.waitForInstanceStart(instanceId, Duration.ofSeconds(10), false);
-    
+
     Duration timeout = Duration.ofSeconds(10);
     WorkflowInstanceStatus workflowStatus = workflowClient.waitForInstanceCompletion(instanceId, timeout, true);
 
@@ -175,6 +173,7 @@ public void testNamedActivitiesWorkflows() throws Exception {
     assertEquals(instanceId, workflowOutput.getWorkflowId());
   }
 
+  @Test
   public void testExecutionKeyWorkflows() throws Exception {
     TestWorkflowPayload payload = new TestWorkflowPayload(new ArrayList<>());
     String instanceId = workflowClient.scheduleNewWorkflow(TestExecutionKeysWorkflow.class, payload);
@@ -191,8 +190,7 @@ public void testExecutionKeyWorkflows() throws Exception {
     assertEquals(1, workflowOutput.getPayloads().size());
     assertEquals("Execution key found", workflowOutput.getPayloads().get(0));
 
-    String executionKey = workflowOutput.getWorkflowId() +"-"+"io.dapr.it.testcontainers.TaskExecutionKeyActivity";
-    assertTrue(KeyStore.getInstance().getKey(executionKey));
+    assertTrue(KeyStore.getInstance().size() == 1);
 
     assertEquals(instanceId, workflowOutput.getWorkflowId());
   }

sdk-tests/src/test/java/io/dapr/it/testcontainers/KeyStore.java renamed to sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/KeyStore.java

@@ -10,7 +10,7 @@
  * See the License for the specific language governing permissions and
 limitations under the License.
 */
-package io.dapr.it.testcontainers;
+package io.dapr.it.testcontainers.workflows;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -48,4 +48,8 @@ public void removeKey(String key) {
         keyStore.remove(key);
     }
 
+    public int size() {
+        return keyStore.size();
+    }
+
 }

sdk-tests/src/test/java/io/dapr/it/testcontainers/TaskExecutionKeyActivity.java renamed to sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/TaskExecutionIdActivity.java

@@ -11,20 +11,20 @@
 limitations under the License.
 */
 
-package io.dapr.it.testcontainers;
+package io.dapr.it.testcontainers.workflows;
 
 import io.dapr.workflows.WorkflowActivity;
 import io.dapr.workflows.WorkflowActivityContext;
 
-public class TaskExecutionKeyActivity implements WorkflowActivity {
+public class TaskExecutionIdActivity implements WorkflowActivity {
 
   @Override
   public Object run(WorkflowActivityContext ctx) {
     TestWorkflowPayload workflowPayload = ctx.getInput(TestWorkflowPayload.class);
     KeyStore keyStore = KeyStore.getInstance();
-    Boolean exists = keyStore.getKey(ctx.getTaskExecutionKey());
+    Boolean exists = keyStore.getKey(ctx.getTaskExecutionId());
     if (!Boolean.TRUE.equals(exists)) {
-      keyStore.addKey(ctx.getTaskExecutionKey(), true);
+      keyStore.addKey(ctx.getTaskExecutionId(), true);
       workflowPayload.getPayloads().add("Execution key not found");
       throw new IllegalStateException("Task execution key not found");
     }

sdk-tests/src/test/java/io/dapr/it/testcontainers/TestExecutionKeysWorkflow.java renamed to sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/TestExecutionKeysWorkflow.java

@@ -11,7 +11,7 @@
 limitations under the License.
 */
 
-package io.dapr.it.testcontainers;
+package io.dapr.it.testcontainers.workflows;
 
 import io.dapr.durabletask.Task;
 import io.dapr.workflows.Workflow;
@@ -47,7 +47,7 @@ public WorkflowStub create() {
       .build());
 
 
-      Task<TestWorkflowPayload> t =   ctx.callActivity(TaskExecutionKeyActivity.class.getName(), workflowPayload, options,TestWorkflowPayload.class);
+      Task<TestWorkflowPayload> t =   ctx.callActivity(TaskExecutionIdActivity.class.getName(), workflowPayload, options,TestWorkflowPayload.class);
 
       TestWorkflowPayload payloadAfterExecution = t.await();
 

sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/TestWorkflowsConfiguration.java

@@ -63,6 +63,9 @@ public WorkflowRuntimeBuilder workflowRuntimeBuilder(
 
     builder.registerActivity(FirstActivity.class);
     builder.registerActivity(SecondActivity.class);
+    builder.registerActivity(TaskExecutionIdActivity.class);
+    
+    
     builder.registerActivity("a",FirstActivity.class);
     builder.registerActivity("b",FirstActivity.class);
     builder.registerActivity("c", new SecondActivity());

sdk-workflows/src/main/java/io/dapr/workflows/WorkflowActivityContext.java

@@ -17,7 +17,7 @@ public interface WorkflowActivityContext {
 
   String getName();
 
-  String getTaskExecutionKey();
+  String getTaskExecutionId();
 
   <T> T getInput(Class<T> targetType);
 

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

@@ -58,7 +58,7 @@ public <T> T getInput(Class<T> targetType) {
   }
 
   @Override
-  public String getTaskExecutionKey() {
-    return this.innerContext.getTaskExecutionKey();
+  public String getTaskExecutionId() {
+    return this.innerContext.getTaskExecutionId();
   }
 }

sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowActivityClassWrapperTest.java

@@ -13,7 +13,7 @@ public static class TestActivity implements WorkflowActivity {
     @Override
     public Object run(WorkflowActivityContext ctx) {
       String activityContextName = ctx.getName();
-      return ctx.getInput(String.class) + " world! from " + activityContextName + " with task execution key " + ctx.getTaskExecutionKey();
+      return ctx.getInput(String.class) + " world! from " + activityContextName + " with task execution key " + ctx.getTaskExecutionId();
     }
   }
 
@@ -34,7 +34,7 @@ public void createWithClass() {
 
     when(mockContext.getInput(String.class)).thenReturn("Hello");
     when(mockContext.getName()).thenReturn("TestActivityContext");
-    when(mockContext.getTaskExecutionKey()).thenReturn("123");
+    when(mockContext.getTaskExecutionId()).thenReturn("123");
 
     Object result = wrapper.create().run(mockContext);