Skip to content

Commit 90e2436

Browse files
fix: use the referenced resource template for completion/complete
A completion/complete request for a resource template looked the template up by matching its URI template against every registered template's pattern. Another template whose pattern happens to match that string, such as test://{category}/{id} for test://items/{itemId}, could be checked first, and the request then failed with "Argument not found" for a valid argument. Look the template up by its URI template first, in both McpAsyncServer and McpStatelessAsyncServer.
1 parent 54e8b61 commit 90e2436

3 files changed

Lines changed: 106 additions & 2 deletions

File tree

‎mcp-core/src/main/java/io/modelcontextprotocol/server/McpAsyncServer.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1094,7 +1094,11 @@ private McpRequestHandler<McpSchema.CompleteResult> completionCompleteRequestHan
10941094
}
10951095
}
10961096
else {
1097-
var templateSpec = this.findResourceTemplateSpecification(resourceReference.uri()).orElse(null);
1097+
// The reference names a template: matching it as a URI could pick
1098+
// another template whose pattern also matches it
1099+
var templateSpec = Optional.ofNullable(this.resourceTemplates.get(resourceReference.uri()))
1100+
.or(() -> this.findResourceTemplateSpecification(resourceReference.uri()))
1101+
.orElse(null);
10981102
if (templateSpec != null) {
10991103

11001104
if (!uriTemplateManagerFactory.create(templateSpec.resourceTemplate().uriTemplate())

‎mcp-core/src/main/java/io/modelcontextprotocol/server/McpStatelessAsyncServer.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -831,7 +831,11 @@ private McpStatelessRequestHandler<McpSchema.CompleteResult> completionCompleteR
831831
}
832832
}
833833
else {
834-
var templateSpec = this.findResourceTemplateSpecification(resourceReference.uri()).orElse(null);
834+
// The reference names a template: matching it as a URI could pick
835+
// another template whose pattern also matches it
836+
var templateSpec = Optional.ofNullable(this.resourceTemplates.get(resourceReference.uri()))
837+
.or(() -> this.findResourceTemplateSpecification(resourceReference.uri()))
838+
.orElse(null);
835839
if (templateSpec != null) {
836840

837841
if (!uriTemplateManagerFactory.create(templateSpec.resourceTemplate().uriTemplate())

‎mcp-test/src/test/java/io/modelcontextprotocol/server/ResourceTemplateManagementTests.java‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,23 @@
66

77
import java.time.Duration;
88
import java.util.List;
9+
import java.util.concurrent.atomic.AtomicReference;
910

1011
import io.modelcontextprotocol.MockMcpServerTransport;
1112
import io.modelcontextprotocol.MockMcpServerTransportProvider;
13+
import io.modelcontextprotocol.common.McpTransportContext;
14+
import io.modelcontextprotocol.json.McpJsonDefaults;
15+
import io.modelcontextprotocol.json.TypeRef;
1216
import io.modelcontextprotocol.spec.McpSchema;
17+
import io.modelcontextprotocol.spec.McpSchema.CompleteRequest;
18+
import io.modelcontextprotocol.spec.McpSchema.CompleteResult;
1319
import io.modelcontextprotocol.spec.McpSchema.JSONRPCNotification;
1420
import io.modelcontextprotocol.spec.McpSchema.ReadResourceResult;
21+
import io.modelcontextprotocol.spec.McpSchema.ResourceReference;
1522
import io.modelcontextprotocol.spec.McpSchema.ResourceTemplate;
1623
import io.modelcontextprotocol.spec.McpSchema.ServerCapabilities;
24+
import io.modelcontextprotocol.spec.McpStatelessServerTransport;
25+
import io.modelcontextprotocol.spec.ProtocolVersions;
1726
import org.junit.jupiter.api.AfterEach;
1827
import org.junit.jupiter.api.BeforeEach;
1928
import org.junit.jupiter.api.Test;
@@ -57,6 +66,93 @@ void tearDown() {
5766
// Async Resource Template Tests
5867
// ---------------------------------------
5968

69+
@Test
70+
void testCompletionUsesTheReferencedResourceTemplate() {
71+
// The referenced template also matches the generic one, which is checked first
72+
String itemTemplate = "test://items/{itemId}";
73+
String genericTemplate = "test://{category}/{id}";
74+
McpServerFeatures.AsyncResourceTemplateSpecification item = new McpServerFeatures.AsyncResourceTemplateSpecification(
75+
ResourceTemplate.builder(itemTemplate, "item").build(),
76+
(exchange, req) -> Mono.just(ReadResourceResult.builder(List.of()).build()));
77+
McpServerFeatures.AsyncResourceTemplateSpecification generic = new McpServerFeatures.AsyncResourceTemplateSpecification(
78+
ResourceTemplate.builder(genericTemplate, "generic").build(),
79+
(exchange, req) -> Mono.just(ReadResourceResult.builder(List.of()).build()));
80+
ResourceReference itemReference = new ResourceReference(itemTemplate);
81+
82+
mcpAsyncServer = McpServer.async(mockTransportProvider)
83+
.serverInfo("test-server", "1.0.0")
84+
.capabilities(ServerCapabilities.builder().resources(false, false).completions().build())
85+
.resourceTemplates(generic, item)
86+
.completions(new McpServerFeatures.AsyncCompletionSpecification(itemReference, (exchange,
87+
req) -> Mono.just(new CompleteResult(
88+
new CompleteResult.CompleteCompletion(List.of(req.argument().value() + "1"), 1, false)))))
89+
.build();
90+
91+
MockMcpServerTransport transport = mockTransportProvider.getTransport();
92+
mockTransportProvider.simulateIncomingMessage(new McpSchema.JSONRPCRequest(McpSchema.METHOD_INITIALIZE, "init",
93+
McpSchema.InitializeRequest
94+
.builder(ProtocolVersions.MCP_2025_11_25, McpSchema.ClientCapabilities.builder().build(),
95+
McpSchema.Implementation.builder("test-client", "1.0.0").build())
96+
.build()));
97+
mockTransportProvider
98+
.simulateIncomingMessage(new McpSchema.JSONRPCNotification(McpSchema.METHOD_NOTIFICATION_INITIALIZED));
99+
mockTransportProvider.simulateIncomingMessage(new McpSchema.JSONRPCRequest(McpSchema.METHOD_COMPLETION_COMPLETE,
100+
"complete",
101+
CompleteRequest.builder(itemReference, new CompleteRequest.CompleteArgument("itemId", "4")).build()));
102+
103+
McpSchema.JSONRPCResponse response = (McpSchema.JSONRPCResponse) transport.getLastSentMessage();
104+
assertThat(response.error()).isNull();
105+
CompleteResult result = transport.unmarshalFrom(response.result(), new TypeRef<CompleteResult>() {
106+
});
107+
assertThat(result.completion().values()).containsExactly("41");
108+
}
109+
110+
@Test
111+
void testStatelessCompletionUsesTheReferencedResourceTemplate() {
112+
String itemTemplate = "test://items/{itemId}";
113+
String genericTemplate = "test://{category}/{id}";
114+
ResourceReference itemReference = new ResourceReference(itemTemplate);
115+
AtomicReference<McpStatelessServerHandler> handler = new AtomicReference<>();
116+
McpStatelessServerTransport transport = new McpStatelessServerTransport() {
117+
@Override
118+
public void setMcpHandler(McpStatelessServerHandler mcpHandler) {
119+
handler.set(mcpHandler);
120+
}
121+
122+
@Override
123+
public Mono<Void> closeGracefully() {
124+
return Mono.empty();
125+
}
126+
};
127+
128+
McpStatelessAsyncServer server = McpServer.async(transport)
129+
.serverInfo("test-server", "1.0.0")
130+
.capabilities(ServerCapabilities.builder().resources(false, false).completions().build())
131+
.resourceTemplates(
132+
new McpStatelessServerFeatures.AsyncResourceTemplateSpecification(
133+
ResourceTemplate.builder(genericTemplate, "generic").build(),
134+
(context, req) -> Mono.just(ReadResourceResult.builder(List.of()).build())),
135+
new McpStatelessServerFeatures.AsyncResourceTemplateSpecification(
136+
ResourceTemplate.builder(itemTemplate, "item").build(),
137+
(context, req) -> Mono.just(ReadResourceResult.builder(List.of()).build())))
138+
.completions(new McpStatelessServerFeatures.AsyncCompletionSpecification(itemReference, (context,
139+
req) -> Mono.just(new CompleteResult(
140+
new CompleteResult.CompleteCompletion(List.of(req.argument().value() + "1"), 1, false)))))
141+
.build();
142+
143+
McpSchema.JSONRPCResponse response = handler.get()
144+
.handleRequest(McpTransportContext.EMPTY,
145+
new McpSchema.JSONRPCRequest(McpSchema.METHOD_COMPLETION_COMPLETE, "complete",
146+
CompleteRequest.builder(itemReference, new CompleteRequest.CompleteArgument("itemId", "4"))
147+
.build()))
148+
.block(Duration.ofSeconds(10));
149+
150+
assertThat(response.error()).isNull();
151+
CompleteResult result = McpJsonDefaults.getMapper().convertValue(response.result(), CompleteResult.class);
152+
assertThat(result.completion().values()).containsExactly("41");
153+
server.closeGracefully().block(Duration.ofSeconds(10));
154+
}
155+
60156
@Test
61157
void testAddResourceTemplate() {
62158
mcpAsyncServer = McpServer.async(mockTransportProvider)

0 commit comments

Comments
 (0)