Skip to content

Commit 12bea63

Browse files
KehrlannKehrlann
committed
Rename (Async)HttpRequestCustomizer to Mcp(Async)HttpRequestCustomizer
1 parent 5e035ea commit 12bea63

6 files changed

Lines changed: 31 additions & 31 deletions

File tree

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public class HttpClientSseClientTransport implements McpClientTransport {
112112
/**
113113
* Customizer to modify requests before they are executed.
114114
*/
115-
private final AsyncHttpRequestCustomizer httpRequestCustomizer;
115+
private final McpAsyncHttpRequestCustomizer httpRequestCustomizer;
116116

117117
/**
118118
* Creates a new transport instance with default HTTP client and object mapper.
@@ -187,7 +187,7 @@ public HttpClientSseClientTransport(HttpClient.Builder clientBuilder, HttpReques
187187
@Deprecated(forRemoval = true)
188188
HttpClientSseClientTransport(HttpClient httpClient, HttpRequest.Builder requestBuilder, String baseUri,
189189
String sseEndpoint, ObjectMapper objectMapper) {
190-
this(httpClient, requestBuilder, baseUri, sseEndpoint, objectMapper, AsyncHttpRequestCustomizer.NOOP);
190+
this(httpClient, requestBuilder, baseUri, sseEndpoint, objectMapper, McpAsyncHttpRequestCustomizer.NOOP);
191191
}
192192

193193
/**
@@ -203,7 +203,7 @@ public HttpClientSseClientTransport(HttpClient.Builder clientBuilder, HttpReques
203203
* @throws IllegalArgumentException if objectMapper, clientBuilder, or headers is null
204204
*/
205205
HttpClientSseClientTransport(HttpClient httpClient, HttpRequest.Builder requestBuilder, String baseUri,
206-
String sseEndpoint, ObjectMapper objectMapper, AsyncHttpRequestCustomizer httpRequestCustomizer) {
206+
String sseEndpoint, ObjectMapper objectMapper, McpAsyncHttpRequestCustomizer httpRequestCustomizer) {
207207
Assert.notNull(objectMapper, "ObjectMapper must not be null");
208208
Assert.hasText(baseUri, "baseUri must not be empty");
209209
Assert.hasText(sseEndpoint, "sseEndpoint must not be empty");
@@ -250,7 +250,7 @@ public static class Builder {
250250
private HttpRequest.Builder requestBuilder = HttpRequest.newBuilder()
251251
.header("Content-Type", "application/json");
252252

253-
private AsyncHttpRequestCustomizer httpRequestCustomizer = AsyncHttpRequestCustomizer.NOOP;
253+
private McpAsyncHttpRequestCustomizer httpRequestCustomizer = McpAsyncHttpRequestCustomizer.NOOP;
254254

255255
/**
256256
* Creates a new builder instance.
@@ -354,16 +354,16 @@ public Builder objectMapper(ObjectMapper objectMapper) {
354354
* executing them.
355355
* <p>
356356
* This overrides the customizer from
357-
* {@link #asyncHttpRequestCustomizer(AsyncHttpRequestCustomizer)}.
357+
* {@link #asyncHttpRequestCustomizer(McpAsyncHttpRequestCustomizer)}.
358358
* <p>
359-
* Do NOT use a blocking {@link SyncHttpRequestCustomizer} in a non-blocking
360-
* context. Use {@link #asyncHttpRequestCustomizer(AsyncHttpRequestCustomizer)}
359+
* Do NOT use a blocking {@link McpSyncHttpRequestCustomizer} in a non-blocking
360+
* context. Use {@link #asyncHttpRequestCustomizer(McpAsyncHttpRequestCustomizer)}
361361
* instead.
362362
* @param syncHttpRequestCustomizer the request customizer
363363
* @return this builder
364364
*/
365-
public Builder httpRequestCustomizer(SyncHttpRequestCustomizer syncHttpRequestCustomizer) {
366-
this.httpRequestCustomizer = AsyncHttpRequestCustomizer.fromSync(syncHttpRequestCustomizer);
365+
public Builder httpRequestCustomizer(McpSyncHttpRequestCustomizer syncHttpRequestCustomizer) {
366+
this.httpRequestCustomizer = McpAsyncHttpRequestCustomizer.fromSync(syncHttpRequestCustomizer);
367367
return this;
368368
}
369369

@@ -372,13 +372,13 @@ public Builder httpRequestCustomizer(SyncHttpRequestCustomizer syncHttpRequestCu
372372
* executing them.
373373
* <p>
374374
* This overrides the customizer from
375-
* {@link #httpRequestCustomizer(SyncHttpRequestCustomizer)}.
375+
* {@link #httpRequestCustomizer(McpSyncHttpRequestCustomizer)}.
376376
* <p>
377377
* Do NOT use a blocking implementation in a non-blocking context.
378378
* @param asyncHttpRequestCustomizer the request customizer
379379
* @return this builder
380380
*/
381-
public Builder asyncHttpRequestCustomizer(AsyncHttpRequestCustomizer asyncHttpRequestCustomizer) {
381+
public Builder asyncHttpRequestCustomizer(McpAsyncHttpRequestCustomizer asyncHttpRequestCustomizer) {
382382
this.httpRequestCustomizer = asyncHttpRequestCustomizer;
383383
return this;
384384
}

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public class HttpClientStreamableHttpTransport implements McpClientTransport {
113113

114114
private final boolean resumableStreams;
115115

116-
private final AsyncHttpRequestCustomizer httpRequestCustomizer;
116+
private final McpAsyncHttpRequestCustomizer httpRequestCustomizer;
117117

118118
private final AtomicReference<DefaultMcpTransportSession> activeSession = new AtomicReference<>();
119119

@@ -123,7 +123,7 @@ public class HttpClientStreamableHttpTransport implements McpClientTransport {
123123

124124
private HttpClientStreamableHttpTransport(ObjectMapper objectMapper, HttpClient httpClient,
125125
HttpRequest.Builder requestBuilder, String baseUri, String endpoint, boolean resumableStreams,
126-
boolean openConnectionOnStartup, AsyncHttpRequestCustomizer httpRequestCustomizer) {
126+
boolean openConnectionOnStartup, McpAsyncHttpRequestCustomizer httpRequestCustomizer) {
127127
this.objectMapper = objectMapper;
128128
this.httpClient = httpClient;
129129
this.requestBuilder = requestBuilder;
@@ -567,7 +567,7 @@ public static class Builder {
567567

568568
private HttpRequest.Builder requestBuilder = HttpRequest.newBuilder();
569569

570-
private AsyncHttpRequestCustomizer httpRequestCustomizer = AsyncHttpRequestCustomizer.NOOP;
570+
private McpAsyncHttpRequestCustomizer httpRequestCustomizer = McpAsyncHttpRequestCustomizer.NOOP;
571571

572572
/**
573573
* Creates a new builder with the specified base URI.
@@ -676,16 +676,16 @@ public Builder openConnectionOnStartup(boolean openConnectionOnStartup) {
676676
* executing them.
677677
* <p>
678678
* This overrides the customizer from
679-
* {@link #asyncHttpRequestCustomizer(AsyncHttpRequestCustomizer)}.
679+
* {@link #asyncHttpRequestCustomizer(McpAsyncHttpRequestCustomizer)}.
680680
* <p>
681-
* Do NOT use a blocking {@link SyncHttpRequestCustomizer} in a non-blocking
682-
* context. Use {@link #asyncHttpRequestCustomizer(AsyncHttpRequestCustomizer)}
681+
* Do NOT use a blocking {@link McpSyncHttpRequestCustomizer} in a non-blocking
682+
* context. Use {@link #asyncHttpRequestCustomizer(McpAsyncHttpRequestCustomizer)}
683683
* instead.
684684
* @param syncHttpRequestCustomizer the request customizer
685685
* @return this builder
686686
*/
687-
public Builder httpRequestCustomizer(SyncHttpRequestCustomizer syncHttpRequestCustomizer) {
688-
this.httpRequestCustomizer = AsyncHttpRequestCustomizer.fromSync(syncHttpRequestCustomizer);
687+
public Builder httpRequestCustomizer(McpSyncHttpRequestCustomizer syncHttpRequestCustomizer) {
688+
this.httpRequestCustomizer = McpAsyncHttpRequestCustomizer.fromSync(syncHttpRequestCustomizer);
689689
return this;
690690
}
691691

@@ -694,13 +694,13 @@ public Builder httpRequestCustomizer(SyncHttpRequestCustomizer syncHttpRequestCu
694694
* executing them.
695695
* <p>
696696
* This overrides the customizer from
697-
* {@link #httpRequestCustomizer(SyncHttpRequestCustomizer)}.
697+
* {@link #httpRequestCustomizer(McpSyncHttpRequestCustomizer)}.
698698
* <p>
699699
* Do NOT use a blocking implementation in a non-blocking context.
700700
* @param asyncHttpRequestCustomizer the request customizer
701701
* @return this builder
702702
*/
703-
public Builder asyncHttpRequestCustomizer(AsyncHttpRequestCustomizer asyncHttpRequestCustomizer) {
703+
public Builder asyncHttpRequestCustomizer(McpAsyncHttpRequestCustomizer asyncHttpRequestCustomizer) {
704704
this.httpRequestCustomizer = asyncHttpRequestCustomizer;
705705
return this;
706706
}

mcp/src/main/java/io/modelcontextprotocol/client/transport/AsyncHttpRequestCustomizer.java renamed to mcp/src/main/java/io/modelcontextprotocol/client/transport/McpAsyncHttpRequestCustomizer.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,27 @@
1919
*
2020
* @author Daniel Garnier-Moiroux
2121
*/
22-
public interface AsyncHttpRequestCustomizer {
22+
public interface McpAsyncHttpRequestCustomizer {
2323

2424
Publisher<HttpRequest.Builder> customize(HttpRequest.Builder builder, String method, URI endpoint,
2525
@Nullable String body);
2626

27-
AsyncHttpRequestCustomizer NOOP = new Noop();
27+
McpAsyncHttpRequestCustomizer NOOP = new Noop();
2828

2929
/**
3030
* Wrap a sync implementation in an async wrapper.
3131
* <p>
3232
* Do NOT wrap a blocking implementation for use in a non-blocking context. For a
3333
* blocking implementation, consider using {@link Schedulers#boundedElastic()}.
3434
*/
35-
static AsyncHttpRequestCustomizer fromSync(SyncHttpRequestCustomizer customizer) {
35+
static McpAsyncHttpRequestCustomizer fromSync(McpSyncHttpRequestCustomizer customizer) {
3636
return (builder, method, uri, body) -> Mono.fromSupplier(() -> {
3737
customizer.customize(builder, method, uri, body);
3838
return builder;
3939
});
4040
}
4141

42-
class Noop implements AsyncHttpRequestCustomizer {
42+
class Noop implements McpAsyncHttpRequestCustomizer {
4343

4444
@Override
4545
public Publisher<HttpRequest.Builder> customize(HttpRequest.Builder builder, String method, URI endpoint,

mcp/src/main/java/io/modelcontextprotocol/client/transport/SyncHttpRequestCustomizer.java renamed to mcp/src/main/java/io/modelcontextprotocol/client/transport/McpSyncHttpRequestCustomizer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
* @author Daniel Garnier-Moiroux
1616
*/
17-
public interface SyncHttpRequestCustomizer {
17+
public interface McpSyncHttpRequestCustomizer {
1818

1919
void customize(HttpRequest.Builder builder, String method, URI endpoint, @Nullable String body);
2020

‎mcp/src/test/java/io/modelcontextprotocol/client/transport/HttpClientSseClientTransportTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ static class TestHttpClientSseClientTransport extends HttpClientSseClientTranspo
7272
public TestHttpClientSseClientTransport(final String baseUri) {
7373
super(HttpClient.newBuilder().version(HttpClient.Version.HTTP_1_1).build(),
7474
HttpRequest.newBuilder().header("Content-Type", "application/json"), baseUri, "/sse",
75-
new ObjectMapper(), AsyncHttpRequestCustomizer.NOOP);
75+
new ObjectMapper(), McpAsyncHttpRequestCustomizer.NOOP);
7676
}
7777

7878
public int getInboundMessageCount() {
@@ -389,7 +389,7 @@ void testChainedCustomizations() {
389389

390390
@Test
391391
void testRequestCustomizer() {
392-
var mockCustomizer = mock(SyncHttpRequestCustomizer.class);
392+
var mockCustomizer = mock(McpSyncHttpRequestCustomizer.class);
393393

394394
// Create a transport with the customizer
395395
var customizedTransport = HttpClientSseClientTransport.builder(host)
@@ -423,7 +423,7 @@ void testRequestCustomizer() {
423423

424424
@Test
425425
void testAsyncRequestCustomizer() {
426-
var mockCustomizer = mock(AsyncHttpRequestCustomizer.class);
426+
var mockCustomizer = mock(McpAsyncHttpRequestCustomizer.class);
427427
when(mockCustomizer.customize(any(), any(), any(), any()))
428428
.thenAnswer(invocation -> Mono.just(invocation.getArguments()[0]));
429429

‎mcp/src/test/java/io/modelcontextprotocol/client/transport/HttpClientStreamableHttpTransportTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ void withTransport(HttpClientStreamableHttpTransport transport, Consumer<HttpCli
6363
@Test
6464
void testRequestCustomizer() throws URISyntaxException {
6565
var uri = new URI(host + "/mcp");
66-
var mockRequestCustomizer = mock(SyncHttpRequestCustomizer.class);
66+
var mockRequestCustomizer = mock(McpSyncHttpRequestCustomizer.class);
6767

6868
var transport = HttpClientStreamableHttpTransport.builder(host)
6969
.httpRequestCustomizer(mockRequestCustomizer)
@@ -88,7 +88,7 @@ void testRequestCustomizer() throws URISyntaxException {
8888
@Test
8989
void testAsyncRequestCustomizer() throws URISyntaxException {
9090
var uri = new URI(host + "/mcp");
91-
var mockRequestCustomizer = mock(AsyncHttpRequestCustomizer.class);
91+
var mockRequestCustomizer = mock(McpAsyncHttpRequestCustomizer.class);
9292
when(mockRequestCustomizer.customize(any(), any(), any(), any()))
9393
.thenAnswer(invocation -> Mono.just(invocation.getArguments()[0]));
9494

0 commit comments

Comments
 (0)