Fix type conversions issues in MCP. Add more tests

Author: adwsingh

core/src/main/java/software/amazon/smithy/java/core/serde/document/DocumentParser.java

@@ -107,6 +107,12 @@ public <T> void writeList(Schema schema, T state, int size, BiConsumer<T, ShapeS
 
     @Override
     public <T> void writeMap(Schema schema, T state, int size, BiConsumer<T, MapSerializer> consumer) {
+        if (schema.type() == ShapeType.DOCUMENT) {
+            var serializer = new DocumentMapSerializer(size);
+            consumer.accept(state, serializer);
+            setResult(new Documents.StringMapDocument(Documents.STR_MAP_SCHEMA, serializer.entries));
+            return;
+        }
         var keyMember = schema.mapKeyMember();
         if (keyMember.type() == ShapeType.STRING || keyMember.type() == ShapeType.ENUM) {
             var serializer = new DocumentMapSerializer(size);

core/src/test/java/software/amazon/smithy/java/core/serde/document/DocumentParserTest.java

@@ -6,6 +6,7 @@
 package software.amazon.smithy.java.core.serde.document;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.aMapWithSize;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.nullValue;
@@ -36,4 +37,21 @@ public void doesNotDropNullListValues() {
         assertThat(parser.getResult().asList().get(2).asString(), equalTo("There"));
         assertThat(parser.getResult().asList().get(3), nullValue());
     }
+
+    @Test
+    void writesMapWithDocumentSchema() {
+        DocumentParser parser = new DocumentParser();
+        parser.writeMap(PreludeSchemas.DOCUMENT, null, 2, (_ignore, ser) -> {
+            ser.writeEntry(PreludeSchemas.STRING, "key1", null, (state, valueSer) -> {
+                valueSer.writeString(PreludeSchemas.STRING, "value1");
+            });
+            ser.writeEntry(PreludeSchemas.STRING, "key2", null, (state, valueSer) -> {
+                valueSer.writeInteger(PreludeSchemas.INTEGER, 42);
+            });
+        });
+
+        assertThat(parser.getResult().asStringMap(), aMapWithSize(2));
+        assertThat(parser.getResult().asStringMap().get("key1").asString(), equalTo("value1"));
+        assertThat(parser.getResult().asStringMap().get("key2").asNumber().intValue(), equalTo(42));
+    }
 }

gradle/libs.versions.toml

@@ -20,6 +20,7 @@ jline = "3.30.6"
 graalvm-native = "0.11.3"
 shadow = "8.3.9"
 jazzer = "0.28.0"
+json-schema-validator = "1.5.5"
 
 [libraries]
 smithy-model = { module = "software.amazon.smithy:smithy-model", version.ref = "smithy" }
@@ -63,6 +64,7 @@ hamcrest = { module = "org.hamcrest:hamcrest", version.ref = "hamcrest" }
 assertj-core = { module = "org.assertj:assertj-core", version.ref = "assertj"}
 jazzer-junit = { module = "com.code-intelligence:jazzer-junit", version.ref = "jazzer" }
 jazzer-api = { module = "com.code-intelligence:jazzer-api", version.ref = "jazzer" }
+json-schema-validator = { module = "com.networknt:json-schema-validator", version.ref = "json-schema-validator"}
 
 # plugin artifacts for buildsrc plugins
 test-logger-plugin = { module = "com.adarshr:gradle-test-logger-plugin", version.ref = "test-logger-plugin" }

mcp/mcp-server/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     id("smithy-java.module-conventions")
+    id("smithy-java.codegen-plugin-conventions")
 }
 
 description =
@@ -21,18 +22,13 @@ dependencies {
     testRuntimeOnly(libs.smithy.aws.traits)
     testRuntimeOnly(project(":aws:client:aws-client-awsjson"))
     testImplementation(project(":server:server-proxy"))
-}
-
-java {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(21))
-}
 
-tasks {
-    compileJava {
-        options.release.set(21)
-    }
+    testImplementation(project(":codegen:plugins:server-codegen"))
+    testImplementation(libs.json.schema.validator)
 }
 
 spotbugs {
     ignoreFailures = true
 }
+
+addGenerateSrcsTask("software.amazon.smithy.java.mcp.server.utils.TestJavaCodegenRunner", null, null, "server")