Update spring-ai-model/src/main/java/org/springframework/ai/tool/execution/DefaultToolCallResultConverter.java

JM-Lab · valery1707 · web-flow · commit 77ecb6c5e1ad · 2025-07-10T20:40:57.000+09:00
refactor: replace Optional null check with String.valueOf

Co-authored-by: valery1707 &lt;valery1707@gmail.com&gt;
Signed-off-by: Jemin Huh &lt;hjm1980@gmail.com&gt;
diff --git a/spring-ai-model/src/main/java/org/springframework/ai/tool/execution/DefaultToolCallResultConverter.java b/spring-ai-model/src/main/java/org/springframework/ai/tool/execution/DefaultToolCallResultConverter.java
@@ -51,7 +51,7 @@ public String convert(@Nullable Object result, @Nullable Type returnType) {
 		}
 		if (returnType instanceof Class<?> cls && cls.equals(String.class)) {
 			logger.debug("Tool return type is String. Returning result as is.");
-			return Optional.ofNullable((String) result).orElse("null");
+			return String.valueOf(result);
 		}
 		if (result instanceof RenderedImage) {
 			final var buf = new ByteArrayOutputStream(1024 * 4);

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public String convert(@Nullable Object result, @Nullable Type returnType) {`
`51`	`51`	`}`
`52`	`52`	`if (returnType instanceof Class<?> cls && cls.equals(String.class)) {`
`53`	`53`	`logger.debug("Tool return type is String. Returning result as is.");`
`54`		`- return Optional.ofNullable((String) result).orElse("null");`
	`54`	`+ return String.valueOf(result);`
`55`	`55`	`}`
`56`	`56`	`if (result instanceof RenderedImage) {`
`57`	`57`	`final var buf = new ByteArrayOutputStream(1024 * 4);`