Skip to content

Commit 15bcad3

Browse files
tilgalascopybara-github
authored andcommitted
feat!: use @nullable fields in Event class
PiperOrigin-RevId: 878498806
1 parent 11ce49e commit 15bcad3

16 files changed

Lines changed: 113 additions & 209 deletions

File tree

a2a/src/main/java/com/google/adk/a2a/RemoteA2AAgent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ private boolean mergeAggregatedContentIntoEvent(Event event) {
436436
}
437437
Content aggregatedContent = Content.builder().role("model").parts(parts).build();
438438

439-
event.setContent(Optional.of(aggregatedContent));
439+
event.setContent(aggregatedContent);
440440

441441
ImmutableList.Builder<CustomMetadata> newMetadata = ImmutableList.builder();
442442
event.customMetadata().ifPresent(newMetadata::addAll);

a2a/src/main/java/com/google/adk/a2a/converters/ResponseConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ private static Optional<Event> handleTaskUpdate(
7676
boolean isLastChunk = Objects.equals(artifactEvent.isLastChunk(), true);
7777

7878
Event eventPart = artifactToEvent(artifactEvent.getArtifact(), context);
79-
eventPart.setPartial(Optional.of(isAppend || !isLastChunk));
79+
eventPart.setPartial(isAppend || !isLastChunk);
8080
// append=true, lastChunk=false: emit as partial, update aggregation
8181
// append=false, lastChunk=false: emit as partial, reset aggregation
8282
// append=true, lastChunk=true: emit as partial, update aggregation and emit as non-partial

a2a/src/test/java/com/google/adk/a2a/executor/AgentExecutorTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ private RequestContext createRequestContext() {
361361
public void process_statefulAggregation_tracksArtifactIdAndAppendForAuthor() {
362362
Event partial1 =
363363
Event.builder()
364-
.partial(Optional.of(true))
364+
.partial(true)
365365
.author("agent_author")
366366
.content(
367367
Content.builder()
@@ -370,7 +370,7 @@ public void process_statefulAggregation_tracksArtifactIdAndAppendForAuthor() {
370370
.build();
371371
Event partial2 =
372372
Event.builder()
373-
.partial(Optional.of(true))
373+
.partial(true)
374374
.author("agent_author")
375375
.content(
376376
Content.builder()
@@ -379,7 +379,7 @@ public void process_statefulAggregation_tracksArtifactIdAndAppendForAuthor() {
379379
.build();
380380
Event finalEvent =
381381
Event.builder()
382-
.partial(Optional.of(false))
382+
.partial(false)
383383
.author("agent_author")
384384
.content(
385385
Content.builder()

core/src/main/java/com/google/adk/agents/BaseAgent.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ private Single<Optional<Event>> callCallback(
409409
.id(Event.generateEventId())
410410
.invocationId(invocationContext.invocationId())
411411
.author(name())
412-
.branch(invocationContext.branch())
412+
.branch(invocationContext.branch().orElse(null))
413413
.actions(callbackContext.eventActions())
414414
.content(content)
415415
.build());
@@ -426,7 +426,7 @@ private Single<Optional<Event>> callCallback(
426426
.id(Event.generateEventId())
427427
.invocationId(invocationContext.invocationId())
428428
.author(name())
429-
.branch(invocationContext.branch())
429+
.branch(invocationContext.branch().orElse(null))
430430
.actions(callbackContext.eventActions());
431431

432432
return Single.just(Optional.of(eventBuilder.build()));

0 commit comments

Comments
 (0)