code cleaning

Author: tzolov

mcp/README.md

@@ -101,7 +101,7 @@ The SDK follows a layered architecture:
 - **McpClient**: Main interface defining the synchronous operations
 - **McpAsyncClient**: Async implementation using Project Reactor
 - **McpSyncClient**: Synchronous wrapper around the async client
-- **McpAsyncTransport**: Transport layer interface
+- **McpTransport**: Transport layer interface
 - **DefaultMcpTransport**: Base transport implementation
 - **StdioServerTransport**: Stdio-based server communication
 

mcp/docs/mcp-class-diagram.puml

@@ -8,7 +8,7 @@ skinparam class {
 }
 
 ' Interfaces
-interface McpAsyncTransport {
+interface McpTransport {
     +start(): void
     +close(): void
     +setInboudMessageHandler(Consumer<JSONRPCMessage>): void
@@ -42,16 +42,16 @@ class DefaultMcpTransport {
 }
 
 class McpAsyncClient {
-    -transport: McpAsyncTransport
+    -transport: McpTransport
     -session: McpAsyncSession
-    +McpAsyncClient(McpAsyncTransport)
+    +McpAsyncClient(McpTransport)
     +initialize(): Mono<InitializeResult>
     +close(): void
 }
 
 class McpSyncClient {
     -asyncClient: McpAsyncClient
-    +McpSyncClient(McpAsyncTransport)
+    +McpSyncClient(McpTransport)
     +initialize(): InitializeResult
     +close(): void
 }
@@ -79,22 +79,22 @@ class Assert {
 }
 
 ' Relationships
-McpAsyncTransport <|.. DefaultMcpTransport
+McpTransport <|.. DefaultMcpTransport
 DefaultMcpTransport <|-- StdioServerTransport
 
 McpClient <|.. McpSyncClient
 McpAsyncSession <|.. McpAsyncClient
 
 McpSyncClient o-- McpAsyncClient
-McpAsyncClient o-- McpAsyncTransport
+McpAsyncClient o-- McpTransport
 McpAsyncClient o-- McpAsyncSession
 
 StdioServerTransport o-- ServerParameters
 ServerParameters <.. ServerParametersParser : creates
 
 ' Package organization
 package "spring.ai.mcp.spec" {
-    ' McpAsyncTransport
+    ' McpTransport
     ' McpAsyncSession
     ' DefaultMcpTransport
 }

mcp/src/main/java/spring/ai/experimental/mcp/client/McpAsyncClient.java

@@ -5,31 +5,36 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import reactor.core.publisher.Mono;
-import spring.ai.experimental.mcp.spec.McpAsyncSession;
-import spring.ai.experimental.mcp.spec.McpAsyncTransport;
+import spring.ai.experimental.mcp.spec.McpSession;
+import spring.ai.experimental.mcp.spec.McpTransport;
 import spring.ai.experimental.mcp.spec.McpSchema;
 
-public class McpAsyncClient extends McpAsyncSession {
+/**
+ * @author Dariusz Jędrzejczyk
+ * @author Christian Tzolov
+ */
+public class McpAsyncClient extends McpSession {
 
-	public McpAsyncClient(McpAsyncTransport transport) {
+	public McpAsyncClient(McpTransport transport) {
 		this(transport, Duration.ofSeconds(10), new ObjectMapper());
 	}
 
-	public McpAsyncClient(McpAsyncTransport transport, Duration requestTimeout, ObjectMapper objectMapper) {		
+	public McpAsyncClient(McpTransport transport, Duration requestTimeout, ObjectMapper objectMapper) {
 		super(requestTimeout, objectMapper, transport);
 	}
 
-
 	/**
-	 * The initialization phase MUST be the first interaction between client and server.
+	 * The initialization phase MUST be the first interaction between client and
+	 * server.
 	 * During this phase, the client and server:
 	 * <ul>
 	 * <li>Establish protocol version compatibility</li>
 	 * <li>Exchange and negotiate capabilities</li>
 	 * <li>Share implementation details</li>
 	 * </ul>
 	 * <br/>
-	 * The client MUST initiate this phase by sending an initialize request containing:
+	 * The client MUST initiate this phase by sending an initialize request
+	 * containing:
 	 * <ul>
 	 * <li>The protocol version the client supports</li>
 	 * <li>The client's capabilities</li>
@@ -38,14 +43,16 @@ public McpAsyncClient(McpAsyncTransport transport, Duration requestTimeout, Obje
 	 *
 	 * The server MUST respond with its own capabilities and information:
 	 * {@link McpSchema.ServerCapabilities}. <br/>
-	 * After successful initialization, the client MUST send an initialized notification
+	 * After successful initialization, the client MUST send an initialized
+	 * notification
 	 * to indicate it is ready to begin normal operations.
 	 *
 	 * <br/>
 	 *
 	 * <a href=
 	 * "https://github.com/modelcontextprotocol/specification/blob/main/docs/specification/basic/lifecycle.md#initialization">Initialization
 	 * Spec</a>
+	 * 
 	 * @return the initialize result.
 	 */
 	public Mono<McpSchema.InitializeResult> initialize() {
@@ -54,8 +61,9 @@ public Mono<McpSchema.InitializeResult> initialize() {
 				new McpSchema.ClientCapabilities(null, new McpSchema.ClientCapabilities.RootCapabilities(true), null),
 				new McpSchema.Implementation("mcp-java-client", "0.0.1")); // @formatter:on
 
-		Mono<McpSchema.InitializeResult> result =
-				this.sendRequest("initialize", initializeRequest, new TypeReference<McpSchema.InitializeResult>() {});
+		Mono<McpSchema.InitializeResult> result = this.sendRequest("initialize", initializeRequest,
+				new TypeReference<McpSchema.InitializeResult>() {
+				});
 
 		return result.flatMap(initializeResult -> {
 			if (!McpSchema.LATEST_PROTOCOL_VERSION.equals(initializeResult.protocolVersion())) {
@@ -64,7 +72,7 @@ public Mono<McpSchema.InitializeResult> initialize() {
 								+ initializeResult.protocolVersion()));
 			} else {
 				return this.sendNotification("notifications/initialized", null)
-				           .thenReturn(initializeResult);
+						.thenReturn(initializeResult);
 			}
 		});
 	}
@@ -81,29 +89,34 @@ public Mono<Void> sendRootsListChanged() {
 	 */
 	public Mono<Void> ping() {
 		return this.sendRequest("ping", null,
-				new TypeReference<Void>() {});
+				new TypeReference<Void>() {
+				});
 	}
 
 	// --------------------------
 	// Tools
 	// --------------------------
 	/**
 	 * Send a tools/call request.
+	 * 
 	 * @param callToolRequest the call tool request.
 	 * @return the call tool result.
 	 */
 	public Mono<McpSchema.CallToolResult> callTool(McpSchema.CallToolRequest callToolRequest) {
 		return this.sendRequest("tools/call", callToolRequest,
-				new TypeReference<McpSchema.CallToolResult>() {});
+				new TypeReference<McpSchema.CallToolResult>() {
+				});
 	}
 
 	/**
 	 * Send a tools/list request.
+	 * 
 	 * @return the list of tools result.
 	 */
 	public Mono<McpSchema.ListToolsResult> listTools(String cursor) {
 		return this.sendRequest("tools/list", new McpSchema.PaginatedRequest(cursor),
-				new TypeReference<McpSchema.ListToolsResult>() {});
+				new TypeReference<McpSchema.ListToolsResult>() {
+				});
 	}
 
 	// --------------------------
@@ -112,16 +125,19 @@ public Mono<McpSchema.ListToolsResult> listTools(String cursor) {
 
 	/**
 	 * Send a resources/list request.
+	 * 
 	 * @param cursor the cursor
 	 * @return the list of resources result.
 	 */
 	public Mono<McpSchema.ListResourcesResult> listResources(String cursor) {
 		return this.sendRequest("resources/list", new McpSchema.PaginatedRequest(cursor),
-				new TypeReference<McpSchema.ListResourcesResult>() {});
+				new TypeReference<McpSchema.ListResourcesResult>() {
+				});
 	}
 
 	/**
 	 * Send a resources/read request.
+	 * 
 	 * @param resource the resource to read
 	 * @return the resource content.
 	 */
@@ -131,56 +147,69 @@ public Mono<McpSchema.ReadResourceResult> readResource(McpSchema.Resource resour
 
 	/**
 	 * Send a resources/read request.
+	 * 
 	 * @param readResourceRequest the read resource request.
 	 * @return the resource content.
 	 */
 	public Mono<McpSchema.ReadResourceResult> readResource(McpSchema.ReadResourceRequest readResourceRequest) {
 		return this.sendRequest("resources/read", readResourceRequest,
-				new TypeReference<McpSchema.ReadResourceResult>() {});
+				new TypeReference<McpSchema.ReadResourceResult>() {
+				});
 	}
 
 	/**
 	 * Resource templates allow servers to expose parameterized resources using URI
 	 * templates. Arguments may be auto-completed through the completion API.
 	 *
 	 * Request a list of resource templates the server has.
+	 * 
 	 * @param cursor the cursor
 	 * @return the list of resource templates result.
 	 */
 	public Mono<McpSchema.ListResourceTemplatesResult> listResourceTemplates(String cursor) {
 		return this.sendRequest("resources/templates/list", new McpSchema.PaginatedRequest(cursor),
-				new TypeReference<McpSchema.ListResourceTemplatesResult>() {});
+				new TypeReference<McpSchema.ListResourceTemplatesResult>() {
+				});
 	}
 
 	/**
-	 * List Changed Notification. When the list of available resources changes, servers
+	 * List Changed Notification. When the list of available resources changes,
+	 * servers
 	 * that declared the listChanged capability SHOULD send a notification:
 	 */
 	public Mono<Void> sendResourcesListChanged() {
 		return this.sendNotification("notifications/resources/list_changed");
 	}
 
 	/**
-	 * Subscriptions. The protocol supports optional subscriptions to resource changes.
-	 * Clients can subscribe to specific resources and receive notifications when they
+	 * Subscriptions. The protocol supports optional subscriptions to resource
+	 * changes.
+	 * Clients can subscribe to specific resources and receive notifications when
+	 * they
 	 * change.
 	 *
 	 * Send a resources/subscribe request.
-	 * @param subscribeRequest the subscribe request contains the uri of the resource to
-	 * subscribe to.
+	 * 
+	 * @param subscribeRequest the subscribe request contains the uri of the
+	 *                         resource to
+	 *                         subscribe to.
 	 */
 	public Mono<Void> subscribeResource(McpSchema.SubscribeRequest subscribeRequest) {
 		return this.sendRequest("resources/subscribe", subscribeRequest,
-				new TypeReference<Void>() {});
+				new TypeReference<Void>() {
+				});
 	}
 
 	/**
 	 * Send a resources/unsubscribe request.
-	 * @param unsubscribeRequest the unsubscribe request contains the uri of the resource
-	 * to unsubscribe from.
+	 * 
+	 * @param unsubscribeRequest the unsubscribe request contains the uri of the
+	 *                           resource
+	 *                           to unsubscribe from.
 	 */
 	public Mono<Void> unsubscribeResource(McpSchema.UnsubscribeRequest unsubscribeRequest) {
 		return this.sendRequest("resources/unsubscribe", unsubscribeRequest,
-				new TypeReference<Void>() {});
+				new TypeReference<Void>() {
+				});
 	}
 }

