Merge branch 'function_ids' of github.com:zbirkenbuel/adk-java into function_ids

Author: zbirkenbuel

a2a/src/main/java/com/google/adk/a2a/converters/PartConverter.java

@@ -137,7 +137,7 @@ private static Optional<com.google.genai.types.Part> convertDataPartToGenAiPart(
       return Optional.of(
           com.google.genai.types.Part.builder()
               .functionCall(
-                FunctionCall.builder().name(functionName).id(functionId).args(args).build())
+                FunctionCall.builder().name(functionName).id(functionId).id(functionId).args(args).build())
               .build());
     }
 
@@ -150,7 +150,7 @@ private static Optional<com.google.genai.types.Part> convertDataPartToGenAiPart(
           com.google.genai.types.Part.builder()
               .functionResponse(
                   FunctionResponse.builder()
-                      .name(functionName)
+                      .name(functionName).id(functionId)
                       .id(functionId)
                       .response(response)
                       .build())

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

@@ -45,7 +45,7 @@ public void convertEventsToA2AMessage_preservesFunctionCallAndResponseParts() {
         Part.builder()
             .functionCall(
                 FunctionCall.builder()
-                    .name("roll_die")
+                    .name("roll_die").id("adk-call-1")
                     .id("adk-call-1")
                     .args(Map.of("sides", 6))
                     .build())
@@ -65,7 +65,7 @@ public void convertEventsToA2AMessage_preservesFunctionCallAndResponseParts() {
         Part.builder()
             .functionResponse(
                 FunctionResponse.builder()
-                    .name("roll_die")
+                    .name("roll_die").id("adk-call-1")
                     .id("adk-call-1")
                     .response(Map.of("result", 3))
                     .build())