Skip to content

fix: merge metadata instead of replacing in TaskManager.TaskStatusUpdateEvent #426 #427

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
Nov 3, 2025
Merged

fix: merge metadata instead of replacing in TaskManager.TaskStatusUpdateEvent #426 #427

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
554e962
fix: merge metadata instead of replacing in TaskManager.TaskStatusUpd…
mhyeon-lee Oct 31, 2025
7d7803c
Fix comment
mhyeon-lee Nov 3, 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
6 changes: 5 additions & 1 deletion server-common/src/main/java/io/a2a/server/tasks/TaskManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
import static io.a2a.util.Utils.appendArtifactToTask;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import io.a2a.spec.A2AServerException;
import io.a2a.spec.Artifact;
Expand Down Expand Up @@ -78,7 +80,9 @@ Task saveTaskEvent(TaskStatusUpdateEvent event) throws A2AServerException {

// Handle metadata from the event
if (event.getMetadata() != null) {
builder.metadata(event.getMetadata());
Map<String, Object> metadata = task.getMetadata() == null ? new HashMap<>() : new HashMap<>(task.getMetadata());
metadata.putAll(event.getMetadata());
builder.metadata(metadata);
}

task = builder.build();
Expand Down
10 changes: 6 additions & 4 deletions server-common/src/test/java/io/a2a/server/tasks/TaskManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,8 +588,8 @@ public void testSaveTaskEventMetadataUpdateNull() throws A2AServerException {
}

@Test
public void testSaveTaskEventMetadataUpdateOverwritesExisting() throws A2AServerException {
// Test that metadata update overwrites existing metadata
public void testSaveTaskEventMetadataMergeExisting() throws A2AServerException {
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Oct 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

While the test method name has been correctly updated to reflect the new merging logic, the comment on the following line (592) is now outdated and misleading, as it still refers to overwriting metadata. To improve clarity and prevent confusion, please update the comment to align with the test's new purpose.

For example:

// Test that metadata update merges with existing metadata

Copy link
Collaborator

@kabir kabir Nov 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @flex-myeonghyeon Thank you for your PR! Would you be able to update this method?

Copy link
Contributor Author

@flex-myeonghyeon flex-myeonghyeon Nov 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kabir
I’ve updated the comment.
Thank you.

// Test that metadata update merges with existing metadata
Map<String, Object> originalMetadata = new HashMap<>();
originalMetadata.put("original_key", "original_value");

Expand All @@ -612,8 +612,10 @@ public void testSaveTaskEventMetadataUpdateOverwritesExisting() throws A2AServer
taskManager.saveTaskEvent(event);

Task updatedTask = taskManager.getTask();
assertEquals(newMetadata, updatedTask.getMetadata());
assertNotEquals(originalMetadata, updatedTask.getMetadata());

Map<String, Object> mergedMetadata = new HashMap<>(originalMetadata);
mergedMetadata.putAll(newMetadata);
assertEquals(mergedMetadata, updatedTask.getMetadata());
}

@Test
Expand Down