Update copyright headers and add javaformat plugin

Author: markpollack

pom.xml

@@ -97,6 +97,20 @@
 
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>io.spring.javaformat</groupId>
+				<artifactId>spring-javaformat-maven-plugin</artifactId>
+				<version>${spring-javaformat-maven-plugin.version}</version>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<inherited>true</inherited>
+						<goals>
+							<goal>validate</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-site-plugin</artifactId>

spring-ai-mcp-core/docs/spring-ai-mcp-uml-classdiagram.svg

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.experimental</groupId>
 		<artifactId>spring-ai-mcp</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>0.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-ai-mcp-core</artifactId>
 	<packaging>jar</packaging>

spring-ai-mcp-core/pom.xml

@@ -1,18 +1,34 @@
+/*
+ * Copyright 2024-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 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 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;
+import org.springframework.ai.mcp.spec.McpTransport;
 
 /**
  * @author Dariusz Jędrzejczyk
@@ -32,17 +48,15 @@ public McpAsyncClient(McpTransport transport, Duration requestTimeout, ObjectMap
 	}
 
 	/**
-	 * The initialization phase MUST be the first interaction between client and
-	 * server.
+	 * The initialization phase MUST be the first interaction between client and server.
 	 * During this phase, the client and server:
 	 * <ul>
 	 * <li>Establish protocol version compatibility</li>
 	 * <li>Exchange and negotiate capabilities</li>
 	 * <li>Share implementation details</li>
 	 * </ul>
 	 * <br/>
-	 * The client MUST initiate this phase by sending an initialize request
-	 * containing:
+	 * The client MUST initiate this phase by sending an initialize request containing:
 	 * <ul>
 	 * <li>The protocol version the client supports</li>
 	 * <li>The client's capabilities</li>
@@ -51,16 +65,14 @@ public McpAsyncClient(McpTransport transport, Duration requestTimeout, ObjectMap
 	 *
 	 * The server MUST respond with its own capabilities and information:
 	 * {@link McpSchema.ServerCapabilities}. <br/>
-	 * After successful initialization, the client MUST send an initialized
-	 * notification
+	 * After successful initialization, the client MUST send an initialized notification
 	 * to indicate it is ready to begin normal operations.
 	 *
 	 * <br/>
 	 *
 	 * <a href=
 	 * "https://github.com/modelcontextprotocol/specification/blob/main/docs/specification/basic/lifecycle.md#initialization">Initialization
 	 * Spec</a>
-	 * 
 	 * @return the initialize result.
 	 */
 	public Mono<McpSchema.InitializeResult> initialize() {
@@ -75,12 +87,11 @@ public Mono<McpSchema.InitializeResult> initialize() {
 
 		return result.flatMap(initializeResult -> {
 			if (!McpSchema.LATEST_PROTOCOL_VERSION.equals(initializeResult.protocolVersion())) {
-				return Mono.error(
-						new McpError("Unsupported protocol version from the server: "
-								+ initializeResult.protocolVersion()));
-			} else {
-				return this.sendNotification("notifications/initialized", null)
-						.thenReturn(initializeResult);
+				return Mono.error(new McpError(
+						"Unsupported protocol version from the server: " + initializeResult.protocolVersion()));
+			}
+			else {
+				return this.sendNotification("notifications/initialized", null).thenReturn(initializeResult);
 			}
 		});
 	}
@@ -104,12 +115,12 @@ public Mono<Void> ping() {
 	// --------------------------
 	private static TypeReference<McpSchema.CallToolResult> CALL_TOOL_RESULT_TYPE_REF = new TypeReference<McpSchema.CallToolResult>() {
 	};
+
 	private static TypeReference<McpSchema.ListToolsResult> LIST_TOOLS_RESULT_TYPE_REF = new TypeReference<McpSchema.ListToolsResult>() {
 	};
 
 	/**
 	 * Send a tools/call request.
-	 * 
 	 * @param callToolRequest the call tool request.
 	 * @return the call tool result.
 	 */
@@ -119,7 +130,6 @@ public Mono<McpSchema.CallToolResult> callTool(McpSchema.CallToolRequest callToo
 
 	/**
 	 * Send a tools/list request.
-	 * 
 	 * @return the list of tools result.
 	 */
 	public Mono<McpSchema.ListToolsResult> listTools(String cursor) {
@@ -132,14 +142,15 @@ public Mono<McpSchema.ListToolsResult> listTools(String cursor) {
 
 	private static TypeReference<McpSchema.ListResourcesResult> LIST_RESOURCES_RESULT_TYPE_REF = new TypeReference<McpSchema.ListResourcesResult>() {
 	};
+
 	private static TypeReference<McpSchema.ReadResourceResult> READ_RESOURCE_RESULT_TYPE_REF = new TypeReference<McpSchema.ReadResourceResult>() {
 	};
+
 	private static TypeReference<McpSchema.ListResourceTemplatesResult> LIST_RESOURCE_TEMPLATES_RESULT_TYPE_REF = new TypeReference<McpSchema.ListResourceTemplatesResult>() {
 	};
 
 	/**
 	 * Send a resources/list request.
-	 * 
 	 * @param cursor the cursor
 	 * @return the list of resources result.
 	 */
@@ -150,7 +161,6 @@ public Mono<McpSchema.ListResourcesResult> listResources(String cursor) {
 
 	/**
 	 * Send a resources/read request.
-	 * 
 	 * @param resource the resource to read
 	 * @return the resource content.
 	 */
@@ -160,7 +170,6 @@ public Mono<McpSchema.ReadResourceResult> readResource(McpSchema.Resource resour
 
 	/**
 	 * Send a resources/read request.
-	 * 
 	 * @param readResourceRequest the read resource request.
 	 * @return the resource content.
 	 */
@@ -173,7 +182,6 @@ public Mono<McpSchema.ReadResourceResult> readResource(McpSchema.ReadResourceReq
 	 * templates. Arguments may be auto-completed through the completion API.
 	 *
 	 * Request a list of resource templates the server has.
-	 * 
 	 * @param cursor the cursor
 	 * @return the list of resource templates result.
 	 */
@@ -183,33 +191,30 @@ public Mono<McpSchema.ListResourceTemplatesResult> listResourceTemplates(String
 	}
 
 	/**
-	 * List Changed Notification. When the list of available resources changes,
-	 * servers that declared the listChanged capability SHOULD send a notification:
+	 * List Changed Notification. When the list of available resources changes, servers
+	 * that declared the listChanged capability SHOULD send a notification:
 	 */
 	public Mono<Void> sendResourcesListChanged() {
 		return this.sendNotification("notifications/resources/list_changed");
 	}
 
 	/**
-	 * Subscriptions. The protocol supports optional subscriptions to resource
-	 * changes.
-	 * Clients can subscribe to specific resources and receive notifications when
-	 * they change.
+	 * Subscriptions. The protocol supports optional subscriptions to resource changes.
+	 * Clients can subscribe to specific resources and receive notifications when they
+	 * change.
 	 *
 	 * Send a resources/subscribe request.
-	 * 
-	 * @param subscribeRequest the subscribe request contains the uri of the
-	 *                         resource to subscribe to.
+	 * @param subscribeRequest the subscribe request contains the uri of the resource to
+	 * subscribe to.
 	 */
 	public Mono<Void> subscribeResource(McpSchema.SubscribeRequest subscribeRequest) {
 		return this.sendRequest("resources/subscribe", subscribeRequest, VOID_TYPE_REFERENCE);
 	}
 
 	/**
 	 * Send a resources/unsubscribe request.
-	 * 
-	 * @param unsubscribeRequest the unsubscribe request contains the uri of the
-	 *                           resource to unsubscribe from.
+	 * @param unsubscribeRequest the unsubscribe request contains the uri of the resource
+	 * to unsubscribe from.
 	 */
 	public Mono<Void> unsubscribeResource(McpSchema.UnsubscribeRequest unsubscribeRequest) {
 		return this.sendRequest("resources/unsubscribe", unsubscribeRequest, VOID_TYPE_REFERENCE);
@@ -220,23 +225,21 @@ public Mono<Void> unsubscribeResource(McpSchema.UnsubscribeRequest unsubscribeRe
 	// --------------------------
 	private static TypeReference<McpSchema.ListPromptsResult> LIST_PROMPTS_RESULT_TYPE_REF = new TypeReference<McpSchema.ListPromptsResult>() {
 	};
+
 	private static TypeReference<McpSchema.GetPromptResult> GET_PROMPT_RESULT_TYPE_REF = new TypeReference<McpSchema.GetPromptResult>() {
 	};
 
 	public Mono<ListPromptsResult> listPrompts(String cursor) {
-		return this
-				.sendRequest("prompts/list", new PaginatedRequest(cursor), LIST_PROMPTS_RESULT_TYPE_REF);
+		return this.sendRequest("prompts/list", new PaginatedRequest(cursor), LIST_PROMPTS_RESULT_TYPE_REF);
 	}
 
 	public Mono<GetPromptResult> getPrompt(GetPromptRequest getPromptRequest) {
 		return this.sendRequest("prompts/get", getPromptRequest, GET_PROMPT_RESULT_TYPE_REF);
 	}
 
 	/**
-	 * (Server) An optional notification from the server to the client, informing it
-	 * that
-	 * the list of prompts it offers has changed. This may be issued by servers
-	 * without
+	 * (Server) An optional notification from the server to the client, informing it that
+	 * the list of prompts it offers has changed. This may be issued by servers without
 	 * any previous subscription from the client.
 	 */
 	public Mono<Void> promptListChangedNotification() {