Address review comments

Signed-off-by: Christian Tzolov <[email protected]>

Author: tzolov

auto-configurations/mcp/spring-ai-autoconfigure-mcp-server/src/main/java/org/springframework/ai/mcp/server/autoconfigure/McpBackwardCompatibility.java

@@ -44,12 +44,9 @@ public List<BiConsumer<McpSyncServerExchange, List<McpSchema.Root>>> syncRootsCh
 			return List.of();
 		}
 
-		return rootsChangeConsumers.stream().map(c -> new BiConsumer<McpSyncServerExchange, List<McpSchema.Root>>() {
-			@Override
-			public void accept(McpSyncServerExchange exchange, List<McpSchema.Root> roots) {
-				c.accept(roots);
-			}
-		}).collect(Collectors.toList());
+		return rootsChangeConsumers.stream()
+			.map(c -> (BiConsumer<McpSyncServerExchange, List<McpSchema.Root>>) ((exchange, roots) -> c.accept(roots)))
+			.toList();
 	}
 
 	@Bean

auto-configurations/mcp/spring-ai-autoconfigure-mcp-server/src/main/java/org/springframework/ai/mcp/server/autoconfigure/McpServerAutoConfiguration.java

@@ -97,7 +97,7 @@
  * </ul>
  * <p>
  * WebMvc transport support is provided separately by
- * {@link McpWebFluxServerAutoConfiguration}.
+ * {@link McpWebMvcServerAutoConfiguration}.
  *
  * @author Christian Tzolov
  * @since 1.0.0
