Simplify code and adapt jacoco coverage

Author: Jonas-Isr

orchestration/pom.xml

@@ -31,10 +31,10 @@
   </developers>
   <properties>
     <project.rootdir>${project.basedir}/../</project.rootdir>
-    <coverage.complexity>81%</coverage.complexity>
+    <coverage.complexity>80%</coverage.complexity>
     <coverage.line>93%</coverage.line>
     <coverage.instruction>93%</coverage.instruction>
-    <coverage.branch>70%</coverage.branch>
+    <coverage.branch>71%</coverage.branch>
     <coverage.method>95%</coverage.method>
     <coverage.class>100%</coverage.class>
   </properties>

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

@@ -5,8 +5,10 @@
 import com.sap.ai.sdk.orchestration.model.ImageContent;
 import com.sap.ai.sdk.orchestration.model.ImageContentImageUrl;
 import com.sap.ai.sdk.orchestration.model.MultiChatMessage;
+import com.sap.ai.sdk.orchestration.model.MultiChatMessageContent;
 import com.sap.ai.sdk.orchestration.model.SingleChatMessage;
 import com.sap.ai.sdk.orchestration.model.TextContent;
+import java.util.LinkedList;
 import java.util.List;
 import javax.annotation.Nonnull;
 
@@ -67,28 +69,18 @@ default ChatMessage createChatMessage() {
     final var itemList = this.content().contentItemList();
     if (itemList.size() == 1 && itemList.get(0) instanceof TextItem textItem) {
       return SingleChatMessage.create().role(role()).content(textItem.text());
-    } else {
-      return MultiChatMessage.create()
-          .role(role())
-          .content(
-              itemList.stream()
-                  .map(
-                      contentItem -> {
-                        if (contentItem instanceof ImageItem imageItem) {
-                          return ImageContent.create()
-                              .type(ImageContent.TypeEnum.IMAGE_URL)
-                              .imageUrl(
-                                  ImageContentImageUrl.create()
-                                      .url(imageItem.imageUrl())
-                                      .detail(imageItem.detailLevel().toString()));
-                        } else {
-                          return TextContent.create()
-                              .type(TextContent.TypeEnum.TEXT)
-                              .text(((TextItem) contentItem).text());
-                        }
-                      })
-                  .toList());
     }
+    final var contentList = new LinkedList<MultiChatMessageContent>();
+    for (final ContentItem item : itemList) {
+      if (item instanceof TextItem textItem) {
+        contentList.add(TextContent.create().type(TextContent.TypeEnum.TEXT).text(textItem.text()));
+      } else if (item instanceof ImageItem imageItem) {
+        final var detail = imageItem.detailLevel().toString();
+        final var img = ImageContentImageUrl.create().url(imageItem.imageUrl()).detail(detail);
+        contentList.add(ImageContent.create().type(ImageContent.TypeEnum.IMAGE_URL).imageUrl(img));
+      }
+    }
+    return MultiChatMessage.create().role(role()).content(contentList);
   }
 
   /**

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

@@ -58,38 +58,41 @@ public TokenUsage getTokenUsage() {
   @Nonnull
   public List<Message> getAllMessages() throws IllegalArgumentException {
     final var messages = new ArrayList<Message>();
-
     for (final ChatMessage chatMessage : originalResponse.getModuleResults().getTemplating()) {
       if (chatMessage instanceof SingleChatMessage simpleMsg) {
-        final var message =
-            switch (simpleMsg.getRole()) {
-              case "user" -> Message.user(simpleMsg.getContent());
-              case "assistant" -> Message.assistant(simpleMsg.getContent());
-              case "system" -> Message.system(simpleMsg.getContent());
-              default -> throw new IllegalStateException("Unexpected role: " + simpleMsg.getRole());
-            };
-        messages.add(message);
+        messages.add(chatMessageIntoMessage(simpleMsg));
       } else if (chatMessage instanceof MultiChatMessage mCMessage) {
-        messages.add(
-            switch (mCMessage.getRole()) {
-              case "user" ->
-                  new UserMessage(MessageContent.fromMCMContentList(mCMessage.getContent()));
-              case "system" ->
-                  new SystemMessage(MessageContent.fromMCMContentList(mCMessage.getContent()));
-              default ->
-                  throw new IllegalStateException(
-                      "Unexpected role with complex message: " + mCMessage.getRole());
-            });
+        messages.add(chatMessageIntoMessage(mCMessage));
       } else {
         throw new IllegalArgumentException(
             "Messages of type " + chatMessage.getClass() + " are not supported by convenience API");
       }
     }
-
     messages.add(Message.assistant(getChoice().getMessage().getContent()));
     return messages;
   }
 
+  @Nonnull
+  private Message chatMessageIntoMessage(@Nonnull final SingleChatMessage simpleMsg) {
+    return switch (simpleMsg.getRole()) {
+      case "user" -> Message.user(simpleMsg.getContent());
+      case "assistant" -> Message.assistant(simpleMsg.getContent());
+      case "system" -> Message.system(simpleMsg.getContent());
+      default -> throw new IllegalStateException("Unexpected role: " + simpleMsg.getRole());
+    };
+  }
+
+  @Nonnull
+  private Message chatMessageIntoMessage(@Nonnull final MultiChatMessage mCMessage) {
+    return switch (mCMessage.getRole()) {
+      case "user" -> new UserMessage(MessageContent.fromMCMContentList(mCMessage.getContent()));
+      case "system" -> new SystemMessage(MessageContent.fromMCMContentList(mCMessage.getContent()));
+      default ->
+          throw new IllegalStateException(
+              "Unexpected role with complex message: " + mCMessage.getRole());
+    };
+  }
+
   /**
    * Get the LLM response. Useful for accessing the finish reason or further data like logprobs.
    *