feat: case insensitive for "sensitive words" and polish

Signed-off-by: Xavier Chopin <[email protected]>

Author: xchopin

Diff for: spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/DefaultAroundAdvisorChain.java

@@ -161,7 +161,7 @@ public Builder pushAll(List<? extends Advisor> advisors) {
 				}
 
 				List<StreamAroundAdvisor> streamAroundAdvisorList = advisors.stream()
-					.filter(a -> a instanceof StreamAroundAdvisor)
+					.filter(StreamAroundAdvisor.class::isInstance)
 					.map(a -> (StreamAroundAdvisor) a)
 					.toList();
 

Diff for: spring-ai-client-chat/src/main/java/org/springframework/ai/chat/client/advisor/SafeGuardAdvisor.java

@@ -74,9 +74,9 @@ public String getName() {
 
 	@Override
 	public AdvisedResponse aroundCall(AdvisedRequest advisedRequest, CallAroundAdvisorChain chain) {
-
+		String userTextLowerCase = advisedRequest.userText().toLowerCase();
 		if (!CollectionUtils.isEmpty(this.sensitiveWords)
-				&& this.sensitiveWords.stream().anyMatch(w -> advisedRequest.userText().contains(w))) {
+				&& this.sensitiveWords.stream().anyMatch(w -> userTextLowerCase.contains(w.toLowerCase()))) {
 
 			return createFailureResponse(advisedRequest);
 		}
@@ -86,9 +86,9 @@ public AdvisedResponse aroundCall(AdvisedRequest advisedRequest, CallAroundAdvis
 
 	@Override
 	public Flux<AdvisedResponse> aroundStream(AdvisedRequest advisedRequest, StreamAroundAdvisorChain chain) {
-
+		String userTextLowerCase = advisedRequest.userText().toLowerCase();
 		if (!CollectionUtils.isEmpty(this.sensitiveWords)
-				&& this.sensitiveWords.stream().anyMatch(w -> advisedRequest.userText().contains(w))) {
+				&& this.sensitiveWords.stream().anyMatch(w -> userTextLowerCase.contains(w.toLowerCase()))) {
 			return Flux.just(createFailureResponse(advisedRequest));
 		}
 

Diff for: spring-ai-client-chat/src/main/java/org/springframework/ai/chat/memory/InMemoryChatMemory.java

@@ -17,6 +17,7 @@
 package org.springframework.ai.chat.memory;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -41,8 +42,9 @@ public class InMemoryChatMemory implements ChatMemory {
 
 	@Override
 	public void add(String conversationId, List<Message> messages) {
-		this.conversationHistory.putIfAbsent(conversationId, new ArrayList<>());
-		this.conversationHistory.get(conversationId).addAll(messages);
+		this.conversationHistory
+				.computeIfAbsent(conversationId, v -> new ArrayList<>())
+				.addAll(messages);
 	}
 
 	@Override

Diff for: spring-ai-client-chat/src/main/java/org/springframework/ai/converter/BeanOutputConverter.java

@@ -63,9 +63,7 @@ public class BeanOutputConverter<T> implements StructuredOutputConverter<T> {
 
 	private final Logger logger = LoggerFactory.getLogger(BeanOutputConverter.class);
 
-	/**
-	 * The target class type reference to which the output will be converted.
-	 */
+	/** The target class type reference to which the output will be converted. */
 	private final Type type;
 
 	/** The object mapper used for deserialization and other JSON operations. */
@@ -119,7 +117,7 @@ public BeanOutputConverter(ParameterizedTypeReference<T> typeRef, ObjectMapper o
 	 * @param objectMapper Custom object mapper for JSON operations. endings.
 	 */
 	private BeanOutputConverter(Type type, ObjectMapper objectMapper) {
-		Objects.requireNonNull(type, "Type cannot be null;");
+		Objects.requireNonNull(type, "Type cannot be null");
 		this.type = type;
 		this.objectMapper = objectMapper != null ? objectMapper : getObjectMapper();
 		generateSchema();