Move component package to server.component and update references.

codeboyzhou · codeboyzhou · commit 99776c1aa603 · 2026-05-31T23:52:42.000+08:00
diff --git a/src/main/java/com/github/thought2code/mcp/annotated/server/component/completion/CompletionDefinition.java b/src/main/java/com/github/thought2code/mcp/annotated/server/component/completion/CompletionDefinition.java
@@ -1,4 +1,4 @@
-package com.github.thought2code.mcp.annotated.component.completion;
+package com.github.thought2code.mcp.annotated.server.component.completion;
 
 import io.modelcontextprotocol.spec.McpSchema;
 
diff --git a/src/main/java/com/github/thought2code/mcp/annotated/server/component/completion/CompletionInvoker.java b/src/main/java/com/github/thought2code/mcp/annotated/server/component/completion/CompletionInvoker.java
@@ -1,4 +1,4 @@
-package com.github.thought2code.mcp.annotated.component.completion;
+package com.github.thought2code.mcp.annotated.server.component.completion;
 
 import com.github.thought2code.mcp.annotated.McpApplicationContext;
 import com.github.thought2code.mcp.annotated.reflect.Invocation;
diff --git a/src/main/java/com/github/thought2code/mcp/annotated/server/component/completion/CompletionSupport.java b/src/main/java/com/github/thought2code/mcp/annotated/server/component/completion/CompletionSupport.java
@@ -1,8 +1,8 @@
-package com.github.thought2code.mcp.annotated.component.completion;
+package com.github.thought2code.mcp.annotated.server.component.completion;
 
 import com.github.thought2code.mcp.annotated.McpApplicationContext;
-import com.github.thought2code.mcp.annotated.component.spi.ComponentModelProvider;
 import com.github.thought2code.mcp.annotated.exception.McpServerComponentRegistrationException;
+import com.github.thought2code.mcp.annotated.server.component.spi.ComponentModelProvider;
 import io.modelcontextprotocol.server.McpServerFeatures;
 import io.modelcontextprotocol.spec.McpSchema;
 import java.util.ArrayList;
diff --git a/src/main/java/com/github/thought2code/mcp/annotated/server/component/completion/McpCompleteCompletion.java b/src/main/java/com/github/thought2code/mcp/annotated/server/component/completion/McpCompleteCompletion.java
@@ -1,4 +1,4 @@
-package com.github.thought2code.mcp.annotated.component.completion;
+package com.github.thought2code.mcp.annotated.server.component.completion;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/src/main/java/com/github/thought2code/mcp/annotated/server/component/prompt/PromptDefinition.java b/src/main/java/com/github/thought2code/mcp/annotated/server/component/prompt/PromptDefinition.java
@@ -1,4 +1,4 @@
-package com.github.thought2code.mcp.annotated.component.prompt;
+package com.github.thought2code.mcp.annotated.server.component.prompt;
 
 import io.modelcontextprotocol.spec.McpSchema;
 
diff --git a/src/main/java/com/github/thought2code/mcp/annotated/server/component/prompt/PromptInvoker.java b/src/main/java/com/github/thought2code/mcp/annotated/server/component/prompt/PromptInvoker.java
@@ -1,4 +1,4 @@
-package com.github.thought2code.mcp.annotated.component.prompt;
+package com.github.thought2code.mcp.annotated.server.component.prompt;
 
 import com.github.thought2code.mcp.annotated.McpApplicationContext;
 import com.github.thought2code.mcp.annotated.reflect.Invocation;
diff --git a/src/main/java/com/github/thought2code/mcp/annotated/server/component/prompt/PromptRegistration.java b/src/main/java/com/github/thought2code/mcp/annotated/server/component/prompt/PromptRegistration.java
@@ -1,8 +1,8 @@
-package com.github.thought2code.mcp.annotated.component.prompt;
+package com.github.thought2code.mcp.annotated.server.component.prompt;
 
 import com.github.thought2code.mcp.annotated.McpApplicationContext;
-import com.github.thought2code.mcp.annotated.component.spi.ComponentModelProvider;
 import com.github.thought2code.mcp.annotated.exception.McpServerComponentRegistrationException;
+import com.github.thought2code.mcp.annotated.server.component.spi.ComponentModelProvider;
 import com.github.thought2code.mcp.annotated.util.JacksonHelper;
 import io.modelcontextprotocol.server.McpAsyncServer;
 import io.modelcontextprotocol.server.McpServerFeatures;