@@ -132,12 +132,12 @@ public McpSchema.ServerCapabilities.Builder capabilitiesBuilder() {
 	@ConditionalOnProperty(prefix = McpServerProperties.CONFIG_PREFIX, name = "type", havingValue = "SYNC",
 			matchIfMissing = true)
 	public List<McpServerFeatures.SyncToolSpecification> syncTools(ObjectProvider<List<ToolCallback>> toolCalls,
-			List<ToolCallback> toolCallbacks2, McpServerProperties serverProperties) {
+			List<ToolCallback> toolCallbacksList, McpServerProperties serverProperties) {
 
 		List<ToolCallback> tools = new ArrayList<>(toolCalls.stream().flatMap(List::stream).toList());
 
-		if (!CollectionUtils.isEmpty(toolCallbacks2)) {
-			tools.addAll(toolCallbacks2);
+		if (!CollectionUtils.isEmpty(toolCallbacksList)) {
+			tools.addAll(toolCallbacksList);
 		}
 
 		return this.toSyncToolSpecifications(tools, serverProperties);
@@ -219,11 +219,11 @@ public McpSyncServer mcpSyncServer(McpServerTransportProvider transportProvider,
 	@Bean
 	@ConditionalOnProperty(prefix = McpServerProperties.CONFIG_PREFIX, name = "type", havingValue = "ASYNC")
 	public List<McpServerFeatures.AsyncToolSpecification> asyncTools(ObjectProvider<List<ToolCallback>> toolCalls,
-			List<ToolCallback> toolCallbacks2, McpServerProperties serverProperties) {
+			List<ToolCallback> toolCallbackList, McpServerProperties serverProperties) {
 
 		List<ToolCallback> tools = new ArrayList<>(toolCalls.stream().flatMap(List::stream).toList());
-		if (!CollectionUtils.isEmpty(toolCallbacks2)) {
-			tools.addAll(toolCallbacks2);
+		if (!CollectionUtils.isEmpty(toolCallbackList)) {
+			tools.addAll(toolCallbackList);
 		}
 
 		return this.toAsyncToolSpecification(tools, serverProperties);

auto-configurations/models/tool/spring-ai-autoconfigure-model-tool/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -13,4 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-org.springframework.ai.model.tool.autoconfigure.ToolCallingAutoConfiguration
+
+org.springframework.ai.autoconfigure.mcp.server.McpServerAutoConfiguration
+org.springframework.ai.autoconfigure.mcp.server.McpWebMvcServerAutoConfiguration
+org.springframework.ai.autoconfigure.mcp.server.McpWebFluxServerAutoConfiguration

mcp/common/src/main/java/org/springframework/ai/mcp/McpToolUtils.java

@@ -50,7 +50,7 @@
  * <p>
  * This helper class provides methods to:
  * <ul>
- * <li>Convert Spring AI's {@link ToolCallback} instances to MCP tool registrations</li>
+ * <li>Convert Spring AI's {@link ToolCallback} instances to MCP tool specification</li>
  * <li>Generate JSON schemas for tool input validation</li>
  * </ul>
  *
@@ -106,7 +106,6 @@ public static List<McpServerFeatures.SyncToolRegistration> toSyncToolRegistratio
 	 * semantics.
 	 * @param toolCallbacks the list of tool callbacks to convert
 	 * @return a list of MCP synchronous tool specificaiton
-	 * @see #toSyncToolRegistration(ToolCallback)
 	 */
 	public static List<McpServerFeatures.SyncToolSpecification> toSyncToolSpecification(
 			List<ToolCallback> toolCallbacks) {
@@ -142,7 +141,6 @@ public static List<McpServerFeatures.SyncToolRegistration> toSyncToolRegistratio
 	 * usage when working with individual callbacks.
 	 * @param toolCallbacks the tool callbacks to convert
 	 * @return a list of MCP synchronous tool specificaiton
-	 * @see #toSyncToolRegistration(List)
 	 */
 	public static List<McpServerFeatures.SyncToolSpecification> toSyncToolSpecifications(
 			ToolCallback... toolCallbacks) {
@@ -312,11 +310,10 @@ public static List<McpServerFeatures.AsyncToolRegistration> toAsyncToolRegistrat
 	 * <p>
 	 * This method processes multiple tool callbacks in bulk, converting each one to its
 	 * corresponding MCP tool registration while adding asynchronous execution
-	 * capabilities. The resulting registrations will execute their tools on a bounded
+	 * capabilities. The resulting specifications will execute their tools on a bounded
 	 * elastic scheduler.
 	 * @param toolCallbacks the list of tool callbacks to convert
 	 * @return a list of MCP asynchronous tool specifications
-	 * @see #toAsyncToolRegistration(ToolCallback)
 	 */
 	public static List<McpServerFeatures.AsyncToolSpecification> toAsyncToolSpecifications(
 			List<ToolCallback> toolCallbacks) {
@@ -325,7 +322,7 @@ public static List<McpServerFeatures.AsyncToolSpecification> toAsyncToolSpecific
 
 	/**
 	 * Convenience method to convert a variable number of tool callbacks to MCP
-	 * asynchronous tool registrations.
+	 * asynchronous tool specifications.
 	 * <p>
 	 * This is a varargs wrapper around {@link #toAsyncToolRegistration(List)} for easier
 	 * usage when working with individual callbacks.
@@ -469,7 +466,6 @@ public static McpServerFeatures.AsyncToolRegistration toAsyncToolRegistration(To
 	 * @param mimeType the MIME type of the output content
 	 * @return an MCP asynchronous tool specificaiotn that wraps the tool callback
 	 * @see McpServerFeatures.AsyncToolSpecification
-	 * @see Mono
 	 * @see Schedulers#boundedElastic()
 	 */
 	public static McpServerFeatures.AsyncToolSpecification toAsyncToolSpecification(ToolCallback toolCallback,

spring-ai-docs/src/main/antora/modules/ROOT/pages/api/mcp/mcp-server-boot-starter-docs.adoc

@@ -32,7 +32,7 @@ Full MCP Server features support with `STDIO` server transport.
 The starter activates the `McpServerAutoConfiguration` auto-configuration responsible for:
 
 * Configuring the basic server components
-* Handling tool, resource, and prompt specificaitons
+* Handling tool, resource, and prompt specifications
 * Managing server capabilities and change notifications
 * Providing both sync and async server implementations
 
@@ -89,7 +89,7 @@ All properties are prefixed with `spring.ai.mcp.server`:
 |`resource-change-notification` |Enable resource change notifications |`true`
 |`prompt-change-notification` |Enable prompt change notifications |`true`
 |`tool-change-notification` |Enable tool change notifications |`true`
-|`tool-response-mime-type` |(optinal) response MIME type per tool name. For example `spring.ai.mcp.server.tool-response-mime-type.generateImage=image/png` will assosiate the `image/png` mime type with the `generateImage()` tool name |`-`
+|`tool-response-mime-type` |(optional) response MIME type per tool name. For example `spring.ai.mcp.server.tool-response-mime-type.generateImage=image/png` will associate the `image/png` mime type with the `generateImage()` tool name |`-`
 |`sse-message-endpoint` |SSE endpoint path for web transport |`/mcp/message`
 |===
 
@@ -98,11 +98,11 @@ All properties are prefixed with `spring.ai.mcp.server`:
 * **Synchronous Server** - The default server type implemented using `McpSyncServer`. 
 It is designed for straightforward request-response patterns in your applications. 
 To enable this server type, set `spring.ai.mcp.server.type=SYNC` in your configuration. 
-When activated, it automatically handles the configuration of synchronous tool specificaitons.
+When activated, it automatically handles the configuration of synchronous tool specifications.
 
 * **Asynchronous Server** - The asynchronous server implementation uses `McpAsyncServer` and is optimized for non-blocking operations. 
 To enable this server type, configure your application with `spring.ai.mcp.server.type=ASYNC`. 
-This server type automatically sets up asynchronous tool specificaitons with built-in Project Reactor support.
+This server type automatically sets up asynchronous tool specifications with built-in Project Reactor support.
 
 == Transport Options
 
@@ -115,14 +115,14 @@ The MCP Server supports three transport mechanisms, each with its dedicated star
 == Features and Capabilities
 
 The MCP Server Boot Starter allows servers to expose tools, resources, and prompts to clients.
-It automatically converts custom capability handlers registered as Spring beans to sync/async specificaitons based on server type:
+It automatically converts custom capability handlers registered as Spring beans to sync/async specifications based on server type:
 
 === link:https://spec.modelcontextprotocol.io/specification/2024-11-05/server/tools/[Tools]
 Allows servers to expose tools that can be invoked by language models. The MCP Server Boot Starter provides:
 
 * Change notification support
-* Tools are automatically converted to sync/async specificaitons based on server type
-* Automatic tool specificaiton through Spring beans:
+* Tools are automatically converted to sync/async specifications based on server type
+* Automatic tool specification through Spring beans:
 
 [source,java]
 ----
@@ -148,18 +148,18 @@ public List<McpServerFeatures.SyncToolSpecification> myTools(...) {
 
 Provides a standardized way for servers to expose resources to clients.
 
-* Static and dynamic resource specificaitons
+* Static and dynamic resource specifications
 * Optional change notifications
 * Support for resource templates
 * Automatic conversion between sync/async resource specifications
-* Automatic resource specificaiton through Spring beans:
+* Automatic resource specification through Spring beans:
 
 [source,java]
 ----
 @Bean
-public List<McpServerFeatures.SyncResourceSpecificaiton> myResources(...) {
+public List<McpServerFeatures.SyncResourceSpecification> myResources(...) {
     var systemInfoResource = new McpSchema.Resource(...);
-    var resourceSpecificaiton = new McpServerFeatures.SyncResourceSpecificaiton(systemInfoResource, (exchange, request) -> {
+    var resourceSpecification = new McpServerFeatures.SyncResourceSpecification(systemInfoResource, (exchange, request) -> {
         try {
             var systemInfo = Map.of(...);
             String jsonContent = new ObjectMapper().writeValueAsString(systemInfo);
@@ -171,7 +171,7 @@ public List<McpServerFeatures.SyncResourceSpecificaiton> myResources(...) {
         }
     });
 
-    return List.of(resourceSpecificaiton);
+    return List.of(resourceSpecification);
 }
 ----
 
@@ -181,7 +181,7 @@ Provides a standardized way for servers to expose prompt templates to clients.
 
 * Change notification support
 * Template versioning
-* Automatic conversion between sync/async prompt specificaitons
+* Automatic conversion between sync/async prompt specifications
 * Automatic prompt specification through Spring beans:
 
 [source,java]