From b06453912ac36ba6c7bb91d3130dd50a9a4c3bda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mi=C5=82osz=20Sobczyk?= Date: Thu, 26 Mar 2026 03:10:48 -0700 Subject: [PATCH] ADK changes PiperOrigin-RevId: 889726165 --- .../main/java/com/google/adk/agents/ActiveStreamingTool.java | 2 +- .../main/java/com/google/adk/agents/ConfigAgentUtils.java | 2 +- .../main/java/com/google/adk/agents/InvocationContext.java | 2 +- core/src/main/java/com/google/adk/agents/LiveRequest.java | 2 +- core/src/main/java/com/google/adk/agents/LlmAgent.java | 2 +- core/src/main/java/com/google/adk/agents/RunConfig.java | 2 +- core/src/main/java/com/google/adk/agents/ToolResolver.java | 2 +- core/src/main/java/com/google/adk/apps/App.java | 2 +- core/src/main/java/com/google/adk/events/Event.java | 2 +- .../main/java/com/google/adk/events/ToolConfirmation.java | 2 +- .../main/java/com/google/adk/flows/llmflows/Contents.java | 2 +- core/src/main/java/com/google/adk/memory/MemoryEntry.java | 2 +- core/src/main/java/com/google/adk/models/LlmResponse.java | 2 +- .../main/java/com/google/adk/models/VertexCredentials.java | 2 +- .../adk/plugins/agentanalytics/BigQueryLoggerConfig.java | 2 +- core/src/main/java/com/google/adk/runner/Runner.java | 2 +- .../java/com/google/adk/sessions/BaseSessionService.java | 2 +- .../java/com/google/adk/sessions/SessionJsonConverter.java | 2 +- core/src/main/java/com/google/adk/sessions/State.java | 2 +- .../main/java/com/google/adk/sessions/VertexAiClient.java | 2 +- .../com/google/adk/summarizer/EventsCompactionConfig.java | 2 +- core/src/main/java/com/google/adk/tools/BaseToolset.java | 2 +- core/src/main/java/com/google/adk/tools/FunctionTool.java | 5 ++--- .../java/com/google/adk/tools/LongRunningFunctionTool.java | 2 +- core/src/main/java/com/google/adk/tools/ToolContext.java | 2 +- core/src/main/java/com/google/adk/tools/ToolPredicate.java | 2 +- .../applicationintegrationtoolset/CredentialsHelper.java | 2 +- .../GoogleCredentialsHelper.java | 2 +- .../main/java/com/google/adk/tools/mcp/McpAsyncToolset.java | 2 +- .../java/com/google/adk/tools/mcp/SseServerParameters.java | 2 +- .../java/com/google/adk/tools/mcp/StdioServerParameters.java | 2 +- .../google/adk/tools/mcp/StreamableHttpServerParameters.java | 2 +- .../com/google/adk/tools/retrieval/VertexAiRagRetrieval.java | 2 +- 33 files changed, 34 insertions(+), 35 deletions(-) diff --git a/core/src/main/java/com/google/adk/agents/ActiveStreamingTool.java b/core/src/main/java/com/google/adk/agents/ActiveStreamingTool.java index 78e7a471e..31b64e9c6 100644 --- a/core/src/main/java/com/google/adk/agents/ActiveStreamingTool.java +++ b/core/src/main/java/com/google/adk/agents/ActiveStreamingTool.java @@ -18,7 +18,7 @@ package com.google.adk.agents; import io.reactivex.rxjava3.disposables.Disposable; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; /** Manages streaming tool related resources during invocation. */ public class ActiveStreamingTool { diff --git a/core/src/main/java/com/google/adk/agents/ConfigAgentUtils.java b/core/src/main/java/com/google/adk/agents/ConfigAgentUtils.java index c489c9b0d..893353f27 100644 --- a/core/src/main/java/com/google/adk/agents/ConfigAgentUtils.java +++ b/core/src/main/java/com/google/adk/agents/ConfigAgentUtils.java @@ -35,7 +35,7 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/google/adk/agents/InvocationContext.java b/core/src/main/java/com/google/adk/agents/InvocationContext.java index 365f4f8c1..f3a3cf3b0 100644 --- a/core/src/main/java/com/google/adk/agents/InvocationContext.java +++ b/core/src/main/java/com/google/adk/agents/InvocationContext.java @@ -33,7 +33,7 @@ import java.util.Optional; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; /** The context for an agent invocation. */ public class InvocationContext { diff --git a/core/src/main/java/com/google/adk/agents/LiveRequest.java b/core/src/main/java/com/google/adk/agents/LiveRequest.java index df1ada6a5..416ffa794 100644 --- a/core/src/main/java/com/google/adk/agents/LiveRequest.java +++ b/core/src/main/java/com/google/adk/agents/LiveRequest.java @@ -26,7 +26,7 @@ import com.google.genai.types.Blob; import com.google.genai.types.Content; import java.util.Optional; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; /** Represents a request to be sent to a live connection to the LLM model. */ @AutoValue diff --git a/core/src/main/java/com/google/adk/agents/LlmAgent.java b/core/src/main/java/com/google/adk/agents/LlmAgent.java index 077068283..c8199e8a2 100644 --- a/core/src/main/java/com/google/adk/agents/LlmAgent.java +++ b/core/src/main/java/com/google/adk/agents/LlmAgent.java @@ -71,7 +71,7 @@ import java.util.Optional; import java.util.concurrent.Executor; import java.util.function.Function; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/google/adk/agents/RunConfig.java b/core/src/main/java/com/google/adk/agents/RunConfig.java index 1ca203eaf..661a5cddf 100644 --- a/core/src/main/java/com/google/adk/agents/RunConfig.java +++ b/core/src/main/java/com/google/adk/agents/RunConfig.java @@ -22,7 +22,7 @@ import com.google.genai.types.AudioTranscriptionConfig; import com.google.genai.types.Modality; import com.google.genai.types.SpeechConfig; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/google/adk/agents/ToolResolver.java b/core/src/main/java/com/google/adk/agents/ToolResolver.java index b48b25310..09a3d79c1 100644 --- a/core/src/main/java/com/google/adk/agents/ToolResolver.java +++ b/core/src/main/java/com/google/adk/agents/ToolResolver.java @@ -32,7 +32,7 @@ import java.lang.reflect.Modifier; import java.util.List; import java.util.Optional; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/google/adk/apps/App.java b/core/src/main/java/com/google/adk/apps/App.java index a087b738c..689e8c3b1 100644 --- a/core/src/main/java/com/google/adk/apps/App.java +++ b/core/src/main/java/com/google/adk/apps/App.java @@ -24,7 +24,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.List; import java.util.regex.Pattern; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; /** * Represents an LLM-backed agentic application. diff --git a/core/src/main/java/com/google/adk/events/Event.java b/core/src/main/java/com/google/adk/events/Event.java index 2677b635d..454cd591e 100644 --- a/core/src/main/java/com/google/adk/events/Event.java +++ b/core/src/main/java/com/google/adk/events/Event.java @@ -39,7 +39,7 @@ import java.util.Optional; import java.util.Set; import java.util.UUID; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; // TODO - b/413761119 update Agent.java when resolved. /** Represents an event in a session. */ diff --git a/core/src/main/java/com/google/adk/events/ToolConfirmation.java b/core/src/main/java/com/google/adk/events/ToolConfirmation.java index 167286094..ae0104aa1 100644 --- a/core/src/main/java/com/google/adk/events/ToolConfirmation.java +++ b/core/src/main/java/com/google/adk/events/ToolConfirmation.java @@ -21,7 +21,7 @@ import com.google.adk.JsonBaseModel; import com.google.auto.value.AutoValue; import com.google.errorprone.annotations.CanIgnoreReturnValue; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; /** Represents a tool confirmation configuration. */ @AutoValue diff --git a/core/src/main/java/com/google/adk/flows/llmflows/Contents.java b/core/src/main/java/com/google/adk/flows/llmflows/Contents.java index 840a370c6..876f3a206 100644 --- a/core/src/main/java/com/google/adk/flows/llmflows/Contents.java +++ b/core/src/main/java/com/google/adk/flows/llmflows/Contents.java @@ -42,7 +42,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; /** {@link RequestProcessor} that populates content in request for LLM flows. */ public final class Contents implements RequestProcessor { diff --git a/core/src/main/java/com/google/adk/memory/MemoryEntry.java b/core/src/main/java/com/google/adk/memory/MemoryEntry.java index ef310f627..65f1dadc3 100644 --- a/core/src/main/java/com/google/adk/memory/MemoryEntry.java +++ b/core/src/main/java/com/google/adk/memory/MemoryEntry.java @@ -22,7 +22,7 @@ import com.google.auto.value.AutoValue; import com.google.genai.types.Content; import java.time.Instant; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; /** Represents one memory entry. */ @AutoValue diff --git a/core/src/main/java/com/google/adk/models/LlmResponse.java b/core/src/main/java/com/google/adk/models/LlmResponse.java index 1ca381e23..560e2abcc 100644 --- a/core/src/main/java/com/google/adk/models/LlmResponse.java +++ b/core/src/main/java/com/google/adk/models/LlmResponse.java @@ -33,7 +33,7 @@ import com.google.genai.types.GroundingMetadata; import java.util.List; import java.util.Optional; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; /** Represents a response received from the LLM. */ @AutoValue diff --git a/core/src/main/java/com/google/adk/models/VertexCredentials.java b/core/src/main/java/com/google/adk/models/VertexCredentials.java index 93dc05ec1..0ae81c2a4 100644 --- a/core/src/main/java/com/google/adk/models/VertexCredentials.java +++ b/core/src/main/java/com/google/adk/models/VertexCredentials.java @@ -19,7 +19,7 @@ import com.google.auth.oauth2.GoogleCredentials; import com.google.auto.value.AutoValue; import java.util.Optional; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; /** Credentials for accessing Gemini models through Vertex. */ @AutoValue diff --git a/core/src/main/java/com/google/adk/plugins/agentanalytics/BigQueryLoggerConfig.java b/core/src/main/java/com/google/adk/plugins/agentanalytics/BigQueryLoggerConfig.java index aa5bf37de..a7bae007f 100644 --- a/core/src/main/java/com/google/adk/plugins/agentanalytics/BigQueryLoggerConfig.java +++ b/core/src/main/java/com/google/adk/plugins/agentanalytics/BigQueryLoggerConfig.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.Optional; import java.util.function.BiFunction; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; /** Configuration for the BigQueryAgentAnalyticsPlugin. */ @AutoValue diff --git a/core/src/main/java/com/google/adk/runner/Runner.java b/core/src/main/java/com/google/adk/runner/Runner.java index 82f342a81..120465f31 100644 --- a/core/src/main/java/com/google/adk/runner/Runner.java +++ b/core/src/main/java/com/google/adk/runner/Runner.java @@ -64,7 +64,7 @@ import java.util.Map; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; /** The main class for the GenAI Agents runner. */ public class Runner { diff --git a/core/src/main/java/com/google/adk/sessions/BaseSessionService.java b/core/src/main/java/com/google/adk/sessions/BaseSessionService.java index 7a0885544..8596f8eb6 100644 --- a/core/src/main/java/com/google/adk/sessions/BaseSessionService.java +++ b/core/src/main/java/com/google/adk/sessions/BaseSessionService.java @@ -28,7 +28,7 @@ import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; /** * Defines the contract for managing {@link Session}s and their associated {@link Event}s. Provides diff --git a/core/src/main/java/com/google/adk/sessions/SessionJsonConverter.java b/core/src/main/java/com/google/adk/sessions/SessionJsonConverter.java index 0c2b33704..adc84fbb6 100644 --- a/core/src/main/java/com/google/adk/sessions/SessionJsonConverter.java +++ b/core/src/main/java/com/google/adk/sessions/SessionJsonConverter.java @@ -39,7 +39,7 @@ import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/google/adk/sessions/State.java b/core/src/main/java/com/google/adk/sessions/State.java index 70d2dfbf2..577559f85 100644 --- a/core/src/main/java/com/google/adk/sessions/State.java +++ b/core/src/main/java/com/google/adk/sessions/State.java @@ -24,7 +24,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; /** A {@link State} object that also keeps track of the changes to the state. */ @SuppressWarnings("ShouldNotSubclass") diff --git a/core/src/main/java/com/google/adk/sessions/VertexAiClient.java b/core/src/main/java/com/google/adk/sessions/VertexAiClient.java index 1168d1166..2d8a13f2f 100644 --- a/core/src/main/java/com/google/adk/sessions/VertexAiClient.java +++ b/core/src/main/java/com/google/adk/sessions/VertexAiClient.java @@ -18,8 +18,8 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeoutException; -import javax.annotation.Nullable; import okhttp3.ResponseBody; +import org.jspecify.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/com/google/adk/summarizer/EventsCompactionConfig.java b/core/src/main/java/com/google/adk/summarizer/EventsCompactionConfig.java index 39698c3db..db462466c 100644 --- a/core/src/main/java/com/google/adk/summarizer/EventsCompactionConfig.java +++ b/core/src/main/java/com/google/adk/summarizer/EventsCompactionConfig.java @@ -18,7 +18,7 @@ import com.google.auto.value.AutoBuilder; import com.google.errorprone.annotations.CanIgnoreReturnValue; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; /** * Configuration for event compaction. diff --git a/core/src/main/java/com/google/adk/tools/BaseToolset.java b/core/src/main/java/com/google/adk/tools/BaseToolset.java index 40167aa75..76369e5b9 100644 --- a/core/src/main/java/com/google/adk/tools/BaseToolset.java +++ b/core/src/main/java/com/google/adk/tools/BaseToolset.java @@ -19,7 +19,7 @@ import com.google.adk.agents.ReadonlyContext; import io.reactivex.rxjava3.core.Flowable; import java.util.List; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; /** Base interface for toolsets. */ public interface BaseToolset extends AutoCloseable { diff --git a/core/src/main/java/com/google/adk/tools/FunctionTool.java b/core/src/main/java/com/google/adk/tools/FunctionTool.java index 4323b4569..ea67d40d4 100644 --- a/core/src/main/java/com/google/adk/tools/FunctionTool.java +++ b/core/src/main/java/com/google/adk/tools/FunctionTool.java @@ -36,7 +36,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -222,8 +222,7 @@ public Method func() { } /** Returns the underlying function's {@link Object} instance if present. */ - @Nullable - Object instance() { + @Nullable Object instance() { return instance; } diff --git a/core/src/main/java/com/google/adk/tools/LongRunningFunctionTool.java b/core/src/main/java/com/google/adk/tools/LongRunningFunctionTool.java index 68b7c242b..23733c4eb 100644 --- a/core/src/main/java/com/google/adk/tools/LongRunningFunctionTool.java +++ b/core/src/main/java/com/google/adk/tools/LongRunningFunctionTool.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.google.adk.utils.ComponentRegistry; import java.lang.reflect.Method; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; /** A function tool that returns the result asynchronously. */ public class LongRunningFunctionTool extends FunctionTool { diff --git a/core/src/main/java/com/google/adk/tools/ToolContext.java b/core/src/main/java/com/google/adk/tools/ToolContext.java index 5192d19ff..974d1f017 100644 --- a/core/src/main/java/com/google/adk/tools/ToolContext.java +++ b/core/src/main/java/com/google/adk/tools/ToolContext.java @@ -24,7 +24,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import io.reactivex.rxjava3.core.Single; import java.util.Optional; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; /** ToolContext object provides a structured context for executing tools or functions. */ public class ToolContext extends CallbackContext { diff --git a/core/src/main/java/com/google/adk/tools/ToolPredicate.java b/core/src/main/java/com/google/adk/tools/ToolPredicate.java index 6adf53c18..5c8dd9893 100644 --- a/core/src/main/java/com/google/adk/tools/ToolPredicate.java +++ b/core/src/main/java/com/google/adk/tools/ToolPredicate.java @@ -18,7 +18,7 @@ import com.google.adk.agents.ReadonlyContext; import java.util.Optional; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; /** * Functional interface to decide whether a tool should be exposed to the LLM based on the current diff --git a/core/src/main/java/com/google/adk/tools/applicationintegrationtoolset/CredentialsHelper.java b/core/src/main/java/com/google/adk/tools/applicationintegrationtoolset/CredentialsHelper.java index 60bf6fc8d..c6c26d0af 100644 --- a/core/src/main/java/com/google/adk/tools/applicationintegrationtoolset/CredentialsHelper.java +++ b/core/src/main/java/com/google/adk/tools/applicationintegrationtoolset/CredentialsHelper.java @@ -5,7 +5,7 @@ import java.net.http.HttpRequest; import java.util.List; import java.util.Map; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; /** * This interface provides a method to convert a service account JSON string to a Google Credentials diff --git a/core/src/main/java/com/google/adk/tools/applicationintegrationtoolset/GoogleCredentialsHelper.java b/core/src/main/java/com/google/adk/tools/applicationintegrationtoolset/GoogleCredentialsHelper.java index ca036d21b..c78d91159 100644 --- a/core/src/main/java/com/google/adk/tools/applicationintegrationtoolset/GoogleCredentialsHelper.java +++ b/core/src/main/java/com/google/adk/tools/applicationintegrationtoolset/GoogleCredentialsHelper.java @@ -7,7 +7,7 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; public final class GoogleCredentialsHelper implements CredentialsHelper { diff --git a/core/src/main/java/com/google/adk/tools/mcp/McpAsyncToolset.java b/core/src/main/java/com/google/adk/tools/mcp/McpAsyncToolset.java index bcc786d69..5f4c2164b 100644 --- a/core/src/main/java/com/google/adk/tools/mcp/McpAsyncToolset.java +++ b/core/src/main/java/com/google/adk/tools/mcp/McpAsyncToolset.java @@ -35,7 +35,7 @@ import java.util.List; import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Mono; diff --git a/core/src/main/java/com/google/adk/tools/mcp/SseServerParameters.java b/core/src/main/java/com/google/adk/tools/mcp/SseServerParameters.java index 67ea7ef4b..3b12f7064 100644 --- a/core/src/main/java/com/google/adk/tools/mcp/SseServerParameters.java +++ b/core/src/main/java/com/google/adk/tools/mcp/SseServerParameters.java @@ -23,7 +23,7 @@ import com.google.common.collect.ImmutableMap; import java.time.Duration; import java.util.Map; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; /** Parameters for establishing a MCP Server-Sent Events (SSE) connection. */ @AutoValue diff --git a/core/src/main/java/com/google/adk/tools/mcp/StdioServerParameters.java b/core/src/main/java/com/google/adk/tools/mcp/StdioServerParameters.java index b5632594f..50c07c840 100644 --- a/core/src/main/java/com/google/adk/tools/mcp/StdioServerParameters.java +++ b/core/src/main/java/com/google/adk/tools/mcp/StdioServerParameters.java @@ -25,7 +25,7 @@ import io.modelcontextprotocol.client.transport.ServerParameters; import java.util.List; import java.util.Map; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; /** Parameters for establishing a MCP stdio connection. */ @AutoValue diff --git a/core/src/main/java/com/google/adk/tools/mcp/StreamableHttpServerParameters.java b/core/src/main/java/com/google/adk/tools/mcp/StreamableHttpServerParameters.java index f09c8c5e7..e9f8a3ac8 100644 --- a/core/src/main/java/com/google/adk/tools/mcp/StreamableHttpServerParameters.java +++ b/core/src/main/java/com/google/adk/tools/mcp/StreamableHttpServerParameters.java @@ -21,7 +21,7 @@ import java.time.Duration; import java.util.Collections; import java.util.Map; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; /** Server parameters for Streamable HTTP client transport. */ public class StreamableHttpServerParameters { diff --git a/core/src/main/java/com/google/adk/tools/retrieval/VertexAiRagRetrieval.java b/core/src/main/java/com/google/adk/tools/retrieval/VertexAiRagRetrieval.java index 16f11a1f8..02f06829f 100644 --- a/core/src/main/java/com/google/adk/tools/retrieval/VertexAiRagRetrieval.java +++ b/core/src/main/java/com/google/adk/tools/retrieval/VertexAiRagRetrieval.java @@ -40,7 +40,7 @@ import java.util.List; import java.util.Map; import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import org.jspecify.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory;