Skip to content

feat!: Unify spec domain classes as records #548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kabir merged 2 commits into from
Dec 17, 2025
Merged

feat!: Unify spec domain classes as records #548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8766f80
feat!: Unify spec domain classes as records
kabir Dec 17, 2025
4a7f2ab
Gemini feedback
kabir Dec 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions client/base/src/main/java/io/a2a/client/ClientTaskManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ public Task saveTaskEvent(Task task) throws A2AClientInvalidArgsError {

public Task saveTaskEvent(TaskStatusUpdateEvent taskStatusUpdateEvent) throws A2AClientError {
if (taskId == null) {
taskId = taskStatusUpdateEvent.getTaskId();
taskId = taskStatusUpdateEvent.taskId();
}
if (contextId == null) {
contextId = taskStatusUpdateEvent.getContextId();
contextId = taskStatusUpdateEvent.contextId();
}
Task task = currentTask;
if (task == null) {
Expand All @@ -67,31 +67,31 @@ public Task saveTaskEvent(TaskStatusUpdateEvent taskStatusUpdateEvent) throws A2
}

Task.Builder taskBuilder = Task.builder(task);
if (taskStatusUpdateEvent.getStatus().message() != null) {
if (task.getHistory() == null) {
taskBuilder.history(taskStatusUpdateEvent.getStatus().message());
if (taskStatusUpdateEvent.status().message() != null) {
if (task.history() == null) {
taskBuilder.history(taskStatusUpdateEvent.status().message());
} else {
List<Message> history = new ArrayList<>(task.getHistory());
history.add(taskStatusUpdateEvent.getStatus().message());
List<Message> history = new ArrayList<>(task.history());
history.add(taskStatusUpdateEvent.status().message());
taskBuilder.history(history);
}
}
if (taskStatusUpdateEvent.getMetadata() != null) {
Map<String, Object> newMetadata = task.getMetadata() != null ? new HashMap<>(task.getMetadata()) : new HashMap<>();
newMetadata.putAll(taskStatusUpdateEvent.getMetadata());
if (taskStatusUpdateEvent.metadata() != null) {
Map<String, Object> newMetadata = task.metadata() != null ? new HashMap<>(task.metadata()) : new HashMap<>();
newMetadata.putAll(taskStatusUpdateEvent.metadata());
taskBuilder.metadata(newMetadata);
}
taskBuilder.status(taskStatusUpdateEvent.getStatus());
taskBuilder.status(taskStatusUpdateEvent.status());
currentTask = taskBuilder.build();
return currentTask;
}

public Task saveTaskEvent(TaskArtifactUpdateEvent taskArtifactUpdateEvent) {
if (taskId == null) {
taskId = taskArtifactUpdateEvent.getTaskId();
taskId = taskArtifactUpdateEvent.taskId();
}
if (contextId == null) {
contextId = taskArtifactUpdateEvent.getContextId();
contextId = taskArtifactUpdateEvent.contextId();
}
Task task = currentTask;
if (task == null) {
Expand All @@ -115,13 +115,13 @@ public Task saveTaskEvent(TaskArtifactUpdateEvent taskArtifactUpdateEvent) {
*/
public Task updateWithMessage(Message message, Task task) {
Task.Builder taskBuilder = Task.builder(task);
List<Message> history = task.getHistory();
List<Message> history = task.history();
if (history == null) {
history = new ArrayList<>();
}
if (task.getStatus().message() != null) {
history.add(task.getStatus().message());
taskBuilder.status(new TaskStatus(task.getStatus().state(), null, task.getStatus().timestamp()));
if (task.status().message() != null) {
history.add(task.status().message());
taskBuilder.status(new TaskStatus(task.status().state(), null, task.status().timestamp()));
}
history.add(message);
taskBuilder.history(history);
Expand All @@ -132,8 +132,8 @@ public Task updateWithMessage(Message message, Task task) {
private void saveTask(Task task) {
currentTask = task;
if (taskId == null) {
taskId = currentTask.getId();
contextId = currentTask.getContextId();
taskId = currentTask.id();
contextId = currentTask.contextId();
}
}
}
18 changes: 9 additions & 9 deletions client/base/src/main/java/io/a2a/client/MessageEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ public Message getMessage() {
@Override
public String toString() {
String messageAsString = "{"
+ "role=" + message.getRole()
+ ", parts=" + message.getParts()
+ ", messageId=" + message.getMessageId()
+ ", contextId=" + message.getContextId()
+ ", taskId=" + message.getTaskId()
+ ", metadata=" + message.getMetadata()
+ ", kind=" + message.getKind()
+ ", referenceTaskIds=" + message.getReferenceTaskIds()
+ ", extensions=" + message.getExtensions() + '}';
+ "role=" + message.role()
+ ", parts=" + message.parts()
+ ", messageId=" + message.messageId()
+ ", contextId=" + message.contextId()
+ ", taskId=" + message.taskId()
+ ", metadata=" + message.metadata()
+ ", kind=" + message.kind()
+ ", referenceTaskIds=" + message.referenceTaskIds()
+ ", extensions=" + message.extensions() + '}';
return "MessageEvent{" + "message=" + messageAsString + '}';
}
}
78 changes: 39 additions & 39 deletions client/base/src/test/java/io/a2a/A2ATest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ public void testToUserMessage() {
String text = "Hello, world!";
Message message = A2A.toUserMessage(text);

assertEquals(Message.Role.USER, message.getRole());
assertEquals(1, message.getParts().size());
assertEquals(text, ((TextPart) message.getParts().get(0)).getText());
assertNotNull(message.getMessageId());
assertNull(message.getContextId());
assertNull(message.getTaskId());
assertEquals(Message.Role.USER, message.role());
assertEquals(1, message.parts().size());
assertEquals(text, ((TextPart) message.parts().get(0)).text());
assertNotNull(message.messageId());
assertNull(message.contextId());
assertNull(message.taskId());
}

@Test
Expand All @@ -34,19 +34,19 @@ public void testToUserMessageWithId() {
String messageId = "test-message-id";
Message message = A2A.toUserMessage(text, messageId);

assertEquals(Message.Role.USER, message.getRole());
assertEquals(messageId, message.getMessageId());
assertEquals(Message.Role.USER, message.role());
assertEquals(messageId, message.messageId());
}

@Test
public void testToAgentMessage() {
String text = "Hello, I'm an agent!";
Message message = A2A.toAgentMessage(text);

assertEquals(Message.Role.AGENT, message.getRole());
assertEquals(1, message.getParts().size());
assertEquals(text, ((TextPart) message.getParts().get(0)).getText());
assertNotNull(message.getMessageId());
assertEquals(Message.Role.AGENT, message.role());
assertEquals(1, message.parts().size());
assertEquals(text, ((TextPart) message.parts().get(0)).text());
assertNotNull(message.messageId());
}

@Test
Expand All @@ -55,8 +55,8 @@ public void testToAgentMessageWithId() {
String messageId = "agent-message-id";
Message message = A2A.toAgentMessage(text, messageId);

assertEquals(Message.Role.AGENT, message.getRole());
assertEquals(messageId, message.getMessageId());
assertEquals(Message.Role.AGENT, message.role());
assertEquals(messageId, message.messageId());
}

@Test
Expand All @@ -67,14 +67,14 @@ public void testCreateUserTextMessage() {

Message message = A2A.createUserTextMessage(text, contextId, taskId);

assertEquals(Message.Role.USER, message.getRole());
assertEquals(contextId, message.getContextId());
assertEquals(taskId, message.getTaskId());
assertEquals(1, message.getParts().size());
assertEquals(text, ((TextPart) message.getParts().get(0)).getText());
assertNotNull(message.getMessageId());
assertNull(message.getMetadata());
assertNull(message.getReferenceTaskIds());
assertEquals(Message.Role.USER, message.role());
assertEquals(contextId, message.contextId());
assertEquals(taskId, message.taskId());
assertEquals(1, message.parts().size());
assertEquals(text, ((TextPart) message.parts().get(0)).text());
assertNotNull(message.messageId());
assertNull(message.metadata());
assertNull(message.referenceTaskIds());
}

@Test
Expand All @@ -83,11 +83,11 @@ public void testCreateUserTextMessageWithNullParams() {

Message message = A2A.createUserTextMessage(text, null, null);

assertEquals(Message.Role.USER, message.getRole());
assertNull(message.getContextId());
assertNull(message.getTaskId());
assertEquals(1, message.getParts().size());
assertEquals(text, ((TextPart) message.getParts().get(0)).getText());
assertEquals(Message.Role.USER, message.role());
assertNull(message.contextId());
assertNull(message.taskId());
assertEquals(1, message.parts().size());
assertEquals(text, ((TextPart) message.parts().get(0)).text());
}

@Test
Expand All @@ -98,12 +98,12 @@ public void testCreateAgentTextMessage() {

Message message = A2A.createAgentTextMessage(text, contextId, taskId);

assertEquals(Message.Role.AGENT, message.getRole());
assertEquals(contextId, message.getContextId());
assertEquals(taskId, message.getTaskId());
assertEquals(1, message.getParts().size());
assertEquals(text, ((TextPart) message.getParts().get(0)).getText());
assertNotNull(message.getMessageId());
assertEquals(Message.Role.AGENT, message.role());
assertEquals(contextId, message.contextId());
assertEquals(taskId, message.taskId());
assertEquals(1, message.parts().size());
assertEquals(text, ((TextPart) message.parts().get(0)).text());
assertNotNull(message.messageId());
}

@Test
Expand All @@ -117,12 +117,12 @@ public void testCreateAgentPartsMessage() {

Message message = A2A.createAgentPartsMessage(parts, contextId, taskId);

assertEquals(Message.Role.AGENT, message.getRole());
assertEquals(contextId, message.getContextId());
assertEquals(taskId, message.getTaskId());
assertEquals(2, message.getParts().size());
assertEquals("Part 1", ((TextPart) message.getParts().get(0)).getText());
assertEquals("Part 2", ((TextPart) message.getParts().get(1)).getText());
assertEquals(Message.Role.AGENT, message.role());
assertEquals(contextId, message.contextId());
assertEquals(taskId, message.taskId());
assertEquals(2, message.parts().size());
assertEquals("Part 1", ((TextPart) message.parts().get(0)).text());
assertEquals("Part 2", ((TextPart) message.parts().get(1)).text());
}

@Test
Expand Down
14 changes: 7 additions & 7 deletions .../jsonrpc/src/test/java/io/a2a/client/transport/jsonrpc/JSONRPCTransportStreamingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ public void testSendStreamingMessageParams() {
assertNotNull(params);
assertEquals(message, params.message());
assertEquals(configuration, params.configuration());
assertEquals(Message.Role.USER, params.message().getRole());
assertEquals("test message", ((TextPart) params.message().getParts().get(0)).getText());
assertEquals(Message.Role.USER, params.message().role());
assertEquals("test message", ((TextPart) params.message().parts().get(0)).text());
}

@Test
Expand Down Expand Up @@ -159,16 +159,16 @@ public void testA2AClientResubscribeToTask() throws Exception {
assertNotNull(eventKind);
assertInstanceOf(Task.class, eventKind);
Task task = (Task) eventKind;
assertEquals("2", task.getId());
assertEquals("context-1234", task.getContextId());
assertEquals(TaskState.COMPLETED, task.getStatus().state());
List<Artifact> artifacts = task.getArtifacts();
assertEquals("2", task.id());
assertEquals("context-1234", task.contextId());
assertEquals(TaskState.COMPLETED, task.status().state());
List<Artifact> artifacts = task.artifacts();
assertEquals(1, artifacts.size());
Artifact artifact = artifacts.get(0);
assertEquals("artifact-1", artifact.artifactId());
assertEquals("joke", artifact.name());
Part<?> part = artifact.parts().get(0);
assertEquals(Part.Kind.TEXT, part.getKind());
assertEquals("Why did the chicken cross the road? To get to the other side!", ((TextPart) part).getText());
assertEquals("Why did the chicken cross the road? To get to the other side!", ((TextPart) part).text());
}
}
Loading