Skip to content

feat: update return type for artifactDelta getter and setter to Map from ConcurrentMap #986

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

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: update return type for artifactDelta getter and setter to Map from ConcurrentMap #986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions core/src/main/java/com/google/adk/events/EventActions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,16 @@ public void removeStateByKey(String key) {
}

@JsonProperty("artifactDelta")
public ConcurrentMap<String, Integer> artifactDelta() {
public Map<String, Integer> artifactDelta() {
return artifactDelta;
}

public void setArtifactDelta(ConcurrentMap<String, Integer> artifactDelta) {
this.artifactDelta = artifactDelta;
public void setArtifactDelta(Map<String, Integer> artifactDelta) {
if (artifactDelta instanceof ConcurrentMap) {
this.artifactDelta = (ConcurrentMap<String, Integer>) artifactDelta;
} else {
this.artifactDelta = new ConcurrentHashMap<>(artifactDelta);
}
}

@JsonProperty("deletedArtifactIds")
Expand Down
24 changes: 24 additions & 0 deletions core/src/test/java/com/google/adk/events/EventActionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import com.google.genai.types.Part;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
Expand Down Expand Up @@ -109,6 +110,29 @@ public void merge_mergesAllFields() {
assertThat(merged.compaction()).hasValue(COMPACTION);
}

@Test
public void setArtifactDelta_reusesConcurrentMap() {
EventActions eventActions = new EventActions();
ConcurrentMap<String, Integer> artifactDelta = new ConcurrentHashMap<>();
artifactDelta.put("artifact1", 1);

eventActions.setArtifactDelta(artifactDelta);

assertThat(eventActions.artifactDelta()).isSameInstanceAs(artifactDelta);
}

@Test
public void setArtifactDelta_copiesRegularMap() {
EventActions eventActions = new EventActions();
ImmutableMap<String, Integer> artifactDelta = ImmutableMap.of("artifact1", 1);

eventActions.setArtifactDelta(artifactDelta);

assertThat(eventActions.artifactDelta()).isNotSameInstanceAs(artifactDelta);
assertThat(eventActions.artifactDelta()).containsExactly("artifact1", 1);
assertThat(eventActions.artifactDelta()).isInstanceOf(ConcurrentMap.class);
}

@Test
public void removeStateByKey_marksKeyAsRemoved() {
EventActions eventActions = new EventActions();
Expand Down