Clean the code and add more tests

Author: tzolov

mcp/pom.xml

@@ -55,6 +55,11 @@
 			<version>5.11.0</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>io.projectreactor</groupId>
+			<artifactId>reactor-test</artifactId>
+			<scope>test</scope>
+		</dependency>
 
 		<!-- <dependency>
 			<groupId>org.springframework.ai</groupId>
@@ -114,4 +119,4 @@
 		</repository>
 	</repositories>
 
-</project>
+</project>

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

@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import reactor.core.publisher.Mono;
+import spring.ai.mcp.spec.McpAsyncSession;
 import spring.ai.mcp.spec.McpAsyncTransport;
 import spring.ai.mcp.spec.McpSchema;
 

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

@@ -16,30 +16,9 @@
 package spring.ai.mcp.client;
 
 import java.time.Duration;
-import java.util.concurrent.CompletableFuture;
 
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import spring.ai.mcp.spec.McpAsyncTransport;
-import spring.ai.mcp.spec.McpTransport;
-import spring.ai.mcp.spec.McpSchema;
-import spring.ai.mcp.spec.McpSession;
-import spring.ai.mcp.spec.McpTransport;
-import spring.ai.mcp.spec.McpSchema.CallToolRequest;
-import spring.ai.mcp.spec.McpSchema.CallToolResult;
-import spring.ai.mcp.spec.McpSchema.ClientCapabilities;
-import spring.ai.mcp.spec.McpSchema.Implementation;
-import spring.ai.mcp.spec.McpSchema.InitializeRequest;
-import spring.ai.mcp.spec.McpSchema.InitializeResult;
-import spring.ai.mcp.spec.McpSchema.ListResourceTemplatesResult;
-import spring.ai.mcp.spec.McpSchema.ListResourcesResult;
-import spring.ai.mcp.spec.McpSchema.ListToolsResult;
-import spring.ai.mcp.spec.McpSchema.PaginatedRequest;
-import spring.ai.mcp.spec.McpSchema.ReadResourceRequest;
-import spring.ai.mcp.spec.McpSchema.Resource;
-import spring.ai.mcp.spec.McpSchema.SubscribeRequest;
-import spring.ai.mcp.spec.McpSchema.UnsubscribeRequest;
-import spring.ai.mcp.spec.McpSchema.ClientCapabilities.RootCapabilities;
 
 /**
  * The MCP client is the main entry point for interacting with the Model Context Protocol

mcp/src/main/java/spring/ai/mcp/client/stdio/StdioServerParameters.java renamed to mcp/src/main/java/spring/ai/mcp/client/stdio/ServerParameters.java

@@ -7,13 +7,15 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import spring.ai.mcp.client.util.Assert;
 
 /**
  * Server parameters for stdio client.
  */
-public class StdioServerParameters {
+@JsonInclude(JsonInclude.Include.NON_ABSENT)
+public class ServerParameters {
 
 	// Environment variables to inherit by default
 	private static final List<String> DEFAULT_INHERITED_ENV_VARS = System.getProperty("os.name")
@@ -32,7 +34,7 @@ public class StdioServerParameters {
 	@JsonProperty("env")
 	private Map<String, String> env;
 
-	private StdioServerParameters(String command, List<String> args, Map<String, String> env) {
+	private ServerParameters(String command, List<String> args, Map<String, String> env) {
 		Assert.notNull(command, "The command can not be null");
 		Assert.notNull(args, "The args can not be null");
 
@@ -105,8 +107,8 @@ public Builder addEnvVar(String key, String value) {
 			return this;
 		}
 
-		public StdioServerParameters build() {
-			return new StdioServerParameters(command, args, env);
+		public ServerParameters build() {
+			return new ServerParameters(command, args, env);
 		}
 
 	}

mcp/src/main/java/spring/ai/mcp/client/util/McpServerParameterParser.java renamed to mcp/src/main/java/spring/ai/mcp/client/stdio/ServerParametersParser.java

@@ -13,30 +13,31 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package spring.ai.mcp.client.util;
+package spring.ai.mcp.client.stdio;
 
 import java.util.Map;
+import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import spring.ai.mcp.client.util.McpServerParameterParser.McpServers.McpServer;
+import spring.ai.mcp.client.stdio.ServerParametersParser.McpServerConfigurations.McpServerConfiguration;
 
 /**
  * @author Christian Tzolov
  * @since 1.0.0
  */
 
-public class McpServerParameterParser {
+public class ServerParametersParser {
 
 	@JsonInclude(JsonInclude.Include.NON_ABSENT)
-	public record McpServers(// @formatter:off
-		@JsonProperty("mcpServers") Map<String, McpServer> mcpServers) {
+	public record McpServerConfigurations(// @formatter:off
+		@JsonProperty("mcpServers") Map<String, McpServerConfiguration> mcpServers) {
 
 		@JsonInclude(JsonInclude.Include.NON_ABSENT)
-		public record McpServer(
+		public record McpServerConfiguration(
 			@JsonProperty("command") String command,
-			@JsonProperty("args") String[] args,
+			@JsonProperty("args") List<String> args,
 			@JsonProperty("env") Map<String, String> env) {
 		}
 	} // @formatter:on
@@ -72,10 +73,10 @@ public static void main(String[] args) throws Exception {
 								""";
 
 		// Deserialize JSON into McpServers
-		McpServers servers = objectMapper.readValue(jsonInput, McpServers.class);
+		McpServerConfigurations servers = objectMapper.readValue(jsonInput, McpServerConfigurations.class);
 
 		// Access individual servers
-		for (Map.Entry<String, McpServer> entry : servers.mcpServers().entrySet()) {
+		for (Map.Entry<String, McpServerConfiguration> entry : servers.mcpServers().entrySet()) {
 			System.out.println("Key: " + entry.getKey());
 			System.out.println("Command: " + entry.getValue().command());
 			System.out.println("Arguments: " + String.join(", ", entry.getValue().args()));