From 8590bed8a39645b159f05a4aea4ca7f6cdb274cb Mon Sep 17 00:00:00 2001 From: Sun Yuhan Date: Sun, 28 Sep 2025 10:17:58 +0800 Subject: [PATCH 1/2] fix: Resolved the rebase conflicts Signed-off-by: Sun Yuhan --- .../prompt/AbstractMcpPromptListChangedMethodCallback.java | 2 ++ .../AbstractMcpResourceListChangedMethodCallback.java | 2 ++ .../tool/AbstractMcpToolListChangedMethodCallback.java | 2 ++ .../method/complete/AbstractMcpCompleteMethodCallback.java | 2 ++ .../elicitation/AbstractMcpElicitationMethodCallback.java | 2 ++ .../mcp/method/logging/AbstractMcpLoggingMethodCallback.java | 2 ++ .../method/progress/AbstractMcpProgressMethodCallback.java | 2 ++ .../method/sampling/AbstractMcpSamplingMethodCallback.java | 2 ++ .../mcp/provider/tool/AsyncMcpToolProvider.java | 4 ++-- .../mcp/provider/tool/AsyncStatelessMcpToolProvider.java | 4 ++-- .../provider/elicitation/SyncMcpElicitationProviderTests.java | 1 - .../mcp/provider/sampling/SyncMcpSamplingProviderTests.java | 1 - 12 files changed, 20 insertions(+), 6 deletions(-) diff --git a/mcp-annotations/src/main/java/org/springaicommunity/mcp/method/changed/prompt/AbstractMcpPromptListChangedMethodCallback.java b/mcp-annotations/src/main/java/org/springaicommunity/mcp/method/changed/prompt/AbstractMcpPromptListChangedMethodCallback.java index 5742e58..03bbc13 100644 --- a/mcp-annotations/src/main/java/org/springaicommunity/mcp/method/changed/prompt/AbstractMcpPromptListChangedMethodCallback.java +++ b/mcp-annotations/src/main/java/org/springaicommunity/mcp/method/changed/prompt/AbstractMcpPromptListChangedMethodCallback.java @@ -4,6 +4,7 @@ package org.springaicommunity.mcp.method.changed.prompt; +import java.io.Serial; import java.lang.reflect.Method; import java.lang.reflect.Parameter; import java.util.List; @@ -118,6 +119,7 @@ protected Object[] buildArgs(Method method, Object exchange, List getToolSpecifications() { String toolName = Utils.hasText(toolJavaAnnotation.name()) ? toolJavaAnnotation.name() : mcpToolMethod.getName(); - String toolDescrption = toolJavaAnnotation.description(); + String toolDescription = toolJavaAnnotation.description(); String inputSchema = JsonSchemaGenerator.generateForMethodInput(mcpToolMethod); var toolBuilder = McpSchema.Tool.builder() .name(toolName) - .description(toolDescrption) + .description(toolDescription) .inputSchema(this.getJsonMapper(), inputSchema); var title = toolJavaAnnotation.title(); diff --git a/mcp-annotations/src/main/java/org/springaicommunity/mcp/provider/tool/AsyncStatelessMcpToolProvider.java b/mcp-annotations/src/main/java/org/springaicommunity/mcp/provider/tool/AsyncStatelessMcpToolProvider.java index bfc7049..162c758 100644 --- a/mcp-annotations/src/main/java/org/springaicommunity/mcp/provider/tool/AsyncStatelessMcpToolProvider.java +++ b/mcp-annotations/src/main/java/org/springaicommunity/mcp/provider/tool/AsyncStatelessMcpToolProvider.java @@ -77,13 +77,13 @@ public List getToolSpecifications() { String toolName = Utils.hasText(toolJavaAnnotation.name()) ? toolJavaAnnotation.name() : mcpToolMethod.getName(); - String toolDescrption = toolJavaAnnotation.description(); + String toolDescription = toolJavaAnnotation.description(); String inputSchema = JsonSchemaGenerator.generateForMethodInput(mcpToolMethod); var toolBuilder = McpSchema.Tool.builder() .name(toolName) - .description(toolDescrption) + .description(toolDescription) .inputSchema(this.getJsonMapper(), inputSchema); var title = toolJavaAnnotation.title(); diff --git a/mcp-annotations/src/test/java/org/springaicommunity/mcp/provider/elicitation/SyncMcpElicitationProviderTests.java b/mcp-annotations/src/test/java/org/springaicommunity/mcp/provider/elicitation/SyncMcpElicitationProviderTests.java index 9a37182..0d3d106 100644 --- a/mcp-annotations/src/test/java/org/springaicommunity/mcp/provider/elicitation/SyncMcpElicitationProviderTests.java +++ b/mcp-annotations/src/test/java/org/springaicommunity/mcp/provider/elicitation/SyncMcpElicitationProviderTests.java @@ -6,7 +6,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertThrows; import java.util.List; import java.util.Map; diff --git a/mcp-annotations/src/test/java/org/springaicommunity/mcp/provider/sampling/SyncMcpSamplingProviderTests.java b/mcp-annotations/src/test/java/org/springaicommunity/mcp/provider/sampling/SyncMcpSamplingProviderTests.java index a34b135..adf529d 100644 --- a/mcp-annotations/src/test/java/org/springaicommunity/mcp/provider/sampling/SyncMcpSamplingProviderTests.java +++ b/mcp-annotations/src/test/java/org/springaicommunity/mcp/provider/sampling/SyncMcpSamplingProviderTests.java @@ -7,7 +7,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import java.util.Collections; import java.util.List; import java.util.function.Function; From 0e7d4e0b8473f26bde1dd49d455554456039aefa Mon Sep 17 00:00:00 2001 From: Sun Yuhan Date: Wed, 22 Oct 2025 16:38:26 +0800 Subject: [PATCH 2/2] fix: remove the `@Serial` annotations Signed-off-by: Sun Yuhan --- .../prompt/AbstractMcpPromptListChangedMethodCallback.java | 2 -- .../resource/AbstractMcpResourceListChangedMethodCallback.java | 2 -- .../changed/tool/AbstractMcpToolListChangedMethodCallback.java | 2 -- .../mcp/method/complete/AbstractMcpCompleteMethodCallback.java | 2 -- .../elicitation/AbstractMcpElicitationMethodCallback.java | 2 -- .../mcp/method/logging/AbstractMcpLoggingMethodCallback.java | 2 -- .../mcp/method/progress/AbstractMcpProgressMethodCallback.java | 2 -- .../mcp/method/sampling/AbstractMcpSamplingMethodCallback.java | 2 -- 8 files changed, 16 deletions(-) diff --git a/mcp-annotations/src/main/java/org/springaicommunity/mcp/method/changed/prompt/AbstractMcpPromptListChangedMethodCallback.java b/mcp-annotations/src/main/java/org/springaicommunity/mcp/method/changed/prompt/AbstractMcpPromptListChangedMethodCallback.java index 03bbc13..5742e58 100644 --- a/mcp-annotations/src/main/java/org/springaicommunity/mcp/method/changed/prompt/AbstractMcpPromptListChangedMethodCallback.java +++ b/mcp-annotations/src/main/java/org/springaicommunity/mcp/method/changed/prompt/AbstractMcpPromptListChangedMethodCallback.java @@ -4,7 +4,6 @@ package org.springaicommunity.mcp.method.changed.prompt; -import java.io.Serial; import java.lang.reflect.Method; import java.lang.reflect.Parameter; import java.util.List; @@ -119,7 +118,6 @@ protected Object[] buildArgs(Method method, Object exchange, List