Merge branch 'main' into fix-issue-4472

# Conflicts:
#	models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/api/StreamHelperTests.java

Author: sunyuhan1998

models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/api/StreamHelperTests.java

@@ -76,6 +76,19 @@ void testMultipleErrorEventsHandling() {
 		assertThat(response2).isNotNull();
 	}
 
+	@Test
+	void testPingEventHandling() {
+		StreamHelper streamHelper = new StreamHelper();
+		AtomicReference<ChatCompletionResponseBuilder> contentBlockReference = new AtomicReference<>();
+
+		AnthropicApi.PingEvent pingEvent = new AnthropicApi.PingEvent(AnthropicApi.EventType.PING);
+
+		AnthropicApi.ChatCompletionResponse response = streamHelper.eventToChatCompletionResponse(pingEvent,
+				contentBlockReference);
+
+		assertThat(response).isNotNull();
+	}
+
 	@Test
 	void testMessageStartEvent() {
 		StreamHelper streamHelper = new StreamHelper();

spring-ai-docs/src/main/antora/modules/ROOT/pages/api/chat-memory.adoc

@@ -222,7 +222,7 @@ If you'd rather create the `CassandraChatMemoryRepository` manually, you can do
 [source,java]
 ----
 ChatMemoryRepository chatMemoryRepository = CassandraChatMemoryRepository
-    .create(CassandraChatMemoryConfig.builder().withCqlSession(cqlSession));
+    .create(CassandraChatMemoryRepositoryConfig.builder().withCqlSession(cqlSession));
 
 ChatMemory chatMemory = MessageWindowChatMemory.builder()
     .chatMemoryRepository(chatMemoryRepository)

spring-ai-docs/src/main/antora/modules/ROOT/pages/api/multimodality.adoc

@@ -41,9 +41,10 @@ For most of the multimodal LLMs, the Spring AI code would look something like th
 ----
 var imageResource = new ClassPathResource("/multimodal.test.png");
 
-var userMessage = new UserMessage(
-	"Explain what do you see in this picture?", // content
-	new Media(MimeTypeUtils.IMAGE_PNG, this.imageResource)); // media
+var userMessage = UserMessage.builder()
+    .text("Explain what do you see in this picture?") // content
+    .media(new Media(MimeTypeUtils.IMAGE_PNG, this.imageResource)) // media
+    .build();
 
 ChatResponse response = chatModel.call(new Prompt(this.userMessage));
 ----

spring-ai-rag/src/test/java/org/springframework/ai/rag/QueryTests.java

@@ -78,4 +78,22 @@ void whenCompareQueryToNullThenNotEqual() {
 		assertThat(query).isNotEqualTo(null);
 	}
 
+	@Test
+	void whenCompareQueryToDifferentTypeThenNotEqual() {
+		Query query = new Query("Test query");
+		String notAQuery = "Test query";
+
+		assertThat(query).isNotEqualTo(notAQuery);
+	}
+
+	@Test
+	void toStringReturnsExpectedFormat() {
+		Query query = new Query("Test query text");
+		String toString = query.toString();
+
+		assertThat(toString).contains("Query");
+		assertThat(toString).contains("text");
+		assertThat(toString).contains("Test query text");
+	}
+
 }

spring-ai-rag/src/test/java/org/springframework/ai/rag/preretrieval/query/expansion/MultiQueryExpanderTests.java

@@ -22,6 +22,7 @@
 import org.springframework.ai.chat.prompt.PromptTemplate;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.mockito.Mockito.mock;
 
 /**
@@ -69,4 +70,19 @@ void whenPromptHasMissingQueryPlaceholderThenThrow() {
 			.hasMessageContaining("query");
 	}
 
+	@Test
+	void whenBuilderIsNullThenThrow() {
+		assertThatThrownBy(() -> MultiQueryExpander.builder().build()).isInstanceOf(IllegalArgumentException.class)
+			.hasMessageContaining("chatClientBuilder cannot be null");
+	}
+
+	@Test
+	void whenPromptTemplateIsNullThenUseDefault() {
+		MultiQueryExpander queryExpander = MultiQueryExpander.builder()
+			.chatClientBuilder(mock(ChatClient.Builder.class))
+			.promptTemplate(null)
+			.build();
+		assertThat(queryExpander).isNotNull();
+	}
+
 }