Skip to content

Commit 7762e2e

Browse files
committed
Added test changes
1 parent d518303 commit 7762e2e

File tree

84 files changed

+477
-429
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+477
-429
lines changed

mcp-core/src/main/java/io/modelcontextprotocol/client/LifecycleInitializer.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@
1111
import java.util.concurrent.atomic.AtomicReference;
1212
import java.util.function.Function;
1313

14+
import org.slf4j.Logger;
15+
import org.slf4j.LoggerFactory;
16+
1417
import io.modelcontextprotocol.spec.McpClientSession;
1518
import io.modelcontextprotocol.spec.McpError;
1619
import io.modelcontextprotocol.spec.McpSchema;
1720
import io.modelcontextprotocol.spec.McpTransportSessionNotFoundException;
1821
import io.modelcontextprotocol.util.Assert;
19-
import org.slf4j.Logger;
20-
import org.slf4j.LoggerFactory;
2122
import reactor.core.publisher.Mono;
2223
import reactor.core.publisher.Sinks;
2324
import reactor.util.context.ContextView;

mcp-core/src/main/java/io/modelcontextprotocol/client/McpAsyncClient.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
import java.util.concurrent.ConcurrentHashMap;
1616
import java.util.function.Function;
1717

18+
import org.slf4j.Logger;
19+
import org.slf4j.LoggerFactory;
20+
1821
import io.modelcontextprotocol.client.LifecycleInitializer.Initialization;
1922
import io.modelcontextprotocol.json.TypeRef;
2023
import io.modelcontextprotocol.json.schema.JsonSchemaValidator;
@@ -37,8 +40,6 @@
3740
import io.modelcontextprotocol.spec.McpSchema.Root;
3841
import io.modelcontextprotocol.util.Assert;
3942
import io.modelcontextprotocol.util.Utils;
40-
import org.slf4j.Logger;
41-
import org.slf4j.LoggerFactory;
4243
import reactor.core.publisher.Flux;
4344
import reactor.core.publisher.Mono;
4445

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

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

1919
import org.slf4j.Logger;
2020
import org.slf4j.LoggerFactory;
21+
2122
import io.modelcontextprotocol.client.transport.ResponseSubscribers.ResponseEvent;
2223
import io.modelcontextprotocol.client.transport.customizer.McpAsyncHttpClientRequestCustomizer;
2324
import io.modelcontextprotocol.client.transport.customizer.McpSyncHttpClientRequestCustomizer;
@@ -27,6 +28,7 @@
2728
import io.modelcontextprotocol.json.internal.DefaultMcpJsonMapperSupplier;
2829
import io.modelcontextprotocol.spec.HttpHeaders;
2930
import io.modelcontextprotocol.spec.McpClientTransport;
31+
import io.modelcontextprotocol.spec.McpError;
3032
import io.modelcontextprotocol.spec.McpSchema;
3133
import io.modelcontextprotocol.spec.McpSchema.JSONRPCMessage;
3234
import io.modelcontextprotocol.spec.McpTransportException;

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,17 @@
2020
import java.util.function.Consumer;
2121
import java.util.function.Function;
2222

