Fix MCP annotated specs with early server initialization#6542
Open
hutiefang76 wants to merge 1 commit into
Open
Fix MCP annotated specs with early server initialization#6542hutiefang76 wants to merge 1 commit into
hutiefang76 wants to merge 1 commit into
Conversation
Signed-off-by: hutiefang76 <137664623+hutiefang76@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Fixes #6535.
When an application bean injects
McpAsyncServerearly, the server specification beans can be created before regular MCP annotated beans have been initialized by the annotation-scanningBeanPostProcessor. In that ordering, the specification factory snapshots an emptyServerMcpAnnotatedBeansregistry and the async server starts without the annotated@McpToolmethods.This change initializes beans that declare the relevant MCP annotations before converting the registry into server specifications. The registry now also de-duplicates by bean identity while still allowing the same bean to be registered under additional annotation types later.
Testing
./mvnw -Dmaven.build.cache.enabled=false -pl mcp/mcp-annotations,auto-configurations/mcp/spring-ai-autoconfigure-mcp-server-common -am -Dtest=AbstractMcpAnnotatedBeansTests,AbstractAnnotatedMethodBeanPostProcessorTests,McpServerAutoConfigurationIT#syncServerSpecificationConfiguration+asyncServerSpecificationConfiguration+asyncServerSpecificationConfigurationWithEarlyServerConsumer -Dsurefire.failIfNoSpecifiedTests=false test./mvnw -Dmaven.build.cache.enabled=false -pl mcp/mcp-annotations,auto-configurations/mcp/spring-ai-autoconfigure-mcp-server-common -am testgit diff --check