Merging changes from main

rpanackal · rpanackal · commit 72ce5fa78dcd · 2024-11-08T18:03:25.000+01:00
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/ConfigToRequestTransformer.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/ConfigToRequestTransformer.java
@@ -3,6 +3,7 @@
 import com.sap.ai.sdk.orchestration.client.model.CompletionPostRequest;
 import com.sap.ai.sdk.orchestration.client.model.ModuleConfigs;
 import com.sap.ai.sdk.orchestration.client.model.OrchestrationConfig;
+import com.sap.ai.sdk.orchestration.client.model.Template;
 import com.sap.ai.sdk.orchestration.client.model.TemplatingModuleConfig;
 import io.vavr.control.Option;
 import java.util.ArrayList;
@@ -25,9 +26,9 @@ static CompletionPostRequest toCompletionPostRequest(
     // subsequent requests
     val configCopy = config.withTemplateConfig(template);
 
-    return CompletionPostRequest.create()
+    return new CompletionPostRequest()
         .orchestrationConfig(
-            OrchestrationConfig.create().moduleConfigurations(toModuleConfigs(configCopy)))
+            new OrchestrationConfig().moduleConfigurations(toModuleConfigs(configCopy)))
         .inputParams(prompt.getTemplateParameters())
         .messagesHistory(prompt.getMessagesHistory());
   }
@@ -42,14 +43,14 @@ static TemplatingModuleConfig toTemplateModuleConfig(
      * In this case, the request will fail, since the templating module will try to resolve the parameter.
      * To be fixed with https://github.tools.sap/AI/llm-orchestration/issues/662
      */
-    val messages = Option.of(template).map(TemplatingModuleConfig::getTemplate).getOrElse(List::of);
+    val messages = Option.of(template).map(t -> ((Template) t).getTemplate()).getOrElse(List::of);
     val messagesWithPrompt = new ArrayList<>(messages);
     messagesWithPrompt.addAll(prompt.getMessages());
     if (messagesWithPrompt.isEmpty()) {
       throw new IllegalStateException(
           "A prompt is required. Pass at least one message or configure a template with messages or a template reference.");
     }
-    return TemplatingModuleConfig.create().template(messagesWithPrompt);
+    return new Template().template(messagesWithPrompt);
   }
 
   @Nonnull
