Replaced ToolCall class with existing ResponseMessageToolCall

Author: CharlesDuboisSAP

orchestration/src/main/java/com/sap/ai/sdk/orchestration/AssistantMessage.java

@@ -1,6 +1,7 @@
 package com.sap.ai.sdk.orchestration;
 
 import com.sap.ai.sdk.orchestration.model.ChatMessage;
+import com.sap.ai.sdk.orchestration.model.ResponseMessageToolCall;
 import com.sap.ai.sdk.orchestration.model.SingleChatMessage;
 import java.util.List;
 import javax.annotation.Nonnull;
@@ -21,7 +22,7 @@ public final class AssistantMessage implements Message {
   @Nonnull String content;
 
   /** Tool call if there is any. */
-  @Nullable List<ToolCall> toolCalls = null;
+  @Nullable List<ResponseMessageToolCall> toolCalls = null;
 
   /**
    * Creates a new assistant message with the given text content.
@@ -37,7 +38,7 @@ public AssistantMessage(@Nonnull final String content) {
    *
    * @param toolCalls list of tool call objects
    */
-  public AssistantMessage(@Nonnull final List<ToolCall> toolCalls) {
+  public AssistantMessage(@Nonnull final List<ResponseMessageToolCall> toolCalls) {
     content = "";
     this.toolCalls = toolCalls;
   }
@@ -48,10 +49,7 @@ public ChatMessage createChatMessage() {
     if (toolCalls() != null) {
       // content shouldn't be required for tool calls 🤷
       val message = SingleChatMessage.create().role(role).content("");
-
-      val maps = toolCalls().stream().map(ToolCall::map).toList();
-      message.setCustomField("tool_calls", maps);
-
+      message.setCustomField("tool_calls", toolCalls);
       return message;
     }
     return Message.super.createChatMessage();

orchestration/src/main/java/com/sap/ai/sdk/orchestration/ToolCall.java

@@ -1,16 +1,18 @@
 package com.sap.ai.sdk.orchestration.spring;
 
 import static com.sap.ai.sdk.orchestration.OrchestrationClient.toCompletionPostRequest;
+import static com.sap.ai.sdk.orchestration.model.ResponseMessageToolCall.TypeEnum.FUNCTION;
 
 import com.google.common.annotations.Beta;
 import com.sap.ai.sdk.orchestration.AssistantMessage;
 import com.sap.ai.sdk.orchestration.OrchestrationChatCompletionDelta;
 import com.sap.ai.sdk.orchestration.OrchestrationClient;
 import com.sap.ai.sdk.orchestration.OrchestrationPrompt;
 import com.sap.ai.sdk.orchestration.SystemMessage;
-import com.sap.ai.sdk.orchestration.ToolCall;
 import com.sap.ai.sdk.orchestration.ToolMessage;
 import com.sap.ai.sdk.orchestration.UserMessage;
+import com.sap.ai.sdk.orchestration.model.ResponseMessageToolCall;
+import com.sap.ai.sdk.orchestration.model.ResponseMessageToolCallFunction;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -134,15 +136,17 @@ private static com.sap.ai.sdk.orchestration.Message[] toOrchestrationMessages(
                 val springToolCalls =
                     ((org.springframework.ai.chat.messages.AssistantMessage) msg).getToolCalls();
                 if (springToolCalls != null) {
-                  final List<ToolCall> sdkToolCalls =
+                  final List<ResponseMessageToolCall> sdkToolCalls =
                       springToolCalls.stream()
                           .map(
                               toolCall ->
-                                  new ToolCall()
+                                  ResponseMessageToolCall.create()
                                       .id(toolCall.id())
-                                      .type(toolCall.type())
-                                      .name(toolCall.name())
-                                      .arguments(toolCall.arguments()))
+                                      .type(FUNCTION)
+                                      .function(
+                                          ResponseMessageToolCallFunction.create()
+                                              .name(toolCall.name())
+                                              .arguments(toolCall.arguments())))
                           .toList();
                   yield List.of(new AssistantMessage(sdkToolCalls));
                 }