Skip to content

ClientMcp*HandlersRegistry: support beans with unresolvable types #4918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 19, 2025
+30 −1
Merged

ClientMcp*HandlersRegistry: support beans with unresolvable types #4918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion ...n/java/org/springframework/ai/mcp/annotation/spring/AbstractClientMcpHandlerRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,14 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
// Only process singleton beans, not scoped beans
continue;
}
var foundAnnotations = this.scan(AutoProxyUtils.determineTargetClass(beanFactory, beanName));
Class<?> beanClass = AutoProxyUtils.determineTargetClass(beanFactory, beanName);
if (beanClass == null) {
// If we cannot determine the bean class, we cannot scan it before
// it is really resolved. This is very likely an infrastructure-level
// bean, not a "service" type, skip it entirely.
continue;
}
var foundAnnotations = this.scan(beanClass);
if (!foundAnnotations.isEmpty()) {
this.allAnnotatedBeans.add(beanName);
}
Expand Down
11 changes: 11 additions & 0 deletions ...ava/org/springframework/ai/mcp/annotation/spring/ClientMcpAsyncHandlersRegistryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.springframework.beans.factory.support.DefaultListableBeanFactory;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatNoException;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.assertj.core.api.InstanceOfAssertFactories.type;

Expand Down Expand Up @@ -340,6 +341,16 @@ void supportsProxiedClass() {
assertThat(registry.getCapabilities("client-1").elicitation()).isNotNull();
}

@Test
void skipsUnknownBeanClass() {
var registry = new ClientMcpAsyncHandlersRegistry();
var beanFactory = new DefaultListableBeanFactory();
beanFactory.registerBeanDefinition("myConfig",
BeanDefinitionBuilder.genericBeanDefinition().getBeanDefinition());

assertThatNoException().isThrownBy(() -> registry.postProcessBeanFactory(beanFactory));
}

static class ClientCapabilitiesConfiguration {

@McpElicitation(clients = { "client-1", "client-2" })
Expand Down
11 changes: 11 additions & 0 deletions ...java/org/springframework/ai/mcp/annotation/spring/ClientMcpSyncHandlersRegistryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import org.springframework.beans.factory.support.DefaultListableBeanFactory;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatNoException;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.assertj.core.api.InstanceOfAssertFactories.type;

Expand Down Expand Up @@ -332,6 +333,16 @@ void supportsProxiedClass() {
assertThat(registry.getCapabilities("client-1").elicitation()).isNotNull();
}

@Test
void skipsUnknownBeanClass() {
var registry = new ClientMcpAsyncHandlersRegistry();
var beanFactory = new DefaultListableBeanFactory();
beanFactory.registerBeanDefinition("myConfig",
BeanDefinitionBuilder.genericBeanDefinition().getBeanDefinition());

assertThatNoException().isThrownBy(() -> registry.postProcessBeanFactory(beanFactory));
}

static class ClientCapabilitiesConfiguration {

@McpElicitation(clients = { "client-1", "client-2" })
Expand Down