Fix map value types

block · Sep 12, 2024 · c73fa0e · c73fa0e
1 parent ed06fbe
commit c73fa0e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/...e/ftl-runtime/common/deployment/src/main/java/xyz/block/ftl/deployment/ModuleBuilder.java b/...e/ftl-runtime/common/deployment/src/main/java/xyz/block/ftl/deployment/ModuleBuilder.java
@@ -363,7 +363,7 @@ public Type buildType(org.jboss.jandex.Type type, boolean export) {
                 } else if (paramType.name().equals(DotName.createSimple(Map.class))) {
                     return Type.newBuilder().setMap(xyz.block.ftl.v1.schema.Map.newBuilder()
                             .setKey(buildType(paramType.arguments().get(0), export))
-                            .setValue(buildType(paramType.arguments().get(0), export)))
+                            .setValue(buildType(paramType.arguments().get(1), export)))
                             .build();
                 } else if (paramType.name().equals(DotNames.OPTIONAL)) {
                     //TODO: optional kinda sucks

diff --git a/jvm-runtime/jvm_integration_test.go b/jvm-runtime/jvm_integration_test.go
@@ -111,8 +111,7 @@ func TestJVMToGoCall(t *testing.T) {
 	})...)
 	tests = append(tests, PairedVerbTest("testObjectVerb", exampleObject)...)
 	tests = append(tests, PairedVerbTest("testObjectOptionalFieldsVerb", exampleOptionalFieldsObject)...)
-	// TODO turn on when https://github.com/TBD54566975/ftl/issues/2651 is fixed
-	//tests = append(tests, PairedVerbTest("objectMapVerb", map[string]TestObject{"hello": exampleObject})...)
+	tests = append(tests, PairedVerbTest("objectMapVerb", map[string]TestObject{"hello": exampleObject})...)
 	tests = append(tests, PairedVerbTest("objectArrayVerb", []TestObject{exampleObject})...)
 	tests = append(tests, PairedVerbTest("parameterizedObjectVerb", parameterizedObject)...)
 	tests = append(tests, PairedVerbTest("optionalIntVerb", -3)...)