Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ public ToolCallback[] getToolCallbacks() {
AopUtils.isAopProxy(toolObject) ? AopUtils.getTargetClass(toolObject) : toolObject.getClass()))
.filter(toolMethod -> toolMethod.isAnnotationPresent(Tool.class))
.filter(toolMethod -> !isFunctionalType(toolMethod))
.filter(ReflectionUtils.USER_DECLARED_METHODS::matches)
.map(toolMethod -> MethodToolCallback.builder()
.toolDefinition(ToolDefinition.from(toolMethod))
.toolMetadata(ToolMetadata.from(toolMethod))
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package org.springframework.ai.tool.method;

import org.junit.jupiter.api.Test;
import org.springframework.ai.tool.ToolCallback;
import org.springframework.ai.tool.annotation.Tool;

import static org.junit.jupiter.api.Assertions.*;

class MethodToolCallbackProviderTest {

abstract class TestObjectClass<T> {

public abstract String test(T input);
}

class TestObjectSuperClass extends TestObjectClass<String> {

@Tool
public String test(String input) {
return input;
}
}

@Test
public void buildToolsWithBridgeMethodReturnOnlyUserDeclaredMethods() {
MethodToolCallbackProvider provider = MethodToolCallbackProvider.builder().toolObjects(new TestObjectSuperClass()).build();
ToolCallback[] toolCallbacks = provider.getToolCallbacks();
assertEquals(1, toolCallbacks.length);
assertInstanceOf(MethodToolCallback.class, toolCallbacks[0]);
}

}