From 181e1f25ab85f02a8b1f638c8b2b4c9e7caa2ab3 Mon Sep 17 00:00:00 2001 From: Christian Tzolov Date: Tue, 28 Jan 2025 17:23:07 +0100 Subject: [PATCH] Change the top domain from org to io --- .github/workflows/continuous-integration.yml | 2 +- README.md | 6 +-- mcp-bom/pom.xml | 10 ++--- mcp-docs/pom.xml | 2 +- .../ROOT/pages/dependency-management.adoc | 12 +++--- .../main/antora/modules/ROOT/pages/mcp.adoc | 12 +++--- .../antora/modules/ROOT/pages/overview.adoc | 12 +++--- mcp-test/pom.xml | 4 +- .../MockMcpTransport.java | 12 +++--- .../client/AbstractMcpAsyncClientTests.java | 32 ++++++++------- .../client/AbstractMcpSyncClientTests.java | 34 ++++++++-------- .../server/AbstractMcpAsyncServerTests.java | 29 ++++++++------ .../server/AbstractMcpSyncServerTests.java | 29 ++++++++------ .../mcp-webflux-sse-transport/README.md | 2 +- .../mcp-webflux-sse-transport/pom.xml | 6 +-- .../transport/WebFluxSseClientTransport.java | 14 +++---- .../transport/WebFluxSseServerTransport.java | 10 ++--- .../WebFluxSseIntegrationTests.java | 36 ++++++++--------- .../client/WebFluxSseMcpAsyncClientTests.java | 8 ++-- .../client/WebFluxSseMcpSyncClientTests.java | 8 ++-- .../WebFluxSseClientTransportTests.java | 7 ++-- .../server/WebFluxSseMcpAsyncServerTests.java | 8 ++-- .../server/WebFluxSseMcpSyncServerTests.java | 8 ++-- .../server/transport/BlockingInputStream.java | 2 +- .../mcp-webmvc-sse-transport/README.md | 2 +- .../mcp-webmvc-sse-transport/pom.xml | 6 +-- .../transport/WebMvcSseServerTransport.java | 10 ++--- .../WebMvcSseAsyncServerTransportTests.java | 7 ++-- .../server/WebMvcSseIntegrationTests.java | 32 ++++++++------- .../WebMvcSseSyncServerTransportTests.java | 7 ++-- .../src/test/resources/logback.xml | 8 ++-- mcp/pom.xml | 2 +- .../client/McpAsyncClient.java | 40 +++++++++---------- .../client/McpClient.java | 20 +++++----- .../client/McpClientFeatures.java | 8 ++-- .../client/McpSyncClient.java | 16 ++++---- .../client/transport/FlowSseClient.java | 2 +- .../HttpClientSseClientTransport.java | 20 +++++----- .../client/transport/ServerParameters.java | 4 +- .../transport/StdioClientTransport.java | 10 ++--- .../server/McpAsyncServer.java | 24 +++++------ .../server/McpServer.java | 14 +++---- .../server/McpServerFeatures.java | 8 ++-- .../server/McpSyncServer.java | 12 +++--- .../HttpServletSseServerTransport.java | 8 ++-- .../transport/StdioServerTransport.java | 10 ++--- .../spec/ClientMcpTransport.java | 2 +- .../spec/DefaultMcpSession.java | 4 +- .../modelcontextprotocol/spec/McpError.java | 4 +- .../modelcontextprotocol/spec/McpSchema.java | 2 +- .../modelcontextprotocol/spec/McpSession.java | 2 +- .../spec/McpTransport.java | 4 +- .../spec/ServerMcpTransport.java | 2 +- .../modelcontextprotocol/util/Assert.java | 2 +- .../modelcontextprotocol/util/Utils.java | 2 +- .../MockMcpTransport.java | 12 +++--- .../client/AbstractMcpAsyncClientTests.java | 32 ++++++++------- .../client/AbstractMcpSyncClientTests.java | 34 ++++++++-------- .../McpAsyncClientResponseHandlerTests.java | 14 ++++--- .../client/McpClientProtocolVersionTests.java | 12 +++--- .../client/ServletSseMcpAsyncClientTests.java | 7 ++-- .../client/ServletSseMcpSyncClientTests.java | 7 ++-- .../client/StdioMcpAsyncClientTests.java | 9 +++-- .../client/StdioMcpSyncClientTests.java | 9 +++-- .../HttpClientSseClientTransportTests.java | 7 ++-- .../server/AbstractMcpAsyncServerTests.java | 29 ++++++++------ .../server/AbstractMcpSyncServerTests.java | 29 ++++++++------ .../server/McpServerProtocolVersionTests.java | 8 ++-- .../server/ServletSseMcpAsyncServerTests.java | 7 ++-- .../server/ServletSseMcpSyncServerTests.java | 7 ++-- .../server/StdioMcpAsyncServerTests.java | 7 ++-- .../server/StdioMcpSyncServerTests.java | 7 ++-- .../server/transport/BlockingInputStream.java | 2 +- ...letSseServerTransportIntegrationTests.java | 33 +++++++-------- .../transport/StdioServerTransportTests.java | 7 ++-- .../spec/DefaultMcpSessionTests.java | 7 +++- pom.xml | 2 +- 77 files changed, 470 insertions(+), 417 deletions(-) rename mcp-test/src/main/java/{org => io}/modelcontextprotocol/MockMcpTransport.java (88%) rename mcp-test/src/main/java/{org => io}/modelcontextprotocol/client/AbstractMcpAsyncClientTests.java (91%) rename mcp-test/src/main/java/{org => io}/modelcontextprotocol/client/AbstractMcpSyncClientTests.java (88%) rename mcp-test/src/main/java/{org => io}/modelcontextprotocol/server/AbstractMcpAsyncServerTests.java (94%) rename mcp-test/src/main/java/{org => io}/modelcontextprotocol/server/AbstractMcpSyncServerTests.java (94%) rename mcp-transport/mcp-webflux-sse-transport/src/main/java/{org => io}/modelcontextprotocol/client/transport/WebFluxSseClientTransport.java (96%) rename mcp-transport/mcp-webflux-sse-transport/src/main/java/{org => io}/modelcontextprotocol/server/transport/WebFluxSseServerTransport.java (98%) rename mcp-transport/mcp-webflux-sse-transport/src/test/java/{org => io}/modelcontextprotocol/WebFluxSseIntegrationTests.java (93%) rename mcp-transport/mcp-webflux-sse-transport/src/test/java/{org => io}/modelcontextprotocol/client/WebFluxSseMcpAsyncClientTests.java (81%) rename mcp-transport/mcp-webflux-sse-transport/src/test/java/{org => io}/modelcontextprotocol/client/WebFluxSseMcpSyncClientTests.java (82%) rename mcp-transport/mcp-webflux-sse-transport/src/test/java/{org => io}/modelcontextprotocol/client/transport/WebFluxSseClientTransportTests.java (97%) rename mcp-transport/mcp-webflux-sse-transport/src/test/java/{org => io}/modelcontextprotocol/server/WebFluxSseMcpAsyncServerTests.java (82%) rename mcp-transport/mcp-webflux-sse-transport/src/test/java/{org => io}/modelcontextprotocol/server/WebFluxSseMcpSyncServerTests.java (83%) rename mcp-transport/mcp-webflux-sse-transport/src/test/java/{org => io}/modelcontextprotocol/server/transport/BlockingInputStream.java (96%) rename mcp-transport/mcp-webmvc-sse-transport/src/main/java/{org => io}/modelcontextprotocol/server/transport/WebMvcSseServerTransport.java (98%) rename mcp-transport/mcp-webmvc-sse-transport/src/test/java/{org => io}/modelcontextprotocol/server/WebMvcSseAsyncServerTransportTests.java (93%) rename mcp-transport/mcp-webmvc-sse-transport/src/test/java/{org => io}/modelcontextprotocol/server/WebMvcSseIntegrationTests.java (94%) rename mcp-transport/mcp-webmvc-sse-transport/src/test/java/{org => io}/modelcontextprotocol/server/WebMvcSseSyncServerTransportTests.java (93%) rename mcp/src/main/java/{org => io}/modelcontextprotocol/client/McpAsyncClient.java (95%) rename mcp/src/main/java/{org => io}/modelcontextprotocol/client/McpClient.java (97%) rename mcp/src/main/java/{org => io}/modelcontextprotocol/client/McpClientFeatures.java (98%) rename mcp/src/main/java/{org => io}/modelcontextprotocol/client/McpSyncClient.java (96%) rename mcp/src/main/java/{org => io}/modelcontextprotocol/client/transport/FlowSseClient.java (99%) rename mcp/src/main/java/{org => io}/modelcontextprotocol/client/transport/HttpClientSseClientTransport.java (93%) rename mcp/src/main/java/{org => io}/modelcontextprotocol/client/transport/ServerParameters.java (97%) rename mcp/src/main/java/{org => io}/modelcontextprotocol/client/transport/StdioClientTransport.java (97%) rename mcp/src/main/java/{org => io}/modelcontextprotocol/server/McpAsyncServer.java (97%) rename mcp/src/main/java/{org => io}/modelcontextprotocol/server/McpServer.java (98%) rename mcp/src/main/java/{org => io}/modelcontextprotocol/server/McpServerFeatures.java (98%) rename mcp/src/main/java/{org => io}/modelcontextprotocol/server/McpSyncServer.java (95%) rename mcp/src/main/java/{org => io}/modelcontextprotocol/server/transport/HttpServletSseServerTransport.java (98%) rename mcp/src/main/java/{org => io}/modelcontextprotocol/server/transport/StdioServerTransport.java (96%) rename mcp/src/main/java/{org => io}/modelcontextprotocol/spec/ClientMcpTransport.java (84%) rename mcp/src/main/java/{org => io}/modelcontextprotocol/spec/DefaultMcpSession.java (99%) rename mcp/src/main/java/{org => io}/modelcontextprotocol/spec/McpError.java (77%) rename mcp/src/main/java/{org => io}/modelcontextprotocol/spec/McpSchema.java (99%) rename mcp/src/main/java/{org => io}/modelcontextprotocol/spec/McpSession.java (98%) rename mcp/src/main/java/{org => io}/modelcontextprotocol/spec/McpTransport.java (96%) rename mcp/src/main/java/{org => io}/modelcontextprotocol/spec/ServerMcpTransport.java (84%) rename mcp/src/main/java/{org => io}/modelcontextprotocol/util/Assert.java (98%) rename mcp/src/main/java/{org => io}/modelcontextprotocol/util/Utils.java (97%) rename mcp/src/test/java/{org => io}/modelcontextprotocol/MockMcpTransport.java (89%) rename mcp/src/test/java/{org => io}/modelcontextprotocol/client/AbstractMcpAsyncClientTests.java (91%) rename mcp/src/test/java/{org => io}/modelcontextprotocol/client/AbstractMcpSyncClientTests.java (88%) rename mcp/src/test/java/{org => io}/modelcontextprotocol/client/McpAsyncClientResponseHandlerTests.java (96%) rename mcp/src/test/java/{org => io}/modelcontextprotocol/client/McpClientProtocolVersionTests.java (93%) rename mcp/src/test/java/{org => io}/modelcontextprotocol/client/ServletSseMcpAsyncClientTests.java (84%) rename mcp/src/test/java/{org => io}/modelcontextprotocol/client/ServletSseMcpSyncClientTests.java (84%) rename mcp/src/test/java/{org => io}/modelcontextprotocol/client/StdioMcpAsyncClientTests.java (69%) rename mcp/src/test/java/{org => io}/modelcontextprotocol/client/StdioMcpSyncClientTests.java (81%) rename mcp/src/test/java/{org => io}/modelcontextprotocol/client/transport/HttpClientSseClientTransportTests.java (96%) rename mcp/src/test/java/{org => io}/modelcontextprotocol/server/AbstractMcpAsyncServerTests.java (94%) rename mcp/src/test/java/{org => io}/modelcontextprotocol/server/AbstractMcpSyncServerTests.java (94%) rename mcp/src/test/java/{org => io}/modelcontextprotocol/server/McpServerProtocolVersionTests.java (95%) rename mcp/src/test/java/{org => io}/modelcontextprotocol/server/ServletSseMcpAsyncServerTests.java (70%) rename mcp/src/test/java/{org => io}/modelcontextprotocol/server/ServletSseMcpSyncServerTests.java (70%) rename mcp/src/test/java/{org => io}/modelcontextprotocol/server/StdioMcpAsyncServerTests.java (67%) rename mcp/src/test/java/{org => io}/modelcontextprotocol/server/StdioMcpSyncServerTests.java (67%) rename mcp/src/test/java/{org => io}/modelcontextprotocol/server/transport/BlockingInputStream.java (96%) rename mcp/src/test/java/{org => io}/modelcontextprotocol/server/transport/HttpServletSseServerTransportIntegrationTests.java (91%) rename mcp/src/test/java/{org => io}/modelcontextprotocol/server/transport/StdioServerTransportTests.java (95%) rename mcp/src/test/java/{org => io}/modelcontextprotocol/spec/DefaultMcpSessionTests.java (96%) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 51c921a..a9bc8fd 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -35,7 +35,7 @@ jobs: MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }} run: | - mvn -Pjavadoc -Prelease --batch-mode --update-snapshots deploy + mvn -Pjavadoc -Prelease -DskipTests --batch-mode --update-snapshots deploy - name: Generate Java docs run: mvn -Pjavadoc -B javadoc:aggregate diff --git a/README.md b/README.md index 3d985bb..c994354 100644 --- a/README.md +++ b/README.md @@ -47,19 +47,19 @@ Add the following dependencies to your Maven project: ```xml - org.modelcontextprotocol.sdk + io.modelcontextprotocol.sdk mcp - org.modelcontextprotocol.sdk + io.modelcontextprotocol.sdk mcp-webflux-sse-transport - org.modelcontextprotocol.sdk + io.modelcontextprotocol.sdk mcp-webmvc-sse-transport ``` diff --git a/mcp-bom/pom.xml b/mcp-bom/pom.xml index a1b5164..a524793 100644 --- a/mcp-bom/pom.xml +++ b/mcp-bom/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - org.modelcontextprotocol.sdk + io.modelcontextprotocol.sdk mcp-parent 0.7.0-SNAPSHOT @@ -28,28 +28,28 @@ - org.modelcontextprotocol.sdk + io.modelcontextprotocol.sdk mcp ${project.version} - org.modelcontextprotocol.sdk + io.modelcontextprotocol.sdk mcp-test ${project.version} - org.modelcontextprotocol.sdk + io.modelcontextprotocol.sdk mcp-webflux-sse-transport ${project.version} - org.modelcontextprotocol.sdk + io.modelcontextprotocol.sdk mcp-webmvc-sse-transport ${project.version} diff --git a/mcp-docs/pom.xml b/mcp-docs/pom.xml index fe61156..feac637 100644 --- a/mcp-docs/pom.xml +++ b/mcp-docs/pom.xml @@ -18,7 +18,7 @@ 4.0.0 - org.modelcontextprotocol.sdk + io.modelcontextprotocol.sdk mcp-parent 0.7.0-SNAPSHOT diff --git a/mcp-docs/src/main/antora/modules/ROOT/pages/dependency-management.adoc b/mcp-docs/src/main/antora/modules/ROOT/pages/dependency-management.adoc index 3aaf09e..7fcbba5 100644 --- a/mcp-docs/src/main/antora/modules/ROOT/pages/dependency-management.adoc +++ b/mcp-docs/src/main/antora/modules/ROOT/pages/dependency-management.adoc @@ -20,7 +20,7 @@ Maven:: - org.modelcontextprotocol.sdk + io.modelcontextprotocol.sdk mcp-bom 0.6.0-SNAPSHOT pom @@ -35,7 +35,7 @@ Gradle:: [source,groovy,indent=0,subs="verbatim,quotes"] ---- dependencies { - implementation platform("org.modelcontextprotocol.sdk:mcp-bom:0.6.0-SNAPSHOT") + implementation platform("io.modelcontextprotocol.sdk:mcp-bom:0.6.0-SNAPSHOT") //... } ---- @@ -53,16 +53,16 @@ The following dependencies are available and managed by the BOM: === Core Dependencies -* `org.modelcontextprotocol.sdk:mcp` - Core MCP library providing the base functionality and APIs for Model Context Protocol implementation. +* `io.modelcontextprotocol.sdk:mcp` - Core MCP library providing the base functionality and APIs for Model Context Protocol implementation. === Transport Dependencies -* `org.modelcontextprotocol.sdk:mcp-webflux-sse-transport` - WebFlux-based Server-Sent Events (SSE) transport implementation for reactive applications. -* `org.modelcontextprotocol.sdk:mcp-webmvc-sse-transport` - WebMVC-based Server-Sent Events (SSE) transport implementation for servlet-based applications. +* `io.modelcontextprotocol.sdk:mcp-webflux-sse-transport` - WebFlux-based Server-Sent Events (SSE) transport implementation for reactive applications. +* `io.modelcontextprotocol.sdk:mcp-webmvc-sse-transport` - WebMVC-based Server-Sent Events (SSE) transport implementation for servlet-based applications. === Testing Dependencies -* `org.modelcontextprotocol.sdk:mcp-test` - Testing utilities and support for MCP-based applications. +* `io.modelcontextprotocol.sdk:mcp-test` - Testing utilities and support for MCP-based applications. [[repositories]] === Milestone and Snapshot Repositories diff --git a/mcp-docs/src/main/antora/modules/ROOT/pages/mcp.adoc b/mcp-docs/src/main/antora/modules/ROOT/pages/mcp.adoc index 86ca519..6237ed1 100644 --- a/mcp-docs/src/main/antora/modules/ROOT/pages/mcp.adoc +++ b/mcp-docs/src/main/antora/modules/ROOT/pages/mcp.adoc @@ -34,7 +34,7 @@ The core MCP functionality: [source,xml] ---- - org.modelcontextprotocol.sdk + io.modelcontextprotocol.sdk mcp ---- @@ -46,13 +46,13 @@ For HTTP SSE transport implementations, add one of the following dependencies ---- - org.modelcontextprotocol.sdk + io.modelcontextprotocol.sdk mcp-webflux-sse-transport - org.modelcontextprotocol.sdk + io.modelcontextprotocol.sdk mcp-webmvc-sse-transport ---- @@ -64,7 +64,7 @@ The core MCP functionality: [source,groovy] ---- dependencies { - implementation 'org.modelcontextprotocol.sdk:mcp' + implementation 'io.modelcontextprotocol.sdk:mcp' } ---- + @@ -74,10 +74,10 @@ For HTTP SSE transport implementations, add one of the following dependencies [source,groovy] ---- // Spring WebFlux-based SSE client and server transport -implementation 'org.modelcontextprotocol.sdk:mcp-webflux-sse-transport' +implementation 'io.modelcontextprotocol.sdk:mcp-webflux-sse-transport' // Spring WebMVC-based SSE server transport -implementation 'org.modelcontextprotocol.sdk:mcp-webmvc-sse-transport' +implementation 'io.modelcontextprotocol.sdk:mcp-webmvc-sse-transport' ---- ====== diff --git a/mcp-docs/src/main/antora/modules/ROOT/pages/overview.adoc b/mcp-docs/src/main/antora/modules/ROOT/pages/overview.adoc index 28d4cb4..e3ec80b 100644 --- a/mcp-docs/src/main/antora/modules/ROOT/pages/overview.adoc +++ b/mcp-docs/src/main/antora/modules/ROOT/pages/overview.adoc @@ -39,19 +39,19 @@ Maven:: ---- - org.modelcontextprotocol.sdk + io.modelcontextprotocol.sdk mcp - org.modelcontextprotocol.sdk + io.modelcontextprotocol.sdk mcp-webflux-sse-transport - org.modelcontextprotocol.sdk + io.modelcontextprotocol.sdk mcp-webmvc-sse-transport @@ -78,9 +78,9 @@ Gradle:: [source,groovy] ---- dependencies { - implementation 'org.modelcontextprotocol.sdk:mcp' // Core - implementation 'org.modelcontextprotocol.sdk:mcp-webflux-sse-transport' // Optional - implementation 'org.modelcontextprotocol.sdk:mcp-webmvc-sse-transport' // Optional + implementation 'io.modelcontextprotocol.sdk:mcp' // Core + implementation 'io.modelcontextprotocol.sdk:mcp-webflux-sse-transport' // Optional + implementation 'io.modelcontextprotocol.sdk:mcp-webmvc-sse-transport' // Optional } repositories { diff --git a/mcp-test/pom.xml b/mcp-test/pom.xml index e1edaf2..e6b4170 100644 --- a/mcp-test/pom.xml +++ b/mcp-test/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.modelcontextprotocol.sdk + io.modelcontextprotocol.sdk mcp-parent 0.7.0-SNAPSHOT @@ -22,7 +22,7 @@ - org.modelcontextprotocol.sdk + io.modelcontextprotocol.sdk mcp 0.7.0-SNAPSHOT diff --git a/mcp-test/src/main/java/org/modelcontextprotocol/MockMcpTransport.java b/mcp-test/src/main/java/io/modelcontextprotocol/MockMcpTransport.java similarity index 88% rename from mcp-test/src/main/java/org/modelcontextprotocol/MockMcpTransport.java rename to mcp-test/src/main/java/io/modelcontextprotocol/MockMcpTransport.java index 9660d19..0604768 100644 --- a/mcp-test/src/main/java/org/modelcontextprotocol/MockMcpTransport.java +++ b/mcp-test/src/main/java/io/modelcontextprotocol/MockMcpTransport.java @@ -2,18 +2,18 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol; +package io.modelcontextprotocol; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import org.modelcontextprotocol.spec.ClientMcpTransport; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.ServerMcpTransport; -import org.modelcontextprotocol.spec.McpSchema.JSONRPCNotification; -import org.modelcontextprotocol.spec.McpSchema.JSONRPCRequest; +import io.modelcontextprotocol.spec.ClientMcpTransport; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.ServerMcpTransport; +import io.modelcontextprotocol.spec.McpSchema.JSONRPCNotification; +import io.modelcontextprotocol.spec.McpSchema.JSONRPCRequest; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.core.publisher.Sinks; diff --git a/mcp-test/src/main/java/org/modelcontextprotocol/client/AbstractMcpAsyncClientTests.java b/mcp-test/src/main/java/io/modelcontextprotocol/client/AbstractMcpAsyncClientTests.java similarity index 91% rename from mcp-test/src/main/java/org/modelcontextprotocol/client/AbstractMcpAsyncClientTests.java rename to mcp-test/src/main/java/io/modelcontextprotocol/client/AbstractMcpAsyncClientTests.java index b4e2b30..affbc4d 100644 --- a/mcp-test/src/main/java/org/modelcontextprotocol/client/AbstractMcpAsyncClientTests.java +++ b/mcp-test/src/main/java/io/modelcontextprotocol/client/AbstractMcpAsyncClientTests.java @@ -2,31 +2,33 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.client; +package io.modelcontextprotocol.client; import java.time.Duration; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Function; +import io.modelcontextprotocol.client.McpAsyncClient; +import io.modelcontextprotocol.client.McpClient; +import io.modelcontextprotocol.spec.ClientMcpTransport; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.McpTransport; +import io.modelcontextprotocol.spec.McpSchema.CallToolRequest; +import io.modelcontextprotocol.spec.McpSchema.ClientCapabilities; +import io.modelcontextprotocol.spec.McpSchema.CreateMessageRequest; +import io.modelcontextprotocol.spec.McpSchema.CreateMessageResult; +import io.modelcontextprotocol.spec.McpSchema.GetPromptRequest; +import io.modelcontextprotocol.spec.McpSchema.Prompt; +import io.modelcontextprotocol.spec.McpSchema.Resource; +import io.modelcontextprotocol.spec.McpSchema.Root; +import io.modelcontextprotocol.spec.McpSchema.SubscribeRequest; +import io.modelcontextprotocol.spec.McpSchema.Tool; +import io.modelcontextprotocol.spec.McpSchema.UnsubscribeRequest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.modelcontextprotocol.spec.ClientMcpTransport; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.McpSchema.CallToolRequest; -import org.modelcontextprotocol.spec.McpSchema.ClientCapabilities; -import org.modelcontextprotocol.spec.McpSchema.CreateMessageRequest; -import org.modelcontextprotocol.spec.McpSchema.CreateMessageResult; -import org.modelcontextprotocol.spec.McpSchema.GetPromptRequest; -import org.modelcontextprotocol.spec.McpSchema.Prompt; -import org.modelcontextprotocol.spec.McpSchema.Resource; -import org.modelcontextprotocol.spec.McpSchema.Root; -import org.modelcontextprotocol.spec.McpSchema.SubscribeRequest; -import org.modelcontextprotocol.spec.McpSchema.Tool; -import org.modelcontextprotocol.spec.McpSchema.UnsubscribeRequest; -import org.modelcontextprotocol.spec.McpTransport; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/mcp-test/src/main/java/org/modelcontextprotocol/client/AbstractMcpSyncClientTests.java b/mcp-test/src/main/java/io/modelcontextprotocol/client/AbstractMcpSyncClientTests.java similarity index 88% rename from mcp-test/src/main/java/org/modelcontextprotocol/client/AbstractMcpSyncClientTests.java rename to mcp-test/src/main/java/io/modelcontextprotocol/client/AbstractMcpSyncClientTests.java index 8115903..df08498 100644 --- a/mcp-test/src/main/java/org/modelcontextprotocol/client/AbstractMcpSyncClientTests.java +++ b/mcp-test/src/main/java/io/modelcontextprotocol/client/AbstractMcpSyncClientTests.java @@ -2,30 +2,32 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.client; +package io.modelcontextprotocol.client; import java.time.Duration; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; +import io.modelcontextprotocol.client.McpClient; +import io.modelcontextprotocol.client.McpSyncClient; +import io.modelcontextprotocol.spec.ClientMcpTransport; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.McpSchema.CallToolRequest; +import io.modelcontextprotocol.spec.McpSchema.CallToolResult; +import io.modelcontextprotocol.spec.McpSchema.ClientCapabilities; +import io.modelcontextprotocol.spec.McpSchema.ListResourceTemplatesResult; +import io.modelcontextprotocol.spec.McpSchema.ListResourcesResult; +import io.modelcontextprotocol.spec.McpSchema.ListToolsResult; +import io.modelcontextprotocol.spec.McpSchema.ReadResourceResult; +import io.modelcontextprotocol.spec.McpSchema.Resource; +import io.modelcontextprotocol.spec.McpSchema.Root; +import io.modelcontextprotocol.spec.McpSchema.SubscribeRequest; +import io.modelcontextprotocol.spec.McpSchema.TextContent; +import io.modelcontextprotocol.spec.McpSchema.Tool; +import io.modelcontextprotocol.spec.McpSchema.UnsubscribeRequest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.modelcontextprotocol.spec.ClientMcpTransport; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.McpSchema.CallToolRequest; -import org.modelcontextprotocol.spec.McpSchema.CallToolResult; -import org.modelcontextprotocol.spec.McpSchema.ClientCapabilities; -import org.modelcontextprotocol.spec.McpSchema.ListResourceTemplatesResult; -import org.modelcontextprotocol.spec.McpSchema.ListResourcesResult; -import org.modelcontextprotocol.spec.McpSchema.ListToolsResult; -import org.modelcontextprotocol.spec.McpSchema.ReadResourceResult; -import org.modelcontextprotocol.spec.McpSchema.Resource; -import org.modelcontextprotocol.spec.McpSchema.Root; -import org.modelcontextprotocol.spec.McpSchema.SubscribeRequest; -import org.modelcontextprotocol.spec.McpSchema.TextContent; -import org.modelcontextprotocol.spec.McpSchema.Tool; -import org.modelcontextprotocol.spec.McpSchema.UnsubscribeRequest; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; diff --git a/mcp-test/src/main/java/org/modelcontextprotocol/server/AbstractMcpAsyncServerTests.java b/mcp-test/src/main/java/io/modelcontextprotocol/server/AbstractMcpAsyncServerTests.java similarity index 94% rename from mcp-test/src/main/java/org/modelcontextprotocol/server/AbstractMcpAsyncServerTests.java rename to mcp-test/src/main/java/io/modelcontextprotocol/server/AbstractMcpAsyncServerTests.java index 43f0ff8..730f367 100644 --- a/mcp-test/src/main/java/org/modelcontextprotocol/server/AbstractMcpAsyncServerTests.java +++ b/mcp-test/src/main/java/io/modelcontextprotocol/server/AbstractMcpAsyncServerTests.java @@ -2,26 +2,29 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.server; +package io.modelcontextprotocol.server; import java.time.Duration; import java.util.List; +import io.modelcontextprotocol.server.McpAsyncServer; +import io.modelcontextprotocol.server.McpServer; +import io.modelcontextprotocol.server.McpServerFeatures; +import io.modelcontextprotocol.spec.McpError; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.McpTransport; +import io.modelcontextprotocol.spec.ServerMcpTransport; +import io.modelcontextprotocol.spec.McpSchema.CallToolResult; +import io.modelcontextprotocol.spec.McpSchema.GetPromptResult; +import io.modelcontextprotocol.spec.McpSchema.Prompt; +import io.modelcontextprotocol.spec.McpSchema.PromptMessage; +import io.modelcontextprotocol.spec.McpSchema.ReadResourceResult; +import io.modelcontextprotocol.spec.McpSchema.Resource; +import io.modelcontextprotocol.spec.McpSchema.ServerCapabilities; +import io.modelcontextprotocol.spec.McpSchema.Tool; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.modelcontextprotocol.spec.McpError; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.McpSchema.CallToolResult; -import org.modelcontextprotocol.spec.McpSchema.GetPromptResult; -import org.modelcontextprotocol.spec.McpSchema.Prompt; -import org.modelcontextprotocol.spec.McpSchema.PromptMessage; -import org.modelcontextprotocol.spec.McpSchema.ReadResourceResult; -import org.modelcontextprotocol.spec.McpSchema.Resource; -import org.modelcontextprotocol.spec.McpSchema.ServerCapabilities; -import org.modelcontextprotocol.spec.McpSchema.Tool; -import org.modelcontextprotocol.spec.McpTransport; -import org.modelcontextprotocol.spec.ServerMcpTransport; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/mcp-test/src/main/java/org/modelcontextprotocol/server/AbstractMcpSyncServerTests.java b/mcp-test/src/main/java/io/modelcontextprotocol/server/AbstractMcpSyncServerTests.java similarity index 94% rename from mcp-test/src/main/java/org/modelcontextprotocol/server/AbstractMcpSyncServerTests.java rename to mcp-test/src/main/java/io/modelcontextprotocol/server/AbstractMcpSyncServerTests.java index 8a10bf8..9c44a82 100644 --- a/mcp-test/src/main/java/org/modelcontextprotocol/server/AbstractMcpSyncServerTests.java +++ b/mcp-test/src/main/java/io/modelcontextprotocol/server/AbstractMcpSyncServerTests.java @@ -2,25 +2,28 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.server; +package io.modelcontextprotocol.server; import java.util.List; +import io.modelcontextprotocol.server.McpServer; +import io.modelcontextprotocol.server.McpServerFeatures; +import io.modelcontextprotocol.server.McpSyncServer; +import io.modelcontextprotocol.spec.McpError; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.McpTransport; +import io.modelcontextprotocol.spec.ServerMcpTransport; +import io.modelcontextprotocol.spec.McpSchema.CallToolResult; +import io.modelcontextprotocol.spec.McpSchema.GetPromptResult; +import io.modelcontextprotocol.spec.McpSchema.Prompt; +import io.modelcontextprotocol.spec.McpSchema.PromptMessage; +import io.modelcontextprotocol.spec.McpSchema.ReadResourceResult; +import io.modelcontextprotocol.spec.McpSchema.Resource; +import io.modelcontextprotocol.spec.McpSchema.ServerCapabilities; +import io.modelcontextprotocol.spec.McpSchema.Tool; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.modelcontextprotocol.spec.McpError; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.McpSchema.CallToolResult; -import org.modelcontextprotocol.spec.McpSchema.GetPromptResult; -import org.modelcontextprotocol.spec.McpSchema.Prompt; -import org.modelcontextprotocol.spec.McpSchema.PromptMessage; -import org.modelcontextprotocol.spec.McpSchema.ReadResourceResult; -import org.modelcontextprotocol.spec.McpSchema.Resource; -import org.modelcontextprotocol.spec.McpSchema.ServerCapabilities; -import org.modelcontextprotocol.spec.McpSchema.Tool; -import org.modelcontextprotocol.spec.McpTransport; -import org.modelcontextprotocol.spec.ServerMcpTransport; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; diff --git a/mcp-transport/mcp-webflux-sse-transport/README.md b/mcp-transport/mcp-webflux-sse-transport/README.md index a38741f..475882b 100644 --- a/mcp-transport/mcp-webflux-sse-transport/README.md +++ b/mcp-transport/mcp-webflux-sse-transport/README.md @@ -2,7 +2,7 @@ ```xml - org.modelcontextprotocol.sdk + io.modelcontextprotocol.sdk mcp-webflux-sse-transport ``` diff --git a/mcp-transport/mcp-webflux-sse-transport/pom.xml b/mcp-transport/mcp-webflux-sse-transport/pom.xml index fb65db4..d737a38 100644 --- a/mcp-transport/mcp-webflux-sse-transport/pom.xml +++ b/mcp-transport/mcp-webflux-sse-transport/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.modelcontextprotocol.sdk + io.modelcontextprotocol.sdk mcp-parent 0.7.0-SNAPSHOT ../../pom.xml @@ -23,13 +23,13 @@ - org.modelcontextprotocol.sdk + io.modelcontextprotocol.sdk mcp 0.7.0-SNAPSHOT - org.modelcontextprotocol.sdk + io.modelcontextprotocol.sdk mcp-test 0.7.0-SNAPSHOT test diff --git a/mcp-transport/mcp-webflux-sse-transport/src/main/java/org/modelcontextprotocol/client/transport/WebFluxSseClientTransport.java b/mcp-transport/mcp-webflux-sse-transport/src/main/java/io/modelcontextprotocol/client/transport/WebFluxSseClientTransport.java similarity index 96% rename from mcp-transport/mcp-webflux-sse-transport/src/main/java/org/modelcontextprotocol/client/transport/WebFluxSseClientTransport.java rename to mcp-transport/mcp-webflux-sse-transport/src/main/java/io/modelcontextprotocol/client/transport/WebFluxSseClientTransport.java index 3a8375b..4ab5cdd 100644 --- a/mcp-transport/mcp-webflux-sse-transport/src/main/java/org/modelcontextprotocol/client/transport/WebFluxSseClientTransport.java +++ b/mcp-transport/mcp-webflux-sse-transport/src/main/java/io/modelcontextprotocol/client/transport/WebFluxSseClientTransport.java @@ -1,7 +1,7 @@ /* * Copyright 2024 - 2024 the original author or authors. */ -package org.modelcontextprotocol.client.transport; +package io.modelcontextprotocol.client.transport; import java.io.IOException; import java.util.function.BiConsumer; @@ -9,11 +9,11 @@ import java.util.function.Function; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import org.modelcontextprotocol.spec.ClientMcpTransport; -import org.modelcontextprotocol.spec.McpError; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.McpSchema.JSONRPCMessage; -import org.modelcontextprotocol.util.Assert; +import io.modelcontextprotocol.spec.ClientMcpTransport; +import io.modelcontextprotocol.spec.McpError; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.McpSchema.JSONRPCMessage; +import io.modelcontextprotocol.util.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.Disposable; @@ -32,7 +32,7 @@ import org.springframework.web.reactive.function.client.WebClient; /** * Server-Sent Events (SSE) implementation of the - * {@link org.modelcontextprotocol.spec.McpTransport} that follows the MCP HTTP with SSE + * {@link io.modelcontextprotocol.spec.McpTransport} that follows the MCP HTTP with SSE * transport specification. * *

diff --git a/mcp-transport/mcp-webflux-sse-transport/src/main/java/org/modelcontextprotocol/server/transport/WebFluxSseServerTransport.java b/mcp-transport/mcp-webflux-sse-transport/src/main/java/io/modelcontextprotocol/server/transport/WebFluxSseServerTransport.java similarity index 98% rename from mcp-transport/mcp-webflux-sse-transport/src/main/java/org/modelcontextprotocol/server/transport/WebFluxSseServerTransport.java rename to mcp-transport/mcp-webflux-sse-transport/src/main/java/io/modelcontextprotocol/server/transport/WebFluxSseServerTransport.java index 8baf696..2dbc929 100644 --- a/mcp-transport/mcp-webflux-sse-transport/src/main/java/org/modelcontextprotocol/server/transport/WebFluxSseServerTransport.java +++ b/mcp-transport/mcp-webflux-sse-transport/src/main/java/io/modelcontextprotocol/server/transport/WebFluxSseServerTransport.java @@ -1,4 +1,4 @@ -package org.modelcontextprotocol.server.transport; +package io.modelcontextprotocol.server.transport; import java.io.IOException; import java.time.Duration; @@ -9,10 +9,10 @@ import java.util.function.Function; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import org.modelcontextprotocol.spec.McpError; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.ServerMcpTransport; -import org.modelcontextprotocol.util.Assert; +import io.modelcontextprotocol.spec.McpError; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.ServerMcpTransport; +import io.modelcontextprotocol.util.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Flux; diff --git a/mcp-transport/mcp-webflux-sse-transport/src/test/java/org/modelcontextprotocol/WebFluxSseIntegrationTests.java b/mcp-transport/mcp-webflux-sse-transport/src/test/java/io/modelcontextprotocol/WebFluxSseIntegrationTests.java similarity index 93% rename from mcp-transport/mcp-webflux-sse-transport/src/test/java/org/modelcontextprotocol/WebFluxSseIntegrationTests.java rename to mcp-transport/mcp-webflux-sse-transport/src/test/java/io/modelcontextprotocol/WebFluxSseIntegrationTests.java index 67a9191..4cd24c6 100644 --- a/mcp-transport/mcp-webflux-sse-transport/src/test/java/org/modelcontextprotocol/WebFluxSseIntegrationTests.java +++ b/mcp-transport/mcp-webflux-sse-transport/src/test/java/io/modelcontextprotocol/WebFluxSseIntegrationTests.java @@ -1,7 +1,7 @@ /* * Copyright 2024 - 2024 the original author or authors. */ -package org.modelcontextprotocol; +package io.modelcontextprotocol; import java.time.Duration; import java.util.List; @@ -11,28 +11,28 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; import com.fasterxml.jackson.databind.ObjectMapper; +import io.modelcontextprotocol.client.McpClient; +import io.modelcontextprotocol.client.transport.HttpClientSseClientTransport; +import io.modelcontextprotocol.client.transport.WebFluxSseClientTransport; +import io.modelcontextprotocol.server.McpServer; +import io.modelcontextprotocol.server.McpServerFeatures; +import io.modelcontextprotocol.server.transport.WebFluxSseServerTransport; +import io.modelcontextprotocol.spec.McpError; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.McpSchema.CallToolResult; +import io.modelcontextprotocol.spec.McpSchema.ClientCapabilities; +import io.modelcontextprotocol.spec.McpSchema.CreateMessageRequest; +import io.modelcontextprotocol.spec.McpSchema.CreateMessageResult; +import io.modelcontextprotocol.spec.McpSchema.InitializeResult; +import io.modelcontextprotocol.spec.McpSchema.Role; +import io.modelcontextprotocol.spec.McpSchema.Root; +import io.modelcontextprotocol.spec.McpSchema.ServerCapabilities; +import io.modelcontextprotocol.spec.McpSchema.Tool; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import org.modelcontextprotocol.client.McpClient; -import org.modelcontextprotocol.client.transport.HttpClientSseClientTransport; -import org.modelcontextprotocol.client.transport.WebFluxSseClientTransport; -import org.modelcontextprotocol.server.McpServer; -import org.modelcontextprotocol.server.McpServerFeatures; -import org.modelcontextprotocol.server.transport.WebFluxSseServerTransport; -import org.modelcontextprotocol.spec.McpError; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.McpSchema.CallToolResult; -import org.modelcontextprotocol.spec.McpSchema.ClientCapabilities; -import org.modelcontextprotocol.spec.McpSchema.CreateMessageRequest; -import org.modelcontextprotocol.spec.McpSchema.CreateMessageResult; -import org.modelcontextprotocol.spec.McpSchema.InitializeResult; -import org.modelcontextprotocol.spec.McpSchema.Role; -import org.modelcontextprotocol.spec.McpSchema.Root; -import org.modelcontextprotocol.spec.McpSchema.ServerCapabilities; -import org.modelcontextprotocol.spec.McpSchema.Tool; import reactor.netty.DisposableServer; import reactor.netty.http.server.HttpServer; import reactor.test.StepVerifier; diff --git a/mcp-transport/mcp-webflux-sse-transport/src/test/java/org/modelcontextprotocol/client/WebFluxSseMcpAsyncClientTests.java b/mcp-transport/mcp-webflux-sse-transport/src/test/java/io/modelcontextprotocol/client/WebFluxSseMcpAsyncClientTests.java similarity index 81% rename from mcp-transport/mcp-webflux-sse-transport/src/test/java/org/modelcontextprotocol/client/WebFluxSseMcpAsyncClientTests.java rename to mcp-transport/mcp-webflux-sse-transport/src/test/java/io/modelcontextprotocol/client/WebFluxSseMcpAsyncClientTests.java index 2299bf3..79a9db8 100644 --- a/mcp-transport/mcp-webflux-sse-transport/src/test/java/org/modelcontextprotocol/client/WebFluxSseMcpAsyncClientTests.java +++ b/mcp-transport/mcp-webflux-sse-transport/src/test/java/io/modelcontextprotocol/client/WebFluxSseMcpAsyncClientTests.java @@ -2,11 +2,13 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.client; +package io.modelcontextprotocol.client; +import io.modelcontextprotocol.client.AbstractMcpAsyncClientTests; +import io.modelcontextprotocol.client.McpAsyncClient; +import io.modelcontextprotocol.client.transport.WebFluxSseClientTransport; +import io.modelcontextprotocol.spec.ClientMcpTransport; import org.junit.jupiter.api.Timeout; -import org.modelcontextprotocol.client.transport.WebFluxSseClientTransport; -import org.modelcontextprotocol.spec.ClientMcpTransport; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.wait.strategy.Wait; diff --git a/mcp-transport/mcp-webflux-sse-transport/src/test/java/org/modelcontextprotocol/client/WebFluxSseMcpSyncClientTests.java b/mcp-transport/mcp-webflux-sse-transport/src/test/java/io/modelcontextprotocol/client/WebFluxSseMcpSyncClientTests.java similarity index 82% rename from mcp-transport/mcp-webflux-sse-transport/src/test/java/org/modelcontextprotocol/client/WebFluxSseMcpSyncClientTests.java rename to mcp-transport/mcp-webflux-sse-transport/src/test/java/io/modelcontextprotocol/client/WebFluxSseMcpSyncClientTests.java index a154987..16108c6 100644 --- a/mcp-transport/mcp-webflux-sse-transport/src/test/java/org/modelcontextprotocol/client/WebFluxSseMcpSyncClientTests.java +++ b/mcp-transport/mcp-webflux-sse-transport/src/test/java/io/modelcontextprotocol/client/WebFluxSseMcpSyncClientTests.java @@ -2,11 +2,13 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.client; +package io.modelcontextprotocol.client; +import io.modelcontextprotocol.client.AbstractMcpSyncClientTests; +import io.modelcontextprotocol.client.McpSyncClient; +import io.modelcontextprotocol.client.transport.WebFluxSseClientTransport; +import io.modelcontextprotocol.spec.ClientMcpTransport; import org.junit.jupiter.api.Timeout; -import org.modelcontextprotocol.client.transport.WebFluxSseClientTransport; -import org.modelcontextprotocol.spec.ClientMcpTransport; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.wait.strategy.Wait; diff --git a/mcp-transport/mcp-webflux-sse-transport/src/test/java/org/modelcontextprotocol/client/transport/WebFluxSseClientTransportTests.java b/mcp-transport/mcp-webflux-sse-transport/src/test/java/io/modelcontextprotocol/client/transport/WebFluxSseClientTransportTests.java similarity index 97% rename from mcp-transport/mcp-webflux-sse-transport/src/test/java/org/modelcontextprotocol/client/transport/WebFluxSseClientTransportTests.java rename to mcp-transport/mcp-webflux-sse-transport/src/test/java/io/modelcontextprotocol/client/transport/WebFluxSseClientTransportTests.java index 80de0a8..a09700d 100644 --- a/mcp-transport/mcp-webflux-sse-transport/src/test/java/org/modelcontextprotocol/client/transport/WebFluxSseClientTransportTests.java +++ b/mcp-transport/mcp-webflux-sse-transport/src/test/java/io/modelcontextprotocol/client/transport/WebFluxSseClientTransportTests.java @@ -2,7 +2,7 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.client.transport; +package io.modelcontextprotocol.client.transport; import java.time.Duration; import java.util.Map; @@ -10,12 +10,13 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; import com.fasterxml.jackson.databind.ObjectMapper; +import io.modelcontextprotocol.client.transport.WebFluxSseClientTransport; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.McpSchema.JSONRPCRequest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.McpSchema.JSONRPCRequest; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.wait.strategy.Wait; import reactor.core.publisher.Flux; diff --git a/mcp-transport/mcp-webflux-sse-transport/src/test/java/org/modelcontextprotocol/server/WebFluxSseMcpAsyncServerTests.java b/mcp-transport/mcp-webflux-sse-transport/src/test/java/io/modelcontextprotocol/server/WebFluxSseMcpAsyncServerTests.java similarity index 82% rename from mcp-transport/mcp-webflux-sse-transport/src/test/java/org/modelcontextprotocol/server/WebFluxSseMcpAsyncServerTests.java rename to mcp-transport/mcp-webflux-sse-transport/src/test/java/io/modelcontextprotocol/server/WebFluxSseMcpAsyncServerTests.java index 5a4f797..b26afd6 100644 --- a/mcp-transport/mcp-webflux-sse-transport/src/test/java/org/modelcontextprotocol/server/WebFluxSseMcpAsyncServerTests.java +++ b/mcp-transport/mcp-webflux-sse-transport/src/test/java/io/modelcontextprotocol/server/WebFluxSseMcpAsyncServerTests.java @@ -2,12 +2,14 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.server; +package io.modelcontextprotocol.server; import com.fasterxml.jackson.databind.ObjectMapper; +import io.modelcontextprotocol.server.AbstractMcpAsyncServerTests; +import io.modelcontextprotocol.server.McpAsyncServer; +import io.modelcontextprotocol.server.transport.WebFluxSseServerTransport; +import io.modelcontextprotocol.spec.ServerMcpTransport; import org.junit.jupiter.api.Timeout; -import org.modelcontextprotocol.server.transport.WebFluxSseServerTransport; -import org.modelcontextprotocol.spec.ServerMcpTransport; import reactor.netty.DisposableServer; import reactor.netty.http.server.HttpServer; diff --git a/mcp-transport/mcp-webflux-sse-transport/src/test/java/org/modelcontextprotocol/server/WebFluxSseMcpSyncServerTests.java b/mcp-transport/mcp-webflux-sse-transport/src/test/java/io/modelcontextprotocol/server/WebFluxSseMcpSyncServerTests.java similarity index 83% rename from mcp-transport/mcp-webflux-sse-transport/src/test/java/org/modelcontextprotocol/server/WebFluxSseMcpSyncServerTests.java rename to mcp-transport/mcp-webflux-sse-transport/src/test/java/io/modelcontextprotocol/server/WebFluxSseMcpSyncServerTests.java index df9eacd..0ad5c73 100644 --- a/mcp-transport/mcp-webflux-sse-transport/src/test/java/org/modelcontextprotocol/server/WebFluxSseMcpSyncServerTests.java +++ b/mcp-transport/mcp-webflux-sse-transport/src/test/java/io/modelcontextprotocol/server/WebFluxSseMcpSyncServerTests.java @@ -2,12 +2,14 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.server; +package io.modelcontextprotocol.server; import com.fasterxml.jackson.databind.ObjectMapper; +import io.modelcontextprotocol.server.AbstractMcpSyncServerTests; +import io.modelcontextprotocol.server.McpSyncServer; +import io.modelcontextprotocol.server.transport.WebFluxSseServerTransport; +import io.modelcontextprotocol.spec.ServerMcpTransport; import org.junit.jupiter.api.Timeout; -import org.modelcontextprotocol.server.transport.WebFluxSseServerTransport; -import org.modelcontextprotocol.spec.ServerMcpTransport; import reactor.netty.DisposableServer; import reactor.netty.http.server.HttpServer; diff --git a/mcp-transport/mcp-webflux-sse-transport/src/test/java/org/modelcontextprotocol/server/transport/BlockingInputStream.java b/mcp-transport/mcp-webflux-sse-transport/src/test/java/io/modelcontextprotocol/server/transport/BlockingInputStream.java similarity index 96% rename from mcp-transport/mcp-webflux-sse-transport/src/test/java/org/modelcontextprotocol/server/transport/BlockingInputStream.java rename to mcp-transport/mcp-webflux-sse-transport/src/test/java/io/modelcontextprotocol/server/transport/BlockingInputStream.java index ec4b136..0ab72a9 100644 --- a/mcp-transport/mcp-webflux-sse-transport/src/test/java/org/modelcontextprotocol/server/transport/BlockingInputStream.java +++ b/mcp-transport/mcp-webflux-sse-transport/src/test/java/io/modelcontextprotocol/server/transport/BlockingInputStream.java @@ -1,7 +1,7 @@ /* * Copyright 2024 - 2024 the original author or authors. */ -package org.modelcontextprotocol.server.transport; +package io.modelcontextprotocol.server.transport; import java.io.IOException; import java.io.InputStream; diff --git a/mcp-transport/mcp-webmvc-sse-transport/README.md b/mcp-transport/mcp-webmvc-sse-transport/README.md index 22ed7e4..1e63e47 100644 --- a/mcp-transport/mcp-webmvc-sse-transport/README.md +++ b/mcp-transport/mcp-webmvc-sse-transport/README.md @@ -2,7 +2,7 @@ ```xml - org.modelcontextprotocol.sdk + io.modelcontextprotocol.sdk mcp-webmvc-sse-transport ``` diff --git a/mcp-transport/mcp-webmvc-sse-transport/pom.xml b/mcp-transport/mcp-webmvc-sse-transport/pom.xml index 7dcb169..4e3e910 100644 --- a/mcp-transport/mcp-webmvc-sse-transport/pom.xml +++ b/mcp-transport/mcp-webmvc-sse-transport/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.modelcontextprotocol.sdk + io.modelcontextprotocol.sdk mcp-parent 0.7.0-SNAPSHOT ../../pom.xml @@ -23,13 +23,13 @@ - org.modelcontextprotocol.sdk + io.modelcontextprotocol.sdk mcp 0.7.0-SNAPSHOT - org.modelcontextprotocol.sdk + io.modelcontextprotocol.sdk mcp-test 0.7.0-SNAPSHOT test diff --git a/mcp-transport/mcp-webmvc-sse-transport/src/main/java/org/modelcontextprotocol/server/transport/WebMvcSseServerTransport.java b/mcp-transport/mcp-webmvc-sse-transport/src/main/java/io/modelcontextprotocol/server/transport/WebMvcSseServerTransport.java similarity index 98% rename from mcp-transport/mcp-webmvc-sse-transport/src/main/java/org/modelcontextprotocol/server/transport/WebMvcSseServerTransport.java rename to mcp-transport/mcp-webmvc-sse-transport/src/main/java/io/modelcontextprotocol/server/transport/WebMvcSseServerTransport.java index aa00066..7339311 100644 --- a/mcp-transport/mcp-webmvc-sse-transport/src/main/java/org/modelcontextprotocol/server/transport/WebMvcSseServerTransport.java +++ b/mcp-transport/mcp-webmvc-sse-transport/src/main/java/io/modelcontextprotocol/server/transport/WebMvcSseServerTransport.java @@ -2,7 +2,7 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.server.transport; +package io.modelcontextprotocol.server.transport; import java.io.IOException; import java.util.UUID; @@ -11,10 +11,10 @@ import java.util.function.Function; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import org.modelcontextprotocol.spec.McpError; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.ServerMcpTransport; -import org.modelcontextprotocol.util.Assert; +import io.modelcontextprotocol.spec.McpError; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.ServerMcpTransport; +import io.modelcontextprotocol.util.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Mono; diff --git a/mcp-transport/mcp-webmvc-sse-transport/src/test/java/org/modelcontextprotocol/server/WebMvcSseAsyncServerTransportTests.java b/mcp-transport/mcp-webmvc-sse-transport/src/test/java/io/modelcontextprotocol/server/WebMvcSseAsyncServerTransportTests.java similarity index 93% rename from mcp-transport/mcp-webmvc-sse-transport/src/test/java/org/modelcontextprotocol/server/WebMvcSseAsyncServerTransportTests.java rename to mcp-transport/mcp-webmvc-sse-transport/src/test/java/io/modelcontextprotocol/server/WebMvcSseAsyncServerTransportTests.java index 846482f..d00c17e 100644 --- a/mcp-transport/mcp-webmvc-sse-transport/src/test/java/org/modelcontextprotocol/server/WebMvcSseAsyncServerTransportTests.java +++ b/mcp-transport/mcp-webmvc-sse-transport/src/test/java/io/modelcontextprotocol/server/WebMvcSseAsyncServerTransportTests.java @@ -2,15 +2,16 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.server; +package io.modelcontextprotocol.server; import com.fasterxml.jackson.databind.ObjectMapper; +import io.modelcontextprotocol.server.AbstractMcpAsyncServerTests; +import io.modelcontextprotocol.server.transport.WebMvcSseServerTransport; +import io.modelcontextprotocol.spec.ServerMcpTransport; import org.apache.catalina.Context; import org.apache.catalina.LifecycleException; import org.apache.catalina.startup.Tomcat; import org.junit.jupiter.api.Timeout; -import org.modelcontextprotocol.server.transport.WebMvcSseServerTransport; -import org.modelcontextprotocol.spec.ServerMcpTransport; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/mcp-transport/mcp-webmvc-sse-transport/src/test/java/org/modelcontextprotocol/server/WebMvcSseIntegrationTests.java b/mcp-transport/mcp-webmvc-sse-transport/src/test/java/io/modelcontextprotocol/server/WebMvcSseIntegrationTests.java similarity index 94% rename from mcp-transport/mcp-webmvc-sse-transport/src/test/java/org/modelcontextprotocol/server/WebMvcSseIntegrationTests.java rename to mcp-transport/mcp-webmvc-sse-transport/src/test/java/io/modelcontextprotocol/server/WebMvcSseIntegrationTests.java index 96fbc3e..6600ab4 100644 --- a/mcp-transport/mcp-webmvc-sse-transport/src/test/java/org/modelcontextprotocol/server/WebMvcSseIntegrationTests.java +++ b/mcp-transport/mcp-webmvc-sse-transport/src/test/java/io/modelcontextprotocol/server/WebMvcSseIntegrationTests.java @@ -1,7 +1,7 @@ /* * Copyright 2024 - 2024 the original author or authors. */ -package org.modelcontextprotocol.server; +package io.modelcontextprotocol.server; import java.time.Duration; import java.util.List; @@ -10,6 +10,22 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; import com.fasterxml.jackson.databind.ObjectMapper; +import io.modelcontextprotocol.client.McpClient; +import io.modelcontextprotocol.client.transport.HttpClientSseClientTransport; +import io.modelcontextprotocol.server.McpServer; +import io.modelcontextprotocol.server.McpServerFeatures; +import io.modelcontextprotocol.server.transport.WebMvcSseServerTransport; +import io.modelcontextprotocol.spec.McpError; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.McpSchema.CallToolResult; +import io.modelcontextprotocol.spec.McpSchema.ClientCapabilities; +import io.modelcontextprotocol.spec.McpSchema.CreateMessageRequest; +import io.modelcontextprotocol.spec.McpSchema.CreateMessageResult; +import io.modelcontextprotocol.spec.McpSchema.InitializeResult; +import io.modelcontextprotocol.spec.McpSchema.Role; +import io.modelcontextprotocol.spec.McpSchema.Root; +import io.modelcontextprotocol.spec.McpSchema.ServerCapabilities; +import io.modelcontextprotocol.spec.McpSchema.Tool; import org.apache.catalina.Context; import org.apache.catalina.LifecycleException; import org.apache.catalina.LifecycleState; @@ -17,20 +33,6 @@ import org.apache.catalina.startup.Tomcat; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.modelcontextprotocol.client.McpClient; -import org.modelcontextprotocol.client.transport.HttpClientSseClientTransport; -import org.modelcontextprotocol.server.transport.WebMvcSseServerTransport; -import org.modelcontextprotocol.spec.McpError; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.McpSchema.CallToolResult; -import org.modelcontextprotocol.spec.McpSchema.ClientCapabilities; -import org.modelcontextprotocol.spec.McpSchema.CreateMessageRequest; -import org.modelcontextprotocol.spec.McpSchema.CreateMessageResult; -import org.modelcontextprotocol.spec.McpSchema.InitializeResult; -import org.modelcontextprotocol.spec.McpSchema.Role; -import org.modelcontextprotocol.spec.McpSchema.Root; -import org.modelcontextprotocol.spec.McpSchema.ServerCapabilities; -import org.modelcontextprotocol.spec.McpSchema.Tool; import reactor.test.StepVerifier; import org.springframework.context.annotation.Bean; diff --git a/mcp-transport/mcp-webmvc-sse-transport/src/test/java/org/modelcontextprotocol/server/WebMvcSseSyncServerTransportTests.java b/mcp-transport/mcp-webmvc-sse-transport/src/test/java/io/modelcontextprotocol/server/WebMvcSseSyncServerTransportTests.java similarity index 93% rename from mcp-transport/mcp-webmvc-sse-transport/src/test/java/org/modelcontextprotocol/server/WebMvcSseSyncServerTransportTests.java rename to mcp-transport/mcp-webmvc-sse-transport/src/test/java/io/modelcontextprotocol/server/WebMvcSseSyncServerTransportTests.java index 8024173..7539790 100644 --- a/mcp-transport/mcp-webmvc-sse-transport/src/test/java/org/modelcontextprotocol/server/WebMvcSseSyncServerTransportTests.java +++ b/mcp-transport/mcp-webmvc-sse-transport/src/test/java/io/modelcontextprotocol/server/WebMvcSseSyncServerTransportTests.java @@ -2,15 +2,16 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.server; +package io.modelcontextprotocol.server; import com.fasterxml.jackson.databind.ObjectMapper; +import io.modelcontextprotocol.server.AbstractMcpSyncServerTests; +import io.modelcontextprotocol.server.transport.WebMvcSseServerTransport; +import io.modelcontextprotocol.spec.ServerMcpTransport; import org.apache.catalina.Context; import org.apache.catalina.LifecycleException; import org.apache.catalina.startup.Tomcat; import org.junit.jupiter.api.Timeout; -import org.modelcontextprotocol.server.transport.WebMvcSseServerTransport; -import org.modelcontextprotocol.spec.ServerMcpTransport; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/mcp-transport/mcp-webmvc-sse-transport/src/test/resources/logback.xml b/mcp-transport/mcp-webmvc-sse-transport/src/test/resources/logback.xml index e300a15..bc1140b 100644 --- a/mcp-transport/mcp-webmvc-sse-transport/src/test/resources/logback.xml +++ b/mcp-transport/mcp-webmvc-sse-transport/src/test/resources/logback.xml @@ -9,16 +9,16 @@ - + - + - + - + diff --git a/mcp/pom.xml b/mcp/pom.xml index d727c55..9890371 100644 --- a/mcp/pom.xml +++ b/mcp/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.modelcontextprotocol.sdk + io.modelcontextprotocol.sdk mcp-parent 0.7.0-SNAPSHOT diff --git a/mcp/src/main/java/org/modelcontextprotocol/client/McpAsyncClient.java b/mcp/src/main/java/io/modelcontextprotocol/client/McpAsyncClient.java similarity index 95% rename from mcp/src/main/java/org/modelcontextprotocol/client/McpAsyncClient.java rename to mcp/src/main/java/io/modelcontextprotocol/client/McpAsyncClient.java index 875de37..9a0933e 100644 --- a/mcp/src/main/java/org/modelcontextprotocol/client/McpAsyncClient.java +++ b/mcp/src/main/java/io/modelcontextprotocol/client/McpAsyncClient.java @@ -1,7 +1,7 @@ /* * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.client; +package io.modelcontextprotocol.client; import java.time.Duration; import java.util.ArrayList; @@ -13,25 +13,25 @@ import java.util.function.Consumer; import java.util.function.Function; import com.fasterxml.jackson.core.type.TypeReference; -import org.modelcontextprotocol.spec.ClientMcpTransport; -import org.modelcontextprotocol.spec.DefaultMcpSession; -import org.modelcontextprotocol.spec.DefaultMcpSession.NotificationHandler; -import org.modelcontextprotocol.spec.DefaultMcpSession.RequestHandler; -import org.modelcontextprotocol.spec.McpError; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.McpSchema.ClientCapabilities; -import org.modelcontextprotocol.spec.McpSchema.CreateMessageRequest; -import org.modelcontextprotocol.spec.McpSchema.CreateMessageResult; -import org.modelcontextprotocol.spec.McpSchema.GetPromptRequest; -import org.modelcontextprotocol.spec.McpSchema.GetPromptResult; -import org.modelcontextprotocol.spec.McpSchema.ListPromptsResult; -import org.modelcontextprotocol.spec.McpSchema.LoggingLevel; -import org.modelcontextprotocol.spec.McpSchema.LoggingMessageNotification; -import org.modelcontextprotocol.spec.McpSchema.PaginatedRequest; -import org.modelcontextprotocol.spec.McpSchema.Root; -import org.modelcontextprotocol.spec.McpTransport; -import org.modelcontextprotocol.util.Assert; -import org.modelcontextprotocol.util.Utils; +import io.modelcontextprotocol.spec.ClientMcpTransport; +import io.modelcontextprotocol.spec.DefaultMcpSession; +import io.modelcontextprotocol.spec.McpError; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.McpTransport; +import io.modelcontextprotocol.spec.DefaultMcpSession.NotificationHandler; +import io.modelcontextprotocol.spec.DefaultMcpSession.RequestHandler; +import io.modelcontextprotocol.spec.McpSchema.ClientCapabilities; +import io.modelcontextprotocol.spec.McpSchema.CreateMessageRequest; +import io.modelcontextprotocol.spec.McpSchema.CreateMessageResult; +import io.modelcontextprotocol.spec.McpSchema.GetPromptRequest; +import io.modelcontextprotocol.spec.McpSchema.GetPromptResult; +import io.modelcontextprotocol.spec.McpSchema.ListPromptsResult; +import io.modelcontextprotocol.spec.McpSchema.LoggingLevel; +import io.modelcontextprotocol.spec.McpSchema.LoggingMessageNotification; +import io.modelcontextprotocol.spec.McpSchema.PaginatedRequest; +import io.modelcontextprotocol.spec.McpSchema.Root; +import io.modelcontextprotocol.util.Assert; +import io.modelcontextprotocol.util.Utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Flux; diff --git a/mcp/src/main/java/org/modelcontextprotocol/client/McpClient.java b/mcp/src/main/java/io/modelcontextprotocol/client/McpClient.java similarity index 97% rename from mcp/src/main/java/org/modelcontextprotocol/client/McpClient.java rename to mcp/src/main/java/io/modelcontextprotocol/client/McpClient.java index 554c408..7ab01b7 100644 --- a/mcp/src/main/java/org/modelcontextprotocol/client/McpClient.java +++ b/mcp/src/main/java/io/modelcontextprotocol/client/McpClient.java @@ -2,7 +2,7 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.client; +package io.modelcontextprotocol.client; import java.time.Duration; import java.util.ArrayList; @@ -12,15 +12,15 @@ import java.util.Map; import java.util.function.Consumer; import java.util.function.Function; -import org.modelcontextprotocol.spec.ClientMcpTransport; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.McpTransport; -import org.modelcontextprotocol.spec.McpSchema.ClientCapabilities; -import org.modelcontextprotocol.spec.McpSchema.CreateMessageRequest; -import org.modelcontextprotocol.spec.McpSchema.CreateMessageResult; -import org.modelcontextprotocol.spec.McpSchema.Implementation; -import org.modelcontextprotocol.spec.McpSchema.Root; -import org.modelcontextprotocol.util.Assert; +import io.modelcontextprotocol.spec.ClientMcpTransport; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.McpTransport; +import io.modelcontextprotocol.spec.McpSchema.ClientCapabilities; +import io.modelcontextprotocol.spec.McpSchema.CreateMessageRequest; +import io.modelcontextprotocol.spec.McpSchema.CreateMessageResult; +import io.modelcontextprotocol.spec.McpSchema.Implementation; +import io.modelcontextprotocol.spec.McpSchema.Root; +import io.modelcontextprotocol.util.Assert; import reactor.core.publisher.Mono; /** diff --git a/mcp/src/main/java/org/modelcontextprotocol/client/McpClientFeatures.java b/mcp/src/main/java/io/modelcontextprotocol/client/McpClientFeatures.java similarity index 98% rename from mcp/src/main/java/org/modelcontextprotocol/client/McpClientFeatures.java rename to mcp/src/main/java/io/modelcontextprotocol/client/McpClientFeatures.java index 6cbc456..284b93f 100644 --- a/mcp/src/main/java/org/modelcontextprotocol/client/McpClientFeatures.java +++ b/mcp/src/main/java/io/modelcontextprotocol/client/McpClientFeatures.java @@ -2,7 +2,7 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.client; +package io.modelcontextprotocol.client; import java.util.ArrayList; import java.util.HashMap; @@ -12,9 +12,9 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.function.Consumer; import java.util.function.Function; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.util.Assert; -import org.modelcontextprotocol.util.Utils; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.util.Assert; +import io.modelcontextprotocol.util.Utils; import reactor.core.publisher.Mono; import reactor.core.scheduler.Schedulers; diff --git a/mcp/src/main/java/org/modelcontextprotocol/client/McpSyncClient.java b/mcp/src/main/java/io/modelcontextprotocol/client/McpSyncClient.java similarity index 96% rename from mcp/src/main/java/org/modelcontextprotocol/client/McpSyncClient.java rename to mcp/src/main/java/io/modelcontextprotocol/client/McpSyncClient.java index a44afbd..0178b4b 100644 --- a/mcp/src/main/java/org/modelcontextprotocol/client/McpSyncClient.java +++ b/mcp/src/main/java/io/modelcontextprotocol/client/McpSyncClient.java @@ -2,17 +2,17 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.client; +package io.modelcontextprotocol.client; import java.time.Duration; -import org.modelcontextprotocol.spec.ClientMcpTransport; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.McpSchema.ClientCapabilities; -import org.modelcontextprotocol.spec.McpSchema.GetPromptRequest; -import org.modelcontextprotocol.spec.McpSchema.GetPromptResult; -import org.modelcontextprotocol.spec.McpSchema.ListPromptsResult; -import org.modelcontextprotocol.util.Assert; +import io.modelcontextprotocol.spec.ClientMcpTransport; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.McpSchema.ClientCapabilities; +import io.modelcontextprotocol.spec.McpSchema.GetPromptRequest; +import io.modelcontextprotocol.spec.McpSchema.GetPromptResult; +import io.modelcontextprotocol.spec.McpSchema.ListPromptsResult; +import io.modelcontextprotocol.util.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/mcp/src/main/java/org/modelcontextprotocol/client/transport/FlowSseClient.java b/mcp/src/main/java/io/modelcontextprotocol/client/transport/FlowSseClient.java similarity index 99% rename from mcp/src/main/java/org/modelcontextprotocol/client/transport/FlowSseClient.java rename to mcp/src/main/java/io/modelcontextprotocol/client/transport/FlowSseClient.java index f382f9c..7fc6799 100644 --- a/mcp/src/main/java/org/modelcontextprotocol/client/transport/FlowSseClient.java +++ b/mcp/src/main/java/io/modelcontextprotocol/client/transport/FlowSseClient.java @@ -1,7 +1,7 @@ /* * Copyright 2024 - 2024 the original author or authors. */ -package org.modelcontextprotocol.client.transport; +package io.modelcontextprotocol.client.transport; import java.net.URI; import java.net.http.HttpClient; diff --git a/mcp/src/main/java/org/modelcontextprotocol/client/transport/HttpClientSseClientTransport.java b/mcp/src/main/java/io/modelcontextprotocol/client/transport/HttpClientSseClientTransport.java similarity index 93% rename from mcp/src/main/java/org/modelcontextprotocol/client/transport/HttpClientSseClientTransport.java rename to mcp/src/main/java/io/modelcontextprotocol/client/transport/HttpClientSseClientTransport.java index f80f695..7af5294 100644 --- a/mcp/src/main/java/org/modelcontextprotocol/client/transport/HttpClientSseClientTransport.java +++ b/mcp/src/main/java/io/modelcontextprotocol/client/transport/HttpClientSseClientTransport.java @@ -1,16 +1,16 @@ /* * Copyright 2024 - 2024 the original author or authors. */ -package org.modelcontextprotocol.client.transport; +package io.modelcontextprotocol.client.transport; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import org.modelcontextprotocol.client.transport.FlowSseClient.SseEvent; -import org.modelcontextprotocol.spec.ClientMcpTransport; -import org.modelcontextprotocol.spec.McpError; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.McpSchema.JSONRPCMessage; -import org.modelcontextprotocol.util.Assert; +import io.modelcontextprotocol.client.transport.FlowSseClient.SseEvent; +import io.modelcontextprotocol.spec.ClientMcpTransport; +import io.modelcontextprotocol.spec.McpError; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.McpSchema.JSONRPCMessage; +import io.modelcontextprotocol.util.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Mono; @@ -29,7 +29,7 @@ import java.util.function.Function; /** * Server-Sent Events (SSE) implementation of the - * {@link org.modelcontextprotocol.spec.McpTransport} that follows the MCP HTTP with SSE + * {@link io.modelcontextprotocol.spec.McpTransport} that follows the MCP HTTP with SSE * transport specification, using Java's HttpClient. * *

@@ -51,8 +51,8 @@ import java.util.function.Function; * * * @author Christian Tzolov - * @see org.modelcontextprotocol.spec.McpTransport - * @see org.modelcontextprotocol.spec.ClientMcpTransport + * @see io.modelcontextprotocol.spec.McpTransport + * @see io.modelcontextprotocol.spec.ClientMcpTransport */ public class HttpClientSseClientTransport implements ClientMcpTransport { diff --git a/mcp/src/main/java/org/modelcontextprotocol/client/transport/ServerParameters.java b/mcp/src/main/java/io/modelcontextprotocol/client/transport/ServerParameters.java similarity index 97% rename from mcp/src/main/java/org/modelcontextprotocol/client/transport/ServerParameters.java rename to mcp/src/main/java/io/modelcontextprotocol/client/transport/ServerParameters.java index 04f5f88..25a0227 100644 --- a/mcp/src/main/java/org/modelcontextprotocol/client/transport/ServerParameters.java +++ b/mcp/src/main/java/io/modelcontextprotocol/client/transport/ServerParameters.java @@ -2,7 +2,7 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.client.transport; +package io.modelcontextprotocol.client.transport; import java.util.ArrayList; import java.util.Arrays; @@ -13,7 +13,7 @@ import java.util.stream.Collectors; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import org.modelcontextprotocol.util.Assert; +import io.modelcontextprotocol.util.Assert; /** * Server parameters for stdio client. diff --git a/mcp/src/main/java/org/modelcontextprotocol/client/transport/StdioClientTransport.java b/mcp/src/main/java/io/modelcontextprotocol/client/transport/StdioClientTransport.java similarity index 97% rename from mcp/src/main/java/org/modelcontextprotocol/client/transport/StdioClientTransport.java rename to mcp/src/main/java/io/modelcontextprotocol/client/transport/StdioClientTransport.java index ec7c816..462837b 100644 --- a/mcp/src/main/java/org/modelcontextprotocol/client/transport/StdioClientTransport.java +++ b/mcp/src/main/java/io/modelcontextprotocol/client/transport/StdioClientTransport.java @@ -2,7 +2,7 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.client.transport; +package io.modelcontextprotocol.client.transport; import java.io.BufferedReader; import java.io.IOException; @@ -18,10 +18,10 @@ import java.util.function.Function; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import org.modelcontextprotocol.spec.ClientMcpTransport; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.McpSchema.JSONRPCMessage; -import org.modelcontextprotocol.util.Assert; +import io.modelcontextprotocol.spec.ClientMcpTransport; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.McpSchema.JSONRPCMessage; +import io.modelcontextprotocol.util.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Flux; diff --git a/mcp/src/main/java/org/modelcontextprotocol/server/McpAsyncServer.java b/mcp/src/main/java/io/modelcontextprotocol/server/McpAsyncServer.java similarity index 97% rename from mcp/src/main/java/org/modelcontextprotocol/server/McpAsyncServer.java rename to mcp/src/main/java/io/modelcontextprotocol/server/McpAsyncServer.java index 9086714..a6c9475 100644 --- a/mcp/src/main/java/org/modelcontextprotocol/server/McpAsyncServer.java +++ b/mcp/src/main/java/io/modelcontextprotocol/server/McpAsyncServer.java @@ -2,7 +2,7 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.server; +package io.modelcontextprotocol.server; import java.time.Duration; import java.util.HashMap; @@ -14,17 +14,17 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.function.Function; import com.fasterxml.jackson.core.type.TypeReference; -import org.modelcontextprotocol.spec.DefaultMcpSession; -import org.modelcontextprotocol.spec.DefaultMcpSession.NotificationHandler; -import org.modelcontextprotocol.spec.McpError; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.McpSchema.CallToolResult; -import org.modelcontextprotocol.spec.McpSchema.ClientCapabilities; -import org.modelcontextprotocol.spec.McpSchema.LoggingLevel; -import org.modelcontextprotocol.spec.McpSchema.LoggingMessageNotification; -import org.modelcontextprotocol.spec.McpSchema.Tool; -import org.modelcontextprotocol.spec.ServerMcpTransport; -import org.modelcontextprotocol.util.Utils; +import io.modelcontextprotocol.spec.DefaultMcpSession; +import io.modelcontextprotocol.spec.McpError; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.ServerMcpTransport; +import io.modelcontextprotocol.spec.DefaultMcpSession.NotificationHandler; +import io.modelcontextprotocol.spec.McpSchema.CallToolResult; +import io.modelcontextprotocol.spec.McpSchema.ClientCapabilities; +import io.modelcontextprotocol.spec.McpSchema.LoggingLevel; +import io.modelcontextprotocol.spec.McpSchema.LoggingMessageNotification; +import io.modelcontextprotocol.spec.McpSchema.Tool; +import io.modelcontextprotocol.util.Utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Flux; diff --git a/mcp/src/main/java/org/modelcontextprotocol/server/McpServer.java b/mcp/src/main/java/io/modelcontextprotocol/server/McpServer.java similarity index 98% rename from mcp/src/main/java/org/modelcontextprotocol/server/McpServer.java rename to mcp/src/main/java/io/modelcontextprotocol/server/McpServer.java index 870282f..54c7a28 100644 --- a/mcp/src/main/java/org/modelcontextprotocol/server/McpServer.java +++ b/mcp/src/main/java/io/modelcontextprotocol/server/McpServer.java @@ -2,7 +2,7 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.server; +package io.modelcontextprotocol.server; import java.util.ArrayList; import java.util.HashMap; @@ -11,12 +11,12 @@ import java.util.Map; import java.util.function.Consumer; import java.util.function.Function; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.McpSchema.CallToolResult; -import org.modelcontextprotocol.spec.McpSchema.ResourceTemplate; -import org.modelcontextprotocol.spec.McpTransport; -import org.modelcontextprotocol.spec.ServerMcpTransport; -import org.modelcontextprotocol.util.Assert; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.McpTransport; +import io.modelcontextprotocol.spec.ServerMcpTransport; +import io.modelcontextprotocol.spec.McpSchema.CallToolResult; +import io.modelcontextprotocol.spec.McpSchema.ResourceTemplate; +import io.modelcontextprotocol.util.Assert; import reactor.core.publisher.Mono; /** diff --git a/mcp/src/main/java/org/modelcontextprotocol/server/McpServerFeatures.java b/mcp/src/main/java/io/modelcontextprotocol/server/McpServerFeatures.java similarity index 98% rename from mcp/src/main/java/org/modelcontextprotocol/server/McpServerFeatures.java rename to mcp/src/main/java/io/modelcontextprotocol/server/McpServerFeatures.java index 162b431..c8f8399 100644 --- a/mcp/src/main/java/org/modelcontextprotocol/server/McpServerFeatures.java +++ b/mcp/src/main/java/io/modelcontextprotocol/server/McpServerFeatures.java @@ -2,7 +2,7 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.server; +package io.modelcontextprotocol.server; import java.util.ArrayList; import java.util.HashMap; @@ -11,9 +11,9 @@ import java.util.Map; import java.util.function.Consumer; import java.util.function.Function; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.util.Assert; -import org.modelcontextprotocol.util.Utils; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.util.Assert; +import io.modelcontextprotocol.util.Utils; import reactor.core.publisher.Mono; import reactor.core.scheduler.Schedulers; diff --git a/mcp/src/main/java/org/modelcontextprotocol/server/McpSyncServer.java b/mcp/src/main/java/io/modelcontextprotocol/server/McpSyncServer.java similarity index 95% rename from mcp/src/main/java/org/modelcontextprotocol/server/McpSyncServer.java rename to mcp/src/main/java/io/modelcontextprotocol/server/McpSyncServer.java index aab1457..1de0139 100644 --- a/mcp/src/main/java/org/modelcontextprotocol/server/McpSyncServer.java +++ b/mcp/src/main/java/io/modelcontextprotocol/server/McpSyncServer.java @@ -2,13 +2,13 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.server; +package io.modelcontextprotocol.server; -import org.modelcontextprotocol.spec.McpError; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.McpSchema.ClientCapabilities; -import org.modelcontextprotocol.spec.McpSchema.LoggingMessageNotification; -import org.modelcontextprotocol.util.Assert; +import io.modelcontextprotocol.spec.McpError; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.McpSchema.ClientCapabilities; +import io.modelcontextprotocol.spec.McpSchema.LoggingMessageNotification; +import io.modelcontextprotocol.util.Assert; /** * A synchronous implementation of the Model Context Protocol (MCP) server that wraps diff --git a/mcp/src/main/java/org/modelcontextprotocol/server/transport/HttpServletSseServerTransport.java b/mcp/src/main/java/io/modelcontextprotocol/server/transport/HttpServletSseServerTransport.java similarity index 98% rename from mcp/src/main/java/org/modelcontextprotocol/server/transport/HttpServletSseServerTransport.java rename to mcp/src/main/java/io/modelcontextprotocol/server/transport/HttpServletSseServerTransport.java index 6a56798..98b8ea5 100644 --- a/mcp/src/main/java/org/modelcontextprotocol/server/transport/HttpServletSseServerTransport.java +++ b/mcp/src/main/java/io/modelcontextprotocol/server/transport/HttpServletSseServerTransport.java @@ -1,7 +1,7 @@ /* * Copyright 2024 - 2024 the original author or authors. */ -package org.modelcontextprotocol.server.transport; +package io.modelcontextprotocol.server.transport; import java.io.BufferedReader; import java.io.IOException; @@ -14,15 +14,15 @@ import java.util.function.Function; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; +import io.modelcontextprotocol.spec.McpError; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.ServerMcpTransport; import jakarta.servlet.AsyncContext; import jakarta.servlet.ServletException; import jakarta.servlet.annotation.WebServlet; import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.modelcontextprotocol.spec.McpError; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.ServerMcpTransport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Mono; diff --git a/mcp/src/main/java/org/modelcontextprotocol/server/transport/StdioServerTransport.java b/mcp/src/main/java/io/modelcontextprotocol/server/transport/StdioServerTransport.java similarity index 96% rename from mcp/src/main/java/org/modelcontextprotocol/server/transport/StdioServerTransport.java rename to mcp/src/main/java/io/modelcontextprotocol/server/transport/StdioServerTransport.java index 52845a9..506e387 100644 --- a/mcp/src/main/java/org/modelcontextprotocol/server/transport/StdioServerTransport.java +++ b/mcp/src/main/java/io/modelcontextprotocol/server/transport/StdioServerTransport.java @@ -2,7 +2,7 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.server.transport; +package io.modelcontextprotocol.server.transport; import java.io.BufferedReader; import java.io.IOException; @@ -16,10 +16,10 @@ import java.util.function.Function; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.ServerMcpTransport; -import org.modelcontextprotocol.spec.McpSchema.JSONRPCMessage; -import org.modelcontextprotocol.util.Assert; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.ServerMcpTransport; +import io.modelcontextprotocol.spec.McpSchema.JSONRPCMessage; +import io.modelcontextprotocol.util.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Flux; diff --git a/mcp/src/main/java/org/modelcontextprotocol/spec/ClientMcpTransport.java b/mcp/src/main/java/io/modelcontextprotocol/spec/ClientMcpTransport.java similarity index 84% rename from mcp/src/main/java/org/modelcontextprotocol/spec/ClientMcpTransport.java rename to mcp/src/main/java/io/modelcontextprotocol/spec/ClientMcpTransport.java index eff6c15..8a9b4ce 100644 --- a/mcp/src/main/java/org/modelcontextprotocol/spec/ClientMcpTransport.java +++ b/mcp/src/main/java/io/modelcontextprotocol/spec/ClientMcpTransport.java @@ -1,7 +1,7 @@ /* * Copyright 2024 - 2024 the original author or authors. */ -package org.modelcontextprotocol.spec; +package io.modelcontextprotocol.spec; /** * Marker interface for the client-side MCP transport. diff --git a/mcp/src/main/java/org/modelcontextprotocol/spec/DefaultMcpSession.java b/mcp/src/main/java/io/modelcontextprotocol/spec/DefaultMcpSession.java similarity index 99% rename from mcp/src/main/java/org/modelcontextprotocol/spec/DefaultMcpSession.java rename to mcp/src/main/java/io/modelcontextprotocol/spec/DefaultMcpSession.java index 5a89a1a..eb7ce49 100644 --- a/mcp/src/main/java/org/modelcontextprotocol/spec/DefaultMcpSession.java +++ b/mcp/src/main/java/io/modelcontextprotocol/spec/DefaultMcpSession.java @@ -2,7 +2,7 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.spec; +package io.modelcontextprotocol.spec; import java.time.Duration; import java.util.Map; @@ -11,7 +11,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; import com.fasterxml.jackson.core.type.TypeReference; -import org.modelcontextprotocol.util.Assert; +import io.modelcontextprotocol.util.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.Disposable; diff --git a/mcp/src/main/java/org/modelcontextprotocol/spec/McpError.java b/mcp/src/main/java/io/modelcontextprotocol/spec/McpError.java similarity index 77% rename from mcp/src/main/java/org/modelcontextprotocol/spec/McpError.java rename to mcp/src/main/java/io/modelcontextprotocol/spec/McpError.java index df79238..13e4324 100644 --- a/mcp/src/main/java/org/modelcontextprotocol/spec/McpError.java +++ b/mcp/src/main/java/io/modelcontextprotocol/spec/McpError.java @@ -1,9 +1,9 @@ /* * Copyright 2024 - 2024 the original author or authors. */ -package org.modelcontextprotocol.spec; +package io.modelcontextprotocol.spec; -import org.modelcontextprotocol.spec.McpSchema.JSONRPCResponse.JSONRPCError; +import io.modelcontextprotocol.spec.McpSchema.JSONRPCResponse.JSONRPCError; public class McpError extends RuntimeException { diff --git a/mcp/src/main/java/org/modelcontextprotocol/spec/McpSchema.java b/mcp/src/main/java/io/modelcontextprotocol/spec/McpSchema.java similarity index 99% rename from mcp/src/main/java/org/modelcontextprotocol/spec/McpSchema.java rename to mcp/src/main/java/io/modelcontextprotocol/spec/McpSchema.java index 153ca99..1c6bb61 100644 --- a/mcp/src/main/java/org/modelcontextprotocol/spec/McpSchema.java +++ b/mcp/src/main/java/io/modelcontextprotocol/spec/McpSchema.java @@ -2,7 +2,7 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.spec; +package io.modelcontextprotocol.spec; import java.io.IOException; import java.util.HashMap; diff --git a/mcp/src/main/java/org/modelcontextprotocol/spec/McpSession.java b/mcp/src/main/java/io/modelcontextprotocol/spec/McpSession.java similarity index 98% rename from mcp/src/main/java/org/modelcontextprotocol/spec/McpSession.java rename to mcp/src/main/java/io/modelcontextprotocol/spec/McpSession.java index 50ecc52..92b4607 100644 --- a/mcp/src/main/java/org/modelcontextprotocol/spec/McpSession.java +++ b/mcp/src/main/java/io/modelcontextprotocol/spec/McpSession.java @@ -2,7 +2,7 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.spec; +package io.modelcontextprotocol.spec; import java.util.Map; diff --git a/mcp/src/main/java/org/modelcontextprotocol/spec/McpTransport.java b/mcp/src/main/java/io/modelcontextprotocol/spec/McpTransport.java similarity index 96% rename from mcp/src/main/java/org/modelcontextprotocol/spec/McpTransport.java rename to mcp/src/main/java/io/modelcontextprotocol/spec/McpTransport.java index 577ae5b..344a50b 100644 --- a/mcp/src/main/java/org/modelcontextprotocol/spec/McpTransport.java +++ b/mcp/src/main/java/io/modelcontextprotocol/spec/McpTransport.java @@ -2,12 +2,12 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.spec; +package io.modelcontextprotocol.spec; import java.util.function.Function; import com.fasterxml.jackson.core.type.TypeReference; -import org.modelcontextprotocol.spec.McpSchema.JSONRPCMessage; +import io.modelcontextprotocol.spec.McpSchema.JSONRPCMessage; import reactor.core.publisher.Mono; /** diff --git a/mcp/src/main/java/org/modelcontextprotocol/spec/ServerMcpTransport.java b/mcp/src/main/java/io/modelcontextprotocol/spec/ServerMcpTransport.java similarity index 84% rename from mcp/src/main/java/org/modelcontextprotocol/spec/ServerMcpTransport.java rename to mcp/src/main/java/io/modelcontextprotocol/spec/ServerMcpTransport.java index 182be85..1359143 100644 --- a/mcp/src/main/java/org/modelcontextprotocol/spec/ServerMcpTransport.java +++ b/mcp/src/main/java/io/modelcontextprotocol/spec/ServerMcpTransport.java @@ -1,7 +1,7 @@ /* * Copyright 2024 - 2024 the original author or authors. */ -package org.modelcontextprotocol.spec; +package io.modelcontextprotocol.spec; /** * Marker interface for the server-side MCP transport. diff --git a/mcp/src/main/java/org/modelcontextprotocol/util/Assert.java b/mcp/src/main/java/io/modelcontextprotocol/util/Assert.java similarity index 98% rename from mcp/src/main/java/org/modelcontextprotocol/util/Assert.java rename to mcp/src/main/java/io/modelcontextprotocol/util/Assert.java index bee6c44..d68188c 100644 --- a/mcp/src/main/java/org/modelcontextprotocol/util/Assert.java +++ b/mcp/src/main/java/io/modelcontextprotocol/util/Assert.java @@ -2,7 +2,7 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.util; +package io.modelcontextprotocol.util; import java.util.Collection; diff --git a/mcp/src/main/java/org/modelcontextprotocol/util/Utils.java b/mcp/src/main/java/io/modelcontextprotocol/util/Utils.java similarity index 97% rename from mcp/src/main/java/org/modelcontextprotocol/util/Utils.java rename to mcp/src/main/java/io/modelcontextprotocol/util/Utils.java index 2a8da98..0f799ca 100644 --- a/mcp/src/main/java/org/modelcontextprotocol/util/Utils.java +++ b/mcp/src/main/java/io/modelcontextprotocol/util/Utils.java @@ -2,7 +2,7 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.util; +package io.modelcontextprotocol.util; import java.util.Collection; import java.util.Map; diff --git a/mcp/src/test/java/org/modelcontextprotocol/MockMcpTransport.java b/mcp/src/test/java/io/modelcontextprotocol/MockMcpTransport.java similarity index 89% rename from mcp/src/test/java/org/modelcontextprotocol/MockMcpTransport.java rename to mcp/src/test/java/io/modelcontextprotocol/MockMcpTransport.java index c62c0d4..1679ab7 100644 --- a/mcp/src/test/java/org/modelcontextprotocol/MockMcpTransport.java +++ b/mcp/src/test/java/io/modelcontextprotocol/MockMcpTransport.java @@ -2,18 +2,18 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol; +package io.modelcontextprotocol; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import org.modelcontextprotocol.spec.ClientMcpTransport; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.ServerMcpTransport; -import org.modelcontextprotocol.spec.McpSchema.JSONRPCNotification; -import org.modelcontextprotocol.spec.McpSchema.JSONRPCRequest; +import io.modelcontextprotocol.spec.ClientMcpTransport; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.ServerMcpTransport; +import io.modelcontextprotocol.spec.McpSchema.JSONRPCNotification; +import io.modelcontextprotocol.spec.McpSchema.JSONRPCRequest; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.core.publisher.Sinks; diff --git a/mcp/src/test/java/org/modelcontextprotocol/client/AbstractMcpAsyncClientTests.java b/mcp/src/test/java/io/modelcontextprotocol/client/AbstractMcpAsyncClientTests.java similarity index 91% rename from mcp/src/test/java/org/modelcontextprotocol/client/AbstractMcpAsyncClientTests.java rename to mcp/src/test/java/io/modelcontextprotocol/client/AbstractMcpAsyncClientTests.java index e76e389..ea61844 100644 --- a/mcp/src/test/java/org/modelcontextprotocol/client/AbstractMcpAsyncClientTests.java +++ b/mcp/src/test/java/io/modelcontextprotocol/client/AbstractMcpAsyncClientTests.java @@ -2,31 +2,33 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.client; +package io.modelcontextprotocol.client; import java.time.Duration; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Function; +import io.modelcontextprotocol.client.McpAsyncClient; +import io.modelcontextprotocol.client.McpClient; +import io.modelcontextprotocol.spec.ClientMcpTransport; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.McpTransport; +import io.modelcontextprotocol.spec.McpSchema.CallToolRequest; +import io.modelcontextprotocol.spec.McpSchema.ClientCapabilities; +import io.modelcontextprotocol.spec.McpSchema.CreateMessageRequest; +import io.modelcontextprotocol.spec.McpSchema.CreateMessageResult; +import io.modelcontextprotocol.spec.McpSchema.GetPromptRequest; +import io.modelcontextprotocol.spec.McpSchema.Prompt; +import io.modelcontextprotocol.spec.McpSchema.Resource; +import io.modelcontextprotocol.spec.McpSchema.Root; +import io.modelcontextprotocol.spec.McpSchema.SubscribeRequest; +import io.modelcontextprotocol.spec.McpSchema.Tool; +import io.modelcontextprotocol.spec.McpSchema.UnsubscribeRequest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.modelcontextprotocol.spec.ClientMcpTransport; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.McpSchema.CallToolRequest; -import org.modelcontextprotocol.spec.McpSchema.ClientCapabilities; -import org.modelcontextprotocol.spec.McpSchema.CreateMessageRequest; -import org.modelcontextprotocol.spec.McpSchema.CreateMessageResult; -import org.modelcontextprotocol.spec.McpSchema.GetPromptRequest; -import org.modelcontextprotocol.spec.McpSchema.Prompt; -import org.modelcontextprotocol.spec.McpSchema.Resource; -import org.modelcontextprotocol.spec.McpSchema.Root; -import org.modelcontextprotocol.spec.McpSchema.SubscribeRequest; -import org.modelcontextprotocol.spec.McpSchema.Tool; -import org.modelcontextprotocol.spec.McpSchema.UnsubscribeRequest; -import org.modelcontextprotocol.spec.McpTransport; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/mcp/src/test/java/org/modelcontextprotocol/client/AbstractMcpSyncClientTests.java b/mcp/src/test/java/io/modelcontextprotocol/client/AbstractMcpSyncClientTests.java similarity index 88% rename from mcp/src/test/java/org/modelcontextprotocol/client/AbstractMcpSyncClientTests.java rename to mcp/src/test/java/io/modelcontextprotocol/client/AbstractMcpSyncClientTests.java index 79378fa..6a630c4 100644 --- a/mcp/src/test/java/org/modelcontextprotocol/client/AbstractMcpSyncClientTests.java +++ b/mcp/src/test/java/io/modelcontextprotocol/client/AbstractMcpSyncClientTests.java @@ -2,30 +2,32 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.client; +package io.modelcontextprotocol.client; import java.time.Duration; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; +import io.modelcontextprotocol.client.McpClient; +import io.modelcontextprotocol.client.McpSyncClient; +import io.modelcontextprotocol.spec.ClientMcpTransport; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.McpSchema.CallToolRequest; +import io.modelcontextprotocol.spec.McpSchema.CallToolResult; +import io.modelcontextprotocol.spec.McpSchema.ClientCapabilities; +import io.modelcontextprotocol.spec.McpSchema.ListResourceTemplatesResult; +import io.modelcontextprotocol.spec.McpSchema.ListResourcesResult; +import io.modelcontextprotocol.spec.McpSchema.ListToolsResult; +import io.modelcontextprotocol.spec.McpSchema.ReadResourceResult; +import io.modelcontextprotocol.spec.McpSchema.Resource; +import io.modelcontextprotocol.spec.McpSchema.Root; +import io.modelcontextprotocol.spec.McpSchema.SubscribeRequest; +import io.modelcontextprotocol.spec.McpSchema.TextContent; +import io.modelcontextprotocol.spec.McpSchema.Tool; +import io.modelcontextprotocol.spec.McpSchema.UnsubscribeRequest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.modelcontextprotocol.spec.ClientMcpTransport; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.McpSchema.CallToolRequest; -import org.modelcontextprotocol.spec.McpSchema.CallToolResult; -import org.modelcontextprotocol.spec.McpSchema.ClientCapabilities; -import org.modelcontextprotocol.spec.McpSchema.ListResourceTemplatesResult; -import org.modelcontextprotocol.spec.McpSchema.ListResourcesResult; -import org.modelcontextprotocol.spec.McpSchema.ListToolsResult; -import org.modelcontextprotocol.spec.McpSchema.ReadResourceResult; -import org.modelcontextprotocol.spec.McpSchema.Resource; -import org.modelcontextprotocol.spec.McpSchema.Root; -import org.modelcontextprotocol.spec.McpSchema.SubscribeRequest; -import org.modelcontextprotocol.spec.McpSchema.TextContent; -import org.modelcontextprotocol.spec.McpSchema.Tool; -import org.modelcontextprotocol.spec.McpSchema.UnsubscribeRequest; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; diff --git a/mcp/src/test/java/org/modelcontextprotocol/client/McpAsyncClientResponseHandlerTests.java b/mcp/src/test/java/io/modelcontextprotocol/client/McpAsyncClientResponseHandlerTests.java similarity index 96% rename from mcp/src/test/java/org/modelcontextprotocol/client/McpAsyncClientResponseHandlerTests.java rename to mcp/src/test/java/io/modelcontextprotocol/client/McpAsyncClientResponseHandlerTests.java index 6a4ee28..a58df5e 100644 --- a/mcp/src/test/java/org/modelcontextprotocol/client/McpAsyncClientResponseHandlerTests.java +++ b/mcp/src/test/java/io/modelcontextprotocol/client/McpAsyncClientResponseHandlerTests.java @@ -2,7 +2,7 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.client; +package io.modelcontextprotocol.client; import java.time.Duration; import java.util.ArrayList; @@ -13,12 +13,14 @@ import java.util.function.Function; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; +import io.modelcontextprotocol.MockMcpTransport; +import io.modelcontextprotocol.client.McpAsyncClient; +import io.modelcontextprotocol.client.McpClient; +import io.modelcontextprotocol.spec.McpError; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.McpSchema.ClientCapabilities; +import io.modelcontextprotocol.spec.McpSchema.Root; import org.junit.jupiter.api.Test; -import org.modelcontextprotocol.MockMcpTransport; -import org.modelcontextprotocol.spec.McpError; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.McpSchema.ClientCapabilities; -import org.modelcontextprotocol.spec.McpSchema.Root; import reactor.core.publisher.Mono; import static org.assertj.core.api.Assertions.assertThat; diff --git a/mcp/src/test/java/org/modelcontextprotocol/client/McpClientProtocolVersionTests.java b/mcp/src/test/java/io/modelcontextprotocol/client/McpClientProtocolVersionTests.java similarity index 93% rename from mcp/src/test/java/org/modelcontextprotocol/client/McpClientProtocolVersionTests.java rename to mcp/src/test/java/io/modelcontextprotocol/client/McpClientProtocolVersionTests.java index 88e18f8..317f571 100644 --- a/mcp/src/test/java/org/modelcontextprotocol/client/McpClientProtocolVersionTests.java +++ b/mcp/src/test/java/io/modelcontextprotocol/client/McpClientProtocolVersionTests.java @@ -2,16 +2,18 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.client; +package io.modelcontextprotocol.client; import java.time.Duration; import java.util.List; +import io.modelcontextprotocol.MockMcpTransport; +import io.modelcontextprotocol.client.McpAsyncClient; +import io.modelcontextprotocol.client.McpClient; +import io.modelcontextprotocol.spec.McpError; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.McpSchema.InitializeResult; import org.junit.jupiter.api.Test; -import org.modelcontextprotocol.MockMcpTransport; -import org.modelcontextprotocol.spec.McpError; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.McpSchema.InitializeResult; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/mcp/src/test/java/org/modelcontextprotocol/client/ServletSseMcpAsyncClientTests.java b/mcp/src/test/java/io/modelcontextprotocol/client/ServletSseMcpAsyncClientTests.java similarity index 84% rename from mcp/src/test/java/org/modelcontextprotocol/client/ServletSseMcpAsyncClientTests.java rename to mcp/src/test/java/io/modelcontextprotocol/client/ServletSseMcpAsyncClientTests.java index 5c841b6..d96dc7f 100644 --- a/mcp/src/test/java/org/modelcontextprotocol/client/ServletSseMcpAsyncClientTests.java +++ b/mcp/src/test/java/io/modelcontextprotocol/client/ServletSseMcpAsyncClientTests.java @@ -2,11 +2,12 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.client; +package io.modelcontextprotocol.client; +import io.modelcontextprotocol.client.McpSyncClient; +import io.modelcontextprotocol.client.transport.HttpClientSseClientTransport; +import io.modelcontextprotocol.spec.ClientMcpTransport; import org.junit.jupiter.api.Timeout; -import org.modelcontextprotocol.client.transport.HttpClientSseClientTransport; -import org.modelcontextprotocol.spec.ClientMcpTransport; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.wait.strategy.Wait; diff --git a/mcp/src/test/java/org/modelcontextprotocol/client/ServletSseMcpSyncClientTests.java b/mcp/src/test/java/io/modelcontextprotocol/client/ServletSseMcpSyncClientTests.java similarity index 84% rename from mcp/src/test/java/org/modelcontextprotocol/client/ServletSseMcpSyncClientTests.java rename to mcp/src/test/java/io/modelcontextprotocol/client/ServletSseMcpSyncClientTests.java index 8b6f257..0ae22ac 100644 --- a/mcp/src/test/java/org/modelcontextprotocol/client/ServletSseMcpSyncClientTests.java +++ b/mcp/src/test/java/io/modelcontextprotocol/client/ServletSseMcpSyncClientTests.java @@ -2,11 +2,12 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.client; +package io.modelcontextprotocol.client; +import io.modelcontextprotocol.client.McpSyncClient; +import io.modelcontextprotocol.client.transport.HttpClientSseClientTransport; +import io.modelcontextprotocol.spec.ClientMcpTransport; import org.junit.jupiter.api.Timeout; -import org.modelcontextprotocol.client.transport.HttpClientSseClientTransport; -import org.modelcontextprotocol.spec.ClientMcpTransport; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.wait.strategy.Wait; diff --git a/mcp/src/test/java/org/modelcontextprotocol/client/StdioMcpAsyncClientTests.java b/mcp/src/test/java/io/modelcontextprotocol/client/StdioMcpAsyncClientTests.java similarity index 69% rename from mcp/src/test/java/org/modelcontextprotocol/client/StdioMcpAsyncClientTests.java rename to mcp/src/test/java/io/modelcontextprotocol/client/StdioMcpAsyncClientTests.java index 58de6f8..44c2876 100644 --- a/mcp/src/test/java/org/modelcontextprotocol/client/StdioMcpAsyncClientTests.java +++ b/mcp/src/test/java/io/modelcontextprotocol/client/StdioMcpAsyncClientTests.java @@ -2,12 +2,13 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.client; +package io.modelcontextprotocol.client; +import io.modelcontextprotocol.client.McpAsyncClient; +import io.modelcontextprotocol.client.transport.ServerParameters; +import io.modelcontextprotocol.client.transport.StdioClientTransport; +import io.modelcontextprotocol.spec.ClientMcpTransport; import org.junit.jupiter.api.Timeout; -import org.modelcontextprotocol.client.transport.ServerParameters; -import org.modelcontextprotocol.client.transport.StdioClientTransport; -import org.modelcontextprotocol.spec.ClientMcpTransport; /** * Tests for the {@link McpAsyncClient} with {@link StdioClientTransport}. diff --git a/mcp/src/test/java/org/modelcontextprotocol/client/StdioMcpSyncClientTests.java b/mcp/src/test/java/io/modelcontextprotocol/client/StdioMcpSyncClientTests.java similarity index 81% rename from mcp/src/test/java/org/modelcontextprotocol/client/StdioMcpSyncClientTests.java rename to mcp/src/test/java/io/modelcontextprotocol/client/StdioMcpSyncClientTests.java index d5607fd..ef7c83b 100644 --- a/mcp/src/test/java/org/modelcontextprotocol/client/StdioMcpSyncClientTests.java +++ b/mcp/src/test/java/io/modelcontextprotocol/client/StdioMcpSyncClientTests.java @@ -2,15 +2,16 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.client; +package io.modelcontextprotocol.client; import java.util.concurrent.atomic.AtomicReference; +import io.modelcontextprotocol.client.McpSyncClient; +import io.modelcontextprotocol.client.transport.ServerParameters; +import io.modelcontextprotocol.client.transport.StdioClientTransport; +import io.modelcontextprotocol.spec.ClientMcpTransport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; -import org.modelcontextprotocol.client.transport.ServerParameters; -import org.modelcontextprotocol.client.transport.StdioClientTransport; -import org.modelcontextprotocol.spec.ClientMcpTransport; import static org.assertj.core.api.Assertions.assertThat; diff --git a/mcp/src/test/java/org/modelcontextprotocol/client/transport/HttpClientSseClientTransportTests.java b/mcp/src/test/java/io/modelcontextprotocol/client/transport/HttpClientSseClientTransportTests.java similarity index 96% rename from mcp/src/test/java/org/modelcontextprotocol/client/transport/HttpClientSseClientTransportTests.java rename to mcp/src/test/java/io/modelcontextprotocol/client/transport/HttpClientSseClientTransportTests.java index 74593d3..2d37b4a 100644 --- a/mcp/src/test/java/org/modelcontextprotocol/client/transport/HttpClientSseClientTransportTests.java +++ b/mcp/src/test/java/io/modelcontextprotocol/client/transport/HttpClientSseClientTransportTests.java @@ -2,19 +2,20 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.client.transport; +package io.modelcontextprotocol.client.transport; import java.time.Duration; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; +import io.modelcontextprotocol.client.transport.HttpClientSseClientTransport; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.McpSchema.JSONRPCRequest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.McpSchema.JSONRPCRequest; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.wait.strategy.Wait; import reactor.core.publisher.Mono; diff --git a/mcp/src/test/java/org/modelcontextprotocol/server/AbstractMcpAsyncServerTests.java b/mcp/src/test/java/io/modelcontextprotocol/server/AbstractMcpAsyncServerTests.java similarity index 94% rename from mcp/src/test/java/org/modelcontextprotocol/server/AbstractMcpAsyncServerTests.java rename to mcp/src/test/java/io/modelcontextprotocol/server/AbstractMcpAsyncServerTests.java index 0913d29..ff1162c 100644 --- a/mcp/src/test/java/org/modelcontextprotocol/server/AbstractMcpAsyncServerTests.java +++ b/mcp/src/test/java/io/modelcontextprotocol/server/AbstractMcpAsyncServerTests.java @@ -2,26 +2,29 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.server; +package io.modelcontextprotocol.server; import java.time.Duration; import java.util.List; +import io.modelcontextprotocol.server.McpAsyncServer; +import io.modelcontextprotocol.server.McpServer; +import io.modelcontextprotocol.server.McpServerFeatures; +import io.modelcontextprotocol.spec.McpError; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.McpTransport; +import io.modelcontextprotocol.spec.ServerMcpTransport; +import io.modelcontextprotocol.spec.McpSchema.CallToolResult; +import io.modelcontextprotocol.spec.McpSchema.GetPromptResult; +import io.modelcontextprotocol.spec.McpSchema.Prompt; +import io.modelcontextprotocol.spec.McpSchema.PromptMessage; +import io.modelcontextprotocol.spec.McpSchema.ReadResourceResult; +import io.modelcontextprotocol.spec.McpSchema.Resource; +import io.modelcontextprotocol.spec.McpSchema.ServerCapabilities; +import io.modelcontextprotocol.spec.McpSchema.Tool; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.modelcontextprotocol.spec.McpError; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.McpSchema.CallToolResult; -import org.modelcontextprotocol.spec.McpSchema.GetPromptResult; -import org.modelcontextprotocol.spec.McpSchema.Prompt; -import org.modelcontextprotocol.spec.McpSchema.PromptMessage; -import org.modelcontextprotocol.spec.McpSchema.ReadResourceResult; -import org.modelcontextprotocol.spec.McpSchema.Resource; -import org.modelcontextprotocol.spec.McpSchema.ServerCapabilities; -import org.modelcontextprotocol.spec.McpSchema.Tool; -import org.modelcontextprotocol.spec.McpTransport; -import org.modelcontextprotocol.spec.ServerMcpTransport; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/mcp/src/test/java/org/modelcontextprotocol/server/AbstractMcpSyncServerTests.java b/mcp/src/test/java/io/modelcontextprotocol/server/AbstractMcpSyncServerTests.java similarity index 94% rename from mcp/src/test/java/org/modelcontextprotocol/server/AbstractMcpSyncServerTests.java rename to mcp/src/test/java/io/modelcontextprotocol/server/AbstractMcpSyncServerTests.java index cc1b4fe..37c02c8 100644 --- a/mcp/src/test/java/org/modelcontextprotocol/server/AbstractMcpSyncServerTests.java +++ b/mcp/src/test/java/io/modelcontextprotocol/server/AbstractMcpSyncServerTests.java @@ -2,25 +2,28 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.server; +package io.modelcontextprotocol.server; import java.util.List; +import io.modelcontextprotocol.server.McpServer; +import io.modelcontextprotocol.server.McpServerFeatures; +import io.modelcontextprotocol.server.McpSyncServer; +import io.modelcontextprotocol.spec.McpError; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.McpTransport; +import io.modelcontextprotocol.spec.ServerMcpTransport; +import io.modelcontextprotocol.spec.McpSchema.CallToolResult; +import io.modelcontextprotocol.spec.McpSchema.GetPromptResult; +import io.modelcontextprotocol.spec.McpSchema.Prompt; +import io.modelcontextprotocol.spec.McpSchema.PromptMessage; +import io.modelcontextprotocol.spec.McpSchema.ReadResourceResult; +import io.modelcontextprotocol.spec.McpSchema.Resource; +import io.modelcontextprotocol.spec.McpSchema.ServerCapabilities; +import io.modelcontextprotocol.spec.McpSchema.Tool; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.modelcontextprotocol.spec.McpError; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.McpSchema.CallToolResult; -import org.modelcontextprotocol.spec.McpSchema.GetPromptResult; -import org.modelcontextprotocol.spec.McpSchema.Prompt; -import org.modelcontextprotocol.spec.McpSchema.PromptMessage; -import org.modelcontextprotocol.spec.McpSchema.ReadResourceResult; -import org.modelcontextprotocol.spec.McpSchema.Resource; -import org.modelcontextprotocol.spec.McpSchema.ServerCapabilities; -import org.modelcontextprotocol.spec.McpSchema.Tool; -import org.modelcontextprotocol.spec.McpTransport; -import org.modelcontextprotocol.spec.ServerMcpTransport; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; diff --git a/mcp/src/test/java/org/modelcontextprotocol/server/McpServerProtocolVersionTests.java b/mcp/src/test/java/io/modelcontextprotocol/server/McpServerProtocolVersionTests.java similarity index 95% rename from mcp/src/test/java/org/modelcontextprotocol/server/McpServerProtocolVersionTests.java rename to mcp/src/test/java/io/modelcontextprotocol/server/McpServerProtocolVersionTests.java index 1e05231..74498ff 100644 --- a/mcp/src/test/java/org/modelcontextprotocol/server/McpServerProtocolVersionTests.java +++ b/mcp/src/test/java/io/modelcontextprotocol/server/McpServerProtocolVersionTests.java @@ -2,14 +2,16 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.server; +package io.modelcontextprotocol.server; import java.util.List; import java.util.UUID; +import io.modelcontextprotocol.MockMcpTransport; +import io.modelcontextprotocol.server.McpAsyncServer; +import io.modelcontextprotocol.server.McpServer; +import io.modelcontextprotocol.spec.McpSchema; import org.junit.jupiter.api.Test; -import org.modelcontextprotocol.MockMcpTransport; -import org.modelcontextprotocol.spec.McpSchema; import static org.assertj.core.api.Assertions.assertThat; diff --git a/mcp/src/test/java/org/modelcontextprotocol/server/ServletSseMcpAsyncServerTests.java b/mcp/src/test/java/io/modelcontextprotocol/server/ServletSseMcpAsyncServerTests.java similarity index 70% rename from mcp/src/test/java/org/modelcontextprotocol/server/ServletSseMcpAsyncServerTests.java rename to mcp/src/test/java/io/modelcontextprotocol/server/ServletSseMcpAsyncServerTests.java index 52836e4..02d140f 100644 --- a/mcp/src/test/java/org/modelcontextprotocol/server/ServletSseMcpAsyncServerTests.java +++ b/mcp/src/test/java/io/modelcontextprotocol/server/ServletSseMcpAsyncServerTests.java @@ -2,12 +2,13 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.server; +package io.modelcontextprotocol.server; import com.fasterxml.jackson.databind.ObjectMapper; +import io.modelcontextprotocol.server.McpAsyncServer; +import io.modelcontextprotocol.server.transport.HttpServletSseServerTransport; +import io.modelcontextprotocol.spec.ServerMcpTransport; import org.junit.jupiter.api.Timeout; -import org.modelcontextprotocol.server.transport.HttpServletSseServerTransport; -import org.modelcontextprotocol.spec.ServerMcpTransport; /** * Tests for {@link McpAsyncServer} using {@link HttpServletSseServerTransport}. diff --git a/mcp/src/test/java/org/modelcontextprotocol/server/ServletSseMcpSyncServerTests.java b/mcp/src/test/java/io/modelcontextprotocol/server/ServletSseMcpSyncServerTests.java similarity index 70% rename from mcp/src/test/java/org/modelcontextprotocol/server/ServletSseMcpSyncServerTests.java rename to mcp/src/test/java/io/modelcontextprotocol/server/ServletSseMcpSyncServerTests.java index 14f6e30..9b64e3e 100644 --- a/mcp/src/test/java/org/modelcontextprotocol/server/ServletSseMcpSyncServerTests.java +++ b/mcp/src/test/java/io/modelcontextprotocol/server/ServletSseMcpSyncServerTests.java @@ -2,12 +2,13 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.server; +package io.modelcontextprotocol.server; import com.fasterxml.jackson.databind.ObjectMapper; +import io.modelcontextprotocol.server.McpSyncServer; +import io.modelcontextprotocol.server.transport.HttpServletSseServerTransport; +import io.modelcontextprotocol.spec.ServerMcpTransport; import org.junit.jupiter.api.Timeout; -import org.modelcontextprotocol.server.transport.HttpServletSseServerTransport; -import org.modelcontextprotocol.spec.ServerMcpTransport; /** * Tests for {@link McpSyncServer} using {@link HttpServletSseServerTransport}. diff --git a/mcp/src/test/java/org/modelcontextprotocol/server/StdioMcpAsyncServerTests.java b/mcp/src/test/java/io/modelcontextprotocol/server/StdioMcpAsyncServerTests.java similarity index 67% rename from mcp/src/test/java/org/modelcontextprotocol/server/StdioMcpAsyncServerTests.java rename to mcp/src/test/java/io/modelcontextprotocol/server/StdioMcpAsyncServerTests.java index 717b6b0..75646fd 100644 --- a/mcp/src/test/java/org/modelcontextprotocol/server/StdioMcpAsyncServerTests.java +++ b/mcp/src/test/java/io/modelcontextprotocol/server/StdioMcpAsyncServerTests.java @@ -2,11 +2,12 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.server; +package io.modelcontextprotocol.server; +import io.modelcontextprotocol.server.McpAsyncServer; +import io.modelcontextprotocol.server.transport.StdioServerTransport; +import io.modelcontextprotocol.spec.ServerMcpTransport; import org.junit.jupiter.api.Timeout; -import org.modelcontextprotocol.server.transport.StdioServerTransport; -import org.modelcontextprotocol.spec.ServerMcpTransport; /** * Tests for {@link McpAsyncServer} using {@link StdioServerTransport}. diff --git a/mcp/src/test/java/org/modelcontextprotocol/server/StdioMcpSyncServerTests.java b/mcp/src/test/java/io/modelcontextprotocol/server/StdioMcpSyncServerTests.java similarity index 67% rename from mcp/src/test/java/org/modelcontextprotocol/server/StdioMcpSyncServerTests.java rename to mcp/src/test/java/io/modelcontextprotocol/server/StdioMcpSyncServerTests.java index 2bc8491..073bbcb 100644 --- a/mcp/src/test/java/org/modelcontextprotocol/server/StdioMcpSyncServerTests.java +++ b/mcp/src/test/java/io/modelcontextprotocol/server/StdioMcpSyncServerTests.java @@ -2,11 +2,12 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.server; +package io.modelcontextprotocol.server; +import io.modelcontextprotocol.server.McpSyncServer; +import io.modelcontextprotocol.server.transport.StdioServerTransport; +import io.modelcontextprotocol.spec.ServerMcpTransport; import org.junit.jupiter.api.Timeout; -import org.modelcontextprotocol.server.transport.StdioServerTransport; -import org.modelcontextprotocol.spec.ServerMcpTransport; /** * Tests for {@link McpSyncServer} using {@link StdioServerTransport}. diff --git a/mcp/src/test/java/org/modelcontextprotocol/server/transport/BlockingInputStream.java b/mcp/src/test/java/io/modelcontextprotocol/server/transport/BlockingInputStream.java similarity index 96% rename from mcp/src/test/java/org/modelcontextprotocol/server/transport/BlockingInputStream.java rename to mcp/src/test/java/io/modelcontextprotocol/server/transport/BlockingInputStream.java index ec4b136..0ab72a9 100644 --- a/mcp/src/test/java/org/modelcontextprotocol/server/transport/BlockingInputStream.java +++ b/mcp/src/test/java/io/modelcontextprotocol/server/transport/BlockingInputStream.java @@ -1,7 +1,7 @@ /* * Copyright 2024 - 2024 the original author or authors. */ -package org.modelcontextprotocol.server.transport; +package io.modelcontextprotocol.server.transport; import java.io.IOException; import java.io.InputStream; diff --git a/mcp/src/test/java/org/modelcontextprotocol/server/transport/HttpServletSseServerTransportIntegrationTests.java b/mcp/src/test/java/io/modelcontextprotocol/server/transport/HttpServletSseServerTransportIntegrationTests.java similarity index 91% rename from mcp/src/test/java/org/modelcontextprotocol/server/transport/HttpServletSseServerTransportIntegrationTests.java rename to mcp/src/test/java/io/modelcontextprotocol/server/transport/HttpServletSseServerTransportIntegrationTests.java index 0e6802c..6fe7fe0 100644 --- a/mcp/src/test/java/org/modelcontextprotocol/server/transport/HttpServletSseServerTransportIntegrationTests.java +++ b/mcp/src/test/java/io/modelcontextprotocol/server/transport/HttpServletSseServerTransportIntegrationTests.java @@ -1,7 +1,7 @@ /* * Copyright 2024 - 2024 the original author or authors. */ -package org.modelcontextprotocol.server.transport; +package io.modelcontextprotocol.server.transport; import java.time.Duration; import java.util.List; @@ -10,6 +10,22 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; import com.fasterxml.jackson.databind.ObjectMapper; +import io.modelcontextprotocol.client.McpClient; +import io.modelcontextprotocol.client.transport.HttpClientSseClientTransport; +import io.modelcontextprotocol.server.McpServer; +import io.modelcontextprotocol.server.McpServerFeatures; +import io.modelcontextprotocol.server.transport.HttpServletSseServerTransport; +import io.modelcontextprotocol.spec.McpError; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.McpSchema.CallToolResult; +import io.modelcontextprotocol.spec.McpSchema.ClientCapabilities; +import io.modelcontextprotocol.spec.McpSchema.CreateMessageRequest; +import io.modelcontextprotocol.spec.McpSchema.CreateMessageResult; +import io.modelcontextprotocol.spec.McpSchema.InitializeResult; +import io.modelcontextprotocol.spec.McpSchema.Role; +import io.modelcontextprotocol.spec.McpSchema.Root; +import io.modelcontextprotocol.spec.McpSchema.ServerCapabilities; +import io.modelcontextprotocol.spec.McpSchema.Tool; import org.apache.catalina.Context; import org.apache.catalina.LifecycleException; import org.apache.catalina.LifecycleState; @@ -17,21 +33,6 @@ import org.apache.catalina.startup.Tomcat; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.modelcontextprotocol.client.McpClient; -import org.modelcontextprotocol.client.transport.HttpClientSseClientTransport; -import org.modelcontextprotocol.server.McpServer; -import org.modelcontextprotocol.server.McpServerFeatures; -import org.modelcontextprotocol.spec.McpError; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.McpSchema.CallToolResult; -import org.modelcontextprotocol.spec.McpSchema.ClientCapabilities; -import org.modelcontextprotocol.spec.McpSchema.CreateMessageRequest; -import org.modelcontextprotocol.spec.McpSchema.CreateMessageResult; -import org.modelcontextprotocol.spec.McpSchema.InitializeResult; -import org.modelcontextprotocol.spec.McpSchema.Role; -import org.modelcontextprotocol.spec.McpSchema.Root; -import org.modelcontextprotocol.spec.McpSchema.ServerCapabilities; -import org.modelcontextprotocol.spec.McpSchema.Tool; import reactor.test.StepVerifier; import org.springframework.web.client.RestClient; diff --git a/mcp/src/test/java/org/modelcontextprotocol/server/transport/StdioServerTransportTests.java b/mcp/src/test/java/io/modelcontextprotocol/server/transport/StdioServerTransportTests.java similarity index 95% rename from mcp/src/test/java/org/modelcontextprotocol/server/transport/StdioServerTransportTests.java rename to mcp/src/test/java/io/modelcontextprotocol/server/transport/StdioServerTransportTests.java index f564a87..a06cfe6 100644 --- a/mcp/src/test/java/org/modelcontextprotocol/server/transport/StdioServerTransportTests.java +++ b/mcp/src/test/java/io/modelcontextprotocol/server/transport/StdioServerTransportTests.java @@ -2,7 +2,7 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.server.transport; +package io.modelcontextprotocol.server.transport; import java.io.ByteArrayOutputStream; import java.io.InputStream; @@ -11,12 +11,13 @@ import java.nio.charset.StandardCharsets; import java.util.Map; import com.fasterxml.jackson.databind.ObjectMapper; +import io.modelcontextprotocol.server.transport.StdioServerTransport; +import io.modelcontextprotocol.spec.McpSchema; +import io.modelcontextprotocol.spec.McpSchema.JSONRPCRequest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.modelcontextprotocol.spec.McpSchema; -import org.modelcontextprotocol.spec.McpSchema.JSONRPCRequest; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/mcp/src/test/java/org/modelcontextprotocol/spec/DefaultMcpSessionTests.java b/mcp/src/test/java/io/modelcontextprotocol/spec/DefaultMcpSessionTests.java similarity index 96% rename from mcp/src/test/java/org/modelcontextprotocol/spec/DefaultMcpSessionTests.java rename to mcp/src/test/java/io/modelcontextprotocol/spec/DefaultMcpSessionTests.java index 6ee5345..2b7bf34 100644 --- a/mcp/src/test/java/org/modelcontextprotocol/spec/DefaultMcpSessionTests.java +++ b/mcp/src/test/java/io/modelcontextprotocol/spec/DefaultMcpSessionTests.java @@ -2,16 +2,19 @@ * Copyright 2024-2024 the original author or authors. */ -package org.modelcontextprotocol.spec; +package io.modelcontextprotocol.spec; import java.time.Duration; import java.util.Map; import com.fasterxml.jackson.core.type.TypeReference; +import io.modelcontextprotocol.MockMcpTransport; +import io.modelcontextprotocol.spec.DefaultMcpSession; +import io.modelcontextprotocol.spec.McpError; +import io.modelcontextprotocol.spec.McpSchema; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.modelcontextprotocol.MockMcpTransport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Mono; diff --git a/pom.xml b/pom.xml index b683519..b562247 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.modelcontextprotocol.sdk + io.modelcontextprotocol.sdk mcp-parent 0.7.0-SNAPSHOT