Incorporate dynamic addition of tools, resources, and prompts

Signed-off-by: Dariusz Jędrzejczyk <[email protected]>

Author: chemicL

mcp/src/main/java/io/modelcontextprotocol/server/McpAsyncServer.java

@@ -185,11 +185,23 @@ public Mono<McpSchema.ListRootsResult> listRoots(String cursor) {
 	 * Add a new tool registration at runtime.
 	 * @param toolRegistration The tool registration to add
 	 * @return Mono that completes when clients have been notified of the change
+	 * @deprecated This method will be removed in 0.9.0. Use
+	 * {@link #addTool(McpServerFeatures.AsyncToolSpecification)}.
 	 */
+	@Deprecated
 	public Mono<Void> addTool(McpServerFeatures.AsyncToolRegistration toolRegistration) {
 		return this.delegate.addTool(toolRegistration);
 	}
 
+	/**
+	 * Add a new tool specification at runtime.
+	 * @param toolSpecification The tool specification to add
+	 * @return Mono that completes when clients have been notified of the change
+	 */
+	public Mono<Void> addTool(McpServerFeatures.AsyncToolSpecification toolSpecification) {
+		return this.delegate.addTool(toolSpecification);
+	}
+
 	/**
 	 * Remove a tool handler at runtime.
 	 * @param toolName The name of the tool handler to remove
@@ -215,11 +227,23 @@ public Mono<Void> notifyToolsListChanged() {
 	 * Add a new resource handler at runtime.
 	 * @param resourceHandler The resource handler to add
 	 * @return Mono that completes when clients have been notified of the change
+	 * @deprecated This method will be removed in 0.9.0. Use
+	 * {@link #addResource(McpServerFeatures.AsyncResourceSpecification)}.
 	 */
+	@Deprecated
 	public Mono<Void> addResource(McpServerFeatures.AsyncResourceRegistration resourceHandler) {
 		return this.delegate.addResource(resourceHandler);
 	}
 
+	/**
+	 * Add a new resource handler at runtime.
+	 * @param resourceHandler The resource handler to add
+	 * @return Mono that completes when clients have been notified of the change
+	 */
+	public Mono<Void> addResource(McpServerFeatures.AsyncResourceSpecification resourceHandler) {
+		return this.delegate.addResource(resourceHandler);
+	}
+
 	/**
 	 * Remove a resource handler at runtime.
 	 * @param resourceUri The URI of the resource handler to remove
@@ -245,11 +269,23 @@ public Mono<Void> notifyResourcesListChanged() {
 	 * Add a new prompt handler at runtime.
 	 * @param promptRegistration The prompt handler to add
 	 * @return Mono that completes when clients have been notified of the change
+	 * @deprecated This method will be removed in 0.9.0. Use
+	 * {@link #addPrompt(McpServerFeatures.AsyncPromptSpecification)}.
 	 */
+	@Deprecated
 	public Mono<Void> addPrompt(McpServerFeatures.AsyncPromptRegistration promptRegistration) {
 		return this.delegate.addPrompt(promptRegistration);
 	}
 
+	/**
+	 * Add a new prompt handler at runtime.
+	 * @param promptSpecification The prompt handler to add
+	 * @return Mono that completes when clients have been notified of the change
+	 */
+	public Mono<Void> addPrompt(McpServerFeatures.AsyncPromptSpecification promptSpecification) {
+		return this.delegate.addPrompt(promptSpecification);
+	}
+
 	/**
 	 * Remove a prompt handler at runtime.
 	 * @param promptName The name of the prompt handler to remove
@@ -536,20 +572,8 @@ private McpServerSession.NotificationHandler asyncRootsListChangedNotificationHa
 		// ---------------------------------------
 
 		/**
-		 * Add a new tool registration at runtime.
-		 * @param toolRegistration The tool registration to add
-		 * @return Mono that completes when clients have been notified of the change
-		 * @deprecated This method will be removed in 0.9.0. Use
-		 * {@link #addTool(McpServerFeatures.AsyncToolSpecification)}.
-		 */
-		@Deprecated
-		public Mono<Void> addTool(McpServerFeatures.AsyncToolRegistration toolRegistration) {
-			return this.addTool(toolRegistration.toSpecification());
-		}
-
-		/**
-		 * Add a new tool registration at runtime.
-		 * @param toolSpecification The tool registration to add
+		 * Add a new tool specification at runtime.
+		 * @param toolSpecification The tool specification to add
 		 * @return Mono that completes when clients have been notified of the change
 		 */
 		public Mono<Void> addTool(McpServerFeatures.AsyncToolSpecification toolSpecification) {
@@ -583,6 +607,11 @@ public Mono<Void> addTool(McpServerFeatures.AsyncToolSpecification toolSpecifica
 			});
 		}
 
+		@Override
+		public Mono<Void> addTool(McpServerFeatures.AsyncToolRegistration toolRegistration) {
+			return this.addTool(toolRegistration.toSpecification());
+		}
+
 		/**
 		 * Remove a tool handler at runtime.
 		 * @param toolName The name of the tool handler to remove
@@ -598,7 +627,7 @@ public Mono<Void> removeTool(String toolName) {
 
 			return Mono.defer(() -> {
 				boolean removed = this.tools
-					.removeIf(toolRegistration -> toolRegistration.tool().name().equals(toolName));
+					.removeIf(toolSpecification -> toolSpecification.tool().name().equals(toolName));
 				if (removed) {
 					logger.debug("Removed tool handler: {}", toolName);
 					if (this.serverCapabilities.tools().listChanged()) {
@@ -649,18 +678,6 @@ private McpServerSession.RequestHandler<CallToolResult> toolsCallRequestHandler(
 		// Resource Management
 		// ---------------------------------------
 
-		/**
-		 * Add a new resource handler at runtime.
-		 * @param resourceHandler The resource handler to add
-		 * @return Mono that completes when clients have been notified of the change
-		 * @deprecated This method will be removed in 0.9.0. Use
-		 * {@link #addResource(McpServerFeatures.AsyncResourceSpecification)}.
-		 */
-		@Deprecated
-		public Mono<Void> addResource(McpServerFeatures.AsyncResourceRegistration resourceHandler) {
-			return this.addResource(resourceHandler.toSpecification());
-		}
-
 		/**
 		 * Add a new resource handler at runtime.
 		 * @param resourceSpecification The resource handler to add
@@ -688,6 +705,11 @@ public Mono<Void> addResource(McpServerFeatures.AsyncResourceSpecification resou
 			});
 		}
 
+		@Override
+		public Mono<Void> addResource(McpServerFeatures.AsyncResourceRegistration resourceHandler) {
+			return this.addResource(resourceHandler.toSpecification());
+		}
+
 		/**
 		 * Remove a resource handler at runtime.
 		 * @param resourceUri The URI of the resource handler to remove
@@ -744,9 +766,9 @@ private McpServerSession.RequestHandler<McpSchema.ReadResourceResult> resourcesR
 						new TypeReference<McpSchema.ReadResourceRequest>() {
 						});
 				var resourceUri = resourceRequest.uri();
-				McpServerFeatures.AsyncResourceSpecification registration = this.resources.get(resourceUri);
-				if (registration != null) {
-					return registration.readHandler().apply(exchange, resourceRequest);
+				McpServerFeatures.AsyncResourceSpecification specification = this.resources.get(resourceUri);
+				if (specification != null) {
+					return specification.readHandler().apply(exchange, resourceRequest);
 				}
 				return Mono.error(new McpError("Resource not found: " + resourceUri));
 			};
@@ -756,26 +778,14 @@ private McpServerSession.RequestHandler<McpSchema.ReadResourceResult> resourcesR
 		// Prompt Management
 		// ---------------------------------------
 
-		/**
-		 * Add a new prompt handler at runtime.
-		 * @param promptRegistration The prompt handler to add
-		 * @return Mono that completes when clients have been notified of the change
-		 * @deprecated This method will be removed in 0.9.0. Use
-		 * {@link #addPrompt(McpServerFeatures.AsyncPromptSpecification)}.
-		 */
-		@Deprecated
-		public Mono<Void> addPrompt(McpServerFeatures.AsyncPromptRegistration promptRegistration) {
-			return this.addPrompt(promptRegistration.toSpecification());
-		}
-
 		/**
 		 * Add a new prompt handler at runtime.
 		 * @param promptSpecification The prompt handler to add
 		 * @return Mono that completes when clients have been notified of the change
 		 */
 		public Mono<Void> addPrompt(McpServerFeatures.AsyncPromptSpecification promptSpecification) {
 			if (promptSpecification == null) {
-				return Mono.error(new McpError("Prompt registration must not be null"));
+				return Mono.error(new McpError("Prompt specification must not be null"));
 			}
 			if (this.serverCapabilities.prompts() == null) {
 				return Mono.error(new McpError("Server must be configured with prompt capabilities"));
@@ -801,6 +811,11 @@ public Mono<Void> addPrompt(McpServerFeatures.AsyncPromptSpecification promptSpe
 			});
 		}
 
+		@Override
+		public Mono<Void> addPrompt(McpServerFeatures.AsyncPromptRegistration promptRegistration) {
+			return this.addPrompt(promptRegistration.toSpecification());
+		}
+
 		/**
 		 * Remove a prompt handler at runtime.
 		 * @param promptName The name of the prompt handler to remove
@@ -1056,6 +1071,24 @@ private static final class LegacyAsyncServer extends McpAsyncServer {
 					notificationHandlers);
 		}
 
+		@Override
+		public Mono<Void> addTool(McpServerFeatures.AsyncToolSpecification toolSpecification) {
+			throw new IllegalArgumentException(
+					"McpAsyncServer configured with legacy " + "transport. Use McpServerTransportProvider instead.");
+		}
+
+		@Override
+		public Mono<Void> addResource(McpServerFeatures.AsyncResourceSpecification resourceHandler) {
+			throw new IllegalArgumentException(
+					"McpAsyncServer configured with legacy " + "transport. Use McpServerTransportProvider instead.");
+		}
+
+		@Override
+		public Mono<Void> addPrompt(McpServerFeatures.AsyncPromptSpecification promptSpecification) {
+			throw new IllegalArgumentException(
+					"McpAsyncServer configured with legacy " + "transport. Use McpServerTransportProvider instead.");
+		}
+
 		// ---------------------------------------
 		// Lifecycle Management
 		// ---------------------------------------
@@ -1182,6 +1215,7 @@ private DefaultMcpSession.NotificationHandler asyncRootsListChangedNotificationH
 		 * @param toolRegistration The tool registration to add
 		 * @return Mono that completes when clients have been notified of the change
 		 */
+		@Override
 		public Mono<Void> addTool(McpServerFeatures.AsyncToolRegistration toolRegistration) {
 			if (toolRegistration == null) {
 				return Mono.error(new McpError("Tool registration must not be null"));
@@ -1284,6 +1318,7 @@ private DefaultMcpSession.RequestHandler<CallToolResult> toolsCallRequestHandler
 		 * @param resourceHandler The resource handler to add
 		 * @return Mono that completes when clients have been notified of the change
 		 */
+		@Override
 		public Mono<Void> addResource(McpServerFeatures.AsyncResourceRegistration resourceHandler) {
 			if (resourceHandler == null || resourceHandler.resource() == null) {
 				return Mono.error(new McpError("Resource must not be null"));
@@ -1379,6 +1414,7 @@ private DefaultMcpSession.RequestHandler<McpSchema.ReadResourceResult> resources
 		 * @param promptRegistration The prompt handler to add
 		 * @return Mono that completes when clients have been notified of the change
 		 */
+		@Override
 		public Mono<Void> addPrompt(McpServerFeatures.AsyncPromptRegistration promptRegistration) {
 			if (promptRegistration == null) {
 				return Mono.error(new McpError("Prompt registration must not be null"));

mcp/src/main/java/io/modelcontextprotocol/server/McpSyncServer.java

@@ -87,11 +87,22 @@ public McpSchema.ListRootsResult listRoots(String cursor) {
 	/**
 	 * Add a new tool handler.
 	 * @param toolHandler The tool handler to add
+	 * @deprecated This method will be removed in 0.9.0. Use
+	 * {@link #addTool(McpServerFeatures.SyncToolSpecification)}.
 	 */
+	@Deprecated
 	public void addTool(McpServerFeatures.SyncToolRegistration toolHandler) {
 		this.asyncServer.addTool(McpServerFeatures.AsyncToolRegistration.fromSync(toolHandler)).block();
 	}
 
+	/**
+	 * Add a new tool handler.
+	 * @param toolHandler The tool handler to add
+	 */
+	public void addTool(McpServerFeatures.SyncToolSpecification toolHandler) {
+		this.asyncServer.addTool(McpServerFeatures.AsyncToolSpecification.fromSync(toolHandler)).block();
+	}
+
 	/**
 	 * Remove a tool handler.
 	 * @param toolName The name of the tool handler to remove
@@ -103,11 +114,22 @@ public void removeTool(String toolName) {
 	/**
 	 * Add a new resource handler.
 	 * @param resourceHandler The resource handler to add
+	 * @deprecated This method will be removed in 0.9.0. Use
+	 * {@link #addResource(McpServerFeatures.SyncResourceSpecification)}.
 	 */
+	@Deprecated
 	public void addResource(McpServerFeatures.SyncResourceRegistration resourceHandler) {
 		this.asyncServer.addResource(McpServerFeatures.AsyncResourceRegistration.fromSync(resourceHandler)).block();
 	}
 
+	/**
+	 * Add a new resource handler.
+	 * @param resourceHandler The resource handler to add
+	 */
+	public void addResource(McpServerFeatures.SyncResourceSpecification resourceHandler) {
+		this.asyncServer.addResource(McpServerFeatures.AsyncResourceSpecification.fromSync(resourceHandler)).block();
+	}
+
 	/**
 	 * Remove a resource handler.
 	 * @param resourceUri The URI of the resource handler to remove
@@ -119,11 +141,22 @@ public void removeResource(String resourceUri) {
 	/**
 	 * Add a new prompt handler.
 	 * @param promptRegistration The prompt registration to add
+	 * @deprecated This method will be removed in 0.9.0. Use
+	 * {@link #addPrompt(McpServerFeatures.SyncPromptSpecification)}.
 	 */
+	@Deprecated
 	public void addPrompt(McpServerFeatures.SyncPromptRegistration promptRegistration) {
 		this.asyncServer.addPrompt(McpServerFeatures.AsyncPromptRegistration.fromSync(promptRegistration)).block();
 	}
 
+	/**
+	 * Add a new prompt handler.
+	 * @param promptSpecification The prompt specification to add
+	 */
+	public void addPrompt(McpServerFeatures.SyncPromptSpecification promptSpecification) {
+		this.asyncServer.addPrompt(McpServerFeatures.AsyncPromptSpecification.fromSync(promptSpecification)).block();
+	}
+
 	/**
 	 * Remove a prompt handler.
 	 * @param promptName The name of the prompt handler to remove