change method names from addXYZ() to andXYZ()

Author: Jonas-Isr

docs/guides/ORCHESTRATION_CHAT_COMPLETION.md

@@ -269,7 +269,7 @@ It's possible to add images and multiple text inputs to a message.
 An image can be added to an existing message as follows.
 
 ```java
-message.addImage("https://url.to/image.jpg");
+var newMessage = message.andImage("https://url.to/image.jpg");
 ```
 
 You can also construct a message with an image directly, using the `MessageContent` class.
@@ -281,7 +281,7 @@ var message = Message.user(MessageContent.image("https://url.to/image.jpg"));
 Some AI models, like GPT 4o, support additionally setting the detail level with which the image is read. This can be set via the `DetailLevel` parameter.
 
 ```java
-message.addImage("https://url.to/image.jpg", ImageItem.DetailLevel.low);
+var newMessage = message.andImage("https://url.to/image.jpg", ImageItem.DetailLevel.low);
 ```
 Note, that currently only user messages are supported for image attachments.
 
@@ -296,7 +296,7 @@ var message = Message.user("What is chess about?", "Answer in two sentences.");
 Or you can add additional text inputs to an existing message.
 
 ```java
-message.addText("Please use many emojis in your answer.");
+var newMessage = message.andText("Please use many emojis in your answer.");
 ```
 
 Note, that only user and system messages are supported for multiple text inputs.

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

@@ -1,8 +1,7 @@
 package com.sap.ai.sdk.orchestration;
 
-import javax.annotation.Nonnull;
-
 import com.google.common.annotations.Beta;
+import javax.annotation.Nonnull;
 import lombok.Getter;
 import lombok.Value;
 import lombok.experimental.Accessors;

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

@@ -1,11 +1,10 @@
 package com.sap.ai.sdk.orchestration;
 
+import com.google.common.annotations.Beta;
 import java.util.List;
 import java.util.stream.Stream;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-
-import com.google.common.annotations.Beta;
 import lombok.Getter;
 import lombok.Value;
 import lombok.experimental.Accessors;
