Skip to content

Commit

Permalink
Fix bug spring-projects#2301. The SseHttpClientTransportAutoConfigura…
Browse files Browse the repository at this point in the history
…tion will always run for the class name in @ConditionalOnMissingClass is wrong.

Signed-off-by: Mota <[email protected]>
  • Loading branch information
banalite committed Feb 24, 2025
1 parent ce8e8b9 commit 91d7821
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -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"));
}
}

0 comments on commit 91d7821

Please sign in to comment.