Don't serialize empty traits blocks

smithy-lang · May 26, 2022 · 17091eb · 17091eb
1 parent 0b72212
commit 17091eb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/shapes/ModelSerializer.java b/smithy-model/src/main/java/software/amazon/smithy/model/shapes/ModelSerializer.java
@@ -195,7 +195,10 @@ private ObjectNode.Builder serializeTraits(ObjectNode.Builder builder, Collectio
                     traitsToAdd.put(Node.from(trait.toShapeId().toString()), trait.toNode());
                 }
             }
-            builder.withMember("traits", new ObjectNode(traitsToAdd, SourceLocation.none()));
+
+            if (!traitsToAdd.isEmpty()) {
+                builder.withMember("traits", new ObjectNode(traitsToAdd, SourceLocation.none()));
+            }
         }
 
         return builder;

diff --git a/smithy-model/src/test/java/software/amazon/smithy/model/shapes/ModelSerializerTest.java b/smithy-model/src/test/java/software/amazon/smithy/model/shapes/ModelSerializerTest.java
@@ -219,10 +219,6 @@ public void transientTraitsAreNotSerialized() {
         ModelSerializer serializer = ModelSerializer.builder().build();
         ObjectNode result = serializer.serialize(model);
 
-        assertThat(NodePointer.parse("/shapes/com.foo#Str/traits")
-                           .getValue(result)
-                           .expectObjectNode()
-                           .getStringMap(),
-                   not(hasKey(OriginalShapeIdTrait.ID.toShapeId())));
+        assertTrue(NodePointer.parse("/shapes/com.foo#Str/traits").getValue(result).isNullNode());
     }
 }
diff --git a/...src/test/resources/software/amazon/smithy/model/shapes/ast-serialization/cases/enums.json b/...src/test/resources/software/amazon/smithy/model/shapes/ast-serialization/cases/enums.json
@@ -16,8 +16,7 @@
                         "smithy.api#enumValue": "bar"
                     }
                 }
-            },
-            "traits": {}
+            }
         },
         "smithy.example#IntEnum": {
             "type": "intEnum",