Handle boxing in builder methods for list fields

1 files changed, 5 insertions, 4 deletions

diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/javatypes/JavaTypesGenerator.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/javatypes/JavaTypesGenerator.java
index b445747..de2596d 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/javatypes/JavaTypesGenerator.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/javatypes/JavaTypesGenerator.java
@@ -264,7 +264,8 @@ public class JavaTypesGenerator implements Generator {
             fieldConstructedNativeType.constructor().equals(NativeTypes.LIST)
         ) {
             var elementType = fieldConstructedNativeType.args().getFirst();
-            var javaElementType = generateTypeRef(elementType, context);
+            var javaElementUnboxedType = generateTypeRef(elementType, context);
+            var javaElementBoxedType = this.javaGenerator.generateReferenceTypeRef(elementType);
 
             var singularFieldName = field.name().endsWith("s")
                 ? field.name().substring(0, field.name().length() - 1)
@@ -279,7 +280,7 @@ public class JavaTypesGenerator implements Generator {
                 JavaMethodKind.INSTANCE,
                 builderJavaTypeRef,
                 List.of(
-                    new JavaParam(javaElementType, javaElementName)
+                    new JavaParam(javaElementUnboxedType, javaElementName)
                 ),
                 List.of(),
                 new JavaBlock(List.of(
@@ -287,7 +288,7 @@ public class JavaTypesGenerator implements Generator {
                         Optional.empty(),
                         javaFieldName,
                         new JavaNewExpression(
-                            JavaTypeRef.arrayList(javaElementType),
+                            JavaTypeRef.arrayList(javaElementBoxedType),
                             List.of(new JavaFieldAccess(JavaRef.THIS, javaFieldName))
                         )
                     ),
@@ -320,7 +321,7 @@ public class JavaTypesGenerator implements Generator {
                             Optional.empty(),
                             javaFieldName,
                             new JavaNewExpression(
-                                JavaTypeRef.arrayList(javaElementType),
+                                JavaTypeRef.arrayList(javaElementBoxedType),
                                 List.of(new JavaFieldAccess(JavaRef.THIS, javaFieldName))
                             )
                         ),