refactor(annotations): Mark McpPrompts, McpResources, and McpTools as deprecated and update InjectorModule to use new annotations for binding

Author: codeboyzhou

src/main/java/com/github/codeboyzhou/mcp/declarative/annotation/McpPrompts.java

@@ -7,4 +7,5 @@
 
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
+@Deprecated(since = "0.8.0", forRemoval = true)
 public @interface McpPrompts {}

src/main/java/com/github/codeboyzhou/mcp/declarative/annotation/McpResources.java

@@ -7,4 +7,5 @@
 
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
+@Deprecated(since = "0.8.0", forRemoval = true)
 public @interface McpResources {}

src/main/java/com/github/codeboyzhou/mcp/declarative/annotation/McpTools.java

@@ -7,4 +7,5 @@
 
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
+@Deprecated(since = "0.8.0", forRemoval = true)
 public @interface McpTools {}

src/main/java/com/github/codeboyzhou/mcp/declarative/common/InjectorModule.java

@@ -1,23 +1,27 @@
 package com.github.codeboyzhou.mcp.declarative.common;
 
 import static com.google.inject.Scopes.SINGLETON;
+import static java.util.stream.Collectors.toSet;
 import static org.reflections.scanners.Scanners.FieldsAnnotated;
 import static org.reflections.scanners.Scanners.MethodsAnnotated;
-import static org.reflections.scanners.Scanners.TypesAnnotated;
 
 import com.github.codeboyzhou.mcp.declarative.annotation.McpI18nEnabled;
-import com.github.codeboyzhou.mcp.declarative.annotation.McpPrompts;
-import com.github.codeboyzhou.mcp.declarative.annotation.McpResources;
+import com.github.codeboyzhou.mcp.declarative.annotation.McpPrompt;
+import com.github.codeboyzhou.mcp.declarative.annotation.McpResource;
 import com.github.codeboyzhou.mcp.declarative.annotation.McpServerApplication;
-import com.github.codeboyzhou.mcp.declarative.annotation.McpTools;
+import com.github.codeboyzhou.mcp.declarative.annotation.McpTool;
 import com.github.codeboyzhou.mcp.declarative.server.component.McpServerPromptFactory;
 import com.github.codeboyzhou.mcp.declarative.server.component.McpServerResourceFactory;
 import com.github.codeboyzhou.mcp.declarative.server.component.McpServerToolFactory;
 import com.github.codeboyzhou.mcp.declarative.server.factory.McpSseServerFactory;
 import com.github.codeboyzhou.mcp.declarative.server.factory.McpStdioServerFactory;
 import com.github.codeboyzhou.mcp.declarative.server.factory.McpStreamableServerFactory;
 import com.google.inject.AbstractModule;
+import com.google.inject.Provides;
+import com.google.inject.Singleton;
 import com.google.inject.name.Names;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
 import java.util.Set;
 import org.reflections.Reflections;
 
