Skip to content

feat!: use @Nullable fields in Event class #953

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
copybara-service merged 1 commit into from
Mar 6, 2026
Merged

feat!: use @Nullable fields in Event class #953

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
2 changes: 1 addition & 1 deletion a2a/src/main/java/com/google/adk/a2a/RemoteA2AAgent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ private boolean mergeAggregatedContentIntoEvent(Event event) {
}
Content aggregatedContent = Content.builder().role("model").parts(parts).build();

event.setContent(Optional.of(aggregatedContent));
event.setContent(aggregatedContent);

ImmutableList.Builder<CustomMetadata> newMetadata = ImmutableList.builder();
event.customMetadata().ifPresent(newMetadata::addAll);
Expand Down
2 changes: 1 addition & 1 deletion a2a/src/main/java/com/google/adk/a2a/converters/ResponseConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ private static Optional<Event> handleTaskUpdate(
boolean isLastChunk = Objects.equals(artifactEvent.isLastChunk(), true);

Event eventPart = artifactToEvent(artifactEvent.getArtifact(), context);
eventPart.setPartial(Optional.of(isAppend || !isLastChunk));
eventPart.setPartial(isAppend || !isLastChunk);
// append=true, lastChunk=false: emit as partial, update aggregation
// append=false, lastChunk=false: emit as partial, reset aggregation
// append=true, lastChunk=true: emit as partial, update aggregation and emit as non-partial
Expand Down
6 changes: 3 additions & 3 deletions a2a/src/test/java/com/google/adk/a2a/executor/AgentExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ private RequestContext createRequestContext() {
public void process_statefulAggregation_tracksArtifactIdAndAppendForAuthor() {
Event partial1 =
Event.builder()
.partial(Optional.of(true))
.partial(true)
.author("agent_author")
.content(
Content.builder()
Expand All @@ -370,7 +370,7 @@ public void process_statefulAggregation_tracksArtifactIdAndAppendForAuthor() {
.build();
Event partial2 =
Event.builder()
.partial(Optional.of(true))
.partial(true)
.author("agent_author")
.content(
Content.builder()
Expand All @@ -379,7 +379,7 @@ public void process_statefulAggregation_tracksArtifactIdAndAppendForAuthor() {
.build();
Event finalEvent =
Event.builder()
.partial(Optional.of(false))
.partial(false)
.author("agent_author")
.content(
Content.builder()
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/com/google/adk/agents/BaseAgent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ private Single<Optional<Event>> callCallback(
.id(Event.generateEventId())
.invocationId(invocationContext.invocationId())
.author(name())
.branch(invocationContext.branch())
.branch(invocationContext.branch().orElse(null))
.actions(callbackContext.eventActions())
.content(content)
.build());
Expand All @@ -426,7 +426,7 @@ private Single<Optional<Event>> callCallback(
.id(Event.generateEventId())
.invocationId(invocationContext.invocationId())
.author(name())
.branch(invocationContext.branch())
.branch(invocationContext.branch().orElse(null))
.actions(callbackContext.eventActions());

return Single.just(Optional.of(eventBuilder.build()));
Expand Down
Loading