diff --git a/core/src/main/java/com/google/adk/Version.java b/core/src/main/java/com/google/adk/Version.java index b02a5ae02..fab968fe6 100644 --- a/core/src/main/java/com/google/adk/Version.java +++ b/core/src/main/java/com/google/adk/Version.java @@ -24,12 +24,13 @@ public final class Version { private static final Logger logger = LoggerFactory.getLogger(Version.class); - + public static final String JAVA_ADK_VERSION; - + static { String version = "unknown"; - try (InputStream input = Version.class.getClassLoader().getResourceAsStream("version.properties")) { + try (InputStream input = + Version.class.getClassLoader().getResourceAsStream("version.properties")) { if (input != null) { Properties properties = new Properties(); properties.load(input); @@ -44,4 +45,4 @@ public final class Version { } private Version() {} -} \ No newline at end of file +} diff --git a/core/src/main/java/com/google/adk/agents/CallbackUtil.java b/core/src/main/java/com/google/adk/agents/CallbackUtil.java index ac958c498..90e82bd26 100644 --- a/core/src/main/java/com/google/adk/agents/CallbackUtil.java +++ b/core/src/main/java/com/google/adk/agents/CallbackUtil.java @@ -17,11 +17,11 @@ package com.google.adk.agents; import com.google.adk.agents.Callbacks.AfterAgentCallback; +import com.google.adk.agents.Callbacks.AfterAgentCallbackBase; import com.google.adk.agents.Callbacks.AfterAgentCallbackSync; import com.google.adk.agents.Callbacks.BeforeAgentCallback; -import com.google.adk.agents.Callbacks.BeforeAgentCallbackSync; import com.google.adk.agents.Callbacks.BeforeAgentCallbackBase; -import com.google.adk.agents.Callbacks.AfterAgentCallbackBase; +import com.google.adk.agents.Callbacks.BeforeAgentCallbackSync; import com.google.common.collect.ImmutableList; import com.google.errorprone.annotations.CanIgnoreReturnValue; import io.reactivex.rxjava3.core.Maybe; diff --git a/core/src/main/java/com/google/adk/sessions/Session.java b/core/src/main/java/com/google/adk/sessions/Session.java index 97e549dcf..3bf27b55e 100644 --- a/core/src/main/java/com/google/adk/sessions/Session.java +++ b/core/src/main/java/com/google/adk/sessions/Session.java @@ -16,7 +16,6 @@ package com.google.adk.sessions; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/core/src/main/java/com/google/adk/sessions/VertexAiSessionService.java b/core/src/main/java/com/google/adk/sessions/VertexAiSessionService.java index 1fe6482f4..6ed049b93 100644 --- a/core/src/main/java/com/google/adk/sessions/VertexAiSessionService.java +++ b/core/src/main/java/com/google/adk/sessions/VertexAiSessionService.java @@ -152,13 +152,13 @@ public Single createSession( JsonNode getSessionResponseMap = getJsonResponse(getSessionApiResponse); Instant updateTimestamp = Instant.parse(getSessionResponseMap.get("updateTime").asText()); ConcurrentMap sessionState = null; - if (getSessionResponseMap != null && getSessionResponseMap.has("sessionState")) { - JsonNode sessionStateNode = getSessionResponseMap.get("sessionState"); - if (sessionStateNode != null) { + if (getSessionResponseMap != null && getSessionResponseMap.has("sessionState")) { + JsonNode sessionStateNode = getSessionResponseMap.get("sessionState"); + if (sessionStateNode != null) { sessionState = objectMapper.convertValue( sessionStateNode, new TypeReference>() {}); - } + } } return Single.just( Session.builder(sessId) diff --git a/core/src/test/java/com/google/adk/VersionTest.java b/core/src/test/java/com/google/adk/VersionTest.java index 5600a9df1..ff7939165 100644 --- a/core/src/test/java/com/google/adk/VersionTest.java +++ b/core/src/test/java/com/google/adk/VersionTest.java @@ -34,4 +34,4 @@ public void versionShouldMatchProjectVersion() { assertThat(Version.JAVA_ADK_VERSION).matches("\\d+\\.\\d+\\.\\d+(-SNAPSHOT)?"); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/google/adk/flows/llmflows/InstructionsTest.java b/core/src/test/java/com/google/adk/flows/llmflows/InstructionsTest.java index d035da71f..7dc1a7164 100644 --- a/core/src/test/java/com/google/adk/flows/llmflows/InstructionsTest.java +++ b/core/src/test/java/com/google/adk/flows/llmflows/InstructionsTest.java @@ -185,10 +185,7 @@ public void processRequest_agentInstructionProvider_appendsInstruction() { public void processRequest_agentInstructionString_withInvalidPlaceholderSyntax_appendsInstructionWithLiteral() { LlmAgent agent = - LlmAgent.builder() - .name("agent") - .instruction("Value: { invalid name } and {var.}") - .build(); + LlmAgent.builder().name("agent").instruction("Value: { invalid name } and {var.}").build(); InvocationContext context = createContext(agent, createSession()); RequestProcessor.RequestProcessingResult result =