Fix trait code generation for collections of boolean.

Author: joewyz

smithy-trait-codegen/src/it/resources/software/amazon/smithy/traitcodegen/test/lists/nested-boolean-list-trait.smithy

@@ -0,0 +1,8 @@
+$version: "2.0"
+
+namespace test.smithy.traitcodegen
+
+use test.smithy.traitcodegen.lists#NestedBooleanListTrait
+
+@NestedBooleanListTrait({name: "a", items: [[[true]]]})
+structure myStruct {}

smithy-trait-codegen/src/main/java/software/amazon/smithy/traitcodegen/generators/FromNodeMapperVisitor.java

@@ -58,7 +58,7 @@ final class FromNodeMapperVisitor extends ShapeVisitor.DataShapeVisitor<Void> {
 
     @Override
     public Void booleanShape(BooleanShape shape) {
-        writer.write("BooleanMember($1S, builder::$1L)", varName);
+        writer.write("$L.expectBooleanNode().getValue()", varName);
         return null;
     }
 
@@ -67,22 +67,17 @@ public Void listShape(ListShape shape) {
         writer.write("$L.expectArrayNode()", varName);
         writer.indent();
         writer.writeWithNoFormatting(".getElements().stream()");
+        String lambdaVarName = nestedLevel > 0 ? "n" + nestedLevel : "n";
+        writer.write(".map($L -> $C)",
+                lambdaVarName,
+                (Runnable) () -> shape.getMember()
+                        .accept(new FromNodeMapperVisitor(writer,
+                                model,
+                                lambdaVarName,
+                                nestedLevel + 1)));
         if (nestedLevel == 0) { // Triggered when shape is a member.
-            writer.write(".map(n -> $C)",
-                    (Runnable) () -> shape.getMember()
-                            .accept(new FromNodeMapperVisitor(writer,
-                                    model,
-                                    "n",
-                                    nestedLevel + 1)));
             writer.writeWithNoFormatting(".forEach(builder::addValues);");
         } else { // Triggered when shape is nested.
-            writer.write(".map($L -> $C)",
-                    varName + nestedLevel,
-                    (Runnable) () -> shape.getMember()
-                            .accept(new FromNodeMapperVisitor(writer,
-                                    model,
-                                    varName + nestedLevel,
-                                    nestedLevel + 1)));
             writer.write(".collect($T.toList())", Collectors.class);
         }
         writer.dedent();

smithy-trait-codegen/src/main/java/software/amazon/smithy/traitcodegen/generators/ToNodeGenerator.java

@@ -139,7 +139,7 @@ public Void structureShape(StructureShape shape) {
             if (shape.hasTrait(TraitDefinition.ID)) {
                 // If the shape is a trait we need to add the source location of trait to the
                 // generated node.
-                writer.writeInline(".sourceLocation(getSourceLocation())");
+                writer.write(".sourceLocation(getSourceLocation())");
             }
             for (MemberShape mem : shape.members()) {
                 if (TraitCodegenUtils.isNullableMember(mem)) {

smithy-trait-codegen/src/test/java/software/amazon/smithy/traitcodegen/TraitCodegenPluginTest.java

@@ -26,7 +26,7 @@
 import software.amazon.smithy.model.node.ObjectNode;
 
 public class TraitCodegenPluginTest {
-    private static final int EXPECTED_NUMBER_OF_FILES = 63;
+    private static final int EXPECTED_NUMBER_OF_FILES = 64;
 
     private MockManifest manifest;
     private Model model;

smithy-trait-codegen/src/test/resources/META-INF/smithy/lists/nested-boolean-list-trait.smithy

@@ -0,0 +1,17 @@
+$version: "2.0"
+
+namespace test.smithy.traitcodegen.lists
+
+@trait
+structure NestedBooleanListTrait {
+    name: String
+    items: BooleanItemsList
+}
+
+list BooleanItemsList {
+    member: BooleanItemsListEntry
+}
+
+list BooleanItemsListEntry {
+    member: Boolean
+}

smithy-trait-codegen/src/test/resources/META-INF/smithy/manifest

@@ -16,6 +16,7 @@ lists/string-list-trait.smithy
 lists/struct-list-trait.smithy
 lists/document-list-trait.smithy
 lists/nested-list-trait.smithy
+lists/nested-boolean-list-trait.smithy
 maps/string-string-map-trait.smithy
 maps/string-to-struct-map-trait.smithy
 maps/string-to-document-map-trait.smithy