Skip to content

Commit 8d194c8

Browse files
tzolovtzolov
committed
Revert the McpClientTransport breaking change back to ClientMcpTransport
Signed-off-by: Christian Tzolov <[email protected]>
1 parent 1b122c9 commit 8d194c8

File tree

13 files changed

+42
-43
lines changed

13 files changed

+42
-43
lines changed

‎mcp-spring/mcp-spring-webflux/src/main/java/io/modelcontextprotocol/client/transport/WebFluxSseClientTransport.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import com.fasterxml.jackson.core.type.TypeReference;
1111
import com.fasterxml.jackson.databind.ObjectMapper;
12-
import io.modelcontextprotocol.spec.McpClientTransport;
12+
import io.modelcontextprotocol.spec.ClientMcpTransport;
1313
import io.modelcontextprotocol.spec.McpError;
1414
import io.modelcontextprotocol.spec.McpSchema;
1515
import io.modelcontextprotocol.spec.McpSchema.JSONRPCMessage;
@@ -58,7 +58,7 @@
5858
* "https://spec.modelcontextprotocol.io/specification/basic/transports/#http-with-sse">MCP
5959
* HTTP with SSE Transport Specification</a>
6060
*/
61-
public class WebFluxSseClientTransport implements McpClientTransport {
61+
public class WebFluxSseClientTransport implements ClientMcpTransport {
6262

6363
private static final Logger logger = LoggerFactory.getLogger(WebFluxSseClientTransport.class);
6464

‎mcp-spring/mcp-spring-webflux/src/test/java/io/modelcontextprotocol/client/WebFluxSseMcpAsyncClientTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import java.time.Duration;
88

99
import io.modelcontextprotocol.client.transport.WebFluxSseClientTransport;
10-
import io.modelcontextprotocol.spec.McpClientTransport;
10+
import io.modelcontextprotocol.spec.ClientMcpTransport;
1111
import org.junit.jupiter.api.Timeout;
1212
import org.testcontainers.containers.GenericContainer;
1313
import org.testcontainers.containers.wait.strategy.Wait;
@@ -32,7 +32,7 @@ class WebFluxSseMcpAsyncClientTests extends AbstractMcpAsyncClientTests {
3232
.waitingFor(Wait.forHttp("/").forStatusCode(404));
3333

3434
@Override
35-
protected McpClientTransport createMcpTransport() {
35+
protected ClientMcpTransport createMcpTransport() {
3636
return new WebFluxSseClientTransport(WebClient.builder().baseUrl(host));
3737
}
3838

‎mcp-spring/mcp-spring-webflux/src/test/java/io/modelcontextprotocol/client/WebFluxSseMcpSyncClientTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import java.time.Duration;
88

99
import io.modelcontextprotocol.client.transport.WebFluxSseClientTransport;
10-
import io.modelcontextprotocol.spec.McpClientTransport;
10+
import io.modelcontextprotocol.spec.ClientMcpTransport;
1111
import org.junit.jupiter.api.Timeout;
1212
import org.testcontainers.containers.GenericContainer;
1313
import org.testcontainers.containers.wait.strategy.Wait;
@@ -32,7 +32,7 @@ class WebFluxSseMcpSyncClientTests extends AbstractMcpSyncClientTests {
3232
.waitingFor(Wait.forHttp("/").forStatusCode(404));
3333

3434
@Override
35-
protected McpClientTransport createMcpTransport() {
35+
protected ClientMcpTransport createMcpTransport() {
3636
return new WebFluxSseClientTransport(WebClient.builder().baseUrl(host));
3737
}
3838

‎mcp-test/src/main/java/io/modelcontextprotocol/client/AbstractMcpAsyncClientTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import java.util.concurrent.atomic.AtomicBoolean;
1010
import java.util.function.Function;
1111

12-
import io.modelcontextprotocol.spec.McpClientTransport;
12+
import io.modelcontextprotocol.spec.ClientMcpTransport;
1313
import io.modelcontextprotocol.spec.McpError;
1414
import io.modelcontextprotocol.spec.McpSchema;
1515
import io.modelcontextprotocol.spec.McpSchema.CallToolRequest;
@@ -46,11 +46,11 @@ public abstract class AbstractMcpAsyncClientTests {
4646

4747
private McpAsyncClient mcpAsyncClient;
4848

49-
protected McpClientTransport mcpTransport;
49+
protected ClientMcpTransport mcpTransport;
5050

5151
private static final String ECHO_TEST_MESSAGE = "Hello MCP Spring AI!";
5252

53-
abstract protected McpClientTransport createMcpTransport();
53+
abstract protected ClientMcpTransport createMcpTransport();
5454

5555
protected void onStart() {
5656
}

‎mcp-test/src/main/java/io/modelcontextprotocol/client/AbstractMcpSyncClientTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import java.util.Map;
99
import java.util.concurrent.atomic.AtomicBoolean;
1010

11-
import io.modelcontextprotocol.spec.McpClientTransport;
11+
import io.modelcontextprotocol.spec.ClientMcpTransport;
1212
import io.modelcontextprotocol.spec.McpError;
1313
import io.modelcontextprotocol.spec.McpSchema;
1414
import io.modelcontextprotocol.spec.McpSchema.CallToolRequest;
@@ -44,9 +44,9 @@ public abstract class AbstractMcpSyncClientTests {
4444

4545
private static final String TEST_MESSAGE = "Hello MCP Spring AI!";
4646

47-
protected McpClientTransport mcpTransport;
47+
protected ClientMcpTransport mcpTransport;
4848

49-
abstract protected McpClientTransport createMcpTransport();
49+
abstract protected ClientMcpTransport createMcpTransport();
5050

5151
abstract protected void onStart();
5252

‎mcp/src/main/java/io/modelcontextprotocol/client/transport/HttpClientSseClientTransport.java‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,6 @@
33
*/
44
package io.modelcontextprotocol.client.transport;
55

6-
import com.fasterxml.jackson.core.type.TypeReference;
7-
import com.fasterxml.jackson.databind.ObjectMapper;
8-
import io.modelcontextprotocol.client.transport.FlowSseClient.SseEvent;
9-
import io.modelcontextprotocol.spec.ClientMcpTransport;
10-
import io.modelcontextprotocol.spec.McpClientTransport;
11-
import io.modelcontextprotocol.spec.McpError;
12-
import io.modelcontextprotocol.spec.McpSchema;
13-
import io.modelcontextprotocol.spec.McpSchema.JSONRPCMessage;
14-
import io.modelcontextprotocol.util.Assert;
15-
import org.slf4j.Logger;
16-
import org.slf4j.LoggerFactory;
17-
import reactor.core.publisher.Mono;
18-
196
import java.io.IOException;
207
import java.net.URI;
218
import java.net.http.HttpClient;
@@ -28,6 +15,18 @@
2815
import java.util.concurrent.atomic.AtomicReference;
2916
import java.util.function.Function;
3017

18+
import com.fasterxml.jackson.core.type.TypeReference;
19+
import com.fasterxml.jackson.databind.ObjectMapper;
20+
import io.modelcontextprotocol.client.transport.FlowSseClient.SseEvent;
21+
import io.modelcontextprotocol.spec.ClientMcpTransport;
22+
import io.modelcontextprotocol.spec.McpError;
23+
import io.modelcontextprotocol.spec.McpSchema;
24+
import io.modelcontextprotocol.spec.McpSchema.JSONRPCMessage;
25+
import io.modelcontextprotocol.util.Assert;
26+
import org.slf4j.Logger;
27+
import org.slf4j.LoggerFactory;
28+
import reactor.core.publisher.Mono;
29+
3130
/**
3231
* Server-Sent Events (SSE) implementation of the
3332
* {@link io.modelcontextprotocol.spec.McpTransport} that follows the MCP HTTP with SSE
@@ -53,9 +52,9 @@
5352
*
5453
* @author Christian Tzolov
5554
* @see io.modelcontextprotocol.spec.McpTransport
56-
* @see io.modelcontextprotocol.spec.McpClientTransport
55+
* @see io.modelcontextprotocol.spec.ClientMcpTransport
5756
*/
58-
public class HttpClientSseClientTransport implements McpClientTransport {
57+
public class HttpClientSseClientTransport implements ClientMcpTransport {
5958

6059
private static final Logger logger = LoggerFactory.getLogger(HttpClientSseClientTransport.class);
6160

‎mcp/src/main/java/io/modelcontextprotocol/client/transport/StdioClientTransport.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import com.fasterxml.jackson.core.type.TypeReference;
2020
import com.fasterxml.jackson.databind.ObjectMapper;
21-
import io.modelcontextprotocol.spec.McpClientTransport;
21+
import io.modelcontextprotocol.spec.ClientMcpTransport;
2222
import io.modelcontextprotocol.spec.McpSchema;
2323
import io.modelcontextprotocol.spec.McpSchema.JSONRPCMessage;
2424
import io.modelcontextprotocol.util.Assert;
@@ -38,7 +38,7 @@
3838
* @author Christian Tzolov
3939
* @author Dariusz Jędrzejczyk
4040
*/
41-
public class StdioClientTransport implements McpClientTransport {
41+
public class StdioClientTransport implements ClientMcpTransport {
4242

4343
private static final Logger logger = LoggerFactory.getLogger(StdioClientTransport.class);
4444

‎mcp/src/test/java/io/modelcontextprotocol/client/AbstractMcpAsyncClientTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import java.util.concurrent.atomic.AtomicBoolean;
1010
import java.util.function.Function;
1111

12-
import io.modelcontextprotocol.spec.McpClientTransport;
12+
import io.modelcontextprotocol.spec.ClientMcpTransport;
1313
import io.modelcontextprotocol.spec.McpError;
1414
import io.modelcontextprotocol.spec.McpSchema;
1515
import io.modelcontextprotocol.spec.McpSchema.CallToolRequest;
@@ -47,11 +47,11 @@ public abstract class AbstractMcpAsyncClientTests {
4747

4848
private McpAsyncClient mcpAsyncClient;
4949

50-
protected McpClientTransport mcpTransport;
50+
protected ClientMcpTransport mcpTransport;
5151

5252
private static final String ECHO_TEST_MESSAGE = "Hello MCP Spring AI!";
5353

54-
abstract protected McpClientTransport createMcpTransport();
54+
abstract protected ClientMcpTransport createMcpTransport();
5555

5656
protected void onStart() {
5757
}

‎mcp/src/test/java/io/modelcontextprotocol/client/AbstractMcpSyncClientTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import java.util.Map;
99
import java.util.concurrent.atomic.AtomicBoolean;
1010

11-
import io.modelcontextprotocol.spec.McpClientTransport;
11+
import io.modelcontextprotocol.spec.ClientMcpTransport;
1212
import io.modelcontextprotocol.spec.McpError;
1313
import io.modelcontextprotocol.spec.McpSchema;
1414
import io.modelcontextprotocol.spec.McpSchema.CallToolRequest;
@@ -45,9 +45,9 @@ public abstract class AbstractMcpSyncClientTests {
4545

4646
private static final String TEST_MESSAGE = "Hello MCP Spring AI!";
4747

48-
protected McpClientTransport mcpTransport;
48+
protected ClientMcpTransport mcpTransport;
4949

50-
abstract protected McpClientTransport createMcpTransport();
50+
abstract protected ClientMcpTransport createMcpTransport();
5151

5252
abstract protected void onStart();
5353

‎mcp/src/test/java/io/modelcontextprotocol/client/ServletSseMcpAsyncClientTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import java.time.Duration;
88

99
import io.modelcontextprotocol.client.transport.HttpClientSseClientTransport;
10-
import io.modelcontextprotocol.spec.McpClientTransport;
10+
import io.modelcontextprotocol.spec.ClientMcpTransport;
1111
import org.junit.jupiter.api.Timeout;
1212
import org.testcontainers.containers.GenericContainer;
1313
import org.testcontainers.containers.wait.strategy.Wait;
@@ -30,7 +30,7 @@ class ServletSseMcpAsyncClientTests extends AbstractMcpAsyncClientTests {
3030
.waitingFor(Wait.forHttp("/").forStatusCode(404));
3131

3232
@Override
33-
protected McpClientTransport createMcpTransport() {
33+
protected ClientMcpTransport createMcpTransport() {
3434
return new HttpClientSseClientTransport(host);
3535
}
3636

0 commit comments

Comments
 (0)