Merge branch 'main' into feat-allow_new_message_null

Author: wenhaozhao

.vscode/extensions.json

@@ -0,0 +1,7 @@
+{
+  "recommendations": [
+    "redhat.java",
+    "vscjava.vscode-java-pack",
+    "josevseb.google-java-format-for-vs-code"
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,31 @@
+{
+  // formatOnType and formatOnPaste is a very bad idea for slow formatters
+  // (such as an external Google Java Format invocation exec), so just on Save:
+  "editor.formatOnSave": true,
+  "editor.formatOnType": false,
+  "editor.formatOnPaste": false,
+
+  "files.insertFinalNewline": true,
+  "files.trimTrailingWhitespace": true,
+
+  "[java]": {
+    "editor.tabSize": 2,
+    // Format Java using https://github.com/google/google-java-format,
+    // via https://github.com/JoseVSeb/google-java-format-for-vs-code
+    "editor.defaultFormatter": "josevseb.google-java-format-for-vs-code",
+    "editor.codeActionsOnSave": {
+      // Used by at least JS as well as Java, so only overridden for [java]
+      "source.organizeImports": "always",
+      "source.addMissingImports": "never"
+    }
+  },
+  // Keep this version in sync with the same version in pom.xml
+  // NB: Changes to this are only taken into account on start-up, so need to restart.
+  "java.format.settings.google.version": "1.27.0",
+  // TODO https://github.com/eclipse-jdtls/eclipse.jdt.ls/issues/3050
+  "java.compile.nullAnalysis.mode": "automatic",
+  "java.completion.importOrder": ["#", "", "javax", "java"], //# is static
+  "java.completion.favoriteStaticMembers": ["com.google.common.truth.Truth.*"],
+  "java.configuration.updateBuildConfiguration": "automatic",
+  "java.import.maven.enabled": true
+}

contrib/langchain4j/pom.xml

@@ -25,13 +25,13 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>google-adk-contrib-langchain4j</artifactId>
-    <name>Agent Development Kit - Contributions - LangChain4j</name>
+    <artifactId>google-adk-langchain4j</artifactId>
+    <name>Agent Development Kit - LangChain4j</name>
     <description>LangChain4j integration for the Agent Development Kit.</description>
 
     <properties>
-        <mcp-schema.version>0.10.0</mcp-schema.version>
-        <google.genai.version>1.0.0</google.genai.version>
+        <mcp.version>0.10.0</mcp.version>
+        <google.genai.version>1.8.0</google.genai.version>
         <junit.version>5.11.4</junit.version>
         <mockito.version>5.17.0</mockito.version>
         <langchain4j.version>1.1.0</langchain4j.version>
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>io.modelcontextprotocol.sdk</groupId>
             <artifactId>mcp</artifactId>
-            <version>${mcp-schema.version}</version>
+            <version>${mcp.version}</version>
         </dependency>
 
         <!-- Test dependencies -->
@@ -136,4 +136,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
+</project>

contrib/langchain4j/src/main/java/com/google/adk/models/langchain4j/LangChain4j.java

@@ -224,13 +224,11 @@ private ChatRequest toChatRequest(LlmRequest llmRequest) {
                       .mode()
                       .ifPresent(
                           functionMode -> {
-                            if (functionMode
-                                .knownEnum()
-                                .equals(FunctionCallingConfigMode.Known.AUTO)) {
+                            if (FunctionCallingConfigMode.Known.AUTO.equals(
+                                functionMode.knownEnum())) {
                               requestBuilder.toolChoice(ToolChoice.AUTO);
-                            } else if (functionMode
-                                .knownEnum()
-                                .equals(FunctionCallingConfigMode.Known.ANY)) {
+                            } else if (FunctionCallingConfigMode.Known.ANY.equals(
+                                functionMode.knownEnum())) {
                               // TODO check if it's the correct
                               // mapping
                               requestBuilder.toolChoice(ToolChoice.REQUIRED);
@@ -246,9 +244,8 @@ private ChatRequest toChatRequest(LlmRequest llmRequest) {
                                                             toolSpecification.name()))
                                                 .toList());
                                       });
-                            } else if (functionMode
-                                .knownEnum()
-                                .equals(FunctionCallingConfigMode.Known.NONE)) {
+                            } else if (FunctionCallingConfigMode.Known.NONE.equals(
+                                functionMode.knownEnum())) {
                               requestBuilder.toolSpecifications(List.of());
                             }
                           });
@@ -349,7 +346,7 @@ private List<ChatMessage> toUserOrToolResultMessage(Content content) {
                       .mimeType(mimeType)
                       .build());
         } else if (mimeType.startsWith("text/")
-            || mimeType.equals("application/json")
+            || "application/json".equals(mimeType)
             || mimeType.endsWith("+json")
             || mimeType.endsWith("+xml")) {
           // TODO are there missing text based mime types?
@@ -454,7 +451,7 @@ private List<ToolSpecification> toToolSpecifications(LlmRequest llmRequest) {
   }
 
   private JsonObjectSchema toParameters(Schema schema) {
-    if (schema.type().isPresent() && schema.type().get().knownEnum().equals(Type.Known.OBJECT)) {
+    if (schema.type().isPresent() && Type.Known.OBJECT.equals(schema.type().get().knownEnum())) {
       return JsonObjectSchema.builder()
           .addProperties(toProperties(schema))
           .required(schema.required().orElse(List.of()))
@@ -490,7 +487,7 @@ private JsonSchemaElement toJsonSchemaElement(Schema schema) {
                 .items(toJsonSchemaElement(schema.items().orElseThrow()))
                 .build();
         case OBJECT -> toParameters(schema);
-        case TYPE_UNSPECIFIED ->
+        default ->
             throw new UnsupportedFeatureException(
                 "LangChain4jLlm does not support schema of type: " + type);
       };

core/pom.xml

@@ -30,7 +30,7 @@
   <description>Agent Development Kit: an open-source, code-first toolkit designed to simplify building, evaluating, and deploying advanced AI agents anywhere.</description>
 
   <properties>
-    <mcp-schema.version>0.10.0</mcp-schema.version>
+    <mcp.version>0.10.0</mcp.version>
     <errorprone.version>2.38.0</errorprone.version>
     <google.auth.version>1.33.1</google.auth.version>
     <google.cloud.storage.version>2.28.0</google.cloud.storage.version>
@@ -76,7 +76,7 @@
     <dependency>
       <groupId> io.modelcontextprotocol.sdk</groupId>
       <artifactId>mcp</artifactId>
-      <version>${mcp-schema.version}</version>
+      <version>${mcp.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.auth</groupId>
@@ -229,4 +229,4 @@
       </resource>
     </resources>
   </build>
-</project>
+</project>