feat(mcp): add MCP client support and refactor server configuration

- Add MCP client autoconfiguration with support for STDIO, WebMVC and WebFlux transports
- Rename spring-ai-starter-mcp-server to spring-ai-starter-mcp to reflect dual client/server support
- Add close() method to McpToolCallback for proper resource cleanup
- Add initialize flag to control MCP client initialization
- Add comprehensive integration tests and documentation for MCP client configuration
- Fix MCP server auto-configuration tests

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

Author: tzolov

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

@@ -112,4 +112,8 @@ public String call(String functionInput) {
 		return ModelOptionsUtils.toJsonString(response.content());
 	}
 
+	public void close() {
+		this.mcpClient.close();
+	}
+
 }

pom.xml

@@ -126,7 +126,8 @@
 		<module>spring-ai-spring-boot-starters/spring-ai-starter-watsonx-ai</module>
 		<module>spring-ai-spring-boot-starters/spring-ai-starter-zhipuai</module>
 		<module>spring-ai-spring-boot-starters/spring-ai-starter-moonshot</module>
-		<module>spring-ai-spring-boot-starters/spring-ai-starter-mcp-server</module>
+
+		<module>spring-ai-spring-boot-starters/spring-ai-starter-mcp</module>
 
 		<module>spring-ai-integration-tests</module>
 
@@ -851,11 +852,22 @@
 	</dependencyManagement>
 
 	<repositories>
+		<repository>
+			<name>Central Portal Snapshots</name>
+			<id>central-portal-snapshots</id>
+			<url>https://central.sonatype.com/repository/maven-snapshots/</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
 		<repository>
 			<id>maven-central</id>
 			<url>https://repo.maven.apache.org/maven2/</url>
 			<snapshots>
-				<enabled>false</enabled>
+				<enabled>true</enabled>
 			</snapshots>
 			<releases>
 				<enabled>true</enabled>

spring-ai-bom/pom.xml

@@ -589,7 +589,7 @@
 
             <dependency>
                 <groupId>org.springframework.ai</groupId>
-                <artifactId>spring-ai-mcp-server-spring-boot-starter</artifactId>
+                <artifactId>spring-ai-mcp-spring-boot-starter</artifactId>
                 <version>${project.version}</version>
             </dependency>
 

spring-ai-docs/src/main/asciidoc/mcp.md

@@ -9,7 +9,7 @@ To use the MCP server functionality, add the following dependency to your projec
 ```xml
 <dependency>
     <groupId>org.springframework.ai</groupId>
-    <artifactId>spring-ai-mcp-server-spring-boot-starter</artifactId>
+    <artifactId>spring-ai-mcp-spring-boot-starter</artifactId>
     <version>${spring-ai.version}</version>
 </dependency>
 ```
