Correct tests and remaining problems

Signed-off-by: Dariusz Jędrzejczyk <dariusz.jedrzejczyk@broadcom.com>

Author: chemicL

mcp-core/src/main/java/io/modelcontextprotocol/client/transport/HttpClientSseClientTransport.java

@@ -185,7 +185,8 @@ public static class Builder {
 			// Default constructor
 		}
 
-		/** Sets the base URI.
+		/**
+		 * Sets the base URI.
 		 * @param baseUri the base URI
 		 * @return this builder
 		 */

mcp-core/src/main/java/io/modelcontextprotocol/server/McpAsyncServerExchange.java

@@ -49,7 +49,8 @@ public class McpAsyncServerExchange {
 	public static final TypeRef<Object> OBJECT_TYPE_REF = new TypeRef<>() {
 	};
 
-	/** Create a new asynchronous exchange with the client.
+	/**
+	 * Create a new asynchronous exchange with the client.
 	 * @param session The server session representing a 1-1 interaction.
 	 * @param clientCapabilities The client capabilities that define the supported
 	 * features and functionality.
@@ -119,7 +120,8 @@ public String sessionId() {
 	 */
 	public Mono<McpSchema.CreateMessageResult> createMessage(McpSchema.CreateMessageRequest createMessageRequest) {
 		if (this.clientCapabilities == null) {
-			return Mono.error(new IllegalStateException("Client must be initialized. Call the initialize method first!"));
+			return Mono
+				.error(new IllegalStateException("Client must be initialized. Call the initialize method first!"));
 		}
 		if (this.clientCapabilities.sampling() == null) {
 			return Mono.error(new IllegalStateException("Client must be configured with sampling capabilities"));
@@ -144,7 +146,8 @@ public Mono<McpSchema.CreateMessageResult> createMessage(McpSchema.CreateMessage
 	 */
 	public Mono<McpSchema.ElicitResult> createElicitation(McpSchema.ElicitRequest elicitRequest) {
 		if (this.clientCapabilities == null) {
-			return Mono.error(new IllegalStateException("Client must be initialized. Call the initialize method first!"));
+			return Mono
+				.error(new IllegalStateException("Client must be initialized. Call the initialize method first!"));
 		}
 		if (this.clientCapabilities.elicitation() == null) {
 			return Mono.error(new IllegalStateException("Client must be configured with elicitation capabilities"));

mcp-core/src/main/java/io/modelcontextprotocol/spec/McpClientSession.java

@@ -96,7 +96,8 @@ public interface NotificationHandler {
 
 	}
 
-	/** Creates a new McpClientSession with the specified configuration and handlers.
+	/**
+	 * Creates a new McpClientSession with the specified configuration and handlers.
 	 * @param requestTimeout Duration to wait for responses
 	 * @param transport Transport implementation for message exchange
 	 * @param requestHandlers Map of method names to request handlers

mcp-core/src/test/java/io/modelcontextprotocol/server/AsyncToolSpecificationBuilderTest.java

@@ -106,12 +106,8 @@ void builtSpecificationShouldExecuteCallToolCorrectly() {
 
 		McpServerFeatures.AsyncToolSpecification specification = McpServerFeatures.AsyncToolSpecification.builder()
 			.tool(tool)
-			.callHandler((exchange, request) -> {
-				return Mono.just(CallToolResult.builder()
-					.content(List.of(new TextContent(expectedResult)))
-					.isError(false)
-					.build());
-			})
+			.callHandler((exchange, request) -> Mono.just(
+					CallToolResult.builder().content(List.of(new TextContent(expectedResult))).isError(false).build()))
 			.build();
 
 		CallToolRequest request = new CallToolRequest("calculator", Map.of());
@@ -129,30 +125,28 @@ void builtSpecificationShouldExecuteCallToolCorrectly() {
 	@Test
 	void fromSyncShouldConvertSyncToolSpecificationCorrectly() {
 		Tool tool = McpSchema.Tool.builder()
-				.name("sync-tool")
-				.title("A sync tool")
-				.inputSchema(EMPTY_JSON_SCHEMA)
-				.build();
+			.name("sync-tool")
+			.title("A sync tool")
+			.inputSchema(EMPTY_JSON_SCHEMA)
+			.build();
 		String expectedResult = "sync result";
 
 		// Create a sync tool specification
 		McpServerFeatures.SyncToolSpecification syncSpec = McpServerFeatures.SyncToolSpecification.builder()
-				.tool(tool)
-				.callHandler((exchange, request) -> CallToolResult.builder()
-						.content(List.of(new TextContent(expectedResult)))
-						.isError(false)
-						.build())
-				.build();
+			.tool(tool)
+			.callHandler((exchange, request) -> CallToolResult.builder()
+				.content(List.of(new TextContent(expectedResult)))
+				.isError(false)
+				.build())
+			.build();
 
 		// Convert to async using fromSync
 		McpServerFeatures.AsyncToolSpecification asyncSpec = McpServerFeatures.AsyncToolSpecification
-				.fromSync(syncSpec);
+			.fromSync(syncSpec);
 
 		assertThat(asyncSpec).isNotNull();
 		assertThat(asyncSpec.tool()).isEqualTo(tool);
 		assertThat(asyncSpec.callHandler()).isNotNull();
-		assertThat(asyncSpec.call()).isNull(); // should be null since sync spec doesn't
-		// have deprecated call
 
 		// Test that the converted async specification works correctly
 		CallToolRequest request = new CallToolRequest("sync-tool", Map.of("param", "value"));

mcp-core/src/test/java/io/modelcontextprotocol/server/McpAsyncServerExchangeTests.java

@@ -215,7 +215,7 @@ void testGetClientInfo() {
 	@Test
 	void testLoggingNotificationWithNullMessage() {
 		StepVerifier.create(exchange.loggingNotification(null)).verifyErrorSatisfies(error -> {
-			assertThat(error).isInstanceOf(McpError.class).hasMessage("Logging message must not be null");
+			assertThat(error).isInstanceOf(IllegalStateException.class).hasMessage("Logging message must not be null");
 		});
 	}
 
@@ -310,7 +310,7 @@ void testCreateElicitationWithNullCapabilities() {
 
 		StepVerifier.create(exchangeWithNullCapabilities.createElicitation(elicitRequest))
 			.verifyErrorSatisfies(error -> {
-				assertThat(error).isInstanceOf(McpError.class)
+				assertThat(error).isInstanceOf(IllegalStateException.class)
 					.hasMessage("Client must be initialized. Call the initialize method first!");
 			});
 
@@ -333,7 +333,7 @@ void testCreateElicitationWithoutElicitationCapabilities() {
 			.build();
 
 		StepVerifier.create(exchangeWithoutElicitation.createElicitation(elicitRequest)).verifyErrorSatisfies(error -> {
-			assertThat(error).isInstanceOf(McpError.class)
+			assertThat(error).isInstanceOf(IllegalStateException.class)
 				.hasMessage("Client must be configured with elicitation capabilities");
 		});
 
@@ -478,7 +478,7 @@ void testCreateMessageWithNullCapabilities() {
 
 		StepVerifier.create(exchangeWithNullCapabilities.createMessage(createMessageRequest))
 			.verifyErrorSatisfies(error -> {
-				assertThat(error).isInstanceOf(McpError.class)
+				assertThat(error).isInstanceOf(IllegalStateException.class)
 					.hasMessage("Client must be initialized. Call the initialize method first!");
 			});
 
@@ -503,7 +503,7 @@ void testCreateMessageWithoutSamplingCapabilities() {
 			.build();
 
 		StepVerifier.create(exchangeWithoutSampling.createMessage(createMessageRequest)).verifyErrorSatisfies(error -> {
-			assertThat(error).isInstanceOf(McpError.class)
+			assertThat(error).isInstanceOf(IllegalStateException.class)
 				.hasMessage("Client must be configured with sampling capabilities");
 		});
 

mcp-core/src/test/java/io/modelcontextprotocol/server/McpSyncServerExchangeTests.java

@@ -214,7 +214,7 @@ void testGetClientInfo() {
 
 	@Test
 	void testLoggingNotificationWithNullMessage() {
-		assertThatThrownBy(() -> exchange.loggingNotification(null)).isInstanceOf(McpError.class)
+		assertThatThrownBy(() -> exchange.loggingNotification(null)).isInstanceOf(IllegalStateException.class)
 			.hasMessage("Logging message must not be null");
 	}
 
@@ -306,7 +306,7 @@ void testCreateElicitationWithNullCapabilities() {
 			.build();
 
 		assertThatThrownBy(() -> exchangeWithNullCapabilities.createElicitation(elicitRequest))
-			.isInstanceOf(McpError.class)
+			.isInstanceOf(IllegalStateException.class)
 			.hasMessage("Client must be initialized. Call the initialize method first!");
 
 		// Verify that sendRequest was never called due to null capabilities
@@ -329,7 +329,7 @@ void testCreateElicitationWithoutElicitationCapabilities() {
 			.build();
 
 		assertThatThrownBy(() -> exchangeWithoutElicitation.createElicitation(elicitRequest))
-			.isInstanceOf(McpError.class)
+			.isInstanceOf(IllegalStateException.class)
 			.hasMessage("Client must be configured with elicitation capabilities");
 
 		// Verify that sendRequest was never called due to missing elicitation
@@ -478,7 +478,7 @@ void testCreateMessageWithNullCapabilities() {
 			.build();
 
 		assertThatThrownBy(() -> exchangeWithNullCapabilities.createMessage(createMessageRequest))
-			.isInstanceOf(McpError.class)
+			.isInstanceOf(IllegalStateException.class)
 			.hasMessage("Client must be initialized. Call the initialize method first!");
 
 		// Verify that sendRequest was never called due to null capabilities
@@ -503,7 +503,7 @@ void testCreateMessageWithoutSamplingCapabilities() {
 			.build();
 
 		assertThatThrownBy(() -> exchangeWithoutSampling.createMessage(createMessageRequest))
-			.isInstanceOf(McpError.class)
+			.isInstanceOf(IllegalStateException.class)
 			.hasMessage("Client must be configured with sampling capabilities");
 
 		// Verify that sendRequest was never called due to missing sampling capabilities

mcp-test/src/test/java/io/modelcontextprotocol/server/transport/StdioServerTransportProviderTests.java

@@ -185,7 +185,7 @@ void shouldHandleNotificationBeforeSessionFactoryIsSet() {
 		// Send notification before setting session factory
 		StepVerifier.create(transportProvider.notifyClients("testNotification", Map.of("key", "value")))
 			.verifyErrorSatisfies(error -> {
-				assertThat(error).isInstanceOf(McpError.class);
+				assertThat(error).isInstanceOf(IllegalStateException.class);
 			});
 	}