Skip to content

feat!: remove deprecated methods accepting Optional params in InvocationContext #961

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 5, 2026
Merged

feat!: remove deprecated methods accepting Optional params in InvocationContext #961

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
104 changes: 0 additions & 104 deletions core/src/main/java/com/google/adk/agents/InvocationContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,70 +78,6 @@ protected InvocationContext(Builder builder) {
this.callbackContextData = new ConcurrentHashMap<>(builder.callbackContextData);
}

/**
* @deprecated Use {@link #builder()} instead.
*/
@Deprecated(forRemoval = true)
public InvocationContext(
BaseSessionService sessionService,
BaseArtifactService artifactService,
BaseMemoryService memoryService,
Plugin pluginManager,
Optional<LiveRequestQueue> liveRequestQueue,
Optional<String> branch,
String invocationId,
BaseAgent agent,
Session session,
Optional<Content> userContent,
RunConfig runConfig,
boolean endInvocation) {
this(
builder()
.sessionService(sessionService)
.artifactService(artifactService)
.memoryService(memoryService)
.pluginManager(pluginManager)
.liveRequestQueue(liveRequestQueue)
.branch(branch)
.invocationId(invocationId)
.agent(agent)
.session(session)
.userContent(userContent)
.runConfig(runConfig)
.endInvocation(endInvocation));
}

/**
* @deprecated Use {@link #builder()} instead.
*/
@Deprecated(forRemoval = true)
public InvocationContext(
BaseSessionService sessionService,
BaseArtifactService artifactService,
BaseMemoryService memoryService,
Optional<LiveRequestQueue> liveRequestQueue,
Optional<String> branch,
String invocationId,
BaseAgent agent,
Session session,
Optional<Content> userContent,
RunConfig runConfig,
boolean endInvocation) {
this(
builder()
.sessionService(sessionService)
.artifactService(artifactService)
.memoryService(memoryService)
.liveRequestQueue(liveRequestQueue)
.branch(branch)
.invocationId(invocationId)
.agent(agent)
.session(session)
.userContent(userContent)
.runConfig(runConfig)
.endInvocation(endInvocation));
}

/**
* @deprecated Use {@link #builder()} instead.
*/
Expand Down Expand Up @@ -478,21 +414,6 @@ public Builder pluginManager(Plugin pluginManager) {
return this;
}

/**
* Sets the queue for managing live requests.
*
* @param liveRequestQueue the queue for managing live requests.
* @return this builder instance for chaining.
* @deprecated Use {@link #liveRequestQueue(LiveRequestQueue)} instead.
*/
// TODO: b/462140921 - Builders should not accept Optional parameters.
@Deprecated(forRemoval = true)
@CanIgnoreReturnValue
public Builder liveRequestQueue(Optional<LiveRequestQueue> liveRequestQueue) {
this.liveRequestQueue = liveRequestQueue.orElse(null);
return this;
}

/**
* Sets the queue for managing live requests.
*
Expand All @@ -505,21 +426,6 @@ public Builder liveRequestQueue(@Nullable LiveRequestQueue liveRequestQueue) {
return this;
}

/**
* Sets the branch ID for the invocation.
*
* @param branch the branch ID for the invocation.
* @return this builder instance for chaining.
* @deprecated Use {@link #branch(String)} instead.
*/
// TODO: b/462140921 - Builders should not accept Optional parameters.
@Deprecated(forRemoval = true)
@CanIgnoreReturnValue
public Builder branch(Optional<String> branch) {
this.branch = branch.orElse(null);
return this;
}

/**
* Sets the branch ID for the invocation.
*
Expand Down Expand Up @@ -568,16 +474,6 @@ public Builder session(Session session) {
return this;
}

/**
* @deprecated Use {@link #userContent(Content)} instead.
*/
@CanIgnoreReturnValue
@Deprecated
public Builder userContent(Optional<Content> userContent) {
this.userContent = userContent.orElse(null);
return this;
}

