Merge branch 'main' into main

Author: sheegansrigm

mcp-core/src/main/java/io/modelcontextprotocol/spec/McpSchema.java

@@ -306,7 +306,7 @@ public record JSONRPCResponse( // @formatter:off
 		@JsonInclude(JsonInclude.Include.NON_ABSENT)
 		@JsonIgnoreProperties(ignoreUnknown = true)
 		public record JSONRPCError( // @formatter:off
-			@JsonProperty("code") int code,
+			@JsonProperty("code") Integer code,
 			@JsonProperty("message") String message,
 			@JsonProperty("data") Object data) { // @formatter:on
 		}
@@ -1064,8 +1064,8 @@ public UnsubscribeRequest(String uri) {
 	 * The contents of a specific resource or sub-resource.
 	 */
 	@JsonTypeInfo(use = JsonTypeInfo.Id.DEDUCTION)
-	@JsonSubTypes({ @JsonSubTypes.Type(value = TextResourceContents.class, name = "text"),
-			@JsonSubTypes.Type(value = BlobResourceContents.class, name = "blob") })
+	@JsonSubTypes({ @JsonSubTypes.Type(value = TextResourceContents.class),
+			@JsonSubTypes.Type(value = BlobResourceContents.class) })
 	public sealed interface ResourceContents extends Meta permits TextResourceContents, BlobResourceContents {
 
 		/**
@@ -1822,14 +1822,14 @@ public record CreateMessageRequest( // @formatter:off
 		@JsonProperty("systemPrompt") String systemPrompt,
 		@JsonProperty("includeContext") ContextInclusionStrategy includeContext,
 		@JsonProperty("temperature") Double temperature,
-		@JsonProperty("maxTokens") int maxTokens,
+		@JsonProperty("maxTokens") Integer maxTokens,
 		@JsonProperty("stopSequences") List<String> stopSequences,
 		@JsonProperty("metadata") Map<String, Object> metadata,
 		@JsonProperty("_meta") Map<String, Object> meta) implements Request { // @formatter:on
 
 		// backwards compatibility constructor
 		public CreateMessageRequest(List<SamplingMessage> messages, ModelPreferences modelPreferences,
-				String systemPrompt, ContextInclusionStrategy includeContext, Double temperature, int maxTokens,
+				String systemPrompt, ContextInclusionStrategy includeContext, Double temperature, Integer maxTokens,
 				List<String> stopSequences, Map<String, Object> metadata) {
 			this(messages, modelPreferences, systemPrompt, includeContext, temperature, maxTokens, stopSequences,
 					metadata, null);
@@ -1859,7 +1859,7 @@ public static class Builder {
 
 			private Double temperature;
 
-			private int maxTokens;
+			private Integer maxTokens;
 
 			private List<String> stopSequences;
 
@@ -2501,6 +2501,7 @@ public CompleteResult(CompleteCompletion completion) {
 		 * @param hasMore Indicates whether there are additional completion options beyond
 		 * those provided in the current response, even if the exact total is unknown
 		 */
+		@JsonInclude(JsonInclude.Include.ALWAYS)
 		public record CompleteCompletion( // @formatter:off
 				@JsonProperty("values") List<String> values,
 				@JsonProperty("total") Integer total,

mcp-core/src/test/java/io/modelcontextprotocol/spec/CompleteCompletionSerializationTest.java

@@ -0,0 +1,28 @@
+package io.modelcontextprotocol.spec;
+
+import io.modelcontextprotocol.json.McpJsonMapper;
+import org.junit.jupiter.api.Test;
+import java.io.IOException;
+import java.util.Collections;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class CompleteCompletionSerializationTest {
+
+	@Test
+	void codeCompletionSerialization() throws IOException {
+		McpJsonMapper jsonMapper = McpJsonMapper.getDefault();
+		McpSchema.CompleteResult.CompleteCompletion codeComplete = new McpSchema.CompleteResult.CompleteCompletion(
+				Collections.emptyList(), 0, false);
+		String json = jsonMapper.writeValueAsString(codeComplete);
+		String expected = """
+				{"values":[],"total":0,"hasMore":false}""";
+		assertEquals(expected, json, json);
+
+		McpSchema.CompleteResult completeResult = new McpSchema.CompleteResult(codeComplete);
+		json = jsonMapper.writeValueAsString(completeResult);
+		expected = """
+				{"completion":{"values":[],"total":0,"hasMore":false}}""";
+		assertEquals(expected, json, json);
+	}
+
+}