Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -95,22 +95,22 @@
* </ul>
* <p>
* WebMvc transport support is provided separately by
* {@link MpcWebMvcServerAutoConfiguration}.
* {@link McpWebMvcServerAutoConfiguration}.
*
* @author Christian Tzolov
* @since 1.0.0
* @see McpServerProperties
* @see MpcWebMvcServerAutoConfiguration
* @see McpWebMvcServerAutoConfiguration
* @see org.springframework.ai.mcp.ToolCallback
*/
@AutoConfiguration(after = { MpcWebMvcServerAutoConfiguration.class, MpcWebFluxServerAutoConfiguration.class })
@AutoConfiguration(after = { McpWebMvcServerAutoConfiguration.class, McpWebFluxServerAutoConfiguration.class })
@ConditionalOnClass({ McpSchema.class, McpSyncServer.class })
@EnableConfigurationProperties(McpServerProperties.class)
@ConditionalOnProperty(prefix = McpServerProperties.CONFIG_PREFIX, name = "enabled", havingValue = "true",
matchIfMissing = true)
public class MpcServerAutoConfiguration {
public class McpServerAutoConfiguration {

private static final LogAccessor logger = new LogAccessor(MpcServerAutoConfiguration.class);
private static final LogAccessor logger = new LogAccessor(McpServerAutoConfiguration.class);

@Bean
@ConditionalOnMissingBean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
*
* @author Christian Tzolov
* @since 1.0.0
* @see org.springframework.ai.autoconfigure.mcp.server.MpcServerAutoConfiguration
* @see org.springframework.ai.autoconfigure.mcp.server.McpServerAutoConfiguration
*/
@ConfigurationProperties(McpServerProperties.CONFIG_PREFIX)
public class McpServerProperties {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
@ConditionalOnMissingBean(ServerMcpTransport.class)
@ConditionalOnProperty(prefix = McpServerProperties.CONFIG_PREFIX, name = "stdio", havingValue = "false",
matchIfMissing = true)
public class MpcWebFluxServerAutoConfiguration {
public class McpWebFluxServerAutoConfiguration {

@Bean
@ConditionalOnMissingBean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
@ConditionalOnMissingBean(ServerMcpTransport.class)
@ConditionalOnProperty(prefix = McpServerProperties.CONFIG_PREFIX, name = "stdio", havingValue = "false",
matchIfMissing = true)
public class MpcWebMvcServerAutoConfiguration {
public class McpWebMvcServerAutoConfiguration {

@Bean
@ConditionalOnMissingBean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.
#

org.springframework.ai.autoconfigure.mcp.server.MpcServerAutoConfiguration
org.springframework.ai.autoconfigure.mcp.server.MpcWebMvcServerAutoConfiguration
org.springframework.ai.autoconfigure.mcp.server.MpcWebFluxServerAutoConfiguration
org.springframework.ai.autoconfigure.mcp.server.McpServerAutoConfiguration
org.springframework.ai.autoconfigure.mcp.server.McpWebMvcServerAutoConfiguration
org.springframework.ai.autoconfigure.mcp.server.McpWebFluxServerAutoConfiguration

Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
public class McpServerAutoConfigurationIT {

private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(MpcServerAutoConfiguration.class));
.withConfiguration(AutoConfigurations.of(McpServerAutoConfiguration.class));

@Test
void defaultConfiguration() {
Expand Down
6 changes: 3 additions & 3 deletions spring-ai-docs/src/main/asciidoc/mcp.md
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,9 @@ spring:

The MCP server auto-configuration is provided through:

1. `MpcServerAutoConfiguration`: Core server configuration supporting both sync and async modes
2. `MpcWebMvcServerAutoConfiguration`: WebMvc transport configuration (activated when WebMvc dependencies are present)
3. `MpcWebFluxServerAutoConfiguration`: WebFlux transport configuration (activated when WebFlux dependencies are present)
1. `McpServerAutoConfiguration`: Core server configuration supporting both sync and async modes
2. `McpWebMvcServerAutoConfiguration`: WebMvc transport configuration (activated when WebMvc dependencies are present)
3. `McpWebFluxServerAutoConfiguration`: WebFlux transport configuration (activated when WebFlux dependencies are present)

The auto-configuration will automatically set up the appropriate server type and transport based on your configuration and available dependencies.

Expand Down