From 2ff8c0646c1e3969644df4712d8a44a6dceb12f2 Mon Sep 17 00:00:00 2001 From: Mota Date: Mon, 24 Feb 2025 15:39:36 +0800 Subject: [PATCH] Fix bug #2301. The SseHttpClientTransportAutoConfiguration will always run for the class name in @ConditionalOnMissingClass is wrong. --- ...eHttpClientTransportAutoConfiguration.java | 2 +- ...pClientTransportAutoConfigurationTest.java | 43 +++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 auto-configurations/spring-ai-mcp-client/src/test/java/org/springframework/ai/autoconfigure/mcp/client/SseHttpClientTransportAutoConfigurationTest.java diff --git a/auto-configurations/spring-ai-mcp-client/src/main/java/org/springframework/ai/autoconfigure/mcp/client/SseHttpClientTransportAutoConfiguration.java b/auto-configurations/spring-ai-mcp-client/src/main/java/org/springframework/ai/autoconfigure/mcp/client/SseHttpClientTransportAutoConfiguration.java index 31aaa2244b1..25c7d7e45fe 100644 --- a/auto-configurations/spring-ai-mcp-client/src/main/java/org/springframework/ai/autoconfigure/mcp/client/SseHttpClientTransportAutoConfiguration.java +++ b/auto-configurations/spring-ai-mcp-client/src/main/java/org/springframework/ai/autoconfigure/mcp/client/SseHttpClientTransportAutoConfiguration.java @@ -63,7 +63,7 @@ */ @AutoConfiguration(after = SseWebFluxTransportAutoConfiguration.class) @ConditionalOnClass({ McpSchema.class, McpSyncClient.class }) -@ConditionalOnMissingClass("io.modelcontextprotocol.client.transport.public class WebFluxSseClientTransport") +@ConditionalOnMissingClass("io.modelcontextprotocol.client.transport.WebFluxSseClientTransport") @EnableConfigurationProperties({ McpSseClientProperties.class, McpClientCommonProperties.class }) @ConditionalOnProperty(prefix = McpClientCommonProperties.CONFIG_PREFIX, name = "enabled", havingValue = "true", matchIfMissing = true) diff --git a/auto-configurations/spring-ai-mcp-client/src/test/java/org/springframework/ai/autoconfigure/mcp/client/SseHttpClientTransportAutoConfigurationTest.java b/auto-configurations/spring-ai-mcp-client/src/test/java/org/springframework/ai/autoconfigure/mcp/client/SseHttpClientTransportAutoConfigurationTest.java new file mode 100644 index 00000000000..f03b424f775 --- /dev/null +++ b/auto-configurations/spring-ai-mcp-client/src/test/java/org/springframework/ai/autoconfigure/mcp/client/SseHttpClientTransportAutoConfigurationTest.java @@ -0,0 +1,43 @@ +/* + * 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 org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.Import; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; + +import static org.junit.jupiter.api.Assertions.assertFalse; + +@SpringJUnitConfig +@Import(SseHttpClientTransportAutoConfiguration.class) +public class SseHttpClientTransportAutoConfigurationTest { + @Autowired + private ApplicationContext applicationContext; + + @Test + void testConditionOnMissingClass_whenClassNotPresent() { + assertFalse(applicationContext.containsBean("sseHttpClientTransportAutoConfiguration")); + } + + @Test + void testConditionOnMissingClass_whenClassPresent() throws ClassNotFoundException { + Class.forName("io.modelcontextprotocol.client.transport.WebFluxSseClientTransport"); + assertFalse(applicationContext.containsBean("sseHttpClientTransportAutoConfiguration")); + } +}