@@ -50,7 +49,7 @@ public SystemMessage(@Nonnull final MessageContent messageContent) {
    * @return the new message.
    */
   @Nonnull
-  public SystemMessage addText(@Nonnull final String... messages) {
+  public SystemMessage andText(@Nonnull final String... messages) {
     return new SystemMessage(
         new MessageContent(
             Stream.concat(
@@ -66,7 +65,7 @@ public SystemMessage addText(@Nonnull final String... messages) {
    * @return the new message.
    */
   @Nonnull
-  public SystemMessage add(@Nonnull final MessageContent... messageContents) {
+  public SystemMessage and(@Nonnull final MessageContent... messageContents) {
     final List<ContentItem> combinedItems =
         Stream.concat(
                 content.contentItemList().stream(),

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

@@ -1,11 +1,10 @@
 package com.sap.ai.sdk.orchestration;
 
+import com.google.common.annotations.Beta;
 import java.util.List;
 import java.util.stream.Stream;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-
-import com.google.common.annotations.Beta;
 import lombok.Getter;
 import lombok.Value;
 import lombok.experimental.Accessors;
@@ -49,7 +48,7 @@ public UserMessage(@Nonnull final MessageContent messageContent) {
    * @return the new message.
    */
   @Nonnull
-  public UserMessage addText(@Nonnull final String... messages) {
+  public UserMessage andText(@Nonnull final String... messages) {
     return new UserMessage(
         new MessageContent(
             Stream.concat(
@@ -65,7 +64,7 @@ public UserMessage addText(@Nonnull final String... messages) {
    * @return the new message.
    */
   @Nonnull
-  public UserMessage addImage(
+  public UserMessage andImage(
       @Nonnull final String imageUrl, @Nullable final ImageItem.DetailLevel detailLevel) {
     return new UserMessage(
         new MessageContent(
@@ -82,7 +81,7 @@ public UserMessage addImage(
    * @return the new message.
    */
   @Nonnull
-  public UserMessage addImage(@Nonnull final String imageUrl) {
+  public UserMessage andImage(@Nonnull final String imageUrl) {
     return new UserMessage(
         new MessageContent(
             Stream.concat(content.contentItemList().stream(), Stream.of(new ImageItem(imageUrl)))
@@ -96,7 +95,7 @@ public UserMessage addImage(@Nonnull final String imageUrl) {
    * @return the new message.
    */
   @Nonnull
-  public UserMessage add(@Nonnull final MessageContent... messageContents) {
+  public UserMessage and(@Nonnull final MessageContent... messageContents) {
     final List<ContentItem> combinedItems =
         Stream.concat(
                 content.contentItemList().stream(),

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

@@ -695,11 +695,11 @@ void testMultiMessage() throws IOException {
 
     var messageWithTwoTexts =
         Message.system("Please answer in exactly two sentences.")
-            .addText("Start the first sentence with the word 'Well'.");
+            .andText("Start the first sentence with the word 'Well'.");
 
     var messageWithImage =
         Message.user("What is in this image?")
-            .addImage(
+            .andImage(
                 "https://upload.wikimedia.org/wikipedia/commons/thumb/5/59/SAP_2011_logo.svg/440px-SAP_2011_logo.svg.png");
     var prompt =
         new OrchestrationPrompt(messageWithImage).messageHistory(List.of(messageWithTwoTexts));
@@ -791,26 +791,26 @@ void testMultiMessage() throws IOException {
   @Test
   void testMessageConstruction() {
     var userMessageTwoTexts = Message.user("Text 1", "Text 2");
-    var userMessageTwoTextsAddText = Message.user("Text 1").addText("Text 2");
-    var userMessageTwoTextsAdd = Message.user("Text 1").add(MessageContent.text("Text 2"));
+    var userMessageTwoTextsAddText = Message.user("Text 1").andText("Text 2");
+    var userMessageTwoTextsAdd = Message.user("Text 1").and(MessageContent.text("Text 2"));
     var userMessageTwoTextsContent = Message.user(MessageContent.text("Text 1", "Text 2"));
     assertThat(userMessageTwoTexts).isEqualTo(userMessageTwoTextsAddText);
     assertThat(userMessageTwoTextsAddText).isEqualTo(userMessageTwoTextsAdd);
     assertThat(userMessageTwoTextsAdd).isEqualTo(userMessageTwoTextsContent);
 
-    var userMessageWithImageAddImage = Message.user("Text 1").addImage("url");
-    var userMessageWithImageAdd = Message.user("Text 1").add(MessageContent.image("url"));
+    var userMessageWithImageAddImage = Message.user("Text 1").andImage("url");
+    var userMessageWithImageAdd = Message.user("Text 1").and(MessageContent.image("url"));
     assertThat(userMessageWithImageAddImage).isEqualTo(userMessageWithImageAdd);
 
     var userMessageWithImageDetailAddImage =
-        Message.user("Text 1").addImage("url", ImageItem.DetailLevel.low);
+        Message.user("Text 1").andImage("url", ImageItem.DetailLevel.low);
     var userMessageWithImageDetailAdd =
-        Message.user("Text 1").add(MessageContent.image("url", ImageItem.DetailLevel.low));
+        Message.user("Text 1").and(MessageContent.image("url", ImageItem.DetailLevel.low));
     assertThat(userMessageWithImageDetailAddImage).isEqualTo(userMessageWithImageDetailAdd);
 
     var systemMessageTwoTexts = Message.system("Text 1", "Text 2");
-    var systemMessageTwoTextsAddText = Message.system("Text 1").addText("Text 2");
-    var systemMessageTwoTextsAdd = Message.system("Text 1").add(MessageContent.text("Text 2"));
+    var systemMessageTwoTextsAddText = Message.system("Text 1").andText("Text 2");
+    var systemMessageTwoTextsAdd = Message.system("Text 1").and(MessageContent.text("Text 2"));
     var systemMessageTwoTextsContent = Message.system(MessageContent.text("Text 1", "Text 2"));
     assertThat(systemMessageTwoTexts).isEqualTo(systemMessageTwoTextsAddText);
     assertThat(systemMessageTwoTextsAddText).isEqualTo(systemMessageTwoTextsAdd);

sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/services/OrchestrationService.java

@@ -81,7 +81,7 @@ public OrchestrationChatResponse imageInput(@Nonnull final String pathToImage) {
         new OrchestrationModuleConfig().withLlmConfig(customGpt4o);
 
     final var multiMessage =
-        Message.user("What is in this image?").addImage(pathToImage, ImageItem.DetailLevel.low);
+        Message.user("What is in this image?").andImage(pathToImage, ImageItem.DetailLevel.low);
     final var prompt = new OrchestrationPrompt(multiMessage);
     return client.chatCompletion(prompt, llmWithImageSupportConfig);
   }
@@ -95,8 +95,8 @@ public OrchestrationChatResponse imageInput(@Nonnull final String pathToImage) {
   public OrchestrationChatResponse multiStringInput(@Nonnull final List<String> questions) {
     final var multiMessage =
         Message.user(questions.get(0))
-            .addText(questions.get(1))
-            .add(MessageContent.text(questions.get(2)));
+            .andText(questions.get(1))
+            .and(MessageContent.text(questions.get(2)));
     final var prompt = new OrchestrationPrompt(multiMessage);
     return client.chatCompletion(prompt, config);
   }