fix: MethodToolCallbackProvider#isFunctionalType logic to check functiontype

   - Change LHR <-> RHR in the ClassUtils.isAssignable

Auto-cherry-pick to 1.0.x

Fixes #spring-projectsGH-3355

Signed-off-by: Sun Yuhan <[email protected]>

Author: sunyuhan1998

spring-ai-model/src/main/java/org/springframework/ai/tool/method/MethodToolCallbackProvider.java

@@ -103,9 +103,9 @@ public ToolCallback[] getToolCallbacks() {
 	}
 
 	private boolean isFunctionalType(Method toolMethod) {
-		var isFunction = ClassUtils.isAssignable(toolMethod.getReturnType(), Function.class)
-				|| ClassUtils.isAssignable(toolMethod.getReturnType(), Supplier.class)
-				|| ClassUtils.isAssignable(toolMethod.getReturnType(), Consumer.class);
+		var isFunction = ClassUtils.isAssignable(Function.class, toolMethod.getReturnType())
+				|| ClassUtils.isAssignable(Supplier.class, toolMethod.getReturnType())
+				|| ClassUtils.isAssignable(Consumer.class, toolMethod.getReturnType());
 
 		if (isFunction) {
 			logger.warn("Method {} is annotated with @Tool but returns a functional type. "

spring-ai-model/src/test/java/org/springframework/ai/tool/method/MethodToolCallbackProviderTests.java

@@ -78,6 +78,15 @@ void whenMultipleToolObjectsWithSameToolNameThenThrow() {
 			.hasMessageContaining("Multiple tools with the same name (validTool) found in sources");
 	}
 
+	@Test
+	void whenToolObjectHasObjectTypeMethodThenSuccess() {
+		MethodToolCallbackProvider provider = MethodToolCallbackProvider.builder()
+			.toolObjects(new ObjectTypeToolMethodsObject())
+			.build();
+		assertThat(provider.getToolCallbacks()).hasSize(1);
+		assertThat(provider.getToolCallbacks()[0].getToolDefinition().name()).isEqualTo("objectTool");
+	}
+
 	static class ValidToolObject {
 
 		@Tool
@@ -137,4 +146,13 @@ public String validTool() {
 
 	}
 
+	static class ObjectTypeToolMethodsObject {
+
+		@Tool
+		public Object objectTool() {
+			return "Object tool result";
+		}
+
+	}
+
 }