diff --git a/src/main/java/com/github/thought2code/mcp/annotated/server/component/resource/ResourceDefinition.java b/src/main/java/com/github/thought2code/mcp/annotated/server/component/resource/ResourceDefinition.java
@@ -1,4 +1,4 @@
-package com.github.thought2code.mcp.annotated.component.resource;
+package com.github.thought2code.mcp.annotated.server.component.resource;
 
 import io.modelcontextprotocol.spec.McpSchema;
 
diff --git a/src/main/java/com/github/thought2code/mcp/annotated/server/component/resource/ResourceInvoker.java b/src/main/java/com/github/thought2code/mcp/annotated/server/component/resource/ResourceInvoker.java
@@ -1,4 +1,4 @@
-package com.github.thought2code.mcp.annotated.component.resource;
+package com.github.thought2code.mcp.annotated.server.component.resource;
 
 import com.github.thought2code.mcp.annotated.McpApplicationContext;
 import com.github.thought2code.mcp.annotated.reflect.Invocation;
diff --git a/src/main/java/com/github/thought2code/mcp/annotated/server/component/resource/ResourceRegistration.java b/src/main/java/com/github/thought2code/mcp/annotated/server/component/resource/ResourceRegistration.java
@@ -1,8 +1,8 @@
-package com.github.thought2code.mcp.annotated.component.resource;
+package com.github.thought2code.mcp.annotated.server.component.resource;
 
 import com.github.thought2code.mcp.annotated.McpApplicationContext;
-import com.github.thought2code.mcp.annotated.component.spi.ComponentModelProvider;
 import com.github.thought2code.mcp.annotated.exception.McpServerComponentRegistrationException;
+import com.github.thought2code.mcp.annotated.server.component.spi.ComponentModelProvider;
 import com.github.thought2code.mcp.annotated.util.JacksonHelper;
 import io.modelcontextprotocol.server.McpAsyncServer;
 import io.modelcontextprotocol.server.McpServerFeatures;
diff --git a/src/main/java/com/github/thought2code/mcp/annotated/server/component/spi/ComponentModelProvider.java b/src/main/java/com/github/thought2code/mcp/annotated/server/component/spi/ComponentModelProvider.java
@@ -1,9 +1,9 @@
-package com.github.thought2code.mcp.annotated.component.spi;
+package com.github.thought2code.mcp.annotated.server.component.spi;
 
