Simplify logic

Author: Jonas-Isr

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

@@ -10,6 +10,8 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import static java.util.stream.Collectors.toList;
+
 /**
  * Represents the content of a chat message.
  *
@@ -49,19 +51,20 @@ public static MessageContent image(@Nonnull final String imageUrl) {
   /**
    * Creates a new message content containing one or more {@link TextItem}s with the given texts.
    *
-   * @param firstInput the first text of the message
-   * @param moreInputs additional texts of the message
+   * @param message the first text of the message
+   * @param additionalMessages additional texts of the message
    * @return the new message content
    */
   @Nonnull
   public static MessageContent text(
-      @Nonnull final String firstInput, @Nullable final String... moreInputs) {
-    return new MessageContent(
-        Stream.concat(
-                Stream.of(firstInput),
-                moreInputs == null ? Stream.empty() : Arrays.stream(moreInputs))
-            .map(text -> (ContentItem) new TextItem(text))
-            .toList());
+      @Nonnull final String message, @Nullable final String... additionalMessages) {
+    var messagesStream =
+        (additionalMessages != null)
+            ? Stream.concat(Stream.of(message), Stream.of(additionalMessages))
+            : Stream.of(message);
+    var contentList =
+         messagesStream.map(text -> (ContentItem) new TextItem(text)).toList();
+    return new MessageContent(contentList);
   }
 
   /**

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

@@ -1,13 +1,16 @@
 package com.sap.ai.sdk.orchestration;
 
 import com.google.common.annotations.Beta;
+
+import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.Stream;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import lombok.Getter;
 import lombok.Value;
 import lombok.experimental.Accessors;
+import lombok.experimental.Tolerate;
 
 /** Represents a chat message as 'user' to the orchestration service. */
 @Value
@@ -28,32 +31,29 @@ public class UserMessage implements Message {
    * @param message the first message.
    * @param additionalMessages the additional messages.
    */
+  @Tolerate
   public UserMessage(@Nonnull final String message, @Nullable final String... additionalMessages) {
-    content = MessageContent.text(message, additionalMessages);
-  }
-
-  /**
-   * Creates a new user message with the given message content.
-   *
-   * @param messageContent the message content.
-   */
-  public UserMessage(@Nonnull final MessageContent messageContent) {
-    content = messageContent;
+    this(MessageContent.text(message, additionalMessages));
   }
 
   /**
    * Add text to the message.
    *
-   * @param messages the text to add.
+   * @param message the text to add
+   * @param additionalMessages additional text to add
    * @return the new message.
    */
   @Nonnull
-  public UserMessage andText(@Nonnull final String... messages) {
-    return new UserMessage(
-        new MessageContent(
-            Stream.concat(
-                    content.contentItemList().stream(), Stream.of(messages).map(TextItem::new))
-                .toList()));
+  public UserMessage andText(
+      @Nonnull final String message, @Nullable final String... additionalMessages) {
+    var messagesStream =
+        (additionalMessages != null)
+            ? Stream.concat(Stream.of(message), Stream.of(additionalMessages))
+            : Stream.of(message);
+    var contentList =
+        Stream.concat(content.contentItemList().stream(), messagesStream.map(TextItem::new))
+            .toList();
+    return new UserMessage(new MessageContent(contentList));
   }
 
   /**
@@ -66,12 +66,9 @@ public UserMessage andText(@Nonnull final String... messages) {
   @Nonnull
   public UserMessage andImage(
       @Nonnull final String imageUrl, @Nonnull final ImageItem.DetailLevel detailLevel) {
-    return new UserMessage(
-        new MessageContent(
-            Stream.concat(
-                    content.contentItemList().stream(),
-                    Stream.of(new ImageItem(imageUrl, detailLevel)))
-                .toList()));
+    final var contentItems = new LinkedList<>(content.contentItemList());
+    contentItems.add(new ImageItem(imageUrl, detailLevel));
+    return new UserMessage(new MessageContent(contentItems));
   }
 
   /**
@@ -82,10 +79,9 @@ public UserMessage andImage(
    */
   @Nonnull
   public UserMessage andImage(@Nonnull final String imageUrl) {
-    return new UserMessage(
-        new MessageContent(
-            Stream.concat(content.contentItemList().stream(), Stream.of(new ImageItem(imageUrl)))
-                .toList()));
+    final var contentItems = new LinkedList<>(content.contentItemList());
+    contentItems.add(new ImageItem(imageUrl));
+    return new UserMessage(new MessageContent(contentItems));
   }
 
   /**