Update to latest changes on main

Author: MatKuhr

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

@@ -12,7 +12,6 @@
 import com.sap.ai.sdk.core.common.ClientResponseHandler;
 import com.sap.ai.sdk.core.common.ClientStreamingHandler;
 import com.sap.ai.sdk.core.common.StreamedDelta;
-import com.sap.ai.sdk.orchestration.model.ChatMessage;
 import com.sap.ai.sdk.orchestration.model.CompletionPostRequest;
 import com.sap.ai.sdk.orchestration.model.CompletionPostResponse;
 import com.sap.ai.sdk.orchestration.model.ModuleConfigs;
@@ -38,25 +37,6 @@
 public class OrchestrationClient {
   private static final String DEFAULT_SCENARIO = "orchestration";
 
-  static final ObjectMapper JACKSON;
-
-  static {
-    JACKSON = getDefaultObjectMapper();
-
-    // Add mix-ins
-    JACKSON.addMixIn(LLMModuleResult.class, JacksonMixins.LLMModuleResultMixIn.class);
-    JACKSON.addMixIn(
-        ModuleResultsOutputUnmaskingInner.class,
-        JacksonMixins.ModuleResultsOutputUnmaskingInnerMixIn.class);
-
-    final var module =
-        new SimpleModule()
-            .addDeserializer(
-                ChatMessage.class,
-                PolymorphicFallbackDeserializer.fromJsonSubTypes(ChatMessage.class))
-            .setMixInAnnotation(ChatMessage.class, JacksonMixins.NoneTypeInfoMixin.class);
-    JACKSON.registerModule(module);
-  }
   static final ObjectMapper JACKSON = getOrchestrationObjectMapper();
 
   @Nonnull private final Supplier<HttpDestination> destinationSupplier;

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

@@ -5,7 +5,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.google.common.annotations.Beta;
-import com.sap.ai.sdk.orchestration.model.ChatMessagesInner;
+import com.sap.ai.sdk.orchestration.model.ChatMessage;
 import com.sap.ai.sdk.orchestration.model.LLMModuleResult;
 import com.sap.ai.sdk.orchestration.model.ModuleResultsOutputUnmaskingInner;
 import javax.annotation.Nonnull;
@@ -45,9 +45,9 @@ public static ObjectMapper getOrchestrationObjectMapper() {
     final var module =
         new SimpleModule()
             .addDeserializer(
-                ChatMessagesInner.class,
-                PolymorphicFallbackDeserializer.fromJsonSubTypes(ChatMessagesInner.class))
-            .setMixInAnnotation(ChatMessagesInner.class, JacksonMixins.NoneTypeInfoMixin.class);
+                ChatMessage.class,
+                PolymorphicFallbackDeserializer.fromJsonSubTypes(ChatMessage.class))
+            .setMixInAnnotation(ChatMessage.class, JacksonMixins.NoneTypeInfoMixin.class);
     jackson.registerModule(module);
     return jackson;
   }

orchestration/src/test/java/com/sap/ai/sdk/orchestration/OrchestrationUnitTest.java

@@ -309,7 +309,7 @@ void filteringLoose() throws IOException {
             .sexual(ALLOW_SAFE_LOW_MEDIUM)
             .violence(ALLOW_SAFE_LOW_MEDIUM);
 
-    ContentFilter llamaFilter =
+    final ContentFilter llamaFilter =
         () ->
             LlamaGuard38bFilterConfig.create()
                 .type(LlamaGuard38bFilterConfig.TypeEnum.LLAMA_GUARD_3_8B)

orchestration/src/test/java/com/sap/ai/sdk/orchestration/spring/OrchestrationChatResponseTest.java

@@ -2,9 +2,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.sap.ai.sdk.orchestration.model.ChatMessage;
 import com.sap.ai.sdk.orchestration.model.LLMChoice;
 import com.sap.ai.sdk.orchestration.model.LLMModuleResultSynchronous;
+import com.sap.ai.sdk.orchestration.model.ResponseChatMessage;
 import com.sap.ai.sdk.orchestration.model.TokenUsage;
 import java.util.List;
 import org.junit.jupiter.api.Test;
@@ -17,7 +17,7 @@ void testToAssistantMessage() {
     var choice =
         LLMChoice.create()
             .index(0)
-            .message(ChatMessage.create().role("assistant").content("Hello, world!"))
+            .message(ResponseChatMessage.create().role("assistant").content("Hello, world!"))
             .finishReason("stop");
 
     AssistantMessage message = OrchestrationSpringChatResponse.toAssistantMessage(choice);

orchestration/src/test/resources/groundingRequest.json

@@ -17,7 +17,9 @@
         "template" : [ {
           "role" : "system",
           "content" : "Context message with embedded grounding results. {{?results}}"
-        } ]
+        } ],
+        "defaults" : { },
+        "tools" : [ ]
       },
       "grounding_module_config" : {
         "type" : "document_grounding_service",