Merge pull request #186 from scottslewis/master

Fix for ToolAnnotation

Author: scottslewis

framework/bundles/org.eclipse.ecf.ai.mcp.tools/src/org/eclipse/ecf/ai/mcp/tools/annotation/Tool.java

@@ -22,24 +22,5 @@
 
 	String description() default "";
 
-	/**
-	 * Supports the addition of ToolAnnotations to Tool spec in the MCP schema
-	 * (draft as of 5/18/2025) located <a href=
-	 * "https://github.com/modelcontextprotocol/modelcontextprotocol/blob/main/schema/draft/schema.json#L2164">here</a>
-	 */
-	@Retention(RetentionPolicy.RUNTIME)
-	@Target(ElementType.METHOD)
-	public @interface ToolAnnotation {
-		boolean destructiveHint() default false;
-
-		boolean idempotentHint() default false;
-
-		boolean openWorldHint() default false;
-
-		boolean readOnlyHint() default false;
-
-		String title() default "";
-	}
-
-	ToolAnnotation[] annotations();
+	ToolAnnotation[] value();
 }

framework/bundles/org.eclipse.ecf.ai.mcp.tools/src/org/eclipse/ecf/ai/mcp/tools/annotation/ToolAnnotation.java

@@ -0,0 +1,29 @@
+package org.eclipse.ecf.ai.mcp.tools.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Supports the addition of ToolAnnotations to Tool spec in the MCP schema
+ * (draft as of 5/18/2025) located <a href=
+ * "https://github.com/modelcontextprotocol/modelcontextprotocol/blob/main/schema/draft/schema.json#L2164">here</a>
+ */
+@Repeatable(Tool.class)
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface ToolAnnotation {
+	boolean destructiveHint() default false;
+
+	boolean idempotentHint() default false;
+
+	boolean openWorldHint() default false;
+
+	boolean readOnlyHint() default false;
+
+	String title() default "";
+	
+} 
+

framework/bundles/org.eclipse.ecf.ai.mcp.tools/src/org/eclipse/ecf/ai/mcp/tools/service/ToolAnnotationDescription.java

@@ -14,7 +14,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.eclipse.ecf.ai.mcp.tools.annotation.Tool;
+import org.eclipse.ecf.ai.mcp.tools.annotation.ToolAnnotation;
 
 /**
  * Describes the ToolAnnotation type in the MCP schema (draft as of 5/18/2025)
@@ -24,7 +24,7 @@
 public record ToolAnnotationDescription(boolean destructiveHint, boolean idempotentHint, boolean openWorldHint,
 		boolean readOnlyHint, String title) {
 
-	public static List<ToolAnnotationDescription> fromAnnotations(Tool.ToolAnnotation[] annotations) {
+	public static List<ToolAnnotationDescription> fromAnnotations(ToolAnnotation[] annotations) {
 		return (annotations != null) ? Arrays.asList(annotations).stream().map(a -> {
 			return new ToolAnnotationDescription(a.destructiveHint(), a.idempotentHint(), a.openWorldHint(),
 					a.readOnlyHint(), a.title());

framework/bundles/org.eclipse.ecf.ai.mcp.tools/src/org/eclipse/ecf/ai/mcp/tools/service/ToolDescription.java

@@ -28,7 +28,7 @@ public static List<ToolDescription> fromClass(Class<?> clazz) {
 					? new ToolDescription(m.getName(), ma.description(),
 							ToolParamDescription.fromParameters(m.getParameters()), 
 							ToolResultDescription.fromMethod(m),
-							ToolAnnotationDescription.fromAnnotations(ma.annotations()))
+							ToolAnnotationDescription.fromAnnotations(ma.value()))
 					: null;
 		}).filter(Objects::nonNull).collect(Collectors.toList());