/**
* Sets the user content that triggered this invocation.
*
Expand Down
108 changes: 3 additions & 105 deletions core/src/test/java/com/google/adk/agents/InvocationContextTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import com.google.genai.types.Content;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import org.junit.Assert;
import org.junit.Before;
Expand Down Expand Up @@ -607,45 +606,6 @@ public void testBranch() {
assertThat(context.branch()).isEmpty();
}

@Test
// Testing deprecated methods.
public void testDeprecatedCreateMethods() {
InvocationContext context1 =
InvocationContext.builder()
.sessionService(mockSessionService)
.artifactService(mockArtifactService)
.invocationId(testInvocationId)
.agent(mockAgent)
.session(session)
.userContent(Optional.ofNullable(userContent))
.runConfig(runConfig)
.build();

assertThat(context1.sessionService()).isEqualTo(mockSessionService);
assertThat(context1.artifactService()).isEqualTo(mockArtifactService);
assertThat(context1.invocationId()).isEqualTo(testInvocationId);
assertThat(context1.agent()).isEqualTo(mockAgent);
assertThat(context1.session()).isEqualTo(session);
assertThat(context1.userContent()).hasValue(userContent);
assertThat(context1.runConfig()).isEqualTo(runConfig);

InvocationContext context2 =
InvocationContext.create(
mockSessionService,
mockArtifactService,
mockAgent,
session,
liveRequestQueue,
runConfig);

assertThat(context2.sessionService()).isEqualTo(mockSessionService);
assertThat(context2.artifactService()).isEqualTo(mockArtifactService);
assertThat(context2.agent()).isEqualTo(mockAgent);
assertThat(context2.session()).isEqualTo(session);
assertThat(context2.liveRequestQueue()).hasValue(liveRequestQueue);
assertThat(context2.runConfig()).isEqualTo(runConfig);
}

@Test
public void testActiveStreamingTools() {
InvocationContext context =
Expand Down Expand Up @@ -686,78 +646,16 @@ public void testBuilderOptionalParameters() {
.artifactService(mockArtifactService)
.agent(mockAgent)
.session(session)
.liveRequestQueue(Optional.of(liveRequestQueue))
.branch(Optional.of("test-branch"))
.userContent(Optional.of(userContent))
.liveRequestQueue(liveRequestQueue)
.branch("test-branch")
.userContent(userContent)
.build();

assertThat(context.liveRequestQueue()).hasValue(liveRequestQueue);
assertThat(context.branch()).hasValue("test-branch");
assertThat(context.userContent()).hasValue(userContent);
}

@Test
// Testing deprecated methods.
public void testDeprecatedConstructor() {
InvocationContext context =
new InvocationContext(
mockSessionService,
mockArtifactService,
mockMemoryService,
pluginManager,
Optional.of(liveRequestQueue),
Optional.of("test-branch"),
testInvocationId,
mockAgent,
session,
Optional.of(userContent),
runConfig,
true);

assertThat(context.sessionService()).isEqualTo(mockSessionService);
assertThat(context.artifactService()).isEqualTo(mockArtifactService);
assertThat(context.memoryService()).isEqualTo(mockMemoryService);
assertThat(context.pluginManager()).isEqualTo(pluginManager);
assertThat(context.liveRequestQueue()).hasValue(liveRequestQueue);
assertThat(context.branch()).hasValue("test-branch");
assertThat(context.invocationId()).isEqualTo(testInvocationId);
assertThat(context.agent()).isEqualTo(mockAgent);
assertThat(context.session()).isEqualTo(session);
assertThat(context.userContent()).hasValue(userContent);
assertThat(context.runConfig()).isEqualTo(runConfig);
assertThat(context.endInvocation()).isTrue();
}

@Test
// Testing deprecated methods.
public void testDeprecatedConstructor_11params() {
InvocationContext context =
new InvocationContext(
mockSessionService,
mockArtifactService,
mockMemoryService,
Optional.of(liveRequestQueue),
Optional.of("test-branch"),
testInvocationId,
mockAgent,
session,
Optional.of(userContent),
runConfig,
true);

assertThat(context.sessionService()).isEqualTo(mockSessionService);
assertThat(context.artifactService()).isEqualTo(mockArtifactService);
assertThat(context.memoryService()).isEqualTo(mockMemoryService);
assertThat(context.liveRequestQueue()).hasValue(liveRequestQueue);
assertThat(context.branch()).hasValue("test-branch");
assertThat(context.invocationId()).isEqualTo(testInvocationId);
assertThat(context.agent()).isEqualTo(mockAgent);
assertThat(context.session()).isEqualTo(session);
assertThat(context.userContent()).hasValue(userContent);
assertThat(context.runConfig()).isEqualTo(runConfig);
assertThat(context.endInvocation()).isTrue();
}

@Test
public void build_missingInvocationId_null_throwsException() {
InvocationContext.Builder builder =
Expand Down