Undo changes to createNode for Traits that used NodeMapper

They are fixed via #865
smithy-lang · Jul 21, 2021 · 20e4eea · 20e4eea
1 parent 4b9a307
commit 20e4eea
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/...y-traits/src/main/java/software/amazon/smithy/aws/apigateway/traits/IntegrationTrait.java b/...y-traits/src/main/java/software/amazon/smithy/aws/apigateway/traits/IntegrationTrait.java
@@ -336,8 +336,7 @@ protected ObjectNode createNode() {
         NodeMapper mapper = new NodeMapper();
         mapper.disableToNodeForClass(IntegrationTrait.class);
         mapper.setOmitEmptyValues(true);
-        ObjectNode.Builder builder = mapper.serialize(this).expectObjectNode().toBuilder();
-        return builder.sourceLocation(getSourceLocation()).build();
+        return mapper.serialize(this).expectObjectNode();
     }
 
     @Override

diff --git a/...aits/src/main/java/software/amazon/smithy/aws/apigateway/traits/MockIntegrationTrait.java b/...aits/src/main/java/software/amazon/smithy/aws/apigateway/traits/MockIntegrationTrait.java
@@ -157,8 +157,7 @@ protected ObjectNode createNode() {
         NodeMapper mapper = new NodeMapper();
         mapper.disableToNodeForClass(MockIntegrationTrait.class);
         mapper.setOmitEmptyValues(true);
-        ObjectNode.Builder builder = mapper.serialize(this).expectObjectNode().toBuilder();
-        return builder.sourceLocation(getSourceLocation()).build();
+        return mapper.serialize(this).expectObjectNode();
     }
 
     @Override

diff --git a/...aits/src/main/java/software/amazon/smithy/aws/cloudformation/traits/CfnResourceTrait.java b/...aits/src/main/java/software/amazon/smithy/aws/cloudformation/traits/CfnResourceTrait.java
@@ -20,7 +20,6 @@
 import java.util.Optional;
 import software.amazon.smithy.model.node.Node;
 import software.amazon.smithy.model.node.NodeMapper;
-import software.amazon.smithy.model.node.ObjectNode;
 import software.amazon.smithy.model.shapes.ShapeId;
 import software.amazon.smithy.model.traits.AbstractTrait;
 import software.amazon.smithy.model.traits.AbstractTraitBuilder;
@@ -72,8 +71,7 @@ protected Node createNode() {
         NodeMapper mapper = new NodeMapper();
         mapper.disableToNodeForClass(CfnResourceTrait.class);
         mapper.setOmitEmptyValues(true);
-        ObjectNode.Builder builder = mapper.serialize(this).expectObjectNode().toBuilder();
-        return builder.sourceLocation(getSourceLocation()).build();
+        return mapper.serialize(this).expectObjectNode();
     }
 
     @Override