@@ -20,7 +20,7 @@ The MCP server can be configured using the following properties under the `sprin
 
 | Property | Default | Description |
 |----------|---------|-------------|
-| `enabled` | `true` | Enable/disable the MCP server |
+| `enabled` | `false` | Enable/disable the MCP server |
 | `name` | `"mcp-server"` | Name of the MCP server |
 | `version` | `"1.0.0"` | Version of the MCP server |
 | `type` | `SYNC` | Server type (`SYNC` or `ASYNC`) |

spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/mcp/client/HttpClientSseClientAutoConfiguration.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2025-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.ai.autoconfigure.mcp.client;
+
+import io.modelcontextprotocol.client.transport.HttpClientSseClientTransport;
+
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+
+@AutoConfiguration
+@ConditionalOnClass({ HttpClientSseClientTransport.class })
+@ConditionalOnProperty(prefix = McpClientProperties.CONFIG_PREFIX, name = "transport", havingValue = "WEBMVC")
+public class HttpClientSseClientAutoConfiguration {
+
+	@Bean
+	@ConditionalOnMissingBean
+	public HttpClientSseClientTransport webHttpTransport(McpClientProperties properties) {
+		return new HttpClientSseClientTransport(properties.getBaseUrl());
+	}
+
+}

spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/mcp/client/McpBasicClientProperties.java

@@ -0,0 +1,195 @@
+/*
+ * Copyright 2025-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.ai.autoconfigure.mcp.client;
+
+import java.time.Duration;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.util.Assert;
+
+@ConfigurationProperties(McpBasicClientProperties.CONFIG_PREFIX)
+public class McpBasicClientProperties {
+
+	public static final String CONFIG_PREFIX = "spring.ai.mcp.client";
+
+	/**
+	 * Enable/disable the MCP client.
+	 * <p>
+	 * When set to false, the MCP client and all its components will not be initialized.
+	 */
+	private boolean enabled = true;
+
+	/**
+	 * The name of the MCP client instance.
+	 * <p>
+	 * This name is used to identify the server in logs and monitoring.
+	 */
+	private String name = "mcp-client";
+
+	/**
+	 * The version of the MCP client instance.
+	 * <p>
+	 * This version is reported to clients and used for compatibility checks.
+	 */
+	private String version = "1.0.0";
+
+	private Duration requestTimeout = Duration.ofSeconds(20); // Default timeout
+
+	private boolean rootChangeNotification = true;
+
+	/**
+	 * The transport type to use for MCP server communication.
+	 * <p>
+	 * Supported types are:
+	 * <ul>
+	 * <li>STDIO - Standard input/output transport (default)</li>
+	 * <li>WEBMVC - Spring MVC Server-Sent Events transport</li>
+	 * <li>WEBFLUX - Spring WebFlux Server-Sent Events transport</li>
+	 * </ul>
+	 */
+	private Transport transport = Transport.STDIO;
+
+	private String baseUrl;
+
+	private McpStdioConnection stdioConnection = new McpStdioConnection();
+
+	/**
+	 * The type of server to use for MCP server communication.
+	 * <p>
+	 * Supported types are:
+	 * <ul>
+	 * <li>SYNC - Standard synchronous server (default)</li>
+	 * <li>ASYNC - Asynchronous server</li>
+	 * </ul>
+	 */
+	private ClientType type = ClientType.SYNC;
+
+	/**
+	 * Transport types supported by the MCP server.
+	 */
+	public enum Transport {
+
+		/**
+		 * Standard input/output transport, suitable for command-line tools and local
+		 * development.
+		 */
+		STDIO,
+
+		/**
+		 * Spring MVC Server-Sent Events transport, requires spring-boot-starter-web and
+		 * mcp-spring-webmvc.
+		 */
+		WEBMVC,
+
+		/**
+		 * Spring WebFlux Server-Sent Events transport, requires
+		 * spring-boot-starter-webflux and mcp-spring-webflux.
+		 */
+		WEBFLUX
+
+	}
+
+	/**
+	 * Server types supported by the MCP client.
+	 */
+	public enum ClientType {
+
+		/**
+		 * Synchronous (McpSyncServer) server
+		 */
+		SYNC,
+		/**
+		 * Asynchronous (McpAsyncServer) server
+		 */
+		ASYNC
+
+	}
+
+	public McpStdioConnection getStdioConnection() {
+		return this.stdioConnection;
+	}
+
+	public boolean isRootChangeNotification() {
+		return this.rootChangeNotification;
+	}
+
+	public void setRootChangeNotification(boolean rootChangeNotification) {
+		this.rootChangeNotification = rootChangeNotification;
+	}
+
+	public Duration getRequestTimeout() {
+		return this.requestTimeout;
+	}
+
+	public void setRequestTimeout(Duration requestTimeout) {
+		Assert.notNull(requestTimeout, "Request timeout must not be null");
+		this.requestTimeout = requestTimeout;
+	}
+
+	public boolean isEnabled() {
+		return this.enabled;
+	}
+
+	public void setEnabled(boolean enabled) {
+		this.enabled = enabled;
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	public void setName(String name) {
+		Assert.hasText(name, "Name must not be empty");
+		this.name = name;
+	}
+
+	public String getVersion() {
+		return this.version;
+	}
+
+	public void setVersion(String version) {
+		Assert.hasText(version, "Version must not be empty");
+		this.version = version;
+	}
+
+	public Transport getTransport() {
+		return this.transport;
+	}
+
+	public void setTransport(Transport transport) {
+		Assert.notNull(transport, "Transport must not be null");
+		this.transport = transport;
+	}
+
+	public String getBaseUrl() {
+		return this.baseUrl;
+	}
+
+	public void setBaseUrl(String sseUrl) {
+		this.baseUrl = sseUrl;
+	}
+
+	public ClientType getType() {
+		return this.type;
+	}
+
+	public void setType(ClientType serverType) {
+		Assert.notNull(serverType, "Server type must not be null");
+		this.type = serverType;
+	}
+
+}