Skip to content

Commit a114391

Browse files
committed
Hide TaskUpdater.updateStatus() methods, and add isFinal field to TaskState"
1 parent ca4d773 commit a114391

File tree

3 files changed

+21
-41
lines changed

3 files changed

+21
-41
lines changed

src/main/java/io/a2a/server/tasks/TaskUpdater.java

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,15 @@ public TaskUpdater(EventQueue eventQueue, RequestContext context) {
2525
this.contextId = context.getContextId();
2626
}
2727

28-
public void updateStatus(TaskState taskState) {
28+
private void updateStatus(TaskState taskState) {
2929
updateStatus(taskState, null);
3030
}
3131

32-
public void updateStatus(TaskState state, Message message) {
33-
updateStatus(state, message, false);
34-
}
35-
36-
public void updateStatus(TaskState state, Message message, boolean isFinal) {
37-
32+
private void updateStatus(TaskState state, Message message) {
3833
TaskStatusUpdateEvent event = new TaskStatusUpdateEvent.Builder()
3934
.taskId(taskId)
4035
.contextId(contextId)
41-
.isFinal(isFinal)
36+
.isFinal(state.isFinal())
4237
.status(new TaskStatus(state, message, null))
4338
.build();
4439
eventQueue.enqueueEvent(event);
@@ -68,15 +63,15 @@ public void complete() {
6863
}
6964

7065
public void complete(Message message) {
71-
updateStatus(TaskState.COMPLETED, message, true);
66+
updateStatus(TaskState.COMPLETED, message);
7267
}
7368

7469
public void fail() {
7570
fail(null);
7671
}
7772

7873
public void fail(Message message) {
79-
updateStatus(TaskState.FAILED, message, true);
74+
updateStatus(TaskState.FAILED, message);
8075
}
8176

8277
public void submit() {
@@ -100,7 +95,7 @@ public void cancel() {
10095
}
10196

10297
public void cancel(Message message) {
103-
updateStatus(TaskState.CANCELED, message, true);
98+
updateStatus(TaskState.CANCELED, message);
10499
}
105100

106101
public Message newAgentMessage(List<Part<?>> parts, Map<String, Object> metadata) {

src/main/java/io/a2a/spec/TaskState.java

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,33 @@ public enum TaskState {
1111
WORKING("working"),
1212
INPUT_REQUIRED("input-required"),
1313
AUTH_REQUIRED("auth-required"),
14-
COMPLETED("completed"),
15-
CANCELED("canceled"),
16-
FAILED("failed"),
17-
REJECTED("rejected"),
18-
UNKNOWN("unknown");
14+
COMPLETED("completed", true),
15+
CANCELED("canceled", true),
16+
FAILED("failed", true),
17+
REJECTED("rejected", true),
18+
UNKNOWN("unknown", true);
1919

2020
private final String state;
21+
private final boolean isFinal;
2122

2223
TaskState(String state) {
24+
this(state, false);
25+
}
26+
27+
TaskState(String state, boolean isFinal) {
2328
this.state = state;
29+
this.isFinal = isFinal;
2430
}
2531

2632
@JsonValue
2733
public String asString() {
2834
return state;
2935
}
3036

37+
public boolean isFinal(){
38+
return isFinal;
39+
}
40+
3141
@JsonCreator
3242
public static TaskState fromString(String state) {
3343
switch (state) {

src/test/java/io/a2a/server/tasks/TaskUpdaterTest.java

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import static org.junit.jupiter.api.Assertions.assertNotNull;
77
import static org.junit.jupiter.api.Assertions.assertNull;
88
import static org.junit.jupiter.api.Assertions.assertSame;
9-
import static org.junit.jupiter.api.Assertions.assertTrue;
109

1110
import java.util.List;
1211
import java.util.Map;
@@ -51,30 +50,6 @@ public void init() {
5150
taskUpdater = new TaskUpdater(eventQueue, context);
5251
}
5352

54-
//@Test
55-
//public void testInit() {
56-
// // Python has a unit test testing that the constructor works. Not really relevant
57-
//}
58-
59-
@Test
60-
public void testUpdateStatusWithoutMessage() throws Exception {
61-
taskUpdater.updateStatus(TaskState.WORKING);
62-
checkTaskStatusUpdateEventOnQueue(false, TaskState.WORKING, null);
63-
64-
}
65-
66-
@Test
67-
public void testUpdateStatusWithMessage() throws Exception {
68-
taskUpdater.updateStatus(TaskState.WORKING, SAMPLE_MESSAGE);
69-
checkTaskStatusUpdateEventOnQueue(false, TaskState.WORKING, SAMPLE_MESSAGE);
70-
}
71-
72-
@Test
73-
public void testUpdateStatusFinal() throws Exception {
74-
taskUpdater.updateStatus(TaskState.COMPLETED, null, true);
75-
checkTaskStatusUpdateEventOnQueue(true, TaskState.COMPLETED, null);
76-
}
77-
7853
@Test
7954
public void testAddArtifactWithCustomIdAndName() throws Exception {
8055
taskUpdater.addArtifact(SAMPLE_PARTS, "custom-artifact-id", "Custom Artifact", null);

0 commit comments

Comments
 (0)