Clean up

- Rename toChat.. to createChat..
- extract variables

Author: rpanackal

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

@@ -21,7 +21,7 @@ public class AssistantMessage implements Message {
    * @return the corresponding {@code ChatMessage} object.
    */
   @Nonnull
-  public ChatMessage toChatMessage() {
+  public ChatMessage createChatMessage() {
     return ChatMessage.create().role(ROLE).content(content);
   }
 }

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

@@ -31,7 +31,8 @@ static CompletionPostRequest toCompletionPostRequest(
         .orchestrationConfig(
             OrchestrationConfig.create().moduleConfigurations(toModuleConfigs(configCopy)))
         .inputParams(prompt.getTemplateParameters())
-        .messagesHistory(prompt.getMessagesHistory().stream().map(Message::toChatMessage).toList());
+        .messagesHistory(
+            prompt.getMessagesHistory().stream().map(Message::createChatMessage).toList());
   }
 
   @Nonnull
@@ -46,7 +47,8 @@ static TemplatingModuleConfig toTemplateModuleConfig(
      */
     val messages = template instanceof Template t ? t.getTemplate() : List.<ChatMessage>of();
     val messagesWithPrompt = new ArrayList<>(messages);
-    messagesWithPrompt.addAll(prompt.getMessages().stream().map(Message::toChatMessage).toList());
+    messagesWithPrompt.addAll(
+        prompt.getMessages().stream().map(Message::createChatMessage).toList());
     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.");

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

@@ -12,5 +12,5 @@ public sealed interface Message permits UserMessage, AssistantMessage, SystemMes
    * @return the corresponding {@code ChatMessage} object.
    */
   @Nonnull
-  ChatMessage toChatMessage();
+  ChatMessage createChatMessage();
 }

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

@@ -169,10 +169,9 @@ public OrchestrationChatResponse executeRequestFromJsonModuleConfig(
     }
 
     final ObjectNode requestJson = JACKSON.createObjectNode();
-    requestJson.set(
-        "messages_history",
-        JACKSON.valueToTree(
-            prompt.getMessagesHistory().stream().map(Message::toChatMessage).toList()));
+    var chatMessageHistory =
+        prompt.getMessagesHistory().stream().map(Message::createChatMessage).toList();
+    requestJson.set("messages_history", JACKSON.valueToTree(chatMessageHistory));
     requestJson.set("input_params", JACKSON.valueToTree(prompt.getTemplateParameters()));
 
     final JsonNode moduleConfigJson;

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

@@ -21,7 +21,7 @@ public class SystemMessage implements Message {
    * @return the corresponding {@code ChatMessage} object.
    */
   @Nonnull
-  public ChatMessage toChatMessage() {
+  public ChatMessage createChatMessage() {
     return ChatMessage.create().role(ROLE).content(content);
   }
 }

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

@@ -21,7 +21,7 @@ public class UserMessage implements Message {
    * @return the corresponding {@code ChatMessage} object.
    */
   @Nonnull
-  public ChatMessage toChatMessage() {
+  public ChatMessage createChatMessage() {
     return ChatMessage.create().role(ROLE).content(content);
   }
 }

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

@@ -35,7 +35,7 @@ void testEmptyTemplateConfig() {
 
     var expected =
         Template.create()
-            .template(List.of(systemMessage.toChatMessage(), userMessage.toChatMessage()));
+            .template(List.of(systemMessage.createChatMessage(), userMessage.createChatMessage()));
 
     var prompt = new OrchestrationPrompt(systemMessage, userMessage);
     var actual =
@@ -60,14 +60,14 @@ void testMergingTemplateConfig() {
         Template.create()
             .template(
                 List.of(
-                    systemMessage.toChatMessage(),
-                    userMessage.toChatMessage(),
-                    userMessage2.toChatMessage()));
+                    systemMessage.createChatMessage(),
+                    userMessage.createChatMessage(),
+                    userMessage2.createChatMessage()));
 
     var prompt = new OrchestrationPrompt(userMessage2);
     var templateConfig =
         Template.create()
-            .template(List.of(systemMessage.toChatMessage(), userMessage.toChatMessage()));
+            .template(List.of(systemMessage.createChatMessage(), userMessage.createChatMessage()));
     var actual = ConfigToRequestTransformer.toTemplateModuleConfig(prompt, templateConfig);
 
     assertThat(actual).isEqualTo(expected);
@@ -82,6 +82,6 @@ void testMessagesHistory() {
         ConfigToRequestTransformer.toCompletionPostRequest(
             prompt, new OrchestrationModuleConfig().withLlmConfig(CUSTOM_GPT_35));
 
-    assertThat(actual.getMessagesHistory()).containsExactly(systemMessage.toChatMessage());
+    assertThat(actual.getMessagesHistory()).containsExactly(systemMessage.createChatMessage());
   }
 }

sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/OrchestrationController.java

@@ -55,7 +55,7 @@ public OrchestrationChatResponse completion() {
   public OrchestrationChatResponse template() {
     final var template =
         new UserMessage("Reply with 'Orchestration Service is working!' in {{?language}}");
-    final var templatingConfig = Template.create().template(List.of(template.toChatMessage()));
+    final var templatingConfig = Template.create().template(List.of(template.createChatMessage()));
     final var configWithTemplate = config.withTemplateConfig(templatingConfig);
 
     final var inputParams = Map.of("language", "German");