-import com.github.thought2code.mcp.annotated.component.completion.CompletionDefinition;
-import com.github.thought2code.mcp.annotated.component.prompt.PromptDefinition;
-import com.github.thought2code.mcp.annotated.component.resource.ResourceDefinition;
-import com.github.thought2code.mcp.annotated.component.tool.ToolDefinition;
+import com.github.thought2code.mcp.annotated.server.component.completion.CompletionDefinition;
+import com.github.thought2code.mcp.annotated.server.component.prompt.PromptDefinition;
+import com.github.thought2code.mcp.annotated.server.component.resource.ResourceDefinition;
+import com.github.thought2code.mcp.annotated.server.component.tool.ToolDefinition;
 import java.util.List;
 
 /**
diff --git a/src/main/java/com/github/thought2code/mcp/annotated/server/component/tool/ToolDefinition.java b/src/main/java/com/github/thought2code/mcp/annotated/server/component/tool/ToolDefinition.java
@@ -1,4 +1,4 @@
-package com.github.thought2code.mcp.annotated.component.tool;
+package com.github.thought2code.mcp.annotated.server.component.tool;
 
 import io.modelcontextprotocol.spec.McpSchema;
 
diff --git a/src/main/java/com/github/thought2code/mcp/annotated/server/component/tool/ToolInvoker.java b/src/main/java/com/github/thought2code/mcp/annotated/server/component/tool/ToolInvoker.java
@@ -1,4 +1,4 @@
-package com.github.thought2code.mcp.annotated.component.tool;
+package com.github.thought2code.mcp.annotated.server.component.tool;
 
 import com.github.thought2code.mcp.annotated.McpApplicationContext;
 import com.github.thought2code.mcp.annotated.reflect.Invocation;
diff --git a/src/main/java/com/github/thought2code/mcp/annotated/server/component/tool/ToolRegistration.java b/src/main/java/com/github/thought2code/mcp/annotated/server/component/tool/ToolRegistration.java
@@ -1,9 +1,9 @@
-package com.github.thought2code.mcp.annotated.component.tool;
+package com.github.thought2code.mcp.annotated.server.component.tool;
 
 import com.github.thought2code.mcp.annotated.McpApplicationContext;
-import com.github.thought2code.mcp.annotated.component.spi.ComponentModelProvider;
 import com.github.thought2code.mcp.annotated.exception.McpServerComponentRegistrationException;
 import com.github.thought2code.mcp.annotated.server.McpStructuredContent;
+import com.github.thought2code.mcp.annotated.server.component.spi.ComponentModelProvider;
 import com.github.thought2code.mcp.annotated.util.JacksonHelper;
 import io.modelcontextprotocol.server.McpAsyncServer;
 import io.modelcontextprotocol.server.McpServerFeatures;
diff --git a/src/test/java/com/github/thought2code/mcp/annotated/server/component/completion/CompletionSupportTest.java b/src/test/java/com/github/thought2code/mcp/annotated/server/component/completion/CompletionSupportTest.java
@@ -0,0 +1,86 @@
+package com.github.thought2code.mcp.annotated.server.component.completion;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import com.github.thought2code.mcp.annotated.McpApplicationContext;
+import com.github.thought2code.mcp.annotated.reflect.Invocation;
+import com.github.thought2code.mcp.annotated.server.component.spi.ComponentModelProvider;
+import io.modelcontextprotocol.server.McpServerFeatures;
+import io.modelcontextprotocol.spec.McpSchema;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+
+class CompletionSupportTest {
+
+  @Test
+  void allSync_shouldReturnEmptyWhenNoComponentProvider() {
+    McpApplicationContext context = mock(McpApplicationContext.class);
+    List<McpServerFeatures.SyncCompletionSpecification> specs =
+        CompletionSupport.allSync(context, List.of());
+    assertTrue(specs.isEmpty());
+  }
+
+  @Test
+  void allSync_shouldBuildCompletionSpecification() {
+    McpApplicationContext context = mock(McpApplicationContext.class);
+    when(context.isInScope(anyString())).thenReturn(true);
+    ComponentModelProvider provider =
+        new ComponentModelProvider() {
+          @Override
+          public List<CompletionDefinition> completions() {
+            return List.of(
+                new CompletionDefinition(
+                    "test.Source#completion()",
+                    McpSchema.PromptReference.builder("prompt_name").build(),
+                    (ctx, argument) ->
+                        Invocation.builder()
+                            .result(new McpCompleteCompletion(List.of("a", "b"), 2, false))
+                            .build()));
+          }
+        };
+
+    List<McpServerFeatures.SyncCompletionSpecification> specs =
+        CompletionSupport.allSync(context, List.of(provider));
+
+    assertEquals(1, specs.size());
+    McpSchema.CompleteRequest request =
+        new McpSchema.CompleteRequest(
+            McpSchema.PromptReference.builder("prompt_name").build(),
+            new McpSchema.CompleteRequest.CompleteArgument("arg", "v"));
+    McpSchema.CompleteResult result = specs.get(0).completionHandler().apply(null, request);
+    assertNotNull(result);
+    assertEquals(List.of("a", "b"), result.completion().values());
+  }
+
+  @Test
+  void allAsync_shouldBuildCompletionSpecification() {
+    McpApplicationContext context = mock(McpApplicationContext.class);
+    when(context.isInScope(anyString())).thenReturn(true);
+    ComponentModelProvider provider =
+        new ComponentModelProvider() {
+          @Override
+          public List<CompletionDefinition> completions() {
+            return List.of(
+                new CompletionDefinition(
+                    "test.Source#completion()",
+                    new McpSchema.ResourceReference("resource://test"),
+                    (ctx, argument) ->
+                        Invocation.builder()
+                            .result(new McpCompleteCompletion(List.of("one"), 1, false))
+                            .build()));
+          }
+        };
+
+    List<McpServerFeatures.AsyncCompletionSpecification> specs =
+        CompletionSupport.allAsync(context, List.of(provider));
+
+    assertEquals(1, specs.size());
+    assertFalse(specs.isEmpty());
+  }
+}
diff --git a/src/test/java/com/github/thought2code/mcp/annotated/server/component/prompt/PromptRegistrationTest.java b/src/test/java/com/github/thought2code/mcp/annotated/server/component/prompt/PromptRegistrationTest.java
@@ -0,0 +1,117 @@
+package com.github.thought2code.mcp.annotated.server.component.prompt;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.github.thought2code.mcp.annotated.McpApplicationContext;
+import com.github.thought2code.mcp.annotated.exception.McpServerComponentRegistrationException;
+import com.github.thought2code.mcp.annotated.reflect.Invocation;
+import com.github.thought2code.mcp.annotated.server.component.spi.ComponentModelProvider;
+import io.modelcontextprotocol.server.McpAsyncServer;
+import io.modelcontextprotocol.server.McpSyncServer;
+import io.modelcontextprotocol.spec.McpSchema;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Mono;
+
+class PromptRegistrationTest {
+
+  @Test
+  void registerSync_shouldReturnFalseWhenNoComponentProvider() {
+    McpSyncServer server = mock(McpSyncServer.class);
+    McpApplicationContext context = mock(McpApplicationContext.class);
+
+    boolean registered = PromptRegistration.registerSync(server, context, List.of());
+
+    assertFalse(registered);
+    verify(server, times(0)).addPrompt(any());
+  }
+
+  @Test
+  void registerSync_shouldRegisterPrompt() {
+    McpSyncServer server = mock(McpSyncServer.class);
+    McpApplicationContext context = mock(McpApplicationContext.class);
+    ComponentModelProvider provider =
+        new ComponentModelProvider() {
+          @Override
+          public List<PromptDefinition> prompts() {
+            McpSchema.Prompt prompt = McpSchema.Prompt.builder("component_prompt").build();
+            return List.of(
+                new PromptDefinition(
+                    "test.Source#prompt()",
+                    prompt,
+                    "component_prompt",
+                    (ctx, args) -> Invocation.builder().result("ok").build()));
+          }
+        };
+    when(context.isInScope(anyString())).thenReturn(true);
+
+    boolean registered = PromptRegistration.registerSync(server, context, List.of(provider));
+
+    assertTrue(registered);
+    verify(server, times(1)).addPrompt(any());
+  }
+
+  @Test
+  void registerSync_shouldRejectDuplicatePromptNames() {
+    McpSyncServer server = mock(McpSyncServer.class);
+    McpApplicationContext context = mock(McpApplicationContext.class);
+    PromptDefinition a =
+        new PromptDefinition(
+            "test.Source#a()",
+            McpSchema.Prompt.builder("duplicate").build(),
+            "duplicate",
+            (ctx, args) -> Invocation.builder().result("a").build());
+    PromptDefinition b =
+        new PromptDefinition(
+            "test.Source#b()",
+            McpSchema.Prompt.builder("duplicate").build(),
+            "duplicate",
+            (ctx, args) -> Invocation.builder().result("b").build());
+    ComponentModelProvider provider =
+        new ComponentModelProvider() {
+          @Override
+          public List<PromptDefinition> prompts() {
+            return List.of(a, b);
+          }
+        };
+    when(context.isInScope(anyString())).thenReturn(true);
+
+    assertThrows(
+        McpServerComponentRegistrationException.class,
+        () -> PromptRegistration.registerSync(server, context, List.of(provider)));
+  }
+
+  @Test
+  void registerAsync_shouldRegisterPrompt() {
+    McpAsyncServer server = mock(McpAsyncServer.class);
+    when(server.addPrompt(any())).thenReturn(Mono.empty());
+    McpApplicationContext context = mock(McpApplicationContext.class);
+    ComponentModelProvider provider =
+        new ComponentModelProvider() {
+          @Override
+          public List<PromptDefinition> prompts() {
+            McpSchema.Prompt prompt = McpSchema.Prompt.builder("component_prompt_async").build();
+            return List.of(
+                new PromptDefinition(
+                    "test.Source#prompt()",
+                    prompt,
+                    "component_prompt_async",
+                    (ctx, args) -> Invocation.builder().result("ok").build()));
+          }
+        };
+    when(context.isInScope(anyString())).thenReturn(true);
+
+    boolean registered = PromptRegistration.registerAsync(server, context, List.of(provider));
+
+    assertTrue(registered);
+    verify(server, times(1)).addPrompt(any());
+  }
+}
diff --git a/src/test/java/com/github/thought2code/mcp/annotated/server/component/resource/ResourceRegistrationTest.java b/src/test/java/com/github/thought2code/mcp/annotated/server/component/resource/ResourceRegistrationTest.java
diff --git a/src/test/java/com/github/thought2code/mcp/annotated/server/component/tool/ToolRegistrationTest.java b/src/test/java/com/github/thought2code/mcp/annotated/server/component/tool/ToolRegistrationTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.github.thought2code.mcp.annotated.component.completion;`
	`1`	`+package com.github.thought2code.mcp.annotated.server.component.completion;`
`2`	`2`
`3`	`3`	`import io.modelcontextprotocol.spec.McpSchema;`
`4`	`4`