Skip to content

Commit 946facb

Browse files
scottslewisscottslewis
committed
Fixes for import reorg
1 parent 06982a1 commit 946facb

File tree

8 files changed

+27
-29
lines changed

8 files changed

+27
-29
lines changed

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@
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-
1714
import io.modelcontextprotocol.spec.McpClientSession;
1815
import io.modelcontextprotocol.spec.McpError;
1916
import io.modelcontextprotocol.spec.McpSchema;
2017
import io.modelcontextprotocol.spec.McpTransportSessionNotFoundException;
2118
import io.modelcontextprotocol.util.Assert;
19+
import org.slf4j.Logger;
20+
import org.slf4j.LoggerFactory;
2221
import reactor.core.publisher.Mono;
2322
import reactor.core.publisher.Sinks;
2423
import reactor.util.context.ContextView;
@@ -288,9 +287,7 @@ public <T> Mono<T> withInitialization(String actionName, Function<Initialization
288287
this.initializationRef.compareAndSet(newInit, null);
289288
return Mono.error(new RuntimeException("Client failed to initialize " + actionName, ex));
290289
})
291-
.flatMap(res -> operation.apply(res)
292-
.contextWrite(c -> c.put(McpAsyncClient.NEGOTIATED_PROTOCOL_VERSION,
293-
res.initializeResult().protocolVersion())));
290+
.flatMap(operation);
294291
});
295292
}
296293

@@ -322,8 +319,6 @@ private Mono<McpSchema.InitializeResult> doInitialize(DefaultInitialization init
322319
}
323320

