Rename convenience methods to withXyz()

Author: Jonas-Isr

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

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

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

@@ -39,7 +39,7 @@ public UserMessage(@Nonnull final String message) {
    * @return the new message.
    */
   @Nonnull
-  public UserMessage andText(@Nonnull final String message) {
+  public UserMessage withText(@Nonnull final String message) {
     final var contentItems = new LinkedList<>(content.contentItemList());
     contentItems.add(new TextItem(message));
     return new UserMessage(new MessageContent(contentItems));
@@ -53,7 +53,7 @@ public UserMessage andText(@Nonnull final String message) {
    * @return the new message.
    */
   @Nonnull
-  public UserMessage andImage(
+  public UserMessage withImage(
       @Nonnull final String imageUrl, @Nonnull final ImageItem.DetailLevel detailLevel) {
     final var contentItems = new LinkedList<>(content.contentItemList());
     contentItems.add(new ImageItem(imageUrl, detailLevel));
@@ -67,7 +67,7 @@ public UserMessage andImage(
    * @return the new message.
    */
   @Nonnull
-  public UserMessage andImage(@Nonnull final String imageUrl) {
+  public UserMessage withImage(@Nonnull final String imageUrl) {
     final var contentItems = new LinkedList<>(content.contentItemList());
     contentItems.add(new ImageItem(imageUrl));
     return new UserMessage(new MessageContent(contentItems));

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

@@ -25,9 +25,9 @@ void testMessageConstructionImage() {
         new UserMessage(new MessageContent(List.of(new ImageItem("url"))));
     assertThat(userMessageOnlyImageBase).isEqualTo(userMessageOnlyImageConvenience);
 
-    var userMessageWithImage = Message.user("Text 1").andImage("url");
+    var userMessageWithImage = Message.user("Text 1").withImage("url");
     var userMessageWithImageAndDetail =
-        Message.user("Text 1").andImage("url", ImageItem.DetailLevel.AUTO);
+        Message.user("Text 1").withImage("url", ImageItem.DetailLevel.AUTO);
     assertThat(userMessageWithImage).isEqualTo(userMessageWithImageAndDetail);
   }
 }

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

@@ -687,12 +687,12 @@ void testMultiMessage() throws IOException {
 
     var messageWithTwoTexts =
         Message.system("Please answer in exactly two sentences.")
-            .andText("Start the first sentence with the word 'Well'.");
+            .withText("Start the first sentence with the word 'Well'.");
 
     var messageWithImage =
         Message.user("What is in this image?")
-            .andText("And what is the main color?")
-            .andImage(
+            .withText("And what is the main color?")
+            .withImage(
                 "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));

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

@@ -66,7 +66,7 @@ public OrchestrationChatResponse imageInput(@Nonnull final String pathToImage) {
         new OrchestrationModuleConfig().withLlmConfig(GPT_4O_MINI);
 
     final var multiMessage =
-        Message.user("What is in this image?").andImage(pathToImage, ImageItem.DetailLevel.LOW);
+        Message.user("What is in this image?").withImage(pathToImage, ImageItem.DetailLevel.LOW);
     final var prompt = new OrchestrationPrompt(multiMessage);
     return client.chatCompletion(prompt, llmWithImageSupportConfig);
   }
@@ -79,7 +79,7 @@ public OrchestrationChatResponse imageInput(@Nonnull final String pathToImage) {
   @Nonnull
   public OrchestrationChatResponse multiStringInput(@Nonnull final List<String> questions) {
     final var multiMessage =
-        Message.user(questions.get(0)).andText(questions.get(1)).andText(questions.get(2));
+        Message.user(questions.get(0)).withText(questions.get(1)).withText(questions.get(2));
     final var prompt = new OrchestrationPrompt(multiMessage);
     return client.chatCompletion(prompt, config);
   }