package name refactoring

markpollack · markpollack · commit 9978c258650a · 2024-12-10T18:46:49.000-05:00
diff --git a/spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/client/McpAsyncClient.java b/spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/client/McpAsyncClient.java
@@ -1,18 +1,18 @@
-package spring.ai.experimental.mcp.client;
+package org.springframework.ai.mcp.client;
 
 import java.time.Duration;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import reactor.core.publisher.Mono;
-import spring.ai.experimental.mcp.spec.DefaultMcpSession;
-import spring.ai.experimental.mcp.spec.McpTransport;
-import spring.ai.experimental.mcp.spec.McpError;
-import spring.ai.experimental.mcp.spec.McpSchema;
-import spring.ai.experimental.mcp.spec.McpSchema.GetPromptRequest;
-import spring.ai.experimental.mcp.spec.McpSchema.GetPromptResult;
-import spring.ai.experimental.mcp.spec.McpSchema.ListPromptsResult;
-import spring.ai.experimental.mcp.spec.McpSchema.PaginatedRequest;
+import org.springframework.ai.mcp.spec.DefaultMcpSession;
+import org.springframework.ai.mcp.spec.McpTransport;
+import org.springframework.ai.mcp.spec.McpError;
+import org.springframework.ai.mcp.spec.McpSchema;
+import org.springframework.ai.mcp.spec.McpSchema.GetPromptRequest;
+import org.springframework.ai.mcp.spec.McpSchema.GetPromptResult;
+import org.springframework.ai.mcp.spec.McpSchema.ListPromptsResult;
+import org.springframework.ai.mcp.spec.McpSchema.PaginatedRequest;
 
 /**
  * @author Dariusz Jędrzejczyk
diff --git a/spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/client/McpClient.java b/spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/client/McpClient.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spring.ai.experimental.mcp.client;
+package org.springframework.ai.mcp.client;
 
 import java.time.Duration;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import spring.ai.experimental.mcp.spec.McpTransport;
+import org.springframework.ai.mcp.spec.McpTransport;
 
 /**
  * Factory class providing static methods for creating Model Context Protocol (MCP) clients.
diff --git a/spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/client/McpSyncClient.java b/spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/client/McpSyncClient.java
@@ -1,12 +1,12 @@
-package spring.ai.experimental.mcp.client;
+package org.springframework.ai.mcp.client;
 
 import java.time.Duration;
 
-import spring.ai.experimental.mcp.client.util.Assert;
-import spring.ai.experimental.mcp.spec.McpSchema;
-import spring.ai.experimental.mcp.spec.McpSchema.GetPromptRequest;
-import spring.ai.experimental.mcp.spec.McpSchema.GetPromptResult;
-import spring.ai.experimental.mcp.spec.McpSchema.ListPromptsResult;
+import org.springframework.ai.mcp.client.util.Assert;
+import org.springframework.ai.mcp.spec.McpSchema;
+import org.springframework.ai.mcp.spec.McpSchema.GetPromptRequest;
+import org.springframework.ai.mcp.spec.McpSchema.GetPromptResult;
+import org.springframework.ai.mcp.spec.McpSchema.ListPromptsResult;
 
 /**
  * @author Dariusz Jędrzejczyk
diff --git a/spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/client/stdio/ServerParameters.java b/spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/client/stdio/ServerParameters.java
@@ -1,4 +1,4 @@
-package spring.ai.experimental.mcp.client.stdio;
+package org.springframework.ai.mcp.client.stdio;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -9,7 +9,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import spring.ai.experimental.mcp.client.util.Assert;
+import org.springframework.ai.mcp.client.util.Assert;
 
 /**
  * Server parameters for stdio client.
diff --git a/spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/client/stdio/ServerParametersParser.java b/spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/client/stdio/ServerParametersParser.java
@@ -13,15 +13,15 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package spring.ai.experimental.mcp.client.stdio;
+package org.springframework.ai.mcp.client.stdio;
 
 import java.util.Map;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import spring.ai.experimental.mcp.client.stdio.ServerParametersParser.McpServerConfigurations.McpServerConfiguration;
+import org.springframework.ai.mcp.client.stdio.ServerParametersParser.McpServerConfigurations.McpServerConfiguration;
 
 /**
  * @author Christian Tzolov
diff --git a/spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/client/stdio/StdioServerTransport.java b/spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/client/stdio/StdioServerTransport.java
@@ -1,4 +1,4 @@
-package spring.ai.experimental.mcp.client.stdio;
+package org.springframework.ai.mcp.client.stdio;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -13,12 +13,12 @@
 import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Scheduler;
 import reactor.core.scheduler.Schedulers;
-import spring.ai.experimental.mcp.client.util.Assert;
-import spring.ai.experimental.mcp.spec.AbstractMcpTransport;
-import spring.ai.experimental.mcp.spec.McpSchema.JSONRPCMessage;
-import spring.ai.experimental.mcp.spec.McpSchema.JSONRPCNotification;
-import spring.ai.experimental.mcp.spec.McpSchema.JSONRPCRequest;
-import spring.ai.experimental.mcp.spec.McpSchema.JSONRPCResponse;
+import org.springframework.ai.mcp.client.util.Assert;
+import org.springframework.ai.mcp.spec.AbstractMcpTransport;
+import org.springframework.ai.mcp.spec.McpSchema.JSONRPCMessage;
+import org.springframework.ai.mcp.spec.McpSchema.JSONRPCNotification;
+import org.springframework.ai.mcp.spec.McpSchema.JSONRPCRequest;
+import org.springframework.ai.mcp.spec.McpSchema.JSONRPCResponse;
 
 /**
  * Stdio client for communicating with a server process.
diff --git a/spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/client/util/Assert.java b/spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/client/util/Assert.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package spring.ai.experimental.mcp.client.util;
+package org.springframework.ai.mcp.client.util;
 
 import reactor.util.annotation.Nullable;
 
diff --git a/spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/spec/AbstractMcpTransport.java b/spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/spec/AbstractMcpTransport.java
@@ -13,15 +13,15 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package spring.ai.experimental.mcp.spec;
+package org.springframework.ai.mcp.spec;
 
 import java.util.function.Consumer;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.Sinks;
-import spring.ai.experimental.mcp.client.util.Assert;
-import spring.ai.experimental.mcp.spec.McpSchema.JSONRPCMessage;
+import org.springframework.ai.mcp.client.util.Assert;
+import org.springframework.ai.mcp.spec.McpSchema.JSONRPCMessage;
 
 /**
  * @author Christian Tzolov
diff --git a/spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/spec/DefaultMcpSession.java b/spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/spec/DefaultMcpSession.java
@@ -1,4 +1,4 @@
-package spring.ai.experimental.mcp.spec;
+package org.springframework.ai.mcp.spec;
 
 import java.time.Duration;
 import java.util.Map;
@@ -9,7 +9,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.MonoSink;
-import spring.ai.experimental.mcp.client.util.Assert;
+import org.springframework.ai.mcp.client.util.Assert;
 
 /**
  * Implementation of the MCP client session.
diff --git a/spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/spec/McpError.java b/spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/spec/McpError.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package spring.ai.experimental.mcp.spec;
+package org.springframework.ai.mcp.spec;
 
 public class McpError extends RuntimeException {
 
diff --git a/spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/spec/McpSchema.java b/spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/spec/McpSchema.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package spring.ai.experimental.mcp.spec;
+package org.springframework.ai.mcp.spec;
 
 import java.util.List;
 import java.util.Map;
diff --git a/spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/spec/McpSession.java b/spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/spec/McpSession.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spring.ai.experimental.mcp.spec;
+package org.springframework.ai.mcp.spec;
 
 import java.time.Duration;
 import java.util.Map;
diff --git a/spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/spec/McpTransport.java b/spring-ai-mcp-core/src/main/java/org/springframework/ai/mcp/spec/McpTransport.java
@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spring.ai.experimental.mcp.spec;
+package org.springframework.ai.mcp.spec;
 
-import java.time.Duration;
 import java.util.function.Consumer;
 
 import reactor.core.publisher.Mono;
-import spring.ai.experimental.mcp.spec.McpSchema.JSONRPCMessage;
+import org.springframework.ai.mcp.spec.McpSchema.JSONRPCMessage;
 
 /**
  * Defines the asynchronous transport layer for the Model Context Protocol
diff --git a/spring-ai-mcp-core/src/test/java/org/springframework/ai/mcp/attic/ClientSessionTests2.java b/spring-ai-mcp-core/src/test/java/org/springframework/ai/mcp/attic/ClientSessionTests2.java
@@ -13,18 +13,18 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package spring.ai.experimental.mcp.attic;
+package org.springframework.ai.mcp.attic;
 
 import java.time.Duration;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import spring.ai.experimental.mcp.client.McpClient;
-import spring.ai.experimental.mcp.client.McpSyncClient;
-import spring.ai.experimental.mcp.client.stdio.ServerParameters;
-import spring.ai.experimental.mcp.client.stdio.StdioServerTransport;
-import spring.ai.experimental.mcp.spec.McpSchema.ListResourcesResult;
-import spring.ai.experimental.mcp.spec.McpSchema.ListToolsResult;
-import spring.ai.experimental.mcp.spec.McpSchema.Resource;
+import org.springframework.ai.mcp.client.McpClient;
+import org.springframework.ai.mcp.client.McpSyncClient;
+import org.springframework.ai.mcp.client.stdio.ServerParameters;
+import org.springframework.ai.mcp.client.stdio.StdioServerTransport;
+import org.springframework.ai.mcp.spec.McpSchema.ListResourcesResult;
+import org.springframework.ai.mcp.spec.McpSchema.ListToolsResult;
+import org.springframework.ai.mcp.spec.McpSchema.Resource;
 
 /**
  * @author Christian Tzolov
diff --git a/spring-ai-mcp-core/src/test/java/org/springframework/ai/mcp/attic/ClientSessionTests3.java b/spring-ai-mcp-core/src/test/java/org/springframework/ai/mcp/attic/ClientSessionTests3.java
@@ -13,18 +13,18 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package spring.ai.experimental.mcp.attic;
+package org.springframework.ai.mcp.attic;
 
 import java.time.Duration;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import spring.ai.experimental.mcp.client.McpClient;
-import spring.ai.experimental.mcp.client.McpSyncClient;
-import spring.ai.experimental.mcp.client.stdio.ServerParameters;
-import spring.ai.experimental.mcp.client.stdio.StdioServerTransport;
-import spring.ai.experimental.mcp.spec.McpSchema.ListResourcesResult;
-import spring.ai.experimental.mcp.spec.McpSchema.ListToolsResult;
-import spring.ai.experimental.mcp.spec.McpSchema.Resource;
+import org.springframework.ai.mcp.client.McpClient;
+import org.springframework.ai.mcp.client.McpSyncClient;
+import org.springframework.ai.mcp.client.stdio.ServerParameters;
+import org.springframework.ai.mcp.client.stdio.StdioServerTransport;
+import org.springframework.ai.mcp.spec.McpSchema.ListResourcesResult;
+import org.springframework.ai.mcp.spec.McpSchema.ListToolsResult;
+import org.springframework.ai.mcp.spec.McpSchema.Resource;
 
 /**
  * @author Christian Tzolov
diff --git a/spring-ai-mcp-core/src/test/java/org/springframework/ai/mcp/client/McpAsyncClientTests.java b/spring-ai-mcp-core/src/test/java/org/springframework/ai/mcp/client/McpAsyncClientTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spring.ai.experimental.mcp.client;
+package org.springframework.ai.mcp.client;
 
 import java.time.Duration;
 import java.util.Map;
@@ -23,13 +23,13 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
-import spring.ai.experimental.mcp.client.stdio.ServerParameters;
-import spring.ai.experimental.mcp.client.stdio.StdioServerTransport;
-import spring.ai.experimental.mcp.spec.McpSchema.CallToolRequest;
-import spring.ai.experimental.mcp.spec.McpSchema.GetPromptRequest;
-import spring.ai.experimental.mcp.spec.McpSchema.Prompt;
-import spring.ai.experimental.mcp.spec.McpSchema.Resource;
-import spring.ai.experimental.mcp.spec.McpSchema.Tool;
+import org.springframework.ai.mcp.client.stdio.ServerParameters;
+import org.springframework.ai.mcp.client.stdio.StdioServerTransport;
+import org.springframework.ai.mcp.spec.McpSchema.CallToolRequest;
+import org.springframework.ai.mcp.spec.McpSchema.GetPromptRequest;
+import org.springframework.ai.mcp.spec.McpSchema.Prompt;
+import org.springframework.ai.mcp.spec.McpSchema.Resource;
+import org.springframework.ai.mcp.spec.McpSchema.Tool;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
diff --git a/spring-ai-mcp-core/src/test/java/org/springframework/ai/mcp/client/McpSyncClientTests.java b/spring-ai-mcp-core/src/test/java/org/springframework/ai/mcp/client/McpSyncClientTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spring.ai.experimental.mcp.client;
+package org.springframework.ai.mcp.client;
 
 import java.time.Duration;
 import java.util.Map;
@@ -23,15 +23,15 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
-import spring.ai.experimental.mcp.client.stdio.ServerParameters;
-import spring.ai.experimental.mcp.client.stdio.StdioServerTransport;
-import spring.ai.experimental.mcp.spec.McpSchema.CallToolRequest;
-import spring.ai.experimental.mcp.spec.McpSchema.CallToolResult;
-import spring.ai.experimental.mcp.spec.McpSchema.ListResourcesResult;
-import spring.ai.experimental.mcp.spec.McpSchema.ListToolsResult;
-import spring.ai.experimental.mcp.spec.McpSchema.Resource;
-import spring.ai.experimental.mcp.spec.McpSchema.TextContent;
-import spring.ai.experimental.mcp.spec.McpSchema.Tool;
+import org.springframework.ai.mcp.client.stdio.ServerParameters;
+import org.springframework.ai.mcp.client.stdio.StdioServerTransport;
+import org.springframework.ai.mcp.spec.McpSchema.CallToolRequest;
+import org.springframework.ai.mcp.spec.McpSchema.CallToolResult;
+import org.springframework.ai.mcp.spec.McpSchema.ListResourcesResult;
+import org.springframework.ai.mcp.spec.McpSchema.ListToolsResult;
+import org.springframework.ai.mcp.spec.McpSchema.Resource;
+import org.springframework.ai.mcp.spec.McpSchema.TextContent;
+import org.springframework.ai.mcp.spec.McpSchema.Tool;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
diff --git a/spring-ai-mcp-core/src/test/java/org/springframework/ai/mcp/client/stdio/StdioServerTransportTests.java b/spring-ai-mcp-core/src/test/java/org/springframework/ai/mcp/client/stdio/StdioServerTransportTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spring.ai.experimental.mcp.client.stdio;
+package org.springframework.ai.mcp.client.stdio;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
diff --git a/spring-ai-mcp-core/src/test/java/org/springframework/ai/mcp/spec/DefaultMcpTransportTests.java b/spring-ai-mcp-core/src/test/java/org/springframework/ai/mcp/spec/DefaultMcpTransportTests.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package spring.ai.experimental.mcp.spec;
+package org.springframework.ai.mcp.spec;
 
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -22,8 +22,8 @@
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
-import spring.ai.experimental.mcp.spec.McpSchema.JSONRPCMessage;
-import spring.ai.experimental.mcp.spec.McpSchema.JSONRPCRequest;
+import org.springframework.ai.mcp.spec.McpSchema.JSONRPCMessage;
+import org.springframework.ai.mcp.spec.McpSchema.JSONRPCRequest;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
diff --git a/spring-ai-mcp-spring-boot/src/main/java/org/springframework/ai/mcp/spring/boot/McpApplication.java b/spring-ai-mcp-spring-boot/src/main/java/org/springframework/ai/mcp/spring/boot/McpApplication.java
@@ -1,14 +1,14 @@
-package spring.ai.experimental.mcp.spring.boot;
+package org.springframework.ai.mcp.spring.boot;
 
 import java.time.Duration;
 import java.util.List;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import spring.ai.experimental.mcp.client.McpClient;
-import spring.ai.experimental.mcp.client.McpSyncClient;
-import spring.ai.experimental.mcp.client.stdio.ServerParameters;
-import spring.ai.experimental.mcp.client.stdio.StdioServerTransport;
-import spring.ai.experimental.mcp.spring.McpFunctionCallback;
+import org.springframework.ai.mcp.client.McpClient;
+import org.springframework.ai.mcp.client.McpSyncClient;
+import org.springframework.ai.mcp.client.stdio.ServerParameters;
+import org.springframework.ai.mcp.client.stdio.StdioServerTransport;
+import org.springframework.ai.mcp.spring.McpFunctionCallback;
 
 import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.boot.CommandLineRunner;
diff --git a/spring-ai-mcp-spring/src/main/java/org/springframework/ai/mcp/spring/McpFunctionCallback.java b/spring-ai-mcp-spring/src/main/java/org/springframework/ai/mcp/spring/McpFunctionCallback.java
@@ -13,14 +13,14 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package spring.ai.experimental.mcp.spring;
+package org.springframework.ai.mcp.spring;
 
 import java.util.Map;
 
-import spring.ai.experimental.mcp.client.McpSyncClient;
-import spring.ai.experimental.mcp.spec.McpSchema.CallToolRequest;
-import spring.ai.experimental.mcp.spec.McpSchema.CallToolResult;
-import spring.ai.experimental.mcp.spec.McpSchema.Tool;
+import org.springframework.ai.mcp.client.McpSyncClient;
+import org.springframework.ai.mcp.spec.McpSchema.CallToolRequest;
+import org.springframework.ai.mcp.spec.McpSchema.CallToolResult;
+import org.springframework.ai.mcp.spec.McpSchema.Tool;
 
 import org.springframework.ai.model.ModelOptionsUtils;
 import org.springframework.ai.model.function.FunctionCallback;