@@ -60,7 +61,7 @@ static ModuleConfigs toModuleConfigs(@Nonnull final OrchestrationModuleConfig co
 
     //noinspection DataFlowIssue the template is always non-null here
     val moduleConfig =
-        ModuleConfigs.create()
+        new ModuleConfigs()
             .llmModuleConfig(llmConfig)
             .templatingModuleConfig(config.getTemplateConfig());
 
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/OrchestrationPrompt.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/OrchestrationPrompt.java
@@ -32,7 +32,7 @@ public class OrchestrationPrompt {
    * @param message A user message.
    */
   public OrchestrationPrompt(@Nonnull final String message) {
-    messages.add(ChatMessage.create().role("user").content(message));
+    messages.add(new ChatMessage().role("user").content(message));
   }
 
   /**
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/AzureContentSafety.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/AzureContentSafety.java
@@ -26,7 +26,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
+    date = "2024-11-08T18:02:22.585601+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class AzureContentSafety {
   public static final String JSON_PROPERTY_HATE = "Hate";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/AzureContentSafetyFilterConfig.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/AzureContentSafetyFilterConfig.java
@@ -26,7 +26,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
+    date = "2024-11-08T18:02:22.585601+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class AzureContentSafetyFilterConfig implements FilterConfig {
   /** String represents name of the filter provider */
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/ChatDelta.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/ChatDelta.java
@@ -21,7 +21,7 @@
 @JsonPropertyOrder({ChatDelta.JSON_PROPERTY_ROLE, ChatDelta.JSON_PROPERTY_CONTENT})
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
+    date = "2024-11-08T18:02:22.585601+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class ChatDelta {
   public static final String JSON_PROPERTY_ROLE = "role";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/ChatMessage.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/ChatMessage.java
@@ -21,7 +21,7 @@
 @JsonPropertyOrder({ChatMessage.JSON_PROPERTY_ROLE, ChatMessage.JSON_PROPERTY_CONTENT})
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
+    date = "2024-11-08T18:02:22.585601+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class ChatMessage {
   public static final String JSON_PROPERTY_ROLE = "role";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/CompletionPostRequest.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/CompletionPostRequest.java
@@ -29,7 +29,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
+    date = "2024-11-08T18:02:22.585601+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class CompletionPostRequest {
   public static final String JSON_PROPERTY_ORCHESTRATION_CONFIG = "orchestration_config";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/CompletionPostResponse.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/CompletionPostResponse.java
@@ -25,7 +25,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
+    date = "2024-11-08T18:02:22.585601+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class CompletionPostResponse {
   public static final String JSON_PROPERTY_REQUEST_ID = "request_id";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/CompletionPostResponseStreaming.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/CompletionPostResponseStreaming.java
@@ -25,7 +25,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
+    date = "2024-11-08T18:02:22.585601+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class CompletionPostResponseStreaming {
   public static final String JSON_PROPERTY_REQUEST_ID = "request_id";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/DPIConfig.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/DPIConfig.java
@@ -29,7 +29,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
+    date = "2024-11-08T18:02:22.585601+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class DPIConfig implements MaskingProviderConfig {
   /** Type of masking service provider */
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/DPIEntityConfig.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/DPIEntityConfig.java
@@ -21,7 +21,7 @@
 @JsonPropertyOrder({DPIEntityConfig.JSON_PROPERTY_TYPE})
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
+    date = "2024-11-08T18:02:22.585601+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class DPIEntityConfig {
   public static final String JSON_PROPERTY_TYPE = "type";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/ErrorResponse.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/ErrorResponse.java
@@ -27,7 +27,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
+    date = "2024-11-08T18:02:22.585601+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class ErrorResponse {
   public static final String JSON_PROPERTY_REQUEST_ID = "request_id";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/FilteringModuleConfig.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/FilteringModuleConfig.java
@@ -24,7 +24,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
+    date = "2024-11-08T18:02:22.585601+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class FilteringModuleConfig {
   public static final String JSON_PROPERTY_INPUT = "input";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/FilteringStreamOptions.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/FilteringStreamOptions.java
@@ -21,7 +21,7 @@
 @JsonPropertyOrder({FilteringStreamOptions.JSON_PROPERTY_OVERLAP})
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
+    date = "2024-11-08T18:02:22.585601+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class FilteringStreamOptions {
   public static final String JSON_PROPERTY_OVERLAP = "overlap";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/GenericModuleResult.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/GenericModuleResult.java
@@ -24,7 +24,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
+    date = "2024-11-08T18:02:22.585601+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class GenericModuleResult {
   public static final String JSON_PROPERTY_MESSAGE = "message";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/GlobalStreamOptions.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/GlobalStreamOptions.java
@@ -21,7 +21,7 @@
 @JsonPropertyOrder({GlobalStreamOptions.JSON_PROPERTY_CHUNK_SIZE})
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
+    date = "2024-11-08T18:02:22.585601+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class GlobalStreamOptions {
   public static final String JSON_PROPERTY_CHUNK_SIZE = "chunk_size";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/InputFilteringConfig.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/InputFilteringConfig.java
@@ -23,7 +23,7 @@
 @JsonPropertyOrder({InputFilteringConfig.JSON_PROPERTY_FILTERS})
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
+    date = "2024-11-08T18:02:22.585601+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class InputFilteringConfig {
   public static final String JSON_PROPERTY_FILTERS = "filters";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/LLMChoice.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/LLMChoice.java
@@ -30,7 +30,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
+    date = "2024-11-08T18:02:22.585601+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class LLMChoice implements ModuleResultsOutputUnmaskingInner {
   public static final String JSON_PROPERTY_INDEX = "index";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/LLMChoiceStreaming.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/LLMChoiceStreaming.java
@@ -30,7 +30,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
+    date = "2024-11-08T18:02:22.585601+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class LLMChoiceStreaming implements ModuleResultsOutputUnmaskingInner {
   public static final String JSON_PROPERTY_INDEX = "index";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/LLMModuleConfig.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/LLMModuleConfig.java
@@ -25,7 +25,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
+    date = "2024-11-08T18:02:22.585601+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class LLMModuleConfig {
   public static final String JSON_PROPERTY_MODEL_NAME = "model_name";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/LLMModuleResultStreaming.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/LLMModuleResultStreaming.java
@@ -31,7 +31,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
+    date = "2024-11-08T18:02:22.585601+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class LLMModuleResultStreaming implements LLMModuleResult {
   public static final String JSON_PROPERTY_ID = "id";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/LLMModuleResultSynchronous.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/LLMModuleResultSynchronous.java
@@ -31,7 +31,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
+    date = "2024-11-08T18:02:22.585601+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class LLMModuleResultSynchronous implements LLMModuleResult {
   public static final String JSON_PROPERTY_ID = "id";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/MaskingModuleConfig.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/MaskingModuleConfig.java
@@ -23,7 +23,7 @@
 @JsonPropertyOrder({MaskingModuleConfig.JSON_PROPERTY_MASKING_PROVIDERS})
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
+    date = "2024-11-08T18:02:22.585601+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class MaskingModuleConfig {
   public static final String JSON_PROPERTY_MASKING_PROVIDERS = "masking_providers";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/ModuleConfigs.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/ModuleConfigs.java
@@ -26,7 +26,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
+    date = "2024-11-08T18:02:22.585601+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class ModuleConfigs {
   public static final String JSON_PROPERTY_LLM_MODULE_CONFIG = "llm_module_config";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/ModuleResults.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/ModuleResults.java
@@ -30,7 +30,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
+    date = "2024-11-08T18:02:22.585601+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class ModuleResults {
   public static final String JSON_PROPERTY_TEMPLATING = "templating";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/OrchestrationConfig.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/OrchestrationConfig.java
@@ -25,7 +25,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
+    date = "2024-11-08T18:02:22.585601+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class OrchestrationConfig {
   public static final String JSON_PROPERTY_MODULE_CONFIGURATIONS = "module_configurations";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/OutputFilteringConfig.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/OutputFilteringConfig.java
@@ -26,7 +26,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
+    date = "2024-11-08T18:02:22.585601+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class OutputFilteringConfig {
   public static final String JSON_PROPERTY_FILTERS = "filters";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/Template.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/Template.java
@@ -23,7 +23,7 @@
 @JsonPropertyOrder({Template.JSON_PROPERTY_TEMPLATE, Template.JSON_PROPERTY_DEFAULTS})
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
+    date = "2024-11-08T18:02:22.585601+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class Template implements TemplatingModuleConfig {
   public static final String JSON_PROPERTY_TEMPLATE = "template";
diff --git a/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/TokenUsage.java b/orchestration/src/main/java/com/sap/ai/sdk/orchestration/client/model/TokenUsage.java
@@ -25,7 +25,7 @@
 })
 @javax.annotation.Generated(
     value = "org.openapitools.codegen.languages.JavaClientCodegen",
-    date = "2024-11-08T17:17:51.177015+01:00[Europe/Berlin]",
+    date = "2024-11-08T18:02:22.585601+01:00[Europe/Berlin]",
     comments = "Generator version: 7.9.0")
 public class TokenUsage {
   public static final String JSON_PROPERTY_COMPLETION_TOKENS = "completion_tokens";
diff --git a/orchestration/src/test/java/com/sap/ai/sdk/orchestration/ConfigToRequestTransformerTest.java b/orchestration/src/test/java/com/sap/ai/sdk/orchestration/ConfigToRequestTransformerTest.java
@@ -5,7 +5,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import com.sap.ai.sdk.orchestration.client.model.ChatMessage;
-import com.sap.ai.sdk.orchestration.client.model.TemplatingModuleConfig;
+import com.sap.ai.sdk.orchestration.client.model.Template;
 import java.util.List;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
@@ -31,15 +31,16 @@ void testThrowsOnMissingMessages() {
 
   @Test
   void testEmptyTemplateConfig() {
-    var systemMessage = ChatMessage.create().role("system").content("foo");
-    var userMessage = ChatMessage.create().role("user").content("Hello");
+    var systemMessage = new ChatMessage().role("system").content("foo");
+    var userMessage = new ChatMessage().role("user").content("Hello");
 
-    var expected = TemplatingModuleConfig.create().template(systemMessage, userMessage);
+    var expected = new Template().template(List.of(systemMessage, userMessage));
 
     var prompt = new OrchestrationPrompt(systemMessage, userMessage);
     var actual =
-        ConfigToRequestTransformer.toTemplateModuleConfig(
-            prompt, TemplatingModuleConfig.create().template());
+        (Template)
+            ConfigToRequestTransformer.toTemplateModuleConfig(
+                prompt, new Template().template(List.of()));
 
     assertThat(actual).isEqualTo(expected);
     assertThat(actual.getTemplate())
@@ -50,23 +51,22 @@ void testEmptyTemplateConfig() {
 
   @Test
   void testMergingTemplateConfig() {
-    var systemMessage = ChatMessage.create().role("system").content("foo");
-    var userMessage = ChatMessage.create().role("user").content("Hello ");
-    var userMessage2 = ChatMessage.create().role("user").content("World");
+    var systemMessage = new ChatMessage().role("system").content("foo");
+    var userMessage = new ChatMessage().role("user").content("Hello ");
+    var userMessage2 = new ChatMessage().role("user").content("World");
 
-    var expected =
-        TemplatingModuleConfig.create().template(systemMessage, userMessage, userMessage2);
+    var expected = new Template().template(List.of(systemMessage, userMessage, userMessage2));
 
     var prompt = new OrchestrationPrompt(userMessage2);
-    var templateConfig = TemplatingModuleConfig.create().template(systemMessage, userMessage);
+    var templateConfig = new Template().template(List.of(systemMessage, userMessage));
     var actual = ConfigToRequestTransformer.toTemplateModuleConfig(prompt, templateConfig);
 
     assertThat(actual).isEqualTo(expected);
   }
 
   @Test
   void testMessagesHistory() {
-    var systemMessage = ChatMessage.create().role("system").content("foo");
+    var systemMessage = new ChatMessage().role("system").content("foo");
 
     var prompt = new OrchestrationPrompt("bar").messageHistory(List.of(systemMessage));
     var actual =
diff --git a/orchestration/src/test/java/com/sap/ai/sdk/orchestration/OrchestrationUnitTest.java b/orchestration/src/test/java/com/sap/ai/sdk/orchestration/OrchestrationUnitTest.java
diff --git a/sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/OrchestrationController.java b/sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/OrchestrationController.java

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public class OrchestrationPrompt {`
`32`	`32`	`* @param message A user message.`
`33`	`33`	`*/`
`34`	`34`	`public OrchestrationPrompt(@Nonnull final String message) {`
`35`		`- messages.add(ChatMessage.create().role("user").content(message));`
	`35`	`+ messages.add(new ChatMessage().role("user").content(message));`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`/**`