From eda1bcd416286c4c332ac0afa27596a336fd3d10 Mon Sep 17 00:00:00 2001
From: Fu Cheng <alexcheng1982@gmail.com>
Date: Sat, 21 Sep 2024 14:14:56 +1200
Subject: [PATCH] Minor update, simplify checks and filtering

Return type of `getContent` is already `String`, no need for type checking and toString
---
 .../springframework/ai/evaluation/RelevancyEvaluator.java   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/spring-ai-core/src/main/java/org/springframework/ai/evaluation/RelevancyEvaluator.java b/spring-ai-core/src/main/java/org/springframework/ai/evaluation/RelevancyEvaluator.java
index 2f26e976894..9dd75053713 100644
--- a/spring-ai-core/src/main/java/org/springframework/ai/evaluation/RelevancyEvaluator.java
+++ b/spring-ai-core/src/main/java/org/springframework/ai/evaluation/RelevancyEvaluator.java
@@ -5,8 +5,8 @@
 
 import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
 import java.util.stream.Collectors;
+import org.springframework.util.StringUtils;
 
 public class RelevancyEvaluator implements Evaluator {
 
@@ -57,9 +57,7 @@ protected String doGetSupportingData(EvaluationRequest evaluationRequest) {
 		List<Content> data = evaluationRequest.getDataList();
 		return data.stream()
 			.map(Content::getContent)
-			.filter(Objects::nonNull)
-			.filter(c -> c instanceof String)
-			.map(Object::toString)
+			.filter(StringUtils::hasText)
 			.collect(Collectors.joining(System.lineSeparator()));
 	}