Replace mcp_core::resource::* with rmcp types (#3563)

crates/mcp-server/src/main.rs

@@ -2,10 +2,10 @@ use anyhow::Result;
 use mcp_core::handler::{PromptError, ResourceError};
 use mcp_core::protocol::JsonRpcMessage;
 use mcp_core::tool::ToolAnnotations;
-use mcp_core::{handler::ToolError, protocol::ServerCapabilities, resource::Resource, tool::Tool};
+use mcp_core::{handler::ToolError, protocol::ServerCapabilities, tool::Tool};
 use mcp_server::router::{CapabilitiesBuilder, RouterService};
 use mcp_server::{ByteTransport, Router, Server};
-use rmcp::model::{Content, Prompt, PromptArgument};
+use rmcp::model::{Content, Prompt, PromptArgument, RawResource, Resource};
 use serde_json::Value;
 use std::{future::Future, pin::Pin, sync::Arc};
 use tokio::sync::mpsc;
@@ -47,7 +47,7 @@ impl CounterRouter {
     }
 
     fn _create_resource_text(&self, uri: &str, name: &str) -> Resource {
-        Resource::new(uri, Some("text/plain".to_string()), Some(name.to_string())).unwrap()
+        Resource::new(RawResource::new(uri, name), None)
     }
 }
 

crates/mcp-server/src/router.rs

@@ -14,9 +14,8 @@ use mcp_core::{
         PromptsCapability, ReadResourceResult, ResourcesCapability, ServerCapabilities,
         ToolsCapability,
     },
-    ResourceContents,
 };
-use rmcp::model::{Content, Prompt, PromptMessage, PromptMessageRole};
+use rmcp::model::{Content, Prompt, PromptMessage, PromptMessageRole, Resource, ResourceContents};
 use serde_json::Value;
 use tokio::sync::mpsc;
 use tower_service::Service;
@@ -93,7 +92,7 @@ pub trait Router: Send + Sync + 'static {
         arguments: Value,
         notifier: mpsc::Sender<JsonRpcMessage>,
     ) -> Pin<Box<dyn Future<Output = Result<Vec<Content>, ToolError>> + Send + 'static>>;
-    fn list_resources(&self) -> Vec<mcp_core::resource::Resource>;
+    fn list_resources(&self) -> Vec<Resource>;
     fn read_resource(
         &self,
         uri: &str,