324321
return mcpClientSession.sendNotification(McpSchema.METHOD_NOTIFICATION_INITIALIZED, null)
325-
.contextWrite(
326-
c -> c.put(McpAsyncClient.NEGOTIATED_PROTOCOL_VERSION, initializeResult.protocolVersion()))
327322
.thenReturn(initializeResult);
328323
}).flatMap(initializeResult -> {
329324
initialization.cacheResult(initializeResult);

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

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

18-
import org.slf4j.Logger;
19-
import org.slf4j.LoggerFactory;
20-
2118
import io.modelcontextprotocol.client.LifecycleInitializer.Initialization;
2219
import io.modelcontextprotocol.json.TypeRef;
2320
import io.modelcontextprotocol.json.schema.JsonSchemaValidator;
@@ -40,6 +37,8 @@
4037
import io.modelcontextprotocol.spec.McpSchema.Root;
4138
import io.modelcontextprotocol.util.Assert;
4239
import io.modelcontextprotocol.util.Utils;
40+
import org.slf4j.Logger;
41+
import org.slf4j.LoggerFactory;
4342
import reactor.core.publisher.Flux;
4443
import reactor.core.publisher.Mono;
4544

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

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.function.Consumer;
2121
import java.util.function.Function;
2222

23-
import io.modelcontextprotocol.client.McpAsyncClient;
2423
import io.modelcontextprotocol.client.transport.ResponseSubscribers.ResponseEvent;
2524
import io.modelcontextprotocol.client.transport.customizer.McpAsyncHttpClientRequestCustomizer;
2625
import io.modelcontextprotocol.client.transport.customizer.McpSyncHttpClientRequestCustomizer;
@@ -41,6 +40,9 @@
4140
import io.modelcontextprotocol.spec.ProtocolVersions;
4241
import io.modelcontextprotocol.util.Assert;
4342
import io.modelcontextprotocol.util.Utils;
43+
import org.reactivestreams.Publisher;
44+
import org.slf4j.Logger;
45+
import org.slf4j.LoggerFactory;
4446
import reactor.core.Disposable;
4547
import reactor.core.publisher.Flux;
4648
import reactor.core.publisher.FluxSink;
@@ -192,9 +194,7 @@ private Publisher<Void> createDelete(String sessionId) {
192194
.uri(uri)
193195
.header("Cache-Control", "no-cache")
194196
.header(HttpHeaders.MCP_SESSION_ID, sessionId)
195-
.header(HttpHeaders.PROTOCOL_VERSION,
196-
ctx.getOrDefault(McpAsyncClient.NEGOTIATED_PROTOCOL_VERSION,
197-
this.latestSupportedProtocolVersion))
197+
.header(HttpHeaders.PROTOCOL_VERSION, this.latestSupportedProtocolVersion)
198198
.DELETE();
199199
var transportContext = ctx.getOrDefault(McpTransportContext.KEY, McpTransportContext.EMPTY);
200200
return Mono.from(this.httpRequestCustomizer.customize(builder, "DELETE", uri, null, transportContext));
@@ -265,9 +265,7 @@ private Mono<Disposable> reconnect(McpTransportStream<Disposable> stream) {
265265
var builder = requestBuilder.uri(uri)
266266
.header(HttpHeaders.ACCEPT, TEXT_EVENT_STREAM)
267267
.header("Cache-Control", "no-cache")
268-
.header(HttpHeaders.PROTOCOL_VERSION,
269-
connectionCtx.getOrDefault(McpAsyncClient.NEGOTIATED_PROTOCOL_VERSION,
270-
this.latestSupportedProtocolVersion))
268+
.header(HttpHeaders.PROTOCOL_VERSION, this.latestSupportedProtocolVersion)
271269
.GET();
272270
var transportContext = connectionCtx.getOrDefault(McpTransportContext.KEY, McpTransportContext.EMPTY);
273271
return Mono.from(this.httpRequestCustomizer.customize(builder, "GET", uri, null, transportContext));
@@ -442,9 +440,7 @@ public Mono<Void> sendMessage(McpSchema.JSONRPCMessage sentMessage) {
442440
.header(HttpHeaders.ACCEPT, APPLICATION_JSON + ", " + TEXT_EVENT_STREAM)
443441
.header(HttpHeaders.CONTENT_TYPE, APPLICATION_JSON)
444442
.header(HttpHeaders.CACHE_CONTROL, "no-cache")
445-
.header(HttpHeaders.PROTOCOL_VERSION,
446-
ctx.getOrDefault(McpAsyncClient.NEGOTIATED_PROTOCOL_VERSION,
447-
this.latestSupportedProtocolVersion))
443+
.header(HttpHeaders.PROTOCOL_VERSION, this.latestSupportedProtocolVersion)
448444
.POST(HttpRequest.BodyPublishers.ofString(jsonBody));
449445
var transportContext = ctx.getOrDefault(McpTransportContext.KEY, McpTransportContext.EMPTY);
450446
return Mono
@@ -818,10 +814,9 @@ public Builder supportedProtocolVersions(List<String> supportedProtocolVersions)
818814
*/
819815
public HttpClientStreamableHttpTransport build() {
820816
HttpClient httpClient = this.clientBuilder.connectTimeout(this.connectTimeout).build();
821-
return new HttpClientStreamableHttpTransport(
822-
jsonMapper == null ? McpJsonDefaults.getDefaultMcpJsonMapper() : jsonMapper, httpClient,
823-
requestBuilder, baseUri, endpoint, resumableStreams, openConnectionOnStartup, httpRequestCustomizer,
824-
supportedProtocolVersions);
817+
return new HttpClientStreamableHttpTransport(jsonMapper == null ? McpJsonDefaults.getDefaultMcpJsonMapper() : jsonMapper,
818+
httpClient, requestBuilder, baseUri, endpoint, resumableStreams, openConnectionOnStartup,
819+
httpRequestCustomizer, supportedProtocolVersions);
825820
}
826821

827822
}

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

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

18-
import org.slf4j.Logger;
19-
import org.slf4j.LoggerFactory;
20-
21-
import io.modelcontextprotocol.json.McpJsonMapper;
2218
import io.modelcontextprotocol.json.TypeRef;
19+
import io.modelcontextprotocol.json.McpJsonMapper;
2320
import io.modelcontextprotocol.spec.McpClientTransport;
2421
import io.modelcontextprotocol.spec.McpSchema;
2522
import io.modelcontextprotocol.spec.McpSchema.JSONRPCMessage;
2623
import io.modelcontextprotocol.util.Assert;
24+
import org.slf4j.Logger;
25+
import org.slf4j.LoggerFactory;
2726
import reactor.core.publisher.Flux;
2827
import reactor.core.publisher.Mono;
2928
import reactor.core.publisher.Sinks;

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

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

1212
import io.modelcontextprotocol.common.McpTransportContext;
1313
import io.modelcontextprotocol.util.Assert;
14+
1415
import reactor.core.publisher.Mono;
1516

1617
/**

‎mcp-core/src/test/java/io/modelcontextprotocol/server/AbstractMcpAsyncServerTests.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
import java.time.Duration;
1313
import java.util.List;
1414

15+
import org.junit.jupiter.api.AfterEach;
16+
import org.junit.jupiter.api.BeforeEach;
17+
import org.junit.jupiter.api.Test;
18+
1519
import io.modelcontextprotocol.spec.McpSchema;
1620
import io.modelcontextprotocol.spec.McpSchema.CallToolResult;
1721
import io.modelcontextprotocol.spec.McpSchema.GetPromptResult;

‎mcp-core/src/test/java/io/modelcontextprotocol/server/AbstractMcpSyncServerTests.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111

1212
import java.util.List;
1313

14+
import org.junit.jupiter.api.AfterEach;
15+
import org.junit.jupiter.api.BeforeEach;
16+
import org.junit.jupiter.api.Test;
17+
1418
import io.modelcontextprotocol.spec.McpSchema;
1519
import io.modelcontextprotocol.spec.McpSchema.CallToolResult;
1620
import io.modelcontextprotocol.spec.McpSchema.GetPromptResult;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.springframework.web.reactive.function.client.WebClient;
2525
import org.springframework.web.reactive.function.client.WebClientResponseException;
2626

27+
import io.modelcontextprotocol.client.McpAsyncClient;
2728
import io.modelcontextprotocol.json.McpJsonDefaults;
2829
import io.modelcontextprotocol.json.McpJsonMapper;
2930
import io.modelcontextprotocol.json.TypeRef;

0 commit comments

Comments
 (0)