Skip to content

Commit a4c5b57

Browse files
Fix up activity token
1 parent 4170a19 commit a4c5b57

3 files changed

Lines changed: 6 additions & 3 deletions

File tree

temporal-sdk/src/main/java/io/temporal/internal/nexus/OperationTokenType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
public enum OperationTokenType {
77
UNKNOWN(0),
88
WORKFLOW_RUN(1),
9-
ACTIVITY_EXECUTION(4);
9+
ACTIVITY_EXECUTION(2);
1010

1111
private final int value;
1212

temporal-sdk/src/main/java/io/temporal/internal/nexus/OperationTokenUtil.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ public static OperationToken loadOperationToken(String operationToken) {
3131
if (token.getVersion() != null && token.getVersion() != 0) {
3232
throw new IllegalArgumentException("Invalid operation token: unexpected version field");
3333
}
34+
if (token.getType() == OperationTokenType.UNKNOWN) {
35+
throw new IllegalArgumentException("Invalid operation token: unknown or missing type (t)");
36+
}
3437
if (token.getType() == OperationTokenType.WORKFLOW_RUN
3538
&& Strings.isNullOrEmpty(token.getWorkflowId())) {
3639
throw new IllegalArgumentException("Invalid operation token: missing workflow ID (wid)");

temporal-sdk/src/test/java/io/temporal/internal/nexus/WorkflowRunTokenTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,15 +119,15 @@ public void loadWorkflowIdFromBadOperationToken() {
119119
encoder.encodeToString(badTokenUnknownVersion.getBytes())));
120120

121121
// Bad token, unknown type (also has bad version, so loadOperationToken rejects on version)
122-
String badTokenUnknownType = "{\"t\":4,\"ns\":\"namespace\", \"wid\":\"workflowId\", \"v\":1}";
122+
String badTokenUnknownType = "{\"t\":2,\"ns\":\"namespace\", \"wid\":\"workflowId\", \"v\":1}";
123123
Assert.assertThrows(
124124
IllegalArgumentException.class,
125125
() ->
126126
OperationTokenUtil.loadOperationToken(
127127
encoder.encodeToString(badTokenUnknownType.getBytes())));
128128

129129
// Bad token, unknown type with valid version — loadWorkflowRunOperationToken rejects on type
130-
String badTokenWrongType = "{\"t\":4,\"ns\":\"namespace\", \"wid\":\"workflowId\"}";
130+
String badTokenWrongType = "{\"t\":2,\"ns\":\"namespace\", \"wid\":\"workflowId\"}";
131131
Assert.assertThrows(
132132
IllegalArgumentException.class,
133133
() ->

0 commit comments

Comments
 (0)