@@ -34,13 +38,9 @@ public InjectorModule(Class<?> mainClass) {
   @Override
   protected void configure() {
     // Bind classes annotated by McpResources, McpPrompts, McpTools
-    Reflections reflections = provideReflections();
-    Set<Class<?>> resources = reflections.getTypesAnnotatedWith(McpResources.class);
-    resources.forEach(clazz -> bind(clazz).in(SINGLETON));
-    Set<Class<?>> prompts = reflections.getTypesAnnotatedWith(McpPrompts.class);
-    prompts.forEach(clazz -> bind(clazz).in(SINGLETON));
-    Set<Class<?>> tools = reflections.getTypesAnnotatedWith(McpTools.class);
-    tools.forEach(clazz -> bind(clazz).in(SINGLETON));
+    bindClassesOfMethodsAnnotatedWith(McpResource.class);
+    bindClassesOfMethodsAnnotatedWith(McpPrompt.class);
+    bindClassesOfMethodsAnnotatedWith(McpTool.class);
 
     // Bind all implementations of McpServerComponentFactory
     bind(McpServerResourceFactory.class).in(SINGLETON);
@@ -59,10 +59,12 @@ protected void configure() {
         .toInstance(i18nEnabled);
   }
 
-  private Reflections provideReflections() {
+  @Provides
+  @Singleton
+  public Reflections provideReflections() {
     McpServerApplication application = mainClass.getAnnotation(McpServerApplication.class);
     final String basePackage = determineBasePackage(application);
-    return new Reflections(basePackage, TypesAnnotated, MethodsAnnotated, FieldsAnnotated);
+    return new Reflections(basePackage, MethodsAnnotated, FieldsAnnotated);
   }
 
   private String determineBasePackage(McpServerApplication application) {
@@ -76,4 +78,11 @@ private String determineBasePackage(McpServerApplication application) {
     }
     return mainClass.getPackageName();
   }
+
+  private void bindClassesOfMethodsAnnotatedWith(Class<? extends Annotation> annotation) {
+    Reflections reflections = provideReflections();
+    Set<Method> methods = reflections.getMethodsAnnotatedWith(annotation);
+    Set<Class<?>> classes = methods.stream().map(Method::getDeclaringClass).collect(toSet());
+    classes.forEach(clazz -> bind(clazz).in(SINGLETON));
+  }
 }

src/main/java/com/github/codeboyzhou/mcp/declarative/server/component/McpServerComponentRegister.java

@@ -1,18 +1,13 @@
 package com.github.codeboyzhou.mcp.declarative.server.component;
 
 import com.github.codeboyzhou.mcp.declarative.annotation.McpPrompt;
-import com.github.codeboyzhou.mcp.declarative.annotation.McpPrompts;
 import com.github.codeboyzhou.mcp.declarative.annotation.McpResource;
-import com.github.codeboyzhou.mcp.declarative.annotation.McpResources;
 import com.github.codeboyzhou.mcp.declarative.annotation.McpTool;
-import com.github.codeboyzhou.mcp.declarative.annotation.McpTools;
 import com.github.codeboyzhou.mcp.declarative.common.Immutable;
 import com.github.codeboyzhou.mcp.declarative.common.InjectorProvider;
 import com.google.inject.Injector;
-import io.modelcontextprotocol.server.McpServerFeatures;
 import io.modelcontextprotocol.server.McpSyncServer;
 import java.lang.reflect.Method;
-import java.util.List;
 import java.util.Set;
 import org.reflections.Reflections;
 
@@ -38,49 +33,29 @@ private void registerResources() {
     Injector injector = InjectorProvider.getInstance().getInjector();
     McpServerResourceFactory resourceFactory = injector.getInstance(McpServerResourceFactory.class);
     Reflections reflections = injector.getInstance(Reflections.class);
-    Set<Class<?>> resourceClasses = reflections.getTypesAnnotatedWith(McpResources.class);
-    for (Class<?> resourceClass : resourceClasses) {
-      Set<Method> resourceMethods = reflections.getMethodsAnnotatedWith(McpResource.class);
-      List<Method> methods =
-          resourceMethods.stream().filter(m -> m.getDeclaringClass() == resourceClass).toList();
-      for (Method method : methods) {
-        McpServerFeatures.SyncResourceSpecification resource =
-            resourceFactory.create(resourceClass, method);
-        server.addResource(resource);
-      }
+    Set<Method> resourceMethods = reflections.getMethodsAnnotatedWith(McpResource.class);
+    for (Method method : resourceMethods) {
+      server.addResource(resourceFactory.create(method.getDeclaringClass(), method));
     }
   }
 
   private void registerPrompts() {
     Injector injector = InjectorProvider.getInstance().getInjector();
     McpServerPromptFactory promptFactory = injector.getInstance(McpServerPromptFactory.class);
     Reflections reflections = injector.getInstance(Reflections.class);
-    Set<Class<?>> promptClasses = reflections.getTypesAnnotatedWith(McpPrompts.class);
-    for (Class<?> promptClass : promptClasses) {
-      Set<Method> promptMethods = reflections.getMethodsAnnotatedWith(McpPrompt.class);
-      List<Method> methods =
-          promptMethods.stream().filter(m -> m.getDeclaringClass() == promptClass).toList();
-      for (Method method : methods) {
-        McpServerFeatures.SyncPromptSpecification prompt =
-            promptFactory.create(promptClass, method);
-        server.addPrompt(prompt);
-      }
+    Set<Method> promptMethods = reflections.getMethodsAnnotatedWith(McpPrompt.class);
+    for (Method method : promptMethods) {
+      server.addPrompt(promptFactory.create(method.getDeclaringClass(), method));
     }
   }
 
   private void registerTools() {
     Injector injector = InjectorProvider.getInstance().getInjector();
     McpServerToolFactory toolFactory = injector.getInstance(McpServerToolFactory.class);
     Reflections reflections = injector.getInstance(Reflections.class);
-    Set<Class<?>> toolClasses = reflections.getTypesAnnotatedWith(McpTools.class);
-    for (Class<?> toolClass : toolClasses) {
-      Set<Method> toolMethods = reflections.getMethodsAnnotatedWith(McpTool.class);
-      List<Method> methods =
-          toolMethods.stream().filter(m -> m.getDeclaringClass() == toolClass).toList();
-      for (Method method : methods) {
-        McpServerFeatures.SyncToolSpecification tool = toolFactory.create(toolClass, method);
-        server.addTool(tool);
-      }
+    Set<Method> toolMethods = reflections.getMethodsAnnotatedWith(McpTool.class);
+    for (Method method : toolMethods) {
+      server.addTool(toolFactory.create(method.getDeclaringClass(), method));
     }
   }
 }

src/test/java/com/github/codeboyzhou/mcp/declarative/test/TestMcpPrompts.java

@@ -1,9 +1,7 @@
 package com.github.codeboyzhou.mcp.declarative.test;
 
 import com.github.codeboyzhou.mcp.declarative.annotation.McpPrompt;
-import com.github.codeboyzhou.mcp.declarative.annotation.McpPrompts;
 
-@McpPrompts
 public class TestMcpPrompts {
 
   @McpPrompt(name = "prompt1_name", title = "prompt1_title", description = "prompt1_description")

src/test/java/com/github/codeboyzhou/mcp/declarative/test/TestMcpResources.java

@@ -1,9 +1,7 @@
 package com.github.codeboyzhou.mcp.declarative.test;
 
 import com.github.codeboyzhou.mcp.declarative.annotation.McpResource;
-import com.github.codeboyzhou.mcp.declarative.annotation.McpResources;
 
-@McpResources
 public class TestMcpResources {
 
   @McpResource(

src/test/java/com/github/codeboyzhou/mcp/declarative/test/TestMcpTools.java

@@ -1,9 +1,7 @@
 package com.github.codeboyzhou.mcp.declarative.test;
 
 import com.github.codeboyzhou.mcp.declarative.annotation.McpTool;
-import com.github.codeboyzhou.mcp.declarative.annotation.McpTools;
 
-@McpTools
 public class TestMcpTools {
 
   @McpTool(name = "tool1_name", title = "tool1_title", description = "tool1_description")