mcp/src/main/java/spring/ai/experimental/mcp/client/McpClient.java

@@ -18,15 +18,14 @@
 import java.time.Duration;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import spring.ai.experimental.mcp.spec.McpAsyncTransport;
+import spring.ai.experimental.mcp.spec.McpTransport;
 
 /**
  * The MCP client is the main entry point for interacting with the Model Context Protocol
  * (MCP) server.
  * 
- * 
  * @author Christian Tzolov
- * @since 1.0.0
+ * @author Dariusz Jędrzejczyk
  */
 public class McpClient {
 
@@ -40,20 +39,20 @@ private McpClient() {
 	//                                               JSONtoPOJOCodec type
 	//           .sync();
 
-	public static McpAsyncClient async(McpAsyncTransport transport) {
+	public static McpAsyncClient async(McpTransport transport) {
 		return new McpAsyncClient(transport);
 	}
 
-	public static McpAsyncClient async(McpAsyncTransport transport, Duration requestTimeout,
+	public static McpAsyncClient async(McpTransport transport, Duration requestTimeout,
 			ObjectMapper objectMapper) {
 		return new McpAsyncClient(transport, requestTimeout, objectMapper);
 	}
 
-	public static McpSyncClient sync(McpAsyncTransport transport) {
+	public static McpSyncClient sync(McpTransport transport) {
 		return new McpSyncClient(async(transport));
 	}
 
-	public static McpSyncClient sync(McpAsyncTransport transport, Duration requestTimeout,
+	public static McpSyncClient sync(McpTransport transport, Duration requestTimeout,
 			ObjectMapper objectMapper) {
 		return new McpSyncClient(async(transport, requestTimeout, objectMapper));
 	}

mcp/src/main/java/spring/ai/experimental/mcp/client/McpSyncClient.java

@@ -5,6 +5,10 @@
 import spring.ai.experimental.mcp.client.util.Assert;
 import spring.ai.experimental.mcp.spec.McpSchema;
 
+/**
+ * @author Dariusz Jędrzejczyk
+ * @author Christian Tzolov
+ */
 public class McpSyncClient implements AutoCloseable {
 
 	// TODO: Consider providing a client config to set this properly

mcp/src/main/java/spring/ai/experimental/mcp/client/stdio/ServerParameters.java

@@ -13,6 +13,9 @@
 
 /**
  * Server parameters for stdio client.
+ * 
+ * @author Christian Tzolov
+ * @author Dariusz Jędrzejczyk
  */
 @JsonInclude(JsonInclude.Include.NON_ABSENT)
 public class ServerParameters {

mcp/src/main/java/spring/ai/experimental/mcp/client/stdio/ServerParametersParser.java

@@ -25,7 +25,7 @@
 
 /**
  * @author Christian Tzolov
- * @since 1.0.0
+ * @author Dariusz Jędrzejczyk
  */
 
 public class ServerParametersParser {

mcp/src/main/java/spring/ai/experimental/mcp/client/stdio/StdioServerTransport.java

@@ -21,6 +21,9 @@
 
 /**
  * Stdio client for communicating with a server process.
+ * 
+ * @author Christian Tzolov
+ * @author Dariusz Jędrzejczyk
  */
 public class StdioServerTransport extends DefaultMcpTransport {
 

mcp/src/main/java/spring/ai/experimental/mcp/spec/DefaultMcpTransport.java

@@ -25,9 +25,9 @@
 
 /**
  * @author Christian Tzolov
- * @since 1.0.0
+ * @author Dariusz Jędrzejczyk
  */
-public class DefaultMcpTransport implements McpAsyncTransport {
+public class DefaultMcpTransport implements McpTransport {
 
 	protected final ObjectMapper objectMapper;
 
@@ -93,7 +93,7 @@ public void setInboudMessageHandler(Consumer<JSONRPCMessage> inboundMessageHandl
 		this.inboundMessageHandler = inboundMessageHandler;
 	}
 
-	public void setErrorHandler(Consumer<String> errorHandler) {
+	public void setInboundErrorHandler(Consumer<String> errorHandler) {
 		this.errorHandler = errorHandler;
 	}