test coverage and clean up

Author: Jonas-Isr

orchestration/pom.xml

@@ -31,11 +31,11 @@
   </developers>
   <properties>
     <project.rootdir>${project.basedir}/../</project.rootdir>
-    <coverage.complexity>83%</coverage.complexity>
+    <coverage.complexity>84%</coverage.complexity>
     <coverage.line>94%</coverage.line>
-    <coverage.instruction>94%</coverage.instruction>
-    <coverage.branch>78%</coverage.branch>
-    <coverage.method>93%</coverage.method>
+    <coverage.instruction>95%</coverage.instruction>
+    <coverage.branch>79%</coverage.branch>
+    <coverage.method>94%</coverage.method>
     <coverage.class>100%</coverage.class>
   </properties>
 

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

@@ -15,26 +15,6 @@
  * @since 1.3.0
  */
 public record MessageContent(@Nonnull List<ContentItem> items) {
-  //  @Nonnull
-  //  static MessageContent fromMCMContentList(@Nonnull final List<ChatMessageContent>
-  // mCMContentList) {
-  //    final var itemList =
-  //        mCMContentList.stream()
-  //            .map(
-  //                content -> {
-  //                  if (content instanceof TextContent text) {
-  //                    return new TextItem(text.getText());
-  //                  } else {
-  //                    final var imageUrl = ((ImageContent) content).getImageUrl();
-  //                    return (ContentItem)
-  //                        new ImageItem(
-  //                            imageUrl.getUrl(),
-  //                            ImageItem.DetailLevel.fromString(imageUrl.getDetail()));
-  //                  }
-  //                })
-  //            .toList();
-  //    return new MessageContent(itemList);
-  //  }
   @Nonnull
   static MessageContent fromChatMessageContent(final ChatMessageContent chatMessageContent) {
     if (chatMessageContent instanceof ChatMessageContent.InnerString innerString) {
@@ -46,10 +26,8 @@ static MessageContent fromChatMessageContent(final ChatMessageContent chatMessag
               .map(textContent -> ((ContentItem) new TextItem(textContent.getText())))
               .toList();
       return new MessageContent(texts);
-    } else {
-      throw new IllegalArgumentException(
-          "Contents of type " + chatMessageContent.getClass() + " are not supported.");
     }
+    return new MessageContent(List.of());
   }
 
   @Nonnull
@@ -70,9 +48,7 @@ static MessageContent fromUserChatMessageContent(
         }
       }
       return new MessageContent(items);
-    } else {
-      throw new IllegalArgumentException(
-          "Contents of type " + chatMessageContent.getClass() + " are not supported.");
     }
+    return new MessageContent(List.of());
   }
 }

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

@@ -1027,4 +1027,31 @@ void testTemplateFromInputThrows() {
         .isInstanceOf(IOException.class)
         .hasMessageContaining("Failed to deserialize");
   }
+
+  @Test
+  void testGetAllMessages() {
+    stubFor(
+        post(anyUrl())
+            .willReturn(
+                aResponse()
+                    .withBodyFile("templatingResponse.json")
+                    .withHeader("Content-Type", "application/json")));
+    final var resultTemplating = client.chatCompletion(new OrchestrationPrompt("Hello"), config);
+    final var messageListTemplating = resultTemplating.getAllMessages();
+    assertThat(messageListTemplating.get(0)).isInstanceOf(SystemMessage.class);
+    assertThat(messageListTemplating.get(1)).isInstanceOf(UserMessage.class);
+    assertThat(messageListTemplating.get(2)).isInstanceOf(AssistantMessage.class);
+
+    stubFor(
+        post(anyUrl())
+            .willReturn(
+                aResponse()
+                    .withBodyFile("toolCallsResponse2.json")
+                    .withHeader("Content-Type", "application/json")));
+    final var resultTools = client.chatCompletion(new OrchestrationPrompt("Hello"), config);
+    final var messageListTools = resultTools.getAllMessages();
+    assertThat(messageListTools.get(0)).isInstanceOf(UserMessage.class);
+    assertThat(messageListTools.get(1)).isInstanceOf(AssistantMessage.class);
+    assertThat(messageListTools.get(2)).isInstanceOf(ToolMessage.class);
+  }
 }