Rename MessageContent.contentItemList to MessageContent.items

Author: Jonas-Isr

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

@@ -67,7 +67,7 @@ static SystemMessage system(@Nonnull final String message) {
    */
   @Nonnull
   default ChatMessage createChatMessage() {
-    final var itemList = this.content().contentItemList();
+    final var itemList = this.content().items();
     if (itemList.size() == 1 && itemList.get(0) instanceof TextItem textItem) {
       return SingleChatMessage.create().role(role()).content(textItem.text());
     }

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

@@ -9,10 +9,10 @@
 /**
  * Represents the content of a chat message.
  *
- * @param contentItemList a list of the content items
+ * @param items a list of the content items
  * @since 1.3.0
  */
-public record MessageContent(@Nonnull List<ContentItem> contentItemList) {
+public record MessageContent(@Nonnull List<ContentItem> items) {
   @Nonnull
   static MessageContent fromMCMContentList(
       @Nonnull final List<MultiChatMessageContent> mCMContentList) {

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

@@ -41,7 +41,7 @@ public SystemMessage(@Nonnull final String message) {
    */
   @Nonnull
   public SystemMessage withText(@Nonnull final String message) {
-    final var contentItems = new LinkedList<>(content.contentItemList());
+    final var contentItems = new LinkedList<>(content.items());
     contentItems.add(new TextItem(message));
     return new SystemMessage(new MessageContent(contentItems));
   }

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

@@ -41,7 +41,7 @@ public UserMessage(@Nonnull final String message) {
    */
   @Nonnull
   public UserMessage withText(@Nonnull final String message) {
-    final var contentItems = new LinkedList<>(content.contentItemList());
+    final var contentItems = new LinkedList<>(content.items());
     contentItems.add(new TextItem(message));
     return new UserMessage(new MessageContent(contentItems));
   }
@@ -57,7 +57,7 @@ public UserMessage withText(@Nonnull final String message) {
   @Nonnull
   public UserMessage withImage(
       @Nonnull final String imageUrl, @Nonnull final ImageItem.DetailLevel detailLevel) {
-    final var contentItems = new LinkedList<>(content.contentItemList());
+    final var contentItems = new LinkedList<>(content.items());
     contentItems.add(new ImageItem(imageUrl, detailLevel));
     return new UserMessage(new MessageContent(contentItems));
   }
@@ -71,7 +71,7 @@ public UserMessage withImage(
    */
   @Nonnull
   public UserMessage withImage(@Nonnull final String imageUrl) {
-    final var contentItems = new LinkedList<>(content.contentItemList());
+    final var contentItems = new LinkedList<>(content.items());
     contentItems.add(new ImageItem(imageUrl));
     return new UserMessage(new MessageContent(contentItems));
   }

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

@@ -169,7 +169,7 @@ void testGroundingPrompt() {
     var prompt = Grounding.create().createGroundingPrompt("Hello, World!");
     assertThat(prompt.getMessages()).hasSize(1);
     var message = prompt.getMessages().get(0);
-    assertThat(((TextItem) message.content().contentItemList().get(0)).text())
+    assertThat(((TextItem) message.content().items().get(0)).text())
         .isEqualTo(
             "{{?userMessage}} Use the following information as additional context: {{?groundingContext}}");
   }

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

@@ -207,13 +207,13 @@ void testTemplating() throws IOException {
     assertThat(response.getRequestId()).isEqualTo("26ea36b5-c196-4806-a9a6-a686f0c6ad91");
     final var messageList = result.getAllMessages();
 
-    assertThat(((TextItem) messageList.get(0).content().contentItemList().get(0)).text())
+    assertThat(((TextItem) messageList.get(0).content().items().get(0)).text())
         .isEqualTo("You are a multi language translator");
     assertThat(messageList.get(0).role()).isEqualTo("system");
-    assertThat(((TextItem) messageList.get(1).content().contentItemList().get(0)).text())
+    assertThat(((TextItem) messageList.get(1).content().items().get(0)).text())
         .isEqualTo("Reply with 'Orchestration Service is working!' in German");
     assertThat(messageList.get(1).role()).isEqualTo("user");
-    assertThat(((TextItem) messageList.get(2).content().contentItemList().get(0)).text())
+    assertThat(((TextItem) messageList.get(2).content().items().get(0)).text())
         .isEqualTo("Orchestration Service funktioniert!");
     assertThat(messageList.get(2).role()).isEqualTo("assistant");
 
@@ -706,31 +706,31 @@ void testMultiMessage() throws IOException {
     assertThat(result.getAllMessages()).hasSize(3);
     var systemMessage = result.getAllMessages().get(0);
     assertThat(systemMessage.role()).isEqualTo("system");
-    assertThat(systemMessage.content().contentItemList()).hasSize(2);
-    assertThat(systemMessage.content().contentItemList().get(0)).isInstanceOf(TextItem.class);
-    assertThat(((TextItem) systemMessage.content().contentItemList().get(0)).text())
+    assertThat(systemMessage.content().items()).hasSize(2);
+    assertThat(systemMessage.content().items().get(0)).isInstanceOf(TextItem.class);
+    assertThat(((TextItem) systemMessage.content().items().get(0)).text())
         .isEqualTo("Please answer in exactly two sentences.");
-    assertThat(systemMessage.content().contentItemList().get(1)).isInstanceOf(TextItem.class);
-    assertThat(((TextItem) systemMessage.content().contentItemList().get(1)).text())
+    assertThat(systemMessage.content().items().get(1)).isInstanceOf(TextItem.class);
+    assertThat(((TextItem) systemMessage.content().items().get(1)).text())
         .isEqualTo("Start the first sentence with the word 'Well'.");
     var userMessage = result.getAllMessages().get(1);
     assertThat(userMessage.role()).isEqualTo("user");
-    assertThat(userMessage.content().contentItemList()).hasSize(3);
-    assertThat(userMessage.content().contentItemList().get(0)).isInstanceOf(TextItem.class);
-    assertThat(((TextItem) userMessage.content().contentItemList().get(0)).text())
+    assertThat(userMessage.content().items()).hasSize(3);
+    assertThat(userMessage.content().items().get(0)).isInstanceOf(TextItem.class);
+    assertThat(((TextItem) userMessage.content().items().get(0)).text())
         .isEqualTo("What is in this image?");
-    assertThat(userMessage.content().contentItemList().get(1)).isInstanceOf(TextItem.class);
-    assertThat(((TextItem) userMessage.content().contentItemList().get(1)).text())
+    assertThat(userMessage.content().items().get(1)).isInstanceOf(TextItem.class);
+    assertThat(((TextItem) userMessage.content().items().get(1)).text())
         .isEqualTo("And what is the main color?");
-    assertThat(userMessage.content().contentItemList().get(2)).isInstanceOf(ImageItem.class);
-    assertThat(((ImageItem) userMessage.content().contentItemList().get(2)).imageUrl())
+    assertThat(userMessage.content().items().get(2)).isInstanceOf(ImageItem.class);
+    assertThat(((ImageItem) userMessage.content().items().get(2)).imageUrl())
         .isEqualTo(
             "https://upload.wikimedia.org/wikipedia/commons/thumb/5/59/SAP_2011_logo.svg/440px-SAP_2011_logo.svg.png");
     var assistantMessage = result.getAllMessages().get(2);
     assertThat(assistantMessage.role()).isEqualTo("assistant");
-    assertThat(assistantMessage.content().contentItemList()).hasSize(1);
-    assertThat(assistantMessage.content().contentItemList().get(0)).isInstanceOf(TextItem.class);
-    assertThat(((TextItem) assistantMessage.content().contentItemList().get(0)).text())
+    assertThat(assistantMessage.content().items()).hasSize(1);
+    assertThat(assistantMessage.content().items().get(0)).isInstanceOf(TextItem.class);
+    assertThat(((TextItem) assistantMessage.content().items().get(0)).text())
         .isEqualTo(
             "Well, this image features the logo of SAP, a software company, set against a gradient blue background transitioning from light to dark. The main color in the image is blue.");
 

sample-code/spring-app/src/test/java/com/sap/ai/sdk/app/controllers/OrchestrationTest.java

@@ -72,8 +72,7 @@ void testTemplate() {
     final var response = result.getOriginalResponse();
 
     assertThat(response.getRequestId()).isNotEmpty();
-    assertThat(
-            ((TextItem) result.getAllMessages().get(0).content().contentItemList().get(0)).text())
+    assertThat(((TextItem) result.getAllMessages().get(0).content().items().get(0)).text())
         .isEqualTo("Reply with 'Orchestration Service is working!' in German");
     assertThat(result.getAllMessages().get(0).role()).isEqualTo("user");
     var llm = (LLMModuleResultSynchronous) response.getModuleResults().getLlm();