23+
import org.reactivestreams.Publisher;
24+
import org.slf4j.Logger;
25+
import org.slf4j.LoggerFactory;
26+
2327
import io.modelcontextprotocol.client.transport.ResponseSubscribers.ResponseEvent;
2428
import io.modelcontextprotocol.client.transport.customizer.McpAsyncHttpClientRequestCustomizer;
2529
import io.modelcontextprotocol.client.transport.customizer.McpSyncHttpClientRequestCustomizer;
2630
import io.modelcontextprotocol.common.McpTransportContext;
2731
import io.modelcontextprotocol.json.McpJsonMapper;
28-
import io.modelcontextprotocol.json.internal.DefaultMcpJsonMapperSupplier;
2932
import io.modelcontextprotocol.json.TypeRef;
33+
import io.modelcontextprotocol.json.internal.DefaultMcpJsonMapperSupplier;
3034
import io.modelcontextprotocol.spec.ClosedMcpTransportSession;
3135
import io.modelcontextprotocol.spec.DefaultMcpTransportSession;
3236
import io.modelcontextprotocol.spec.DefaultMcpTransportStream;
@@ -40,9 +44,6 @@
4044
import io.modelcontextprotocol.spec.ProtocolVersions;
4145
import io.modelcontextprotocol.util.Assert;
4246
import io.modelcontextprotocol.util.Utils;
43-
import org.reactivestreams.Publisher;
44-
import org.slf4j.Logger;
45-
import org.slf4j.LoggerFactory;
4647
import reactor.core.Disposable;
4748
import reactor.core.publisher.Flux;
4849
import reactor.core.publisher.FluxSink;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
import com.fasterxml.jackson.annotation.JsonInclude;
1515
import com.fasterxml.jackson.annotation.JsonProperty;
16+
1617
import io.modelcontextprotocol.util.Assert;
1718

1819
/**

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,15 @@
1515
import java.util.function.Consumer;
1616
import java.util.function.Function;
1717

18-
import io.modelcontextprotocol.json.TypeRef;
18+
import org.slf4j.Logger;
19+
import org.slf4j.LoggerFactory;
20+
1921
import io.modelcontextprotocol.json.McpJsonMapper;
22+
import io.modelcontextprotocol.json.TypeRef;
2023
import io.modelcontextprotocol.spec.McpClientTransport;
2124
import io.modelcontextprotocol.spec.McpSchema;
2225
import io.modelcontextprotocol.spec.McpSchema.JSONRPCMessage;
2326
import io.modelcontextprotocol.util.Assert;
24-
import org.slf4j.Logger;
25-
import org.slf4j.LoggerFactory;
2627
import reactor.core.publisher.Flux;
2728
import reactor.core.publisher.Mono;
2829
import reactor.core.publisher.Sinks;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
import io.modelcontextprotocol.common.McpTransportContext;
1313
import io.modelcontextprotocol.util.Assert;
14-
1514
import reactor.core.publisher.Mono;
1615

1716
/**

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
import java.net.http.HttpRequest;
99

1010
import org.reactivestreams.Publisher;
11+
12+
import io.modelcontextprotocol.common.McpTransportContext;
1113
import reactor.core.publisher.Mono;
1214
import reactor.core.scheduler.Schedulers;
1315
import reactor.util.annotation.Nullable;
1416

15-
import io.modelcontextprotocol.common.McpTransportContext;
16-
1717
/**
1818
* Customize {@link HttpRequest.Builder} before executing the request, in either SSE or
1919
* Streamable HTTP transport.

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
import java.net.URI;
88
import java.net.http.HttpRequest;
99

10-
import reactor.util.annotation.Nullable;
11-
1210
import io.modelcontextprotocol.client.McpClient.SyncSpec;
1311
import io.modelcontextprotocol.common.McpTransportContext;
12+
import reactor.util.annotation.Nullable;
1413

1514
/**
1615
* Customize {@link HttpRequest.Builder} before executing the request, either in SSE or

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@
44

55
package io.modelcontextprotocol.server;
66

7+
import java.util.Map;
8+
9+
import org.slf4j.Logger;
10+
import org.slf4j.LoggerFactory;
11+
712
import io.modelcontextprotocol.common.McpTransportContext;
813
import io.modelcontextprotocol.spec.McpError;
914
import io.modelcontextprotocol.spec.McpSchema;
10-
import org.slf4j.Logger;
11-
import org.slf4j.LoggerFactory;
1215
import reactor.core.publisher.Mono;
1316

14-
import java.util.Map;
15-
1617
class DefaultMcpStatelessServerHandler implements McpStatelessServerHandler {
1718

1819
private static final Logger logger = LoggerFactory.getLogger(DefaultMcpStatelessServerHandler.class);

0 commit comments

Comments
 (0)