Skip to content

refactor: Improve resource template management and API consistency #576

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

Closed
tzolov wants to merge 5 commits into from
Closed

refactor: Improve resource template management and API consistency #576

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9126875
refactor: Improve resource template management and API consistency
tzolov Sep 25, 2025
2227567
Fix resource-template factory method concistency
tzolov Sep 25, 2025
a5fa67b
Fix resource-template factory method concistency
tzolov Sep 25, 2025
837a958
Adress review comments
tzolov Sep 27, 2025
8b3ca5a
Aglign stateless completionCompleteRequestHandler
tzolov Sep 27, 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
Prev Previous commit
Next Next commit
Fix resource-template factory method concistency 
Signed-off-by: Christian Tzolov <christian.tzolov@broadcom.com>
  • Loading branch information
@tzolov
tzolov committed Sep 25, 2025
commit 22275677b890d24c3faa0176e9f7e67a69800439
32 changes: 18 additions & 14 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 @@ -595,33 +595,35 @@ public AsyncSpecification<S> resources(McpServerFeatures.AsyncResourceSpecificat
* Registers multiple resource templates with their specifications using a List.
* This method is useful when resource templates need to be added in bulk from a
* collection.
* @param resourceTemplatesSpec Map of template URI to specification. Must not be
* @param resourceTemplates Map of template URI to specification. Must not be
* null.
* @return This builder instance for method chaining
* @throws IllegalArgumentException if resourceTemplates is null.
* @see #resourceTemplates(ResourceTemplate...)
*/
public AsyncSpecification<S> resourceTemplates(
Map<String, McpServerFeatures.AsyncResourceTemplateSpecification> resourceTemplatesSpec) {
Assert.notNull(resourceTemplatesSpec, "Resource templates must not be null");
this.resourceTemplates.putAll(resourceTemplatesSpec);
List<McpServerFeatures.AsyncResourceTemplateSpecification> resourceTemplates) {
Assert.notNull(resourceTemplates, "Resource templates must not be null");
for (var resourceTemplate : resourceTemplates) {
this.resourceTemplates.put(resourceTemplate.resourceTemplate().uriTemplate(), resourceTemplate);
}
return this;
}

/**
* Registers multiple resource templates with their specifications using a List.
* This method is useful when resource templates need to be added in bulk from a
* collection.
* @param resourceTemplatesSpec Map of template URI to specification. Must not be
* @param resourceTemplates List of template URI to specification. Must not be
* null.
* @return This builder instance for method chaining
* @throws IllegalArgumentException if resourceTemplates is null.
* @see #resourceTemplates(List)
*/
public AsyncSpecification<S> resourceTemplates(
McpServerFeatures.AsyncResourceTemplateSpecification... resourceTemplatesSpec) {
Assert.notNull(resourceTemplatesSpec, "Resource templates must not be null");
for (McpServerFeatures.AsyncResourceTemplateSpecification resource : resourceTemplatesSpec) {
McpServerFeatures.AsyncResourceTemplateSpecification... resourceTemplates) {
Assert.notNull(resourceTemplates, "Resource templates must not be null");
for (McpServerFeatures.AsyncResourceTemplateSpecification resource : resourceTemplates) {
this.resourceTemplates.put(resource.resourceTemplate().uriTemplate(), resource);
}
return this;
Expand Down Expand Up @@ -1705,7 +1707,7 @@ public StatelessAsyncSpecification resources(
* @see #resourceTemplates(ResourceTemplate...)
*/
public StatelessAsyncSpecification resourceTemplates(
Map<String, McpStatelessServerFeatures.AsyncResourceTemplateSpecification> resourceTemplatesSpec) {
Map<String, McpStatelessServerFeatures.AsyncResourceTemplateSpecification> resourceTemplates) {
Assert.notNull(resourceTemplates, "Resource templates must not be null");
this.resourceTemplates.putAll(resourceTemplates);
return this;
Expand Down Expand Up @@ -2159,16 +2161,18 @@ public StatelessSyncSpecification resources(
/**
* Sets the resource templates that define patterns for dynamic resource access.
* Templates use URI patterns with placeholders that can be filled at runtime.
* @param resourceTemplates List of resource templates. If null, clears existing
* templates.
* @param resourceTemplatesSpec List of resource templates. If null, clears
* existing templates.
* @return This builder instance for method chaining
* @throws IllegalArgumentException if resourceTemplates is null.
* @see #resourceTemplates(ResourceTemplate...)
*/
public StatelessSyncSpecification resourceTemplates(
Map<String, McpStatelessServerFeatures.SyncResourceTemplateSpecification> resourceTemplatesSpec) {
Assert.notNull(resourceTemplates, "Resource templates must not be null");
this.resourceTemplates.putAll(resourceTemplates);
List<McpStatelessServerFeatures.SyncResourceTemplateSpecification> resourceTemplatesSpec) {
Assert.notNull(resourceTemplatesSpec, "Resource templates must not be null");
for (var resourceTemplate : resourceTemplatesSpec) {
this.resourceTemplates.put(resourceTemplate.resourceTemplate().uriTemplate(), resourceTemplate);
}
return this;
}

Expand Down