Skip to content

Commit 6ec2405

Browse files
committed
chore: Use latest durabletask-java version
Signed-off-by: Javier Aliaga <[email protected]>
1 parent 82e2021 commit 6ec2405

File tree

9 files changed

+20
-19
lines changed

9 files changed

+20
-19
lines changed

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
import com.fasterxml.jackson.core.JsonProcessingException;
1717
import com.fasterxml.jackson.databind.ObjectMapper;
1818

19-
import io.dapr.it.testcontainers.KeyStore;
20-
import io.dapr.it.testcontainers.TestExecutionKeysWorkflow;
2119
import io.dapr.testcontainers.Component;
2220
import io.dapr.testcontainers.DaprContainer;
2321
import io.dapr.testcontainers.DaprLogLevel;
@@ -151,7 +149,7 @@ public void testSuspendAndResumeWorkflows() throws Exception {
151149

152150
}
153151

154-
152+
@Test
155153
public void testExecutionKeyWorkflows() throws Exception {
156154
TestWorkflowPayload payload = new TestWorkflowPayload(new ArrayList<>());
157155
String instanceId = workflowClient.scheduleNewWorkflow(TestExecutionKeysWorkflow.class, payload);
@@ -168,8 +166,7 @@ public void testExecutionKeyWorkflows() throws Exception {
168166
assertEquals(1, workflowOutput.getPayloads().size());
169167
assertEquals("Execution key found", workflowOutput.getPayloads().get(0));
170168

171-
String executionKey = workflowOutput.getWorkflowId() +"-"+"io.dapr.it.testcontainers.TaskExecutionKeyActivity";
172-
assertTrue(KeyStore.getInstance().getKey(executionKey));
169+
assertTrue(KeyStore.getInstance().size() == 1);
173170

174171
assertEquals(instanceId, workflowOutput.getWorkflowId());
175172
}

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* See the License for the specific language governing permissions and
1111
limitations under the License.
1212
*/
13-
package io.dapr.it.testcontainers;
13+
package io.dapr.it.testcontainers.workflows;
1414

1515
import java.util.HashMap;
1616
import java.util.Map;
@@ -48,4 +48,8 @@ public void removeKey(String key) {
4848
keyStore.remove(key);
4949
}
5050

51+
public int size() {
52+
return keyStore.size();
53+
}
54+
5155
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@
1111
limitations under the License.
1212
*/
1313

14-
package io.dapr.it.testcontainers;
14+
package io.dapr.it.testcontainers.workflows;
1515

1616
import io.dapr.workflows.WorkflowActivity;
1717
import io.dapr.workflows.WorkflowActivityContext;
1818

19-
public class TaskExecutionKeyActivity implements WorkflowActivity {
19+
public class TaskExecutionIdActivity implements WorkflowActivity {
2020

2121
@Override
2222
public Object run(WorkflowActivityContext ctx) {
2323
TestWorkflowPayload workflowPayload = ctx.getInput(TestWorkflowPayload.class);
2424
KeyStore keyStore = KeyStore.getInstance();
25-
Boolean exists = keyStore.getKey(ctx.getTaskExecutionKey());
25+
Boolean exists = keyStore.getKey(ctx.getTaskExecutionId());
2626
if (!Boolean.TRUE.equals(exists)) {
27-
keyStore.addKey(ctx.getTaskExecutionKey(), true);
27+
keyStore.addKey(ctx.getTaskExecutionId(), true);
2828
workflowPayload.getPayloads().add("Execution key not found");
2929
throw new IllegalStateException("Task execution key not found");
3030
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
limitations under the License.
1212
*/
1313

14-
package io.dapr.it.testcontainers;
14+
package io.dapr.it.testcontainers.workflows;
1515

1616
import io.dapr.durabletask.Task;
1717
import io.dapr.workflows.Workflow;
@@ -47,7 +47,7 @@ public WorkflowStub create() {
4747
.build());
4848

4949

50-
Task<TestWorkflowPayload> t = ctx.callActivity(TaskExecutionKeyActivity.class.getName(), workflowPayload, options,TestWorkflowPayload.class);
50+
Task<TestWorkflowPayload> t = ctx.callActivity(TaskExecutionIdActivity.class.getName(), workflowPayload, options,TestWorkflowPayload.class);
5151

5252
TestWorkflowPayload payloadAfterExecution = t.await();
5353

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public WorkflowRuntimeBuilder workflowRuntimeBuilder(
5959
builder.registerWorkflow(TestExecutionKeysWorkflow.class);
6060
builder.registerActivity(FirstActivity.class);
6161
builder.registerActivity(SecondActivity.class);
62-
builder.registerActivity(TaskExecutionKeyActivity.class);
62+
builder.registerActivity(TaskExecutionIdActivity.class);
6363

6464

6565
return builder;

sdk-workflows/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<dependency>
4848
<groupId>io.dapr</groupId>
4949
<artifactId>durabletask-client</artifactId>
50-
<version>1.5.6</version>
50+
<version>1.5.7</version>
5151
</dependency>
5252
<!--
5353
manually declare durabletask-client's jackson dependencies

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public interface WorkflowActivityContext {
1717

1818
String getName();
1919

20-
String getTaskExecutionKey();
20+
String getTaskExecutionId();
2121

2222
<T> T getInput(Class<T> targetType);
2323

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public <T> T getInput(Class<T> targetType) {
5858
}
5959

6060
@Override
61-
public String getTaskExecutionKey() {
62-
return this.innerContext.getTaskExecutionKey();
61+
public String getTaskExecutionId() {
62+
return this.innerContext.getTaskExecutionId();
6363
}
6464
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public static class TestActivity implements WorkflowActivity {
1616
@Override
1717
public Object run(WorkflowActivityContext ctx) {
1818
String activityContextName = ctx.getName();
19-
return ctx.getInput(String.class) + " world! from " + activityContextName + " with task execution key " + ctx.getTaskExecutionKey();
19+
return ctx.getInput(String.class) + " world! from " + activityContextName + " with task execution key " + ctx.getTaskExecutionId();
2020
}
2121
}
2222

@@ -37,7 +37,7 @@ public void createWithClass() {
3737

3838
when(mockContext.getInput(String.class)).thenReturn("Hello");
3939
when(mockContext.getName()).thenReturn("TestActivityContext");
40-
when(mockContext.getTaskExecutionKey()).thenReturn("123");
40+
when(mockContext.getTaskExecutionId()).thenReturn("123");
4141

4242
Object result = wrapper.create().run(mockContext);
4343

0 commit comments

Comments
 (0)