refactor: replacing uses of InvocationContext constructor with a builder

PiperOrigin-RevId: 856180952

Author: google-genai-bot

a2a/src/test/java/com/google/adk/a2a/converters/EventConverterTest.java

@@ -4,10 +4,8 @@
 
 import com.google.adk.agents.BaseAgent;
 import com.google.adk.agents.InvocationContext;
-import com.google.adk.agents.RunConfig;
 import com.google.adk.artifacts.InMemoryArtifactService;
 import com.google.adk.events.Event;
-import com.google.adk.memory.BaseMemoryService;
 import com.google.adk.plugins.PluginManager;
 import com.google.adk.sessions.InMemorySessionService;
 import com.google.adk.sessions.Session;
@@ -86,19 +84,14 @@ public void convertEventsToA2AMessage_preservesFunctionCallAndResponseParts() {
         Session.builder("session-1").appName("demo").userId("user").events(events).build();
 
     InvocationContext context =
-        new InvocationContext(
-            new InMemorySessionService(),
-            new InMemoryArtifactService(),
-            (BaseMemoryService) null,
-            new PluginManager(),
-            Optional.empty(),
-            Optional.empty(),
-            "invocation-1",
-            new TestAgent(),
-            session,
-            Optional.empty(),
-            RunConfig.builder().build(),
-            false);
+        InvocationContext.builder()
+            .sessionService(new InMemorySessionService())
+            .artifactService(new InMemoryArtifactService())
+            .pluginManager(new PluginManager())
+            .invocationId("invocation-1")
+            .agent(new TestAgent())
+            .session(session)
+            .build();
 
     // Act
     Optional<Message> maybeMessage = EventConverter.convertEventsToA2AMessage(context);

core/src/test/java/com/google/adk/tools/retrieval/VertexAiRagRetrievalTest.java

@@ -25,7 +25,6 @@
 import com.google.genai.types.VertexRagStore;
 import com.google.genai.types.VertexRagStoreRagResource;
 import java.util.Map;
-import java.util.Optional;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -56,18 +55,7 @@ public void runAsync_withResults_returnsContexts() throws Exception {
     String query = "test query";
     ToolContext toolContext =
         ToolContext.builder(
-                new InvocationContext(
-                    /* sessionService= */ null,
-                    /* artifactService= */ null,
-                    /* memoryService= */ null,
-                    /* liveRequestQueue= */ Optional.empty(),
-                    /* branch= */ Optional.empty(),
-                    /* invocationId= */ null,
-                    /* agent= */ null,
-                    Session.builder("123").build(),
-                    /* userContent= */ null,
-                    /* runConfig= */ null,
-                    /* endInvocation= */ false))
+                InvocationContext.builder().session(Session.builder("123").build()).build())
             .functionCallId("functionCallId")
             .build();
     RetrieveContextsRequest expectedRequest =
@@ -111,18 +99,7 @@ public void runAsync_noResults_returnsNoResultFoundMessage() throws Exception {
     String query = "test query";
     ToolContext toolContext =
         ToolContext.builder(
-                new InvocationContext(
-                    /* sessionService= */ null,
-                    /* artifactService= */ null,
-                    /* memoryService= */ null,
-                    /* liveRequestQueue= */ Optional.empty(),
-                    /* branch= */ Optional.empty(),
-                    /* invocationId= */ null,
-                    /* agent= */ null,
-                    Session.builder("123").build(),
-                    /* userContent= */ Optional.empty(),
-                    /* runConfig= */ null,
-                    /* endInvocation= */ false))
+                InvocationContext.builder().session(Session.builder("123").build()).build())
             .functionCallId("functionCallId")
             .build();
     RetrieveContextsRequest expectedRequest =
@@ -168,18 +145,7 @@ public void processLlmRequest_gemini2Model_addVertexRagStoreToConfig() {
     LlmRequest.Builder llmRequestBuilder = LlmRequest.builder().model("gemini-2-pro");
     ToolContext toolContext =
         ToolContext.builder(
-                new InvocationContext(
-                    /* sessionService= */ null,
-                    /* artifactService= */ null,
-                    /* memoryService= */ null,
-                    /* liveRequestQueue= */ Optional.empty(),
-                    /* branch= */ Optional.empty(),
-                    /* invocationId= */ null,
-                    /* agent= */ null,
-                    Session.builder("123").build(),
-                    /* userContent= */ Optional.empty(),
-                    /* runConfig= */ null,
-                    /* endInvocation= */ false))
+                InvocationContext.builder().session(Session.builder("123").build()).build())
             .functionCallId("functionCallId")
             .build();
 
@@ -245,18 +211,7 @@ public void processLlmRequest_otherModel_doNotAddVertexRagStoreToConfig() {
     LlmRequest.Builder llmRequestBuilder = LlmRequest.builder().model("gemini-1-pro");
     ToolContext toolContext =
         ToolContext.builder(
-                new InvocationContext(
-                    /* sessionService= */ null,
-                    /* artifactService= */ null,
-                    /* memoryService= */ null,
-                    /* liveRequestQueue= */ Optional.empty(),
-                    /* branch= */ Optional.empty(),
-                    /* invocationId= */ null,
-                    /* agent= */ null,
-                    Session.builder("123").build(),
-                    /* userContent= */ Optional.empty(),
-                    /* runConfig= */ null,
-                    /* endInvocation= */ false))
+                InvocationContext.builder().session(Session.builder("123").build()).build())
             .functionCallId("functionCallId")
             .build();
     GenerateContentConfig initialConfig = GenerateContentConfig.builder().build();