From 96f1dca638dd99d851704ada66fd658914290584 Mon Sep 17 00:00:00 2001 From: Kabir Khan Date: Wed, 17 Dec 2025 15:24:56 +0000 Subject: [PATCH 1/4] feat!: Remove kind as per the 1.0 specification --- .../JSONRPCTransportStreamingTest.java | 2 +- .../jsonrpc/JSONRPCTransportTest.java | 18 +- .../jsonrpc/sse/SSEEventListenerTest.java | 2 +- .../transport/rest/RestTransportTest.java | 13 +- ...ificationConfigStoreTestAgentExecutor.java | 2 +- .../core/EventSerializationTest.java | 10 +- .../core/ReplicatedQueueManagerTest.java | 2 +- .../tests/ReplicationTestAgentExecutor.java | 2 +- ...JpaDatabaseTaskStoreTestAgentExecutor.java | 2 +- .../server/agentexecution/RequestContext.java | 2 +- .../a2a/server/events/EventConsumerTest.java | 8 +- .../io/a2a/server/events/EventQueueTest.java | 8 +- .../server/tasks/InMemoryTaskStoreTest.java | 3 +- .../io/a2a/server/tasks/TaskManagerTest.java | 3 +- spec/src/main/java/io/a2a/json/JsonUtil.java | 209 ++++++++---------- spec/src/main/java/io/a2a/spec/DataPart.java | 12 +- spec/src/main/java/io/a2a/spec/EventKind.java | 9 +- spec/src/main/java/io/a2a/spec/FilePart.java | 13 +- spec/src/main/java/io/a2a/spec/Part.java | 56 +---- .../java/io/a2a/spec/StreamingEventKind.java | 22 +- spec/src/main/java/io/a2a/spec/TextPart.java | 10 +- .../io/a2a/spec/TaskSerializationTest.java | 44 ++-- .../apps/common/AbstractA2AServerTest.java | 12 +- 23 files changed, 201 insertions(+), 263 deletions(-) diff --git a/client/transport/jsonrpc/src/test/java/io/a2a/client/transport/jsonrpc/JSONRPCTransportStreamingTest.java b/client/transport/jsonrpc/src/test/java/io/a2a/client/transport/jsonrpc/JSONRPCTransportStreamingTest.java index a0c21c13e..92541eb20 100644 --- a/client/transport/jsonrpc/src/test/java/io/a2a/client/transport/jsonrpc/JSONRPCTransportStreamingTest.java +++ b/client/transport/jsonrpc/src/test/java/io/a2a/client/transport/jsonrpc/JSONRPCTransportStreamingTest.java @@ -168,7 +168,7 @@ public void testA2AClientResubscribeToTask() throws Exception { assertEquals("artifact-1", artifact.artifactId()); assertEquals("joke", artifact.name()); Part part = artifact.parts().get(0); - assertEquals(Part.Kind.TEXT, part.getKind()); + assertTrue(part instanceof TextPart); assertEquals("Why did the chicken cross the road? To get to the other side!", ((TextPart) part).text()); } } \ No newline at end of file diff --git a/client/transport/jsonrpc/src/test/java/io/a2a/client/transport/jsonrpc/JSONRPCTransportTest.java b/client/transport/jsonrpc/src/test/java/io/a2a/client/transport/jsonrpc/JSONRPCTransportTest.java index d4e86cbc5..6cd642887 100644 --- a/client/transport/jsonrpc/src/test/java/io/a2a/client/transport/jsonrpc/JSONRPCTransportTest.java +++ b/client/transport/jsonrpc/src/test/java/io/a2a/client/transport/jsonrpc/JSONRPCTransportTest.java @@ -131,7 +131,7 @@ public void testA2AClientSendMessage() throws Exception { assertEquals("joke", artifact.name()); assertEquals(1, artifact.parts().size()); Part part = artifact.parts().get(0); - assertEquals(Part.Kind.TEXT, part.getKind()); + assertTrue(part instanceof TextPart); assertEquals("Why did the chicken cross the road? To get to the other side!", ((TextPart) part).text()); assertTrue(task.metadata().isEmpty()); } @@ -172,7 +172,7 @@ public void testA2AClientSendMessageWithMessageResponse() throws Exception { Message agentMessage = (Message) result; assertEquals(Message.Role.AGENT, agentMessage.role()); Part part = agentMessage.parts().get(0); - assertEquals(Part.Kind.TEXT, part.getKind()); + assertTrue(part instanceof TextPart); assertEquals("Why did the chicken cross the road? To get to the other side!", ((TextPart) part).text()); assertEquals("msg-456", agentMessage.messageId()); } @@ -243,7 +243,7 @@ public void testA2AClientGetTask() throws Exception { assertEquals(1, artifact.parts().size()); assertEquals("artifact-1", artifact.artifactId()); Part part = artifact.parts().get(0); - assertEquals(Part.Kind.TEXT, part.getKind()); + assertTrue(part instanceof TextPart); assertEquals("Why did the chicken cross the road? To get to the other side!", ((TextPart) part).text()); assertTrue(task.metadata().isEmpty()); List history = task.history(); @@ -255,15 +255,15 @@ public void testA2AClientGetTask() throws Exception { assertNotNull(parts); assertEquals(3, parts.size()); part = parts.get(0); - assertEquals(Part.Kind.TEXT, part.getKind()); + assertTrue(part instanceof TextPart); assertEquals("tell me a joke", ((TextPart)part).text()); part = parts.get(1); - assertEquals(Part.Kind.FILE, part.getKind()); + assertTrue(part instanceof FilePart); FileContent filePart = ((FilePart) part).file(); assertEquals("file:///path/to/file.txt", ((FileWithUri) filePart).uri()); assertEquals("text/plain", filePart.mimeType()); part = parts.get(2); - assertEquals(Part.Kind.FILE, part.getKind()); + assertTrue(part instanceof FilePart); filePart = ((FilePart) part).file(); assertEquals("aGVsbG8=", ((FileWithBytes) filePart).bytes()); assertEquals("hello.txt", filePart.name()); @@ -558,7 +558,7 @@ public void testA2AClientSendMessageWithFilePart() throws Exception { assertEquals("image-analysis", artifact.name()); assertEquals(1, artifact.parts().size()); Part part = artifact.parts().get(0); - assertEquals(Part.Kind.TEXT, part.getKind()); + assertTrue(part instanceof TextPart); assertEquals("This is an image of a cat sitting on a windowsill.", ((TextPart) part).text()); assertFalse(task.metadata().isEmpty()); assertEquals(1, task.metadata().size()); @@ -618,7 +618,7 @@ public void testA2AClientSendMessageWithDataPart() throws Exception { assertEquals("data-analysis", artifact.name()); assertEquals(1, artifact.parts().size()); Part part = artifact.parts().get(0); - assertEquals(Part.Kind.TEXT, part.getKind()); + assertTrue(part instanceof TextPart); assertEquals("Processed weather data: Temperature is 25.5°C, humidity is 60.2% in San Francisco.", ((TextPart) part).text()); assertTrue(task.metadata().isEmpty()); } @@ -676,7 +676,7 @@ public void testA2AClientSendMessageWithMixedParts() throws Exception { assertEquals("mixed-analysis", artifact.name()); assertEquals(1, artifact.parts().size()); Part part = artifact.parts().get(0); - assertEquals(Part.Kind.TEXT, part.getKind()); + assertTrue(part instanceof TextPart); assertEquals("Analyzed chart image and data: Bar chart showing quarterly data with values [10, 20, 30, 40].", ((TextPart) part).text()); assertTrue(task.metadata().isEmpty()); } diff --git a/client/transport/jsonrpc/src/test/java/io/a2a/client/transport/jsonrpc/sse/SSEEventListenerTest.java b/client/transport/jsonrpc/src/test/java/io/a2a/client/transport/jsonrpc/sse/SSEEventListenerTest.java index 35aa6a27c..6855e1dcc 100644 --- a/client/transport/jsonrpc/src/test/java/io/a2a/client/transport/jsonrpc/sse/SSEEventListenerTest.java +++ b/client/transport/jsonrpc/src/test/java/io/a2a/client/transport/jsonrpc/sse/SSEEventListenerTest.java @@ -136,7 +136,7 @@ public void testOnEventWithTaskArtifactUpdateEventEvent() throws Exception { Artifact artifact = taskArtifactUpdateEvent.artifact(); assertEquals("artifact-1", artifact.artifactId()); assertEquals(1, artifact.parts().size()); - assertEquals(Part.Kind.TEXT, artifact.parts().get(0).getKind()); + assertTrue(artifact.parts().get(0) instanceof TextPart); assertEquals("Why did the chicken cross the road? To get to the other side!", ((TextPart) artifact.parts().get(0)).text()); } diff --git a/client/transport/rest/src/test/java/io/a2a/client/transport/rest/RestTransportTest.java b/client/transport/rest/src/test/java/io/a2a/client/transport/rest/RestTransportTest.java index 3fe2db40c..784ddb7e2 100644 --- a/client/transport/rest/src/test/java/io/a2a/client/transport/rest/RestTransportTest.java +++ b/client/transport/rest/src/test/java/io/a2a/client/transport/rest/RestTransportTest.java @@ -48,7 +48,6 @@ import io.a2a.spec.MessageSendConfiguration; import io.a2a.spec.MessageSendParams; import io.a2a.spec.Part; -import io.a2a.spec.Part.Kind; import io.a2a.spec.PushNotificationConfig; import io.a2a.spec.StreamingEventKind; import io.a2a.spec.Task; @@ -148,7 +147,7 @@ public void testSendMessage() throws Exception { assertEquals("message-1234", history.messageId()); assertEquals("9b511af4-b27c-47fa-aecf-2a93c08a44f8", history.taskId()); assertEquals(1, history.parts().size()); - assertEquals(Kind.TEXT, history.parts().get(0).getKind()); + assertTrue(history.parts().get(0) instanceof io.a2a.spec.TextPart); assertEquals("tell me a joke", ((TextPart) history.parts().get(0)).text()); assertNull(task.metadata()); assertNull(history.referenceTaskIds()); @@ -210,7 +209,7 @@ public void testGetTask() throws Exception { assertEquals("artifact-1", artifact.artifactId()); assertNull(artifact.name()); assertEquals(false, artifact.parts().isEmpty()); - assertEquals(Kind.TEXT, artifact.parts().get(0).getKind()); + assertTrue(artifact.parts().get(0) instanceof io.a2a.spec.TextPart); assertEquals("Why did the chicken cross the road? To get to the other side!", ((TextPart) artifact.parts().get(0)).text()); assertEquals(1, task.history().size()); Message history = task.history().get(0); @@ -218,14 +217,14 @@ public void testGetTask() throws Exception { assertEquals(Message.Role.USER, history.role()); assertEquals("message-123", history.messageId()); assertEquals(3, history.parts().size()); - assertEquals(Kind.TEXT, history.parts().get(0).getKind()); + assertTrue(history.parts().get(0) instanceof io.a2a.spec.TextPart); assertEquals("tell me a joke", ((TextPart) history.parts().get(0)).text()); - assertEquals(Kind.FILE, history.parts().get(1).getKind()); + assertTrue(history.parts().get(1) instanceof FilePart); FilePart part = (FilePart) history.parts().get(1); assertEquals("text/plain", part.file().mimeType()); assertEquals("file:///path/to/file.txt", ((FileWithUri) part.file()).uri()); part = (FilePart) history.parts().get(2); - assertEquals(Kind.FILE, part.getKind()); + assertTrue(part instanceof FilePart); assertEquals("text/plain", part.file().mimeType()); assertEquals("aGVsbG8=", ((FileWithBytes) part.file()).bytes()); assertNull(history.metadata()); @@ -448,7 +447,7 @@ public void testResubscribe() throws Exception { assertEquals("artifact-1", artifact.artifactId()); assertEquals("joke", artifact.name()); Part part = artifact.parts().get(0); - assertEquals(Part.Kind.TEXT, part.getKind()); + assertTrue(part instanceof io.a2a.spec.TextPart); assertEquals("Why did the chicken cross the road? To get to the other side!", ((TextPart) part).text()); } } diff --git a/extras/push-notification-config-store-database-jpa/src/test/java/io/a2a/extras/pushnotificationconfigstore/database/jpa/JpaDatabasePushNotificationConfigStoreTestAgentExecutor.java b/extras/push-notification-config-store-database-jpa/src/test/java/io/a2a/extras/pushnotificationconfigstore/database/jpa/JpaDatabasePushNotificationConfigStoreTestAgentExecutor.java index d178b0189..3c4242081 100644 --- a/extras/push-notification-config-store-database-jpa/src/test/java/io/a2a/extras/pushnotificationconfigstore/database/jpa/JpaDatabasePushNotificationConfigStoreTestAgentExecutor.java +++ b/extras/push-notification-config-store-database-jpa/src/test/java/io/a2a/extras/pushnotificationconfigstore/database/jpa/JpaDatabasePushNotificationConfigStoreTestAgentExecutor.java @@ -67,7 +67,7 @@ private String getLastTextPart(Message message) throws JSONRPCError { return ""; } Part part = message.parts().get(message.parts().size() - 1); - if (part.getKind() == Part.Kind.TEXT) { + if (part instanceof TextPart) { return ((TextPart) part).text(); } throw new InvalidRequestError("Last part is not text"); diff --git a/extras/queue-manager-replicated/core/src/test/java/io/a2a/extras/queuemanager/replicated/core/EventSerializationTest.java b/extras/queue-manager-replicated/core/src/test/java/io/a2a/extras/queuemanager/replicated/core/EventSerializationTest.java index 8768269b7..ae2679bdc 100644 --- a/extras/queue-manager-replicated/core/src/test/java/io/a2a/extras/queuemanager/replicated/core/EventSerializationTest.java +++ b/extras/queue-manager-replicated/core/src/test/java/io/a2a/extras/queuemanager/replicated/core/EventSerializationTest.java @@ -53,7 +53,7 @@ public void testTaskSerialization() throws JsonProcessingException { // Test serialization as Event String json = JsonUtil.toJson(originalTask); - assertTrue(json.contains("\"kind\":\"task\""), "JSON should contain task kind"); + assertTrue(json.contains("\"task\""), "JSON should contain task wrapper"); assertTrue(json.contains("\"id\":\"test-task-123\""), "JSON should contain task ID"); // Test deserialization back to StreamingEventKind @@ -84,7 +84,7 @@ public void testMessageSerialization() throws JsonProcessingException { // Test serialization as Event String json = JsonUtil.toJson(originalMessage); - assertTrue(json.contains("\"kind\":\"message\""), "JSON should contain message kind"); + assertTrue(json.contains("\"message\""), "JSON should contain message wrapper"); assertTrue(json.contains("\"taskId\":\"test-task-789\""), "JSON should contain task ID"); // Test deserialization back to StreamingEventKind @@ -115,7 +115,7 @@ public void testTaskStatusUpdateEventSerialization() throws JsonProcessingExcept // Test serialization as Event String json = JsonUtil.toJson((Event) originalEvent); - assertTrue(json.contains("\"kind\":\"status-update\""), "JSON should contain status-update kind"); + assertTrue(json.contains("\"statusUpdate\""), "JSON should contain statusUpdate wrapper"); assertTrue(json.contains("\"taskId\":\"test-task-abc\""), "JSON should contain task ID"); assertTrue(json.contains("\"final\":true"), "JSON should contain final flag"); @@ -148,7 +148,7 @@ public void testTaskArtifactUpdateEventSerialization() throws JsonProcessingExce // Test serialization as Event String json = JsonUtil.toJson((Event) originalEvent); - assertTrue(json.contains("\"kind\":\"artifact-update\""), "JSON should contain artifact-update kind"); + assertTrue(json.contains("\"artifactUpdate\""), "JSON should contain artifactUpdate wrapper"); assertTrue(json.contains("\"taskId\":\"test-task-xyz\""), "JSON should contain task ID"); assertTrue(json.contains("\"test-artifact-123\""), "JSON should contain artifact ID"); @@ -216,7 +216,7 @@ public void testReplicatedEventWithStreamingEventSerialization() throws JsonProc String json = JsonUtil.toJson(originalReplicatedEvent); assertTrue(json.contains("\"taskId\":\"replicated-test-task\""), "JSON should contain task ID"); assertTrue(json.contains("\"event\""), "JSON should contain event field"); - assertTrue(json.contains("\"kind\":\"status-update\""), "JSON should contain the event kind"); + assertTrue(json.contains("\"statusUpdate\""), "JSON should contain the event type wrapper"); assertFalse(json.contains("\"error\""), "JSON should not contain error field"); // Deserialize the ReplicatedEventQueueItem diff --git a/extras/queue-manager-replicated/core/src/test/java/io/a2a/extras/queuemanager/replicated/core/ReplicatedQueueManagerTest.java b/extras/queue-manager-replicated/core/src/test/java/io/a2a/extras/queuemanager/replicated/core/ReplicatedQueueManagerTest.java index 0915092ac..0a9326ea0 100644 --- a/extras/queue-manager-replicated/core/src/test/java/io/a2a/extras/queuemanager/replicated/core/ReplicatedQueueManagerTest.java +++ b/extras/queue-manager-replicated/core/src/test/java/io/a2a/extras/queuemanager/replicated/core/ReplicatedQueueManagerTest.java @@ -203,7 +203,7 @@ void testReplicatedEventJsonSerialization() throws Exception { assertNotNull(json); assertTrue(json.contains("json-test-task")); assertTrue(json.contains("\"event\":{")); - assertTrue(json.contains("\"kind\":\"status-update\"")); + assertTrue(json.contains("\"statusUpdate\"")); // Deserialize back ReplicatedEventQueueItem deserialized = JsonUtil.fromJson(json, ReplicatedEventQueueItem.class); diff --git a/extras/queue-manager-replicated/tests-single-instance/src/test/java/io/a2a/extras/queuemanager/replicated/tests/ReplicationTestAgentExecutor.java b/extras/queue-manager-replicated/tests-single-instance/src/test/java/io/a2a/extras/queuemanager/replicated/tests/ReplicationTestAgentExecutor.java index e00282cbe..603857ef1 100644 --- a/extras/queue-manager-replicated/tests-single-instance/src/test/java/io/a2a/extras/queuemanager/replicated/tests/ReplicationTestAgentExecutor.java +++ b/extras/queue-manager-replicated/tests-single-instance/src/test/java/io/a2a/extras/queuemanager/replicated/tests/ReplicationTestAgentExecutor.java @@ -68,7 +68,7 @@ private String getLastTextPart(Message message) throws JSONRPCError { throw new InvalidRequestError("No parts in message"); } Part part = message.parts().get(message.parts().size() - 1); - if (part.getKind() == Part.Kind.TEXT) { + if (part instanceof TextPart) { return ((TextPart) part).text(); } throw new InvalidRequestError("Last part is not text"); diff --git a/extras/task-store-database-jpa/src/test/java/io/a2a/extras/taskstore/database/jpa/JpaDatabaseTaskStoreTestAgentExecutor.java b/extras/task-store-database-jpa/src/test/java/io/a2a/extras/taskstore/database/jpa/JpaDatabaseTaskStoreTestAgentExecutor.java index 374eee549..58e52e57d 100644 --- a/extras/task-store-database-jpa/src/test/java/io/a2a/extras/taskstore/database/jpa/JpaDatabaseTaskStoreTestAgentExecutor.java +++ b/extras/task-store-database-jpa/src/test/java/io/a2a/extras/taskstore/database/jpa/JpaDatabaseTaskStoreTestAgentExecutor.java @@ -56,7 +56,7 @@ public void cancel(RequestContext context, EventQueue eventQueue) throws JSONRPC private String getLastTextPart(Message message) throws JSONRPCError { Part part = message.parts().get(message.parts().size() - 1); - if (part.getKind() == Part.Kind.TEXT) { + if (part instanceof TextPart) { return ((TextPart) part).text(); } throw new InvalidRequestError("No parts"); diff --git a/server-common/src/main/java/io/a2a/server/agentexecution/RequestContext.java b/server-common/src/main/java/io/a2a/server/agentexecution/RequestContext.java index 89d166801..0aa775649 100644 --- a/server-common/src/main/java/io/a2a/server/agentexecution/RequestContext.java +++ b/server-common/src/main/java/io/a2a/server/agentexecution/RequestContext.java @@ -142,7 +142,7 @@ private String getMessageText(Message message, String delimiter) { private List getTextParts(List> parts) { return parts.stream() - .filter(part -> part.getKind() == Part.Kind.TEXT) + .filter(part -> part instanceof TextPart) .map(part -> (TextPart) part) .map(TextPart::text) .collect(Collectors.toList()); diff --git a/server-common/src/test/java/io/a2a/server/events/EventConsumerTest.java b/server-common/src/test/java/io/a2a/server/events/EventConsumerTest.java index b19534e0e..f7f95f01e 100644 --- a/server-common/src/test/java/io/a2a/server/events/EventConsumerTest.java +++ b/server-common/src/test/java/io/a2a/server/events/EventConsumerTest.java @@ -41,17 +41,15 @@ public class EventConsumerTest { { "id": "123", "contextId": "session-xyz", - "status": {"state": "submitted"}, - "kind": "task" + "status": {"state": "submitted"} } """; private static final String MESSAGE_PAYLOAD = """ { "role": "agent", - "parts": [{"kind": "text", "text": "test message"}], - "messageId": "111", - "kind": "message" + "parts": [{"text": "test message"}], + "messageId": "111" } """; diff --git a/server-common/src/test/java/io/a2a/server/events/EventQueueTest.java b/server-common/src/test/java/io/a2a/server/events/EventQueueTest.java index 7754fc87b..6ac904b9e 100644 --- a/server-common/src/test/java/io/a2a/server/events/EventQueueTest.java +++ b/server-common/src/test/java/io/a2a/server/events/EventQueueTest.java @@ -34,17 +34,15 @@ public class EventQueueTest { { "id": "123", "contextId": "session-xyz", - "status": {"state": "submitted"}, - "kind": "task" + "status": {"state": "submitted"} } """; private static final String MESSAGE_PAYLOAD = """ { "role": "agent", - "parts": [{"kind": "text", "text": "test message"}], - "messageId": "111", - "kind": "message" + "parts": [{"text": "test message"}], + "messageId": "111" } """; diff --git a/server-common/src/test/java/io/a2a/server/tasks/InMemoryTaskStoreTest.java b/server-common/src/test/java/io/a2a/server/tasks/InMemoryTaskStoreTest.java index a042ef179..05adb948c 100644 --- a/server-common/src/test/java/io/a2a/server/tasks/InMemoryTaskStoreTest.java +++ b/server-common/src/test/java/io/a2a/server/tasks/InMemoryTaskStoreTest.java @@ -12,8 +12,7 @@ public class InMemoryTaskStoreTest { { "id": "task-abc", "contextId" : "session-xyz", - "status": {"state": "submitted"}, - "kind": "task" + "status": {"state": "submitted"} }"""; @Test diff --git a/server-common/src/test/java/io/a2a/server/tasks/TaskManagerTest.java b/server-common/src/test/java/io/a2a/server/tasks/TaskManagerTest.java index 0fc5648c9..f39382878 100644 --- a/server-common/src/test/java/io/a2a/server/tasks/TaskManagerTest.java +++ b/server-common/src/test/java/io/a2a/server/tasks/TaskManagerTest.java @@ -31,8 +31,7 @@ public class TaskManagerTest { { "id": "task-abc", "contextId" : "session-xyz", - "status": {"state": "submitted"}, - "kind": "task" + "status": {"state": "submitted"} }"""; Task minimalTask; diff --git a/spec/src/main/java/io/a2a/json/JsonUtil.java b/spec/src/main/java/io/a2a/json/JsonUtil.java index 4fdc63878..20eedf710 100644 --- a/spec/src/main/java/io/a2a/json/JsonUtil.java +++ b/spec/src/main/java/io/a2a/json/JsonUtil.java @@ -17,7 +17,9 @@ import com.google.gson.JsonSyntaxException; import com.google.gson.ToNumberPolicy; import com.google.gson.TypeAdapter; +import com.google.gson.reflect.TypeToken; import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonToken; import com.google.gson.stream.JsonWriter; import io.a2a.spec.ContentTypeNotSupportedError; import io.a2a.spec.DataPart; @@ -45,6 +47,7 @@ import io.a2a.spec.UnsupportedOperationError; import java.io.StringReader; import java.lang.reflect.Type; +import java.util.Map; import java.time.OffsetDateTime; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; @@ -64,7 +67,6 @@ private static GsonBuilder createBaseGsonBuilder() { .registerTypeHierarchyAdapter(JSONRPCError.class, new JSONRPCErrorTypeAdapter()) .registerTypeAdapter(TaskState.class, new TaskStateTypeAdapter()) .registerTypeAdapter(Message.Role.class, new RoleTypeAdapter()) - .registerTypeAdapter(Part.Kind.class, new PartKindTypeAdapter()) .registerTypeHierarchyAdapter(FileContent.class, new FileContentTypeAdapter()); } @@ -512,54 +514,6 @@ public void write(JsonWriter out, Message.Role value) throws java.io.IOException } } - /** - * Gson TypeAdapter for serializing and deserializing {@link Part.Kind} enum. - *

- * This adapter ensures that Part.Kind enum values are serialized using their - * wire format string representation (e.g., "text", "file", "data") rather than - * the Java enum constant name (e.g., "TEXT", "FILE", "DATA"). - *

- * For serialization, it uses {@link Part.Kind#asString()} to get the wire format. - * For deserialization, it parses the string to the enum constant. - * - * @see Part.Kind - * @see Part.Kind#asString() - */ - static class PartKindTypeAdapter extends TypeAdapter { - - @Override - public void write(JsonWriter out, Part.Kind value) throws java.io.IOException { - if (value == null) { - out.nullValue(); - } else { - out.value(value.asString()); - } - } - - @Override - public Part.@Nullable Kind read(JsonReader in) throws java.io.IOException { - if (in.peek() == com.google.gson.stream.JsonToken.NULL) { - in.nextNull(); - return null; - } - String kindString = in.nextString(); - try { - return switch (kindString) { - case "text" -> - Part.Kind.TEXT; - case "file" -> - Part.Kind.FILE; - case "data" -> - Part.Kind.DATA; - default -> - throw new IllegalArgumentException("Invalid Part.Kind: " + kindString); - }; - } catch (IllegalArgumentException e) { - throw new JsonSyntaxException("Invalid Part.Kind: " + kindString, e); - } - } - } - /** * Gson TypeAdapter for serializing and deserializing {@link Part} and its subclasses. *

@@ -586,61 +540,69 @@ public void write(JsonWriter out, Part value) throws java.io.IOException { return; } - // Serialize the concrete type to a JsonElement - com.google.gson.JsonElement jsonElement; + // Write wrapper object with member name as discriminator + out.beginObject(); + if (value instanceof TextPart textPart) { - jsonElement = delegateGson.toJsonTree(textPart, TextPart.class); + // TextPart: { "text": "value" } - direct string value + out.name("text"); + out.value(textPart.text()); } else if (value instanceof FilePart filePart) { - jsonElement = delegateGson.toJsonTree(filePart, FilePart.class); + // FilePart: { "file": {...} } + out.name("file"); + delegateGson.toJson(filePart.file(), FileContent.class, out); } else if (value instanceof DataPart dataPart) { - jsonElement = delegateGson.toJsonTree(dataPart, DataPart.class); + // DataPart: { "data": { "data": {...} } } + out.name("data"); + out.beginObject(); + out.name("data"); + delegateGson.toJson(dataPart.data(), Map.class, out); + out.endObject(); } else { throw new JsonSyntaxException("Unknown Part subclass: " + value.getClass().getName()); } - - // TODO temorary workaround to be fixed in https://github.com/a2aproject/a2a-java/issues/544 - // Add the "kind" field from getKind() method - if (jsonElement.isJsonObject()) { - jsonElement.getAsJsonObject().addProperty("kind", value.getKind().asString()); - } - - // Write the modified JSON - delegateGson.toJson(jsonElement, out); + out.endObject(); } @Override public @Nullable Part read(JsonReader in) throws java.io.IOException { - if (in.peek() == com.google.gson.stream.JsonToken.NULL) { + if (in.peek() == JsonToken.NULL) { in.nextNull(); return null; } - // Read the JSON as a tree so we can inspect the "kind" field + // Read the JSON as a tree to inspect the member name discriminator com.google.gson.JsonElement jsonElement = com.google.gson.JsonParser.parseReader(in); if (!jsonElement.isJsonObject()) { throw new JsonSyntaxException("Part must be a JSON object"); } com.google.gson.JsonObject jsonObject = jsonElement.getAsJsonObject(); - com.google.gson.JsonElement kindElement = jsonObject.get("kind"); - if (kindElement == null || !kindElement.isJsonPrimitive()) { - throw new JsonSyntaxException("Part must have a 'kind' field"); - } - - String kind = kindElement.getAsString(); - // Use the delegate Gson to deserialize to the concrete type - return switch (kind) { - case "text" -> - delegateGson.fromJson(jsonElement, TextPart.class); - case "file" -> - delegateGson.fromJson(jsonElement, FilePart.class); - case "data" -> - delegateGson.fromJson(jsonElement, DataPart.class); - default -> - throw new JsonSyntaxException("Unknown Part kind: " + kind); - }; + + // Check for member name discriminators (v1.0 protocol) + if (jsonObject.has("text")) { + // TextPart: { "text": "value" } - direct string value + return new TextPart(jsonObject.get("text").getAsString()); + } else if (jsonObject.has("file")) { + // FilePart: { "file": {...} } + return new FilePart(delegateGson.fromJson(jsonObject.get("file"), FileContent.class)); + } else if (jsonObject.has("data")) { + // DataPart: { "data": { "data": {...} } } + com.google.gson.JsonObject dataWrapper = jsonObject.getAsJsonObject("data"); + if (dataWrapper == null || !dataWrapper.has("data")) { + throw new JsonSyntaxException("DataPart wrapper must contain 'data' field"); + } + @SuppressWarnings("unchecked") + Map dataMap = delegateGson.fromJson( + dataWrapper.get("data"), + new TypeToken>(){}.getType() + ); + return new DataPart(dataMap); + } else { + throw new JsonSyntaxException("Part must have one of: text, file, data (found: " + jsonObject.keySet() + ")"); + } } } @@ -673,64 +635,77 @@ public void write(JsonWriter out, StreamingEventKind value) throws java.io.IOExc return; } - // Serialize the concrete type to a JsonElement - com.google.gson.JsonElement jsonElement; + // Write wrapper object with member name as discriminator + out.beginObject(); + if (value instanceof Task task) { - jsonElement = delegateGson.toJsonTree(task, Task.class); + // Task: { "task": {...} } + out.name("task"); + delegateGson.toJson(task, Task.class, out); } else if (value instanceof Message message) { - jsonElement = delegateGson.toJsonTree(message, Message.class); + // Message: { "message": {...} } + out.name("message"); + delegateGson.toJson(message, Message.class, out); } else if (value instanceof TaskStatusUpdateEvent event) { - jsonElement = delegateGson.toJsonTree(event, TaskStatusUpdateEvent.class); + // TaskStatusUpdateEvent: { "statusUpdate": {...} } - camelCase per spec + out.name("statusUpdate"); + delegateGson.toJson(event, TaskStatusUpdateEvent.class, out); } else if (value instanceof TaskArtifactUpdateEvent event) { - jsonElement = delegateGson.toJsonTree(event, TaskArtifactUpdateEvent.class); + // TaskArtifactUpdateEvent: { "artifactUpdate": {...} } - camelCase per spec + out.name("artifactUpdate"); + delegateGson.toJson(event, TaskArtifactUpdateEvent.class, out); } else { throw new JsonSyntaxException("Unknown StreamingEventKind implementation: " + value.getClass().getName()); } - // TODO temorary workaround to be fixed in https://github.com/a2aproject/a2a-java/issues/544 - // Add the "kind" field from getKind() method - if (jsonElement.isJsonObject()) { - jsonElement.getAsJsonObject().addProperty("kind", value.kind()); - } - - // Write the modified JSON - delegateGson.toJson(jsonElement, out); + out.endObject(); } @Override public @Nullable StreamingEventKind read(JsonReader in) throws java.io.IOException { - if (in.peek() == com.google.gson.stream.JsonToken.NULL) { + if (in.peek() == JsonToken.NULL) { in.nextNull(); return null; } - // Read the JSON as a tree so we can inspect the "kind" field + // Read the JSON as a tree to inspect the member name discriminator com.google.gson.JsonElement jsonElement = com.google.gson.JsonParser.parseReader(in); if (!jsonElement.isJsonObject()) { throw new JsonSyntaxException("StreamingEventKind must be a JSON object"); } com.google.gson.JsonObject jsonObject = jsonElement.getAsJsonObject(); - com.google.gson.JsonElement kindElement = jsonObject.get("kind"); - if (kindElement == null || !kindElement.isJsonPrimitive()) { - throw new JsonSyntaxException("StreamingEventKind must have a 'kind' field"); - } - - String kind = kindElement.getAsString(); - // Use the delegate Gson to deserialize to the concrete type - return switch (kind) { - case "task" -> - delegateGson.fromJson(jsonElement, Task.class); - case "message" -> - delegateGson.fromJson(jsonElement, Message.class); - case "status-update" -> - delegateGson.fromJson(jsonElement, TaskStatusUpdateEvent.class); - case "artifact-update" -> - delegateGson.fromJson(jsonElement, TaskArtifactUpdateEvent.class); - default -> - throw new JsonSyntaxException("Unknown StreamingEventKind kind: " + kind); - }; + + // Check for wrapped member name discriminators (v1.0 protocol - streaming format) + if (jsonObject.has("task")) { + return delegateGson.fromJson(jsonObject.get("task"), Task.class); + } else if (jsonObject.has("message")) { + return delegateGson.fromJson(jsonObject.get("message"), Message.class); + } else if (jsonObject.has("statusUpdate")) { + return delegateGson.fromJson(jsonObject.get("statusUpdate"), TaskStatusUpdateEvent.class); + } else if (jsonObject.has("artifactUpdate")) { + return delegateGson.fromJson(jsonObject.get("artifactUpdate"), TaskArtifactUpdateEvent.class); + } + + // Check for unwrapped format (direct Task/Message deserialization) + // Task objects have "id" and "contextId" fields + // Message objects have "role" and "messageId" fields + if (jsonObject.has("role") && jsonObject.has("messageId")) { + // This is an unwrapped Message + return delegateGson.fromJson(jsonObject, Message.class); + } else if (jsonObject.has("id") && jsonObject.has("contextId")) { + // This is an unwrapped Task + return delegateGson.fromJson(jsonObject, Task.class); + } else if (jsonObject.has("taskId") && jsonObject.has("status")) { + // This is an unwrapped TaskStatusUpdateEvent + return delegateGson.fromJson(jsonObject, TaskStatusUpdateEvent.class); + } else if (jsonObject.has("taskId") && jsonObject.has("artifact")) { + // This is an unwrapped TaskArtifactUpdateEvent + return delegateGson.fromJson(jsonObject, TaskArtifactUpdateEvent.class); + } else { + throw new JsonSyntaxException("StreamingEventKind must have wrapper (task/message/statusUpdate/artifactUpdate) or recognizable unwrapped fields (found: " + jsonObject.keySet() + ")"); + } } } diff --git a/spec/src/main/java/io/a2a/spec/DataPart.java b/spec/src/main/java/io/a2a/spec/DataPart.java index 8cbc83af0..d44e87151 100644 --- a/spec/src/main/java/io/a2a/spec/DataPart.java +++ b/spec/src/main/java/io/a2a/spec/DataPart.java @@ -40,7 +40,12 @@ */ public record DataPart(Map data) implements Part> { - /** The type identifier for data parts in messages and artifacts. */ + /** + * The JSON member name discriminator for data parts: "data". + *

+ * In protocol v1.0+, this constant defines the JSON member name used for serialization: + * {@code { "data": { "data": { "temperature": 22.5, "unit": "C" } } }} + */ public static final String DATA = "data"; /** @@ -53,11 +58,6 @@ public record DataPart(Map data) implements Part - * EventKind implementations use polymorphic JSON serialization with the "kind" discriminator - * to determine the concrete type during deserialization. + * EventKind implementations use polymorphic JSON serialization where the JSON member name + * itself acts as the type discriminator (e.g., "task", "message"). *

* Permitted implementations: *

    @@ -22,7 +22,10 @@ public interface EventKind { /** - * Returns the kind identifier for this event. + * Returns the type identifier for this event. + *

    + * This method provides programmatic type discrimination for routing, logging, and debugging. + * NOTE: This value is NOT serialized to JSON in protocol v1.0+. * * @return the event kind string (e.g., "task", "message") */ diff --git a/spec/src/main/java/io/a2a/spec/FilePart.java b/spec/src/main/java/io/a2a/spec/FilePart.java index f7c3e7426..a1835109c 100644 --- a/spec/src/main/java/io/a2a/spec/FilePart.java +++ b/spec/src/main/java/io/a2a/spec/FilePart.java @@ -40,7 +40,12 @@ */ public record FilePart(FileContent file) implements Part { - /** The type identifier for file parts in messages and artifacts. */ + /** + * The JSON member name discriminator for file parts: "file". + *

    + * In protocol v1.0+, this constant defines the JSON member name used for serialization: + * {@code { "file": { "mediaType": "image/png", "name": "photo.png", ... } }} + */ public static final String FILE = "file"; /** @@ -51,10 +56,4 @@ public record FilePart(FileContent file) implements Part { public FilePart { Assert.checkNotNullParam("file", file); } - - @Override - public Kind getKind() { - return Kind.FILE; - } - } diff --git a/spec/src/main/java/io/a2a/spec/Part.java b/spec/src/main/java/io/a2a/spec/Part.java index 345db0602..631f87f88 100644 --- a/spec/src/main/java/io/a2a/spec/Part.java +++ b/spec/src/main/java/io/a2a/spec/Part.java @@ -11,10 +11,18 @@ *

  • {@link DataPart} - Structured data (JSON objects)
  • *
*

- * Parts use polymorphic JSON serialization with the "kind" discriminator property to - * determine the concrete type during deserialization. + * Parts use polymorphic JSON serialization where the JSON member name itself acts as the + * type discriminator (e.g., "text", "file", "data"). This aligns with Protocol Buffers' + * oneof semantics and modern API design practices. *

- * Each Part can include optional metadata for additional context about the content. + * Use {@code instanceof} pattern matching to determine the concrete Part type at runtime: + *

{@code
+ * if (part instanceof TextPart textPart) {
+ *     String text = textPart.text();
+ * } else if (part instanceof FilePart filePart) {
+ *     FileContent file = filePart.file();
+ * }
+ * }
* * @param the type of content contained in this part * @see Message @@ -22,45 +30,5 @@ * @see A2A Protocol Specification */ public interface Part { - /** - * Enum defining the different types of content parts. - */ - enum Kind { - /** - * Plain text content part. - */ - TEXT("text"), - - /** - * File content part (bytes or URI). - */ - FILE("file"), - - /** - * Structured data content part (JSON). - */ - DATA("data"); - - private final String kind; - - Kind(String kind) { - this.kind = kind; - } - - /** - * Returns the string representation of the kind for JSON serialization. - * - * @return the kind as a string - */ - public String asString() { - return this.kind; - } - } - - /** - * Returns the kind of this part. - * - * @return the Part.Kind indicating the content type - */ - Kind getKind(); + // No methods - use instanceof for type discrimination } \ No newline at end of file diff --git a/spec/src/main/java/io/a2a/spec/StreamingEventKind.java b/spec/src/main/java/io/a2a/spec/StreamingEventKind.java index 4b7751c71..c0aa99810 100644 --- a/spec/src/main/java/io/a2a/spec/StreamingEventKind.java +++ b/spec/src/main/java/io/a2a/spec/StreamingEventKind.java @@ -7,8 +7,9 @@ * agent task execution. Streaming allows agents to provide incremental feedback as work progresses, * rather than waiting until task completion. *

- * Streaming events use polymorphic JSON serialization with the "kind" discriminator to determine - * the concrete type during deserialization. + * Streaming events use polymorphic JSON serialization where the JSON member name itself acts as + * the type discriminator (e.g., "task", "message", "statusUpdate", "artifactUpdate"). + * This aligns with Protocol Buffers' oneof semantics and modern API design practices. *

* Permitted implementations: *

    @@ -32,9 +33,22 @@ public sealed interface StreamingEventKind extends Event permits Task, Message, TaskStatusUpdateEvent, TaskArtifactUpdateEvent { /** - * Returns the kind identifier for this streaming event. + * Returns the type identifier for this streaming event. + *

    + * This method provides programmatic type discrimination for routing, logging, and debugging. + * NOTE: This value is NOT serialized to JSON in protocol v1.0+. + * For JSON serialization, the wrapper field name serves as the discriminator. + *

    + * Use {@code instanceof} pattern matching to determine the concrete event type: + *

    {@code
    +     * if (event instanceof Task task) {
    +     *     // Handle task
    +     * } else if (event instanceof TaskStatusUpdateEvent statusUpdate) {
    +     *     // Handle status update
    +     * }
    +     * }
    * - * @return the event kind string (e.g., "task", "message", "status-update", "artifact-update") + * @return the event type identifier (e.g., "task", "message", "status-update", "artifact-update") */ String kind(); } diff --git a/spec/src/main/java/io/a2a/spec/TextPart.java b/spec/src/main/java/io/a2a/spec/TextPart.java index 4010d0063..57adef574 100644 --- a/spec/src/main/java/io/a2a/spec/TextPart.java +++ b/spec/src/main/java/io/a2a/spec/TextPart.java @@ -29,7 +29,10 @@ public record TextPart(String text) implements Part { /** - * The kind identifier for text parts: "text". + * The JSON member name discriminator for text parts: "text". + *

    + * In protocol v1.0+, this constant defines the JSON member name used for serialization: + * {@code { "text": "Hello, world!" }} */ public static final String TEXT = "text"; @@ -41,9 +44,4 @@ public record TextPart(String text) implements Part { public TextPart { Assert.checkNotNullParam("text", text); } - - @Override - public Kind getKind() { - return Kind.TEXT; - } } diff --git a/spec/src/test/java/io/a2a/spec/TaskSerializationTest.java b/spec/src/test/java/io/a2a/spec/TaskSerializationTest.java index c74dd3999..d62b68179 100644 --- a/spec/src/test/java/io/a2a/spec/TaskSerializationTest.java +++ b/spec/src/test/java/io/a2a/spec/TaskSerializationTest.java @@ -245,8 +245,8 @@ void testTaskWithFilePartBytes() throws JsonProcessingException { // Serialize String json = JsonUtil.toJson(task); - // Verify JSON contains file part data - assertTrue(json.contains("\"kind\":\"file\"")); + // Verify JSON contains file part data (v1.0 format uses member name "file", not "kind") + assertTrue(json.contains("\"file\"")); assertTrue(json.contains("document.pdf")); assertTrue(json.contains("application/pdf")); @@ -316,8 +316,8 @@ void testTaskWithDataPart() throws JsonProcessingException { // Serialize String json = JsonUtil.toJson(task); - // Verify JSON contains data part - assertTrue(json.contains("\"kind\":\"data\"")); + // Verify JSON contains data part (v1.0 format uses member name "data", not "kind") + assertTrue(json.contains("\"data\"")); assertTrue(json.contains("temperature")); // Deserialize @@ -416,8 +416,7 @@ void testDeserializeTaskFromJson() throws JsonProcessingException { "contextId": "context-456", "status": { "state": "submitted" - }, - "kind": "task" + } } """; @@ -446,13 +445,11 @@ void testDeserializeTaskWithArtifactsFromJson() throws JsonProcessingException { "name": "Result", "parts": [ { - "kind": "text", "text": "Hello World" } ] } - ], - "kind": "task" + ] } """; @@ -482,7 +479,6 @@ void testDeserializeTaskWithFilePartBytesFromJson() throws JsonProcessingExcepti "artifactId": "file-artifact", "parts": [ { - "kind": "file", "file": { "mimeType": "application/pdf", "name": "document.pdf", @@ -491,8 +487,7 @@ void testDeserializeTaskWithFilePartBytesFromJson() throws JsonProcessingExcepti } ] } - ], - "kind": "task" + ] } """; @@ -524,7 +519,6 @@ void testDeserializeTaskWithFilePartUriFromJson() throws JsonProcessingException "artifactId": "uri-artifact", "parts": [ { - "kind": "file", "file": { "mimeType": "image/png", "name": "photo.png", @@ -533,8 +527,7 @@ void testDeserializeTaskWithFilePartUriFromJson() throws JsonProcessingException } ] } - ], - "kind": "task" + ] } """; @@ -565,16 +558,16 @@ void testDeserializeTaskWithDataPartFromJson() throws JsonProcessingException { "artifactId": "data-artifact", "parts": [ { - "kind": "data", "data": { - "temperature": 22.5, - "humidity": 65 + "data": { + "temperature": 22.5, + "humidity": 65 + } } } ] } - ], - "kind": "task" + ] } """; @@ -601,7 +594,6 @@ void testDeserializeTaskWithHistoryFromJson() throws JsonProcessingException { "role": "user", "parts": [ { - "kind": "text", "text": "User message" } ], @@ -611,14 +603,12 @@ void testDeserializeTaskWithHistoryFromJson() throws JsonProcessingException { "role": "agent", "parts": [ { - "kind": "text", "text": "Agent response" } ], "messageId": "msg-2" } - ], - "kind": "task" + ] } """; @@ -641,8 +631,7 @@ void testDeserializeTaskWithTimestampFromJson() throws JsonProcessingException { "status": { "state": "working", "timestamp": "2023-10-01T12:00:00.234-05:00" - }, - "kind": "task" + } } """; @@ -666,8 +655,7 @@ void testDeserializeTaskWithMetadataFromJson() throws JsonProcessingException { "metadata": { "key1": "value1", "key2": 42 - }, - "kind": "task" + } } """; diff --git a/tests/server-common/src/test/java/io/a2a/server/apps/common/AbstractA2AServerTest.java b/tests/server-common/src/test/java/io/a2a/server/apps/common/AbstractA2AServerTest.java index 15b41a9c2..8e5fc3e73 100644 --- a/tests/server-common/src/test/java/io/a2a/server/apps/common/AbstractA2AServerTest.java +++ b/tests/server-common/src/test/java/io/a2a/server/apps/common/AbstractA2AServerTest.java @@ -495,7 +495,7 @@ public void testSendMessageNewMessageSuccess() throws Exception { assertEquals(MESSAGE.messageId(), messageResponse.messageId()); assertEquals(MESSAGE.role(), messageResponse.role()); Part part = messageResponse.parts().get(0); - assertEquals(Part.Kind.TEXT, part.getKind()); + assertTrue(part instanceof TextPart); assertEquals("test message", ((TextPart) part).text()); } @@ -533,7 +533,7 @@ public void testSendMessageExistingTaskSuccess() throws Exception { assertEquals(MESSAGE.messageId(), messageResponse.messageId()); assertEquals(MESSAGE.role(), messageResponse.role()); Part part = messageResponse.parts().get(0); - assertEquals(Part.Kind.TEXT, part.getKind()); + assertTrue(part instanceof TextPart); assertEquals("test message", ((TextPart) part).text()); } catch (A2AClientException e) { fail("Unexpected exception during sendMessage: " + e.getMessage(), e); @@ -714,7 +714,7 @@ public void testResubscribeExistingTaskSuccess() throws Exception { assertEquals(MINIMAL_TASK.id(), receivedArtifactEvent.taskId()); assertEquals(MINIMAL_TASK.contextId(), receivedArtifactEvent.contextId()); Part part = receivedArtifactEvent.artifact().parts().get(0); - assertEquals(Part.Kind.TEXT, part.getKind()); + assertTrue(part instanceof TextPart); assertEquals("text", ((TextPart) part).text()); // Verify status update event @@ -820,7 +820,7 @@ public void testResubscribeExistingTaskSuccessWithClientConsumers() throws Excep assertEquals(MINIMAL_TASK.id(), receivedArtifactEvent.taskId()); assertEquals(MINIMAL_TASK.contextId(), receivedArtifactEvent.contextId()); Part part = receivedArtifactEvent.artifact().parts().get(0); - assertEquals(Part.Kind.TEXT, part.getKind()); + assertTrue(part instanceof TextPart); assertEquals("text", ((TextPart) part).text()); // Verify status update event @@ -1607,7 +1607,7 @@ private void testSendStreamingMessageWithHttpClient(String mediaType) throws Exc assertEquals(MESSAGE.messageId(), messageResponse.messageId()); assertEquals(MESSAGE.role(), messageResponse.role()); Part part = messageResponse.parts().get(0); - assertEquals(Part.Kind.TEXT, part.getKind()); + assertTrue(part instanceof TextPart); assertEquals("test message", ((TextPart) part).text()); latch.countDown(); } @@ -1673,7 +1673,7 @@ public void testSendStreamingMessage(boolean createTask) throws Exception { assertEquals(MESSAGE.messageId(), messageResponse.messageId()); assertEquals(MESSAGE.role(), messageResponse.role()); Part part = messageResponse.parts().get(0); - assertEquals(Part.Kind.TEXT, part.getKind()); + assertTrue(part instanceof TextPart); assertEquals("test message", ((TextPart) part).text()); } catch (A2AClientException e) { fail("Unexpected exception during sendMessage: " + e.getMessage(), e); From c8dfcc9563d75694181f0b6aee434e8ece50124f Mon Sep 17 00:00:00 2001 From: Kabir Khan Date: Wed, 17 Dec 2025 23:24:10 +0000 Subject: [PATCH 2/4] Gemini feedback --- spec/src/main/java/io/a2a/json/JsonUtil.java | 13 +++---------- .../java/io/a2a/spec/TaskSerializationTest.java | 6 ++---- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/spec/src/main/java/io/a2a/json/JsonUtil.java b/spec/src/main/java/io/a2a/json/JsonUtil.java index 20eedf710..8af93714e 100644 --- a/spec/src/main/java/io/a2a/json/JsonUtil.java +++ b/spec/src/main/java/io/a2a/json/JsonUtil.java @@ -552,12 +552,9 @@ public void write(JsonWriter out, Part value) throws java.io.IOException { out.name("file"); delegateGson.toJson(filePart.file(), FileContent.class, out); } else if (value instanceof DataPart dataPart) { - // DataPart: { "data": { "data": {...} } } - out.name("data"); - out.beginObject(); + // DataPart: { "data": {...} } out.name("data"); delegateGson.toJson(dataPart.data(), Map.class, out); - out.endObject(); } else { throw new JsonSyntaxException("Unknown Part subclass: " + value.getClass().getName()); } @@ -589,14 +586,10 @@ Part read(JsonReader in) throws java.io.IOException { // FilePart: { "file": {...} } return new FilePart(delegateGson.fromJson(jsonObject.get("file"), FileContent.class)); } else if (jsonObject.has("data")) { - // DataPart: { "data": { "data": {...} } } - com.google.gson.JsonObject dataWrapper = jsonObject.getAsJsonObject("data"); - if (dataWrapper == null || !dataWrapper.has("data")) { - throw new JsonSyntaxException("DataPart wrapper must contain 'data' field"); - } + // DataPart: { "data": {...} } @SuppressWarnings("unchecked") Map dataMap = delegateGson.fromJson( - dataWrapper.get("data"), + jsonObject.get("data"), new TypeToken>(){}.getType() ); return new DataPart(dataMap); diff --git a/spec/src/test/java/io/a2a/spec/TaskSerializationTest.java b/spec/src/test/java/io/a2a/spec/TaskSerializationTest.java index d62b68179..acf1f20e4 100644 --- a/spec/src/test/java/io/a2a/spec/TaskSerializationTest.java +++ b/spec/src/test/java/io/a2a/spec/TaskSerializationTest.java @@ -559,10 +559,8 @@ void testDeserializeTaskWithDataPartFromJson() throws JsonProcessingException { "parts": [ { "data": { - "data": { - "temperature": 22.5, - "humidity": 65 - } + "temperature": 22.5, + "humidity": 65 } } ] From 654cbd4f40575d565123a80640e758074fb6940b Mon Sep 17 00:00:00 2001 From: Kabir Khan Date: Thu, 18 Dec 2025 11:46:42 +0000 Subject: [PATCH 3/4] Test kind does not appear --- spec/src/main/java/io/a2a/json/JsonUtil.java | 4 +- .../StreamingEventKindSerializationTest.java | 257 ++++++++++++++++++ .../io/a2a/spec/TaskSerializationTest.java | 4 + 3 files changed, 263 insertions(+), 2 deletions(-) create mode 100644 spec/src/test/java/io/a2a/spec/StreamingEventKindSerializationTest.java diff --git a/spec/src/main/java/io/a2a/json/JsonUtil.java b/spec/src/main/java/io/a2a/json/JsonUtil.java index 8af93714e..46f00792e 100644 --- a/spec/src/main/java/io/a2a/json/JsonUtil.java +++ b/spec/src/main/java/io/a2a/json/JsonUtil.java @@ -517,8 +517,8 @@ public void write(JsonWriter out, Message.Role value) throws java.io.IOException /** * Gson TypeAdapter for serializing and deserializing {@link Part} and its subclasses. *

    - * This adapter handles polymorphic deserialization based on the "kind" field, creating the - * appropriate subclass instance (TextPart, FilePart, or DataPart). + * This adapter handles polymorphic deserialization, creating the + * appropriate subclass instance (TextPart, FilePart, or DataPart) based on available fields. *

    * The adapter uses a two-pass approach: first reads the JSON as a tree to inspect the "kind" * field, then deserializes to the appropriate concrete type. diff --git a/spec/src/test/java/io/a2a/spec/StreamingEventKindSerializationTest.java b/spec/src/test/java/io/a2a/spec/StreamingEventKindSerializationTest.java new file mode 100644 index 000000000..7c15447e1 --- /dev/null +++ b/spec/src/test/java/io/a2a/spec/StreamingEventKindSerializationTest.java @@ -0,0 +1,257 @@ +package io.a2a.spec; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.List; + +import io.a2a.json.JsonProcessingException; +import io.a2a.json.JsonUtil; +import org.junit.jupiter.api.Test; + +/** + * Tests for StreamingEventKind serialization and deserialization. + *

    + * Verifies that StreamingEventKind types (Task, Message, TaskStatusUpdateEvent, TaskArtifactUpdateEvent) + * serialize using wrapper member names (e.g., {"task": {...}}) and do not contain "kind" fields. + */ +class StreamingEventKindSerializationTest { + + @Test + void testTaskSerialization() throws JsonProcessingException { + // Create a Task + Task task = Task.builder() + .id("task-123") + .contextId("context-456") + .status(new TaskStatus(TaskState.SUBMITTED)) + .build(); + + // Serialize as StreamingEventKind + String json = JsonUtil.toJson((StreamingEventKind) task); + + // Verify JSON contains task wrapper, not "kind" field + assertNotNull(json); + assertTrue(json.contains("\"task\"")); + assertTrue(json.contains("\"id\":\"task-123\"")); + assertTrue(json.contains("\"state\":\"submitted\"")); + assertFalse(json.contains("\"kind\"")); + + // Deserialize back to StreamingEventKind + StreamingEventKind deserialized = JsonUtil.fromJson(json, StreamingEventKind.class); + + // Verify it's a Task + assertInstanceOf(Task.class, deserialized); + Task deserializedTask = (Task) deserialized; + assertEquals(task.id(), deserializedTask.id()); + assertEquals(task.contextId(), deserializedTask.contextId()); + assertEquals(task.status().state(), deserializedTask.status().state()); + } + + @Test + void testMessageSerialization() throws JsonProcessingException { + // Create a Message + Message message = Message.builder() + .role(Message.Role.USER) + .parts(List.of(new TextPart("Hello, agent!"))) + .taskId("task-789") + .messageId("msg-123") + .contextId("context-456") + .build(); + + // Serialize as StreamingEventKind + String json = JsonUtil.toJson((StreamingEventKind) message); + + // Verify JSON contains message wrapper, not "kind" field + assertNotNull(json); + assertTrue(json.contains("\"message\"")); + assertTrue(json.contains("\"taskId\":\"task-789\"")); + assertTrue(json.contains("\"role\":\"user\"")); + assertTrue(json.contains("Hello, agent!")); + assertFalse(json.contains("\"kind\"")); + + // Deserialize back to StreamingEventKind + StreamingEventKind deserialized = JsonUtil.fromJson(json, StreamingEventKind.class); + + // Verify it's a Message + assertInstanceOf(Message.class, deserialized); + Message deserializedMessage = (Message) deserialized; + assertEquals(message.taskId(), deserializedMessage.taskId()); + assertEquals(message.role(), deserializedMessage.role()); + assertEquals(message.parts().size(), deserializedMessage.parts().size()); + } + + @Test + void testTaskStatusUpdateEventSerialization() throws JsonProcessingException { + // Create a TaskStatusUpdateEvent + TaskStatusUpdateEvent statusEvent = TaskStatusUpdateEvent.builder() + .taskId("task-abc") + .contextId("context-def") + .status(new TaskStatus(TaskState.WORKING)) + .isFinal(false) + .build(); + + // Serialize as StreamingEventKind + String json = JsonUtil.toJson((StreamingEventKind) statusEvent); + + // Verify JSON contains statusUpdate wrapper, not "kind" field + assertNotNull(json); + assertTrue(json.contains("\"statusUpdate\"")); + assertTrue(json.contains("\"taskId\":\"task-abc\"")); + assertTrue(json.contains("\"state\":\"working\"")); + assertTrue(json.contains("\"final\":false")); + assertFalse(json.contains("\"kind\"")); + + // Deserialize back to StreamingEventKind + StreamingEventKind deserialized = JsonUtil.fromJson(json, StreamingEventKind.class); + + // Verify it's a TaskStatusUpdateEvent + assertInstanceOf(TaskStatusUpdateEvent.class, deserialized); + TaskStatusUpdateEvent deserializedEvent = (TaskStatusUpdateEvent) deserialized; + assertEquals(statusEvent.taskId(), deserializedEvent.taskId()); + assertEquals(statusEvent.status().state(), deserializedEvent.status().state()); + assertEquals(statusEvent.isFinal(), deserializedEvent.isFinal()); + } + + @Test + void testTaskArtifactUpdateEventSerialization() throws JsonProcessingException { + // Create a TaskArtifactUpdateEvent + Artifact artifact = Artifact.builder() + .artifactId("artifact-xyz") + .name("Test Artifact") + .parts(List.of(new TextPart("Artifact content"))) + .build(); + + TaskArtifactUpdateEvent artifactEvent = TaskArtifactUpdateEvent.builder() + .taskId("task-123") + .contextId("context-456") + .artifact(artifact) + .build(); + + // Serialize as StreamingEventKind + String json = JsonUtil.toJson((StreamingEventKind) artifactEvent); + + // Verify JSON contains artifactUpdate wrapper, not "kind" field + assertNotNull(json); + assertTrue(json.contains("\"artifactUpdate\"")); + assertTrue(json.contains("\"taskId\":\"task-123\"")); + assertTrue(json.contains("\"artifactId\":\"artifact-xyz\"")); + assertTrue(json.contains("Artifact content")); + assertFalse(json.contains("\"kind\"")); + + // Deserialize back to StreamingEventKind + StreamingEventKind deserialized = JsonUtil.fromJson(json, StreamingEventKind.class); + + // Verify it's a TaskArtifactUpdateEvent + assertInstanceOf(TaskArtifactUpdateEvent.class, deserialized); + TaskArtifactUpdateEvent deserializedEvent = (TaskArtifactUpdateEvent) deserialized; + assertEquals(artifactEvent.taskId(), deserializedEvent.taskId()); + assertEquals(artifactEvent.artifact().artifactId(), deserializedEvent.artifact().artifactId()); + } + + @Test + void testUnwrappedTaskDeserialization() throws JsonProcessingException { + // Test that unwrapped Task format (direct deserialization) still works + String json = """ + { + "id": "task-unwrapped", + "contextId": "context-999", + "status": { + "state": "completed" + } + } + """; + + // Deserialize as StreamingEventKind + StreamingEventKind deserialized = JsonUtil.fromJson(json, StreamingEventKind.class); + + // Should successfully deserialize as Task + assertInstanceOf(Task.class, deserialized); + Task task = (Task) deserialized; + assertEquals("task-unwrapped", task.id()); + assertEquals("context-999", task.contextId()); + assertEquals(TaskState.COMPLETED, task.status().state()); + } + + @Test + void testUnwrappedMessageDeserialization() throws JsonProcessingException { + // Test that unwrapped Message format (direct deserialization) still works + String json = """ + { + "role": "agent", + "parts": [ + { + "text": "Unwrapped message" + } + ], + "messageId": "msg-unwrapped", + "taskId": "task-999" + } + """; + + // Deserialize as StreamingEventKind + StreamingEventKind deserialized = JsonUtil.fromJson(json, StreamingEventKind.class); + + // Should successfully deserialize as Message + assertInstanceOf(Message.class, deserialized); + Message message = (Message) deserialized; + assertEquals("msg-unwrapped", message.messageId()); + assertEquals("task-999", message.taskId()); + assertEquals(Message.Role.AGENT, message.role()); + } + + @Test + void testUnwrappedTaskStatusUpdateEventDeserialization() throws JsonProcessingException { + // Test that unwrapped TaskStatusUpdateEvent format still works + String json = """ + { + "taskId": "task-status-unwrapped", + "contextId": "context-999", + "status": { + "state": "working" + }, + "final": false + } + """; + + // Deserialize as StreamingEventKind + StreamingEventKind deserialized = JsonUtil.fromJson(json, StreamingEventKind.class); + + // Should successfully deserialize as TaskStatusUpdateEvent + assertInstanceOf(TaskStatusUpdateEvent.class, deserialized); + TaskStatusUpdateEvent event = (TaskStatusUpdateEvent) deserialized; + assertEquals("task-status-unwrapped", event.taskId()); + assertEquals(TaskState.WORKING, event.status().state()); + assertFalse(event.isFinal()); + } + + @Test + void testUnwrappedTaskArtifactUpdateEventDeserialization() throws JsonProcessingException { + // Test that unwrapped TaskArtifactUpdateEvent format still works + String json = """ + { + "taskId": "task-artifact-unwrapped", + "contextId": "context-999", + "artifact": { + "artifactId": "artifact-unwrapped", + "parts": [ + { + "text": "Unwrapped artifact" + } + ] + } + } + """; + + // Deserialize as StreamingEventKind + StreamingEventKind deserialized = JsonUtil.fromJson(json, StreamingEventKind.class); + + // Should successfully deserialize as TaskArtifactUpdateEvent + assertInstanceOf(TaskArtifactUpdateEvent.class, deserialized); + TaskArtifactUpdateEvent event = (TaskArtifactUpdateEvent) deserialized; + assertEquals("task-artifact-unwrapped", event.taskId()); + assertEquals("artifact-unwrapped", event.artifact().artifactId()); + } +} diff --git a/spec/src/test/java/io/a2a/spec/TaskSerializationTest.java b/spec/src/test/java/io/a2a/spec/TaskSerializationTest.java index acf1f20e4..cded0e204 100644 --- a/spec/src/test/java/io/a2a/spec/TaskSerializationTest.java +++ b/spec/src/test/java/io/a2a/spec/TaskSerializationTest.java @@ -1,6 +1,7 @@ package io.a2a.spec; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -247,6 +248,7 @@ void testTaskWithFilePartBytes() throws JsonProcessingException { // Verify JSON contains file part data (v1.0 format uses member name "file", not "kind") assertTrue(json.contains("\"file\"")); + assertFalse(json.contains("\"kind\"")); assertTrue(json.contains("document.pdf")); assertTrue(json.contains("application/pdf")); @@ -284,6 +286,7 @@ void testTaskWithFilePartUri() throws JsonProcessingException { // Verify JSON contains URI assertTrue(json.contains("https://example.com/photo.png")); + assertFalse(json.contains("\"kind\"")); // Removed in spec 1.0 // Deserialize Task deserialized = JsonUtil.fromJson(json, Task.class); @@ -318,6 +321,7 @@ void testTaskWithDataPart() throws JsonProcessingException { // Verify JSON contains data part (v1.0 format uses member name "data", not "kind") assertTrue(json.contains("\"data\"")); + assertFalse(json.contains("\"kind\"")); assertTrue(json.contains("temperature")); // Deserialize From ba60b475a8b8388a01bbfe0b3b8dcbb2819bcbfa Mon Sep 17 00:00:00 2001 From: Kabir Khan Date: Thu, 18 Dec 2025 12:30:47 +0000 Subject: [PATCH 4/4] Use StreamingEventKind.kind() instead of instanceof for seralization choices etc. --- .../KafkaReplicationIntegrationTest.java | 2 +- .../a2a/grpc/mapper/StreamResponseMapper.java | 27 +++++------ .../java/io/a2a/grpc/utils/ProtoUtils.java | 38 +++++++-------- spec/src/main/java/io/a2a/json/JsonUtil.java | 46 ++++++++----------- spec/src/main/java/io/a2a/spec/Message.java | 10 ++-- .../java/io/a2a/spec/StreamingEventKind.java | 2 +- spec/src/main/java/io/a2a/spec/Task.java | 10 ++-- .../io/a2a/spec/TaskArtifactUpdateEvent.java | 8 ++-- .../io/a2a/spec/TaskStatusUpdateEvent.java | 8 ++-- 9 files changed, 65 insertions(+), 86 deletions(-) diff --git a/extras/queue-manager-replicated/tests-single-instance/src/test/java/io/a2a/extras/queuemanager/replicated/tests/KafkaReplicationIntegrationTest.java b/extras/queue-manager-replicated/tests-single-instance/src/test/java/io/a2a/extras/queuemanager/replicated/tests/KafkaReplicationIntegrationTest.java index 029aa9a62..f174303ac 100644 --- a/extras/queue-manager-replicated/tests-single-instance/src/test/java/io/a2a/extras/queuemanager/replicated/tests/KafkaReplicationIntegrationTest.java +++ b/extras/queue-manager-replicated/tests-single-instance/src/test/java/io/a2a/extras/queuemanager/replicated/tests/KafkaReplicationIntegrationTest.java @@ -177,7 +177,7 @@ public void testA2AMessageReplicatedToKafka() throws Exception { assertEquals(contextId, statusUpdateEvent.contextId(), "Event context ID should match original context ID"); assertEquals(TaskState.SUBMITTED, statusUpdateEvent.status().state(), "Event should show SUBMITTED state"); assertFalse(statusUpdateEvent.isFinal(), "Event should show final:false"); - assertEquals("status-update", statusUpdateEvent.kind(), "Event should indicate status-update type"); + assertEquals(TaskStatusUpdateEvent.STREAMING_EVENT_ID, statusUpdateEvent.kind(), "Event should indicate status-update type"); } @Test diff --git a/spec-grpc/src/main/java/io/a2a/grpc/mapper/StreamResponseMapper.java b/spec-grpc/src/main/java/io/a2a/grpc/mapper/StreamResponseMapper.java index eb2abf624..2b91beff0 100644 --- a/spec-grpc/src/main/java/io/a2a/grpc/mapper/StreamResponseMapper.java +++ b/spec-grpc/src/main/java/io/a2a/grpc/mapper/StreamResponseMapper.java @@ -40,25 +40,22 @@ default io.a2a.grpc.StreamResponse toProto(StreamingEventKind domain) { return null; } - if (domain instanceof Task task) { - return io.a2a.grpc.StreamResponse.newBuilder() - .setTask(TaskMapper.INSTANCE.toProto(task)) + return switch (domain.kind()) { + case Task.STREAMING_EVENT_ID -> io.a2a.grpc.StreamResponse.newBuilder() + .setTask(TaskMapper.INSTANCE.toProto((Task) domain)) .build(); - } else if (domain instanceof Message message) { - return io.a2a.grpc.StreamResponse.newBuilder() - .setMsg(MessageMapper.INSTANCE.toProto(message)) + case Message.STREAMING_EVENT_ID -> io.a2a.grpc.StreamResponse.newBuilder() + .setMsg(MessageMapper.INSTANCE.toProto((Message) domain)) .build(); - } else if (domain instanceof TaskStatusUpdateEvent statusUpdate) { - return io.a2a.grpc.StreamResponse.newBuilder() - .setStatusUpdate(TaskStatusUpdateEventMapper.INSTANCE.toProto(statusUpdate)) + case TaskStatusUpdateEvent.STREAMING_EVENT_ID -> io.a2a.grpc.StreamResponse.newBuilder() + .setStatusUpdate(TaskStatusUpdateEventMapper.INSTANCE.toProto((TaskStatusUpdateEvent) domain)) .build(); - } else if (domain instanceof TaskArtifactUpdateEvent artifactUpdate) { - return io.a2a.grpc.StreamResponse.newBuilder() - .setArtifactUpdate(TaskArtifactUpdateEventMapper.INSTANCE.toProto(artifactUpdate)) + case TaskArtifactUpdateEvent.STREAMING_EVENT_ID -> io.a2a.grpc.StreamResponse.newBuilder() + .setArtifactUpdate(TaskArtifactUpdateEventMapper.INSTANCE.toProto((TaskArtifactUpdateEvent) domain)) .build(); - } - - throw new IllegalArgumentException("Unknown StreamingEventKind type: " + domain.getClass().getName()); + default -> + throw new IllegalArgumentException("Unknown StreamingEventKind type: " + domain.getClass().getName()); + }; } /** diff --git a/spec-grpc/src/main/java/io/a2a/grpc/utils/ProtoUtils.java b/spec-grpc/src/main/java/io/a2a/grpc/utils/ProtoUtils.java index 940addcf7..55be58228 100644 --- a/spec-grpc/src/main/java/io/a2a/grpc/utils/ProtoUtils.java +++ b/spec-grpc/src/main/java/io/a2a/grpc/utils/ProtoUtils.java @@ -139,39 +139,33 @@ public static StreamResponse streamResponse(StreamingEventKind streamingEventKin } public static io.a2a.grpc.SendMessageResponse taskOrMessage(EventKind eventKind) { - if (eventKind instanceof Task) { - return io.a2a.grpc.SendMessageResponse.newBuilder() + return switch (eventKind.kind()) { + case Task.STREAMING_EVENT_ID -> io.a2a.grpc.SendMessageResponse.newBuilder() .setTask(task((Task) eventKind)) .build(); - } else if (eventKind instanceof Message) { - return io.a2a.grpc.SendMessageResponse.newBuilder() + case Message.STREAMING_EVENT_ID -> io.a2a.grpc.SendMessageResponse.newBuilder() .setMsg(message((Message) eventKind)) .build(); - } else { - throw new IllegalArgumentException("Unsupported event type: " + eventKind); - } + default -> throw new IllegalArgumentException("Unsupported event type: " + eventKind); + }; } public static io.a2a.grpc.StreamResponse taskOrMessageStream(StreamingEventKind eventKind) { - if (eventKind instanceof Task task) { - return io.a2a.grpc.StreamResponse.newBuilder() - .setTask(task(task)) + return switch (eventKind.kind()) { + case Task.STREAMING_EVENT_ID -> io.a2a.grpc.StreamResponse.newBuilder() + .setTask(task((Task) eventKind)) .build(); - } else if (eventKind instanceof Message msg) { - return io.a2a.grpc.StreamResponse.newBuilder() - .setMsg(message(msg)) + case Message.STREAMING_EVENT_ID -> io.a2a.grpc.StreamResponse.newBuilder() + .setMsg(message((Message) eventKind)) .build(); - } else if (eventKind instanceof TaskArtifactUpdateEvent update) { - return io.a2a.grpc.StreamResponse.newBuilder() - .setArtifactUpdate(taskArtifactUpdateEvent(update)) + case TaskStatusUpdateEvent.STREAMING_EVENT_ID -> io.a2a.grpc.StreamResponse.newBuilder() + .setStatusUpdate(taskStatusUpdateEvent((TaskStatusUpdateEvent) eventKind)) .build(); - } else if (eventKind instanceof TaskStatusUpdateEvent update) { - return io.a2a.grpc.StreamResponse.newBuilder() - .setStatusUpdate(taskStatusUpdateEvent(update)) + case TaskArtifactUpdateEvent.STREAMING_EVENT_ID -> io.a2a.grpc.StreamResponse.newBuilder() + .setArtifactUpdate(taskArtifactUpdateEvent((TaskArtifactUpdateEvent) eventKind)) .build(); - } else { - throw new IllegalArgumentException("Unsupported event type: " + eventKind); - } + default -> throw new IllegalArgumentException("Unsupported event type: " + eventKind); + }; } public static io.a2a.grpc.TaskPushNotificationConfig setTaskPushNotificationConfigResponse(TaskPushNotificationConfig config) { diff --git a/spec/src/main/java/io/a2a/json/JsonUtil.java b/spec/src/main/java/io/a2a/json/JsonUtil.java index 46f00792e..ddd712a43 100644 --- a/spec/src/main/java/io/a2a/json/JsonUtil.java +++ b/spec/src/main/java/io/a2a/json/JsonUtil.java @@ -631,26 +631,16 @@ public void write(JsonWriter out, StreamingEventKind value) throws java.io.IOExc // Write wrapper object with member name as discriminator out.beginObject(); - if (value instanceof Task task) { - // Task: { "task": {...} } - out.name("task"); - delegateGson.toJson(task, Task.class, out); - } else if (value instanceof Message message) { - // Message: { "message": {...} } - out.name("message"); - delegateGson.toJson(message, Message.class, out); - } else if (value instanceof TaskStatusUpdateEvent event) { - // TaskStatusUpdateEvent: { "statusUpdate": {...} } - camelCase per spec - out.name("statusUpdate"); - delegateGson.toJson(event, TaskStatusUpdateEvent.class, out); - } else if (value instanceof TaskArtifactUpdateEvent event) { - // TaskArtifactUpdateEvent: { "artifactUpdate": {...} } - camelCase per spec - out.name("artifactUpdate"); - delegateGson.toJson(event, TaskArtifactUpdateEvent.class, out); - } else { - throw new JsonSyntaxException("Unknown StreamingEventKind implementation: " + value.getClass().getName()); - } + Type type = switch (value.kind()) { + case Task.STREAMING_EVENT_ID -> Task.class; + case Message.STREAMING_EVENT_ID -> Message.class; + case TaskStatusUpdateEvent.STREAMING_EVENT_ID -> TaskStatusUpdateEvent.class; + case TaskArtifactUpdateEvent.STREAMING_EVENT_ID -> TaskArtifactUpdateEvent.class; + default -> throw new JsonSyntaxException("Unknown StreamingEventKind implementation: " + value.getClass().getName()); + }; + out.name(value.kind()); + delegateGson.toJson(value, type, out); out.endObject(); } @@ -671,14 +661,16 @@ StreamingEventKind read(JsonReader in) throws java.io.IOException { com.google.gson.JsonObject jsonObject = jsonElement.getAsJsonObject(); // Check for wrapped member name discriminators (v1.0 protocol - streaming format) - if (jsonObject.has("task")) { - return delegateGson.fromJson(jsonObject.get("task"), Task.class); - } else if (jsonObject.has("message")) { - return delegateGson.fromJson(jsonObject.get("message"), Message.class); - } else if (jsonObject.has("statusUpdate")) { - return delegateGson.fromJson(jsonObject.get("statusUpdate"), TaskStatusUpdateEvent.class); - } else if (jsonObject.has("artifactUpdate")) { - return delegateGson.fromJson(jsonObject.get("artifactUpdate"), TaskArtifactUpdateEvent.class); + if (jsonObject.has(Task.STREAMING_EVENT_ID)) { + return delegateGson.fromJson(jsonObject.get(Task.STREAMING_EVENT_ID), Task.class); + } else if (jsonObject.has(Message.STREAMING_EVENT_ID)) { + return delegateGson.fromJson(jsonObject.get(Message.STREAMING_EVENT_ID), Message.class); + } else if (jsonObject.has(TaskStatusUpdateEvent.STREAMING_EVENT_ID)) { + return delegateGson.fromJson( + jsonObject.get(TaskStatusUpdateEvent.STREAMING_EVENT_ID), TaskStatusUpdateEvent.class); + } else if (jsonObject.has(TaskArtifactUpdateEvent.STREAMING_EVENT_ID)) { + return delegateGson.fromJson( + jsonObject.get(TaskArtifactUpdateEvent.STREAMING_EVENT_ID), TaskArtifactUpdateEvent.class); } // Check for unwrapped format (direct Task/Message deserialization) diff --git a/spec/src/main/java/io/a2a/spec/Message.java b/spec/src/main/java/io/a2a/spec/Message.java index b218b5396..9606cd15d 100644 --- a/spec/src/main/java/io/a2a/spec/Message.java +++ b/spec/src/main/java/io/a2a/spec/Message.java @@ -6,9 +6,6 @@ import io.a2a.util.Assert; -import static io.a2a.spec.Message.MESSAGE; -import static io.a2a.util.Utils.SPEC_VERSION_1_0; - /** * Represents a single message in the conversation between a user and an agent in the A2A Protocol. *

    @@ -42,7 +39,10 @@ public record Message(Role role, List> parts, Map metadata, List extensions ) implements EventKind, StreamingEventKind { - public static final String MESSAGE = "message"; + /** + * The identifier when used in streaming responses + */ + public static final String STREAMING_EVENT_ID = "message"; /** * Compact constructor with validation and defensive copying. @@ -64,7 +64,7 @@ public record Message(Role role, List> parts, @Override public String kind() { - return MESSAGE; + return STREAMING_EVENT_ID; } /** diff --git a/spec/src/main/java/io/a2a/spec/StreamingEventKind.java b/spec/src/main/java/io/a2a/spec/StreamingEventKind.java index c0aa99810..a8d0dd628 100644 --- a/spec/src/main/java/io/a2a/spec/StreamingEventKind.java +++ b/spec/src/main/java/io/a2a/spec/StreamingEventKind.java @@ -48,7 +48,7 @@ public sealed interface StreamingEventKind extends Event permits Task, Message, * } * } * - * @return the event type identifier (e.g., "task", "message", "status-update", "artifact-update") + * @return the event type identifier (e.g., "task", "message", "statusUpdate", "artifactUpdate") */ String kind(); } diff --git a/spec/src/main/java/io/a2a/spec/Task.java b/spec/src/main/java/io/a2a/spec/Task.java index e949a2fe3..b9e37aabb 100644 --- a/spec/src/main/java/io/a2a/spec/Task.java +++ b/spec/src/main/java/io/a2a/spec/Task.java @@ -5,9 +5,6 @@ import io.a2a.util.Assert; -import static io.a2a.spec.Task.TASK; -import static io.a2a.util.Utils.SPEC_VERSION_1_0; - /** * Represents a single, stateful operation or conversation between a client and an agent in the A2A Protocol. *

    @@ -54,7 +51,10 @@ public record Task( Map metadata ) implements EventKind, StreamingEventKind { - public static final String TASK = "task"; + /** + * The identifier when used in streaming responses + */ + public static final String STREAMING_EVENT_ID = "task"; /** * Compact constructor with validation and defensive copying. @@ -72,7 +72,7 @@ public record Task( @Override public String kind() { - return TASK; + return STREAMING_EVENT_ID; } /** diff --git a/spec/src/main/java/io/a2a/spec/TaskArtifactUpdateEvent.java b/spec/src/main/java/io/a2a/spec/TaskArtifactUpdateEvent.java index 5f492be3d..b8d468b78 100644 --- a/spec/src/main/java/io/a2a/spec/TaskArtifactUpdateEvent.java +++ b/spec/src/main/java/io/a2a/spec/TaskArtifactUpdateEvent.java @@ -4,8 +4,6 @@ import io.a2a.util.Assert; -import static io.a2a.spec.TaskArtifactUpdateEvent.ARTIFACT_UPDATE; - /** * Event notifying that a task artifact has been created, modified, or appended to. *

    @@ -50,9 +48,9 @@ public record TaskArtifactUpdateEvent( ) implements EventKind, StreamingEventKind, UpdateEvent { /** - * The kind identifier for artifact update events: "artifact-update". + * The identifier when used in streaming responses */ - public static final String ARTIFACT_UPDATE = "artifact-update"; + public static final String STREAMING_EVENT_ID = "artifactUpdate"; /** * Compact constructor with validation. @@ -67,7 +65,7 @@ public record TaskArtifactUpdateEvent( @Override public String kind() { - return ARTIFACT_UPDATE; + return STREAMING_EVENT_ID; } /** diff --git a/spec/src/main/java/io/a2a/spec/TaskStatusUpdateEvent.java b/spec/src/main/java/io/a2a/spec/TaskStatusUpdateEvent.java index d9d791f9d..2a34a2e03 100644 --- a/spec/src/main/java/io/a2a/spec/TaskStatusUpdateEvent.java +++ b/spec/src/main/java/io/a2a/spec/TaskStatusUpdateEvent.java @@ -5,8 +5,6 @@ import io.a2a.util.Assert; -import static io.a2a.spec.TaskStatusUpdateEvent.STATUS_UPDATE; - /** * An event sent by the agent to notify the client of a change in a task's status. * This is typically used in streaming or subscription models. @@ -26,9 +24,9 @@ public record TaskStatusUpdateEvent( ) implements EventKind, StreamingEventKind, UpdateEvent { /** - * The kind identifier for status update events: "status-update". + * The identifier when used in streaming responses */ - public static final String STATUS_UPDATE = "status-update"; + public static final String STREAMING_EVENT_ID = "statusUpdate"; /** * Compact constructor with validation. @@ -41,7 +39,7 @@ public record TaskStatusUpdateEvent( @Override public String kind() { - return STATUS_UPDATE; + return STREAMING_EVENT_ID; } /**