Improve processSymbol method to reduce the usage of if statement. Correct smithy files' formatting.

Author: joewyz

smithy-trait-codegen/src/it/resources/software/amazon/smithy/traitcodegen/test/maps/nested-map-trait.smithy

@@ -4,5 +4,5 @@ namespace test.smithy.traitcodegen
 
 use test.smithy.traitcodegen.maps#NestedMapTrait
 
-@NestedMapTrait(a:{b:{c:"d"}})
+@NestedMapTrait(a: {b: {c: "d"}})
 structure myStruct {}

smithy-trait-codegen/src/it/resources/software/amazon/smithy/traitcodegen/test/structures/struct-with-listofmap-trait.smithy

@@ -7,9 +7,8 @@ use test.smithy.traitcodegen.structures#StructWithListOfMapTrait
 @StructWithListOfMapTrait({
     name: "a"
     items: [{
-        b:"c"
+        b: "c"
     }]
 })
 structure myStruct {
-
 }

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

@@ -252,7 +252,7 @@ public Void listShape(ListShape shape) {
 
         @Override
         public Void mapShape(MapShape shape) {
-            String entryName = "entry" + nestedLevel;
+            String entryName = nestedLevel > 0 ? "entry" + nestedLevel : "entry";
             writer.openBlock("$L.entrySet().stream()",
                     "",
                     varName,

smithy-trait-codegen/src/main/java/software/amazon/smithy/traitcodegen/writer/TraitCodegenWriter.java

@@ -6,7 +6,6 @@
 
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Scanner;
@@ -21,6 +20,7 @@
 import software.amazon.smithy.traitcodegen.TraitCodegenSettings;
 import software.amazon.smithy.traitcodegen.TraitCodegenUtils;
 import software.amazon.smithy.utils.ListUtils;
+import software.amazon.smithy.utils.SetUtils;
 import software.amazon.smithy.utils.StringUtils;
 
 /**
@@ -46,6 +46,7 @@
 public class TraitCodegenWriter extends SymbolWriter<TraitCodegenWriter, TraitCodegenImportContainer> {
     private static final int MAX_LINE_LENGTH = 120;
     private static final Pattern PATTERN = Pattern.compile("<([a-z]+)*>.*?</\\1>", Pattern.DOTALL);
+    private static final Set<String> PARAMETERIZED_TYPE_NAMES = SetUtils.of("List", "Map", "Set", "Collection");
     private final String namespace;
     private final String fileName;
     private final TraitCodegenSettings settings;
@@ -233,28 +234,21 @@ private String getPlaceholder(Symbol symbol) {
             return format("$${$L:L}", normalizedSymbol.getFullName());
         }
 
-        private boolean isGenericType(Symbol symbol) {
-            String name = symbol.getName();
-            return name.equals("List") || name.equals("Map")
-                    || name.equals("Set")
-                    || name.equals("Collection");
+        private boolean isParametrized(Symbol symbol) {
+            return PARAMETERIZED_TYPE_NAMES.contains(symbol.getName());
         }
 
         // Recursively process the symbols using Java Type.
         private void processSymbol(Symbol symbol, StringBuilder builder) {
             builder.append(getPlaceholder(symbol));
-            if (isGenericType(symbol)) {
+            if (isParametrized(symbol)) {
                 builder.append("<");
-            }
-            Iterator<SymbolReference> iterator = symbol.getReferences().iterator();
-            while (iterator.hasNext()) {
-                Symbol referenceSymbol = iterator.next().getSymbol();
-                processSymbol(referenceSymbol, builder);
-                if (iterator.hasNext()) {
+                for (SymbolReference reference : symbol.getReferences()) {
+                    Symbol referenceSymbol = reference.getSymbol();
+                    processSymbol(referenceSymbol, builder);
                     builder.append(", ");
                 }
-            }
-            if (isGenericType(symbol)) {
+                builder.setLength(builder.length() - 2); // Trim the final comma.
                 builder.append(">");
             }
         }

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

@@ -13,4 +13,4 @@ list ItemsList {
 
 list ItemsListEntry {
     member: String
-}
+}

smithy-trait-codegen/src/test/resources/META-INF/smithy/maps/nested-map-trait.smithy

@@ -5,7 +5,7 @@ namespace test.smithy.traitcodegen.maps
 @trait
 map NestedMapTrait {
     key: String
-    value:ItemsMap
+    value: ItemsMap
 }
 
 map ItemsMap {
@@ -16,4 +16,4 @@ map ItemsMap {
 map ItemsMapEntry {
     key: String
     value: String
-}
+}

smithy-trait-codegen/src/test/resources/META-INF/smithy/structures/struct-with-listofmap-trait.smithy

@@ -4,7 +4,7 @@ namespace test.smithy.traitcodegen.structures
 
 @trait
 structure StructWithListOfMapTrait {
-    name:String
+    name: String
     items: ItemsList
 }
 
@@ -13,6 +13,6 @@ list ItemsList {
 }
 
 map ItemsListEntry {
-    key:String,
+    key: String,
     value: String
-}
+}