Fix attempt

Author: newtork

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

@@ -97,7 +97,8 @@ public DpiMasking withAllowList(@Nonnull final List<String> allowList) {
   @Nonnull
   @Override
   public MaskingProviderConfig createConfig() {
-    val entitiesDTO = entities.stream().map(it -> (DPIEntityConfig) DPIStandardEntity.create().type(it)).toList();
+    val entitiesDTO =
+        entities.stream().map(it -> (DPIEntityConfig) DPIStandardEntity.create().type(it)).toList();
     return DPIConfig.create()
         .type(SAP_DATA_PRIVACY_INTEGRATION)
         .method(maskingMethod)

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

@@ -97,13 +97,12 @@ public List<Message> getAllMessages() throws IllegalArgumentException {
   /**
    * Get the LLM response. Useful for accessing the finish reason or further data like logprobs.
    *
-   * @return The (first, in case of multiple) {@link com.sap.ai.sdk.orchestration.model.LLMChoiceSynchronous}.
+   * @return The (first, in case of multiple) {@link
+   *     com.sap.ai.sdk.orchestration.model.LLMChoiceSynchronous}.
    */
   @Nonnull
   public LLMChoiceSynchronous getChoice() {
     //    We expect choices to be defined and never empty.
-    return originalResponse.getOrchestrationResult()
-        .getChoices()
-        .get(0);
+    return originalResponse.getOrchestrationResult().getChoices().get(0);
   }
 }

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

@@ -6,7 +6,6 @@
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.google.common.annotations.Beta;
 import com.sap.ai.sdk.orchestration.model.ChatMessage;
-import com.sap.ai.sdk.orchestration.model.TemplateResponseFormat;
 import javax.annotation.Nonnull;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;

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

@@ -6,11 +6,10 @@
 import com.sap.ai.sdk.orchestration.model.ChatMessage;
 import com.sap.ai.sdk.orchestration.model.ChatMessageContent;
 import com.sap.ai.sdk.orchestration.model.SystemChatMessage;
+import com.sap.ai.sdk.orchestration.model.TextContent;
 import java.util.LinkedList;
 import java.util.List;
 import javax.annotation.Nonnull;
-
-import com.sap.ai.sdk.orchestration.model.TextContent;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

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

@@ -2,7 +2,6 @@
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
-import com.sap.ai.sdk.orchestration.model.LLMModuleResult;
 import com.sap.ai.sdk.orchestration.model.LLMModuleResultSynchronous;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.Test;
@@ -42,7 +41,7 @@ void testSubtypeResolutionSynchronous() {
         """;
 
     var json = String.format(JSON, choices);
-    var result = OrchestrationClient.JACKSON.readValue(json, LLMModuleResult.class);
+    var result = OrchestrationClient.JACKSON.readValue(json, LLMModuleResultSynchronous.class);
     assertThat(result).isExactlyInstanceOf(LLMModuleResultSynchronous.class);
   }
 }

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

@@ -2,9 +2,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-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.ChatDelta;
+import com.sap.ai.sdk.orchestration.model.LLMChoiceStreaming;
+import com.sap.ai.sdk.orchestration.model.LLMModuleResultStreaming;
 import com.sap.ai.sdk.orchestration.model.TokenUsage;
 import java.util.List;
 import java.util.Map;
@@ -17,12 +17,9 @@ class OrchestrationChatDeltaTest {
   @Test
   void testToGeneration() {
     var choice =
-        LLMChoice.create()
+        LLMChoiceStreaming.create()
             .index(0)
-            .message(
-                ResponseChatMessage.create()
-                    .role(ResponseChatMessage.RoleEnum.UNKNOWN_DEFAULT_OPEN_API)
-                    .content("wrong"))
+            .delta(ChatDelta.create().content("wrong"))
             .finishReason("stop");
     // this will be fixed once the spec is fixed
     choice.setCustomField("delta", Map.of("content", "Hello, world!"));
@@ -37,7 +34,7 @@ void testToGeneration() {
   @Test
   void testToChatResponseMetadata() {
     var moduleResult =
-        LLMModuleResultSynchronous.create()
+        LLMModuleResultStreaming.create()
             .id("test-id")
             ._object("test-object")
             .created(123456789)

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

@@ -2,7 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.sap.ai.sdk.orchestration.model.LLMChoice;
+import com.sap.ai.sdk.orchestration.model.LLMChoiceSynchronous;
 import com.sap.ai.sdk.orchestration.model.LLMModuleResultSynchronous;
 import com.sap.ai.sdk.orchestration.model.ResponseChatMessage;
 import com.sap.ai.sdk.orchestration.model.TokenUsage;
@@ -15,7 +15,7 @@ class OrchestrationChatResponseTest {
   @Test
   void testToGeneration() {
     var choice =
-        LLMChoice.create()
+        LLMChoiceSynchronous.create()
             .index(0)
             .message(
                 ResponseChatMessage.create()

sample-code/spring-app/src/test/java/com/sap/ai/sdk/app/controllers/SpringAiOrchestrationTest.java

@@ -1,6 +1,7 @@
 package com.sap.ai.sdk.app.controllers;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import com.sap.ai.sdk.app.services.SpringAiOrchestrationService;
 import com.sap.ai.sdk.orchestration.AzureFilterThreshold;