fix: resolve compilation errors after rebase onto upstream main

Author: LucaButBoring

mcp-core/src/test/java/io/modelcontextprotocol/experimental/tasks/InMemoryTaskStoreTests.java

@@ -57,7 +57,7 @@ void tearDown() {
 	// ------------------------------------------
 
 	private CallToolResult createTestResult(String text) {
-		return CallToolResult.builder().content(List.of(new TextContent(null, null, text))).isError(false).build();
+		return CallToolResult.builder().content(List.of(new TextContent(null, text))).isError(false).build();
 	}
 
 	/**

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

@@ -704,7 +704,8 @@ void testPingMultipleCalls() {
 
 	@Test
 	void testListTasksWithNullCapabilities() {
-		McpAsyncServerExchange exchangeWithNullCapabilities = new McpAsyncServerExchange(mockSession, null, clientInfo);
+		McpAsyncServerExchange exchangeWithNullCapabilities = new McpAsyncServerExchange("testSessionId", mockSession,
+				null, clientInfo, McpTransportContext.EMPTY);
 
 		StepVerifier.create(exchangeWithNullCapabilities.listTasks("cursor")).verifyErrorSatisfies(error -> {
 			assertThat(error).isInstanceOf(IllegalStateException.class)
@@ -720,8 +721,8 @@ void testListTasksWithoutTasksCapabilities() {
 			.roots(true)
 			.build();
 
-		McpAsyncServerExchange exchangeWithoutTasks = new McpAsyncServerExchange(mockSession, capabilitiesWithoutTasks,
-				clientInfo);
+		McpAsyncServerExchange exchangeWithoutTasks = new McpAsyncServerExchange("testSessionId", mockSession,
+				capabilitiesWithoutTasks, clientInfo, McpTransportContext.EMPTY);
 
 		StepVerifier.create(exchangeWithoutTasks.listTasks("cursor")).verifyErrorSatisfies(error -> {
 			assertThat(error).isInstanceOf(IllegalStateException.class)
@@ -737,8 +738,8 @@ void testListTasksWithoutListCapability() {
 			.tasks(McpSchema.ClientCapabilities.ClientTaskCapabilities.builder().build())
 			.build();
 
-		McpAsyncServerExchange exchangeWithoutList = new McpAsyncServerExchange(mockSession, capabilitiesWithoutList,
-				clientInfo);
+		McpAsyncServerExchange exchangeWithoutList = new McpAsyncServerExchange("testSessionId", mockSession,
+				capabilitiesWithoutList, clientInfo, McpTransportContext.EMPTY);
 
 		StepVerifier.create(exchangeWithoutList.listTasks("cursor")).verifyErrorSatisfies(error -> {
 			assertThat(error).isInstanceOf(IllegalStateException.class)
@@ -854,7 +855,8 @@ void testListTasksWithMultiplePages() {
 
 	@Test
 	void testCancelTaskWithNullCapabilities() {
-		McpAsyncServerExchange exchangeWithNullCapabilities = new McpAsyncServerExchange(mockSession, null, clientInfo);
+		McpAsyncServerExchange exchangeWithNullCapabilities = new McpAsyncServerExchange("testSessionId", mockSession,
+				null, clientInfo, McpTransportContext.EMPTY);
 
 		StepVerifier
 			.create(exchangeWithNullCapabilities
@@ -873,8 +875,8 @@ void testCancelTaskWithoutTasksCapabilities() {
 			.roots(true)
 			.build();
 
-		McpAsyncServerExchange exchangeWithoutTasks = new McpAsyncServerExchange(mockSession, capabilitiesWithoutTasks,
-				clientInfo);
+		McpAsyncServerExchange exchangeWithoutTasks = new McpAsyncServerExchange("testSessionId", mockSession,
+				capabilitiesWithoutTasks, clientInfo, McpTransportContext.EMPTY);
 
 		StepVerifier
 			.create(exchangeWithoutTasks.cancelTask(McpSchema.CancelTaskRequest.builder().taskId("task-1").build()))
@@ -892,8 +894,8 @@ void testCancelTaskWithoutCancelCapability() {
 			.tasks(McpSchema.ClientCapabilities.ClientTaskCapabilities.builder().build())
 			.build();
 
-		McpAsyncServerExchange exchangeWithoutCancel = new McpAsyncServerExchange(mockSession,
-				capabilitiesWithoutCancel, clientInfo);
+		McpAsyncServerExchange exchangeWithoutCancel = new McpAsyncServerExchange("testSessionId", mockSession,
+				capabilitiesWithoutCancel, clientInfo, McpTransportContext.EMPTY);
 
 		StepVerifier
 			.create(exchangeWithoutCancel.cancelTask(McpSchema.CancelTaskRequest.builder().taskId("task-1").build()))

mcp-test/src/main/java/io/modelcontextprotocol/server/AbstractMcpAsyncServerTests.java

@@ -837,7 +837,7 @@ void builderShouldThrowWhenNormalToolAndTaskToolShareSameName() {
 
 		assertThatThrownBy(() -> {
 			prepareAsyncServerBuilder()
-				.tool(normalTool,
+				.toolCall(normalTool,
 						(exchange, args) -> Mono
 							.just(CallToolResult.builder().content(List.of()).isError(false).build()))
 				.taskTools(TaskAwareAsyncToolSpecification.builder()

mcp-test/src/main/java/io/modelcontextprotocol/server/AbstractMcpSyncServerTests.java

@@ -672,7 +672,7 @@ void testToolWithTaskSupportRequired() {
 		var server = prepareSyncServerBuilder().serverInfo("test-server", "1.0.0")
 			.capabilities(TaskTestUtils.DEFAULT_TASK_CAPABILITIES)
 			.taskStore(taskStore)
-			.tool(taskTool,
+			.toolCall(taskTool,
 					(exchange, args) -> CallToolResult.builder()
 						.content(List.of(new McpSchema.TextContent("Task completed!")))
 						.isError(false)
@@ -692,7 +692,7 @@ void testToolWithTaskSupportOptional() {
 		var server = prepareSyncServerBuilder().serverInfo("test-server", "1.0.0")
 			.capabilities(TaskTestUtils.DEFAULT_TASK_CAPABILITIES)
 			.taskStore(taskStore)
-			.tool(taskTool, (exchange, args) -> CallToolResult.builder().content(List.of()).isError(false).build())
+			.toolCall(taskTool, (exchange, args) -> CallToolResult.builder().content(List.of()).isError(false).build())
 			.build();
 
 		assertThatCode(server::closeGracefully).doesNotThrowAnyException();