Skip to content

Fix: Correct URI query parameter matching and class name typo (Fixes #596) #599

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Fix: Correct URI query parameter matching and class name typo (Fixes #596) #599

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7b6e281
File Rename
sheegansrigm Oct 4, 2025
e9bb9c3
fix: correct spelling of DefaultMcpUriTemplateManagerFactory in multi…
sheegansrigm Oct 4, 2025
99623be
fix: enhance URI matching to support query parameters
sheegansrigm Oct 4, 2025
df31e14
Apply auto-formatting fixes
sheegansrigm Oct 7, 2025
8314b7c
Merge branch 'main' into main
sheegansrigm Oct 7, 2025
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
4 changes: 2 additions & 2 deletions mcp-core/src/main/java/io/modelcontextprotocol/server/McpAsyncServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
import io.modelcontextprotocol.spec.McpServerTransportProviderBase;
import io.modelcontextprotocol.spec.McpStreamableServerTransportProvider;
import io.modelcontextprotocol.util.Assert;
import io.modelcontextprotocol.util.DeafaultMcpUriTemplateManagerFactory;
import io.modelcontextprotocol.util.DefaultMcpUriTemplateManagerFactory;
import io.modelcontextprotocol.util.McpUriTemplateManagerFactory;
import io.modelcontextprotocol.util.Utils;
import org.slf4j.Logger;
Expand Down Expand Up @@ -120,7 +120,7 @@ public class McpAsyncServer {

private List<String> protocolVersions;

private McpUriTemplateManagerFactory uriTemplateManagerFactory = new DeafaultMcpUriTemplateManagerFactory();
private McpUriTemplateManagerFactory uriTemplateManagerFactory = new DefaultMcpUriTemplateManagerFactory();

/**
* Create a new McpAsyncServer with the given transport provider and capabilities.
Expand Down
10 changes: 5 additions & 5 deletions mcp-core/src/main/java/io/modelcontextprotocol/server/McpServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import io.modelcontextprotocol.spec.McpStatelessServerTransport;
import io.modelcontextprotocol.spec.McpStreamableServerTransportProvider;
import io.modelcontextprotocol.util.Assert;
import io.modelcontextprotocol.util.DeafaultMcpUriTemplateManagerFactory;
import io.modelcontextprotocol.util.DefaultMcpUriTemplateManagerFactory;
import io.modelcontextprotocol.util.McpUriTemplateManagerFactory;
import reactor.core.publisher.Mono;

Expand Down Expand Up @@ -268,7 +268,7 @@ public McpAsyncServer build() {
*/
abstract class AsyncSpecification<S extends AsyncSpecification<S>> {

McpUriTemplateManagerFactory uriTemplateManagerFactory = new DeafaultMcpUriTemplateManagerFactory();
McpUriTemplateManagerFactory uriTemplateManagerFactory = new DefaultMcpUriTemplateManagerFactory();

McpJsonMapper jsonMapper;

Expand Down Expand Up @@ -865,7 +865,7 @@ public McpSyncServer build() {
*/
abstract class SyncSpecification<S extends SyncSpecification<S>> {

McpUriTemplateManagerFactory uriTemplateManagerFactory = new DeafaultMcpUriTemplateManagerFactory();
McpUriTemplateManagerFactory uriTemplateManagerFactory = new DefaultMcpUriTemplateManagerFactory();

McpJsonMapper jsonMapper;

Expand Down Expand Up @@ -1407,7 +1407,7 @@ class StatelessAsyncSpecification {

private final McpStatelessServerTransport transport;

McpUriTemplateManagerFactory uriTemplateManagerFactory = new DeafaultMcpUriTemplateManagerFactory();
McpUriTemplateManagerFactory uriTemplateManagerFactory = new DefaultMcpUriTemplateManagerFactory();

McpJsonMapper jsonMapper;

Expand Down Expand Up @@ -1870,7 +1870,7 @@ class StatelessSyncSpecification {

boolean immediateExecution = false;

McpUriTemplateManagerFactory uriTemplateManagerFactory = new DeafaultMcpUriTemplateManagerFactory();
McpUriTemplateManagerFactory uriTemplateManagerFactory = new DefaultMcpUriTemplateManagerFactory();

McpJsonMapper jsonMapper;

Expand Down
4 changes: 2 additions & 2 deletions mcp-core/src/main/java/io/modelcontextprotocol/server/McpStatelessAsyncServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import io.modelcontextprotocol.spec.McpSchema.Tool;
import io.modelcontextprotocol.spec.McpStatelessServerTransport;
import io.modelcontextprotocol.util.Assert;
import io.modelcontextprotocol.util.DeafaultMcpUriTemplateManagerFactory;
import io.modelcontextprotocol.util.DefaultMcpUriTemplateManagerFactory;
import io.modelcontextprotocol.util.McpUriTemplateManagerFactory;
import io.modelcontextprotocol.util.Utils;
import org.slf4j.Logger;
Expand Down Expand Up @@ -74,7 +74,7 @@ public class McpStatelessAsyncServer {

private List<String> protocolVersions;

private McpUriTemplateManagerFactory uriTemplateManagerFactory = new DeafaultMcpUriTemplateManagerFactory();
private McpUriTemplateManagerFactory uriTemplateManagerFactory = new DefaultMcpUriTemplateManagerFactory();

private final JsonSchemaValidator jsonSchemaValidator;

Expand Down
28 changes: 24 additions & 4 deletions mcp-core/src/main/java/io/modelcontextprotocol/util/DefaultMcpUriTemplateManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,14 +141,34 @@ public boolean matches(String uri) {
return uri.equals(this.uriTemplate);
}

// Convert the pattern to a regex
String regex = this.uriTemplate.replaceAll("\\{[^/]+?\\}", "([^/]+?)");
regex = regex.replace("/", "\\/");
// Convert the URI template into a robust regex pattern that escapes special
// characters like '?'.
StringBuilder patternBuilder = new StringBuilder("^");
Matcher variableMatcher = URI_VARIABLE_PATTERN.matcher(this.uriTemplate);
int lastEnd = 0;

while (variableMatcher.find()) {
// Append the literal part of the template, safely quoted
String textBefore = this.uriTemplate.substring(lastEnd, variableMatcher.start());
patternBuilder.append(Pattern.quote(textBefore));
// Append a capturing group for the variable itself
patternBuilder.append("([^/]+?)");
lastEnd = variableMatcher.end();
}

// Append any remaining literal text after the last variable
if (lastEnd < this.uriTemplate.length()) {
patternBuilder.append(Pattern.quote(this.uriTemplate.substring(lastEnd)));
}

patternBuilder.append("$");

// Check if the URI matches the regex
return Pattern.compile(regex).matcher(uri).matches();
return Pattern.compile(patternBuilder.toString()).matcher(uri).matches();
}



@Override
public boolean isUriTemplate(String uri) {
return URI_VARIABLE_PATTERN.matcher(uri).find();
Expand Down
2 changes: 1 addition & 1 deletion ...DeafaultMcpUriTemplateManagerFactory.java → .../DefaultMcpUriTemplateManagerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/**
* @author Christian Tzolov
*/
public class DeafaultMcpUriTemplateManagerFactory implements McpUriTemplateManagerFactory {
public class DefaultMcpUriTemplateManagerFactory implements McpUriTemplateManagerFactory {

/**
* Creates a new instance of {@link McpUriTemplateManager} with the specified URI
Expand Down
12 changes: 10 additions & 2 deletions mcp-core/src/test/java/io/modelcontextprotocol/McpUriTemplateManagerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import java.util.List;
import java.util.Map;

import io.modelcontextprotocol.util.DeafaultMcpUriTemplateManagerFactory;
import io.modelcontextprotocol.util.DefaultMcpUriTemplateManagerFactory;
import io.modelcontextprotocol.util.McpUriTemplateManager;
import io.modelcontextprotocol.util.McpUriTemplateManagerFactory;
import org.junit.jupiter.api.BeforeEach;
Expand All @@ -29,7 +29,7 @@ public class McpUriTemplateManagerTests {

@BeforeEach
void setUp() {
this.uriTemplateFactory = new DeafaultMcpUriTemplateManagerFactory();
this.uriTemplateFactory = new DefaultMcpUriTemplateManagerFactory();
}

@Test
Expand Down Expand Up @@ -94,4 +94,12 @@ void shouldMatchUriAgainstTemplatePattern() {
assertFalse(uriTemplateManager.matches("/api/users/123/comments/456"));
}

@Test
void shouldMatchUriWithQueryParameters() {
String templateWithQuery = "file://name/search?={search}";
var uriTemplateManager = this.uriTemplateFactory.create(templateWithQuery);

assertTrue(uriTemplateManager.matches("file://name/search?=abcd"),
"Should correctly match a URI containing query parameters.");
}
}
Loading