refactor: migrate to MCP SDK 2.0 builder APIs

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: codeboyzhou

src/main/java/com/github/thought2code/mcp/annotated/server/component/McpServerCompletion.java

@@ -213,13 +213,13 @@ private static McpSchema.CompleteReference createCompleteReference(Method method
     if (prompt != null) {
       final String name = prompt.name();
       final String title = prompt.title();
-      return new McpSchema.PromptReference(McpSchema.PromptReference.TYPE, name, title);
+      return McpSchema.PromptReference.builder(name).title(title).build();
     }
 
     McpResourceCompletion resource = method.getAnnotation(McpResourceCompletion.class);
     if (resource != null) {
       final String uri = resource.uri();
-      return new McpSchema.ResourceReference(McpSchema.ResourceReference.TYPE, uri);
+      return new McpSchema.ResourceReference(uri);
     }
 
     // should never happen

src/main/java/com/github/thought2code/mcp/annotated/server/component/McpServerPrompt.java

@@ -175,10 +175,12 @@ private McpSchema.GetPromptResult invoke(
     List<Object> params = parameterConverter.convertAll(parameters, arguments);
     Invocation invocation = MethodInvoker.invoke(instance, method, metadata, params);
 
-    McpSchema.Content content = new McpSchema.TextContent(invocation.result().toString());
-    McpSchema.PromptMessage message = new McpSchema.PromptMessage(McpSchema.Role.USER, content);
+    McpSchema.Content content =
+        McpSchema.TextContent.builder(invocation.result().toString()).build();
+    McpSchema.PromptMessage message =
+        McpSchema.PromptMessage.builder(McpSchema.Role.USER, content).build();
     McpSchema.GetPromptResult getPromptResult =
-        new McpSchema.GetPromptResult(description, List.of(message));
+        McpSchema.GetPromptResult.builder(List.of(message)).description(description).build();
 
     log.debug("Returning MCP GetPromptResult: {}", JacksonHelper.toJsonString(getPromptResult));
 
@@ -208,7 +210,13 @@ private List<McpSchema.PromptArgument> createPromptArguments(
         final String title = context.getLocalizedString(promptParam.title(), name);
         final String description = context.getLocalizedString(promptParam.description(), name);
         final boolean required = promptParam.required();
-        promptArguments.add(new McpSchema.PromptArgument(name, title, description, required));
+        McpSchema.PromptArgument argument =
+            McpSchema.PromptArgument.builder(name)
+                .title(title)
+                .description(description)
+                .required(required)
+                .build();
+        promptArguments.add(argument);
       }
     }
 
@@ -230,7 +238,12 @@ private PromptDefinition createPromptDefinition(
     final String title = context.getLocalizedString(mcpPrompt.title(), name);
     final String description = context.getLocalizedString(mcpPrompt.description(), name);
     List<McpSchema.PromptArgument> args = createPromptArguments(context, method.getParameters());
-    McpSchema.Prompt prompt = new McpSchema.Prompt(name, title, description, args);
+    McpSchema.Prompt prompt =
+        McpSchema.Prompt.builder(name)
+            .title(title)
+            .description(description)
+            .arguments(args)
+            .build();
     log.info(
         "{} prompt specification created: {}",
         serverType.description(),

src/main/java/com/github/thought2code/mcp/annotated/server/component/McpServerResource.java

@@ -158,9 +158,10 @@ private McpSchema.ReadResourceResult invoke(
     final String uri = resource.uri();
     final String mimeType = resource.mimeType();
     final String text = invocation.result().toString();
-    McpSchema.ResourceContents contents = new McpSchema.TextResourceContents(uri, mimeType, text);
+    McpSchema.ResourceContents contents =
+        McpSchema.TextResourceContents.builder(uri, text).mimeType(mimeType).build();
     McpSchema.ReadResourceResult readResourceResult =
-        new McpSchema.ReadResourceResult(List.of(contents));
+        McpSchema.ReadResourceResult.builder(List.of(contents)).build();
 
     log.debug("Returning ReadResourceResult: {}", JacksonHelper.toJsonString(readResourceResult));
 
@@ -182,14 +183,15 @@ private ResourceDefinition createResourceDefinition(
     final String title = context.getLocalizedString(mcpResource.title(), name);
     final String description = context.getLocalizedString(mcpResource.description(), name);
     McpSchema.Resource resource =
-        McpSchema.Resource.builder()
-            .uri(mcpResource.uri())
-            .name(name)
+        McpSchema.Resource.builder(mcpResource.uri(), name)
             .title(title)
             .description(description)
             .mimeType(mcpResource.mimeType())
             .annotations(
-                new McpSchema.Annotations(List.of(mcpResource.roles()), mcpResource.priority()))
+                McpSchema.Annotations.builder()
+                    .audience(List.of(mcpResource.roles()))
+                    .priority(mcpResource.priority())
+                    .build())
             .build();
     log.info(
         "{} resource specification created: {}",

src/main/java/com/github/thought2code/mcp/annotated/server/component/McpServerTool.java

@@ -197,7 +197,7 @@ private McpSchema.CallToolResult invoke(
 
     McpSchema.CallToolResult callToolResult =
         McpSchema.CallToolResult.builder()
-            .content(List.of(new McpSchema.TextContent(textContent)))
+            .addTextContent(textContent)
             .structuredContent(structuredContent)
             .isError(invocation.isError())
             .build();
@@ -332,11 +332,9 @@ private ToolDefinition createToolDefinition(
     Map<String, Object> inputSchema = createJsonSchema(context, method.getParameters());
     Map<String, Object> outputSchema = createJsonSchemaDefinition(context, method.getReturnType());
     McpSchema.Tool tool =
-        McpSchema.Tool.builder()
-            .name(name)
+        McpSchema.Tool.builder(name, inputSchema)
             .title(title)
             .description(description)
-            .inputSchema(inputSchema)
             .outputSchema(outputSchema)
             .build();
     log.info(

src/test/java/com/github/thought2code/mcp/annotated/McpApplicationTest.java

@@ -246,7 +246,8 @@ private void verifyResourcesCalled(McpSyncClient client) {
   private void verifyResourceCalled(
       McpSyncClient client, String resourceUri, String resourceMimeType, String resourceContent) {
 
-    McpSchema.ReadResourceRequest request = new McpSchema.ReadResourceRequest(resourceUri);
+    McpSchema.ReadResourceRequest request =
+        McpSchema.ReadResourceRequest.builder(resourceUri).build();
     McpSchema.ReadResourceResult result = client.readResource(request);
     McpSchema.TextResourceContents content =
         (McpSchema.TextResourceContents) result.contents().get(0);
@@ -352,7 +353,8 @@ private void verifyPromptsCalled(McpSyncClient client) {
   private void verifyPromptCalled(
       McpSyncClient client, String promptName, Map<String, Object> params, String expectedResult) {
 
-    McpSchema.GetPromptRequest request = new McpSchema.GetPromptRequest(promptName, params);
+    McpSchema.GetPromptRequest request =
+        McpSchema.GetPromptRequest.builder(promptName).arguments(params).build();
     McpSchema.GetPromptResult result = client.getPrompt(request);
     McpSchema.TextContent content = (McpSchema.TextContent) result.messages().get(0).content();
     assertEquals(expectedResult, content.text());
@@ -608,7 +610,8 @@ private void verifyToolsCalled(McpSyncClient client) {
   private void verifyToolCalled(
       McpSyncClient client, String toolName, Map<String, Object> args, String expectedResult) {
 
-    McpSchema.CallToolRequest request = new McpSchema.CallToolRequest(toolName, args);
+    McpSchema.CallToolRequest request =
+        McpSchema.CallToolRequest.builder(toolName).arguments(args).build();
     McpSchema.CallToolResult result = client.callTool(request);
     McpSchema.TextContent content = (McpSchema.TextContent) result.content().get(0);
     assertFalse(result.isError());
@@ -621,7 +624,8 @@ private void verifyToolCalled(
 
   private void verifyToolCalledError(
       McpSyncClient client, String toolName, Map<String, Object> args, String expectedResult) {
-    McpSchema.CallToolRequest request = new McpSchema.CallToolRequest(toolName, args);
+    McpSchema.CallToolRequest request =
+        McpSchema.CallToolRequest.builder(toolName).arguments(args).build();
     McpSchema.CallToolResult result = client.callTool(request);
     McpSchema.TextContent content = (McpSchema.TextContent) result.content().get(0);
     assertTrue(result.isError());