From 20e4eea2a8e2c6430e8cf558a6730c34a9b38bdd Mon Sep 17 00:00:00 2001
From: Jaykumar Gosar <gosar@amazon.com>
Date: Tue, 20 Jul 2021 10:35:58 -0700
Subject: [PATCH] Undo changes to createNode for Traits that used NodeMapper

They are fixed via https://github.com/awslabs/smithy/pull/865
---
 .../amazon/smithy/aws/apigateway/traits/IntegrationTrait.java | 3 +--
 .../smithy/aws/apigateway/traits/MockIntegrationTrait.java    | 3 +--
 .../smithy/aws/cloudformation/traits/CfnResourceTrait.java    | 4 +---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/smithy-aws-apigateway-traits/src/main/java/software/amazon/smithy/aws/apigateway/traits/IntegrationTrait.java b/smithy-aws-apigateway-traits/src/main/java/software/amazon/smithy/aws/apigateway/traits/IntegrationTrait.java
index e62849715e4..6d7dbc5abee 100644
--- a/smithy-aws-apigateway-traits/src/main/java/software/amazon/smithy/aws/apigateway/traits/IntegrationTrait.java
+++ b/smithy-aws-apigateway-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/smithy-aws-apigateway-traits/src/main/java/software/amazon/smithy/aws/apigateway/traits/MockIntegrationTrait.java b/smithy-aws-apigateway-traits/src/main/java/software/amazon/smithy/aws/apigateway/traits/MockIntegrationTrait.java
index f937467a361..00b2c8a546a 100644
--- a/smithy-aws-apigateway-traits/src/main/java/software/amazon/smithy/aws/apigateway/traits/MockIntegrationTrait.java
+++ b/smithy-aws-apigateway-traits/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/smithy-aws-cloudformation-traits/src/main/java/software/amazon/smithy/aws/cloudformation/traits/CfnResourceTrait.java b/smithy-aws-cloudformation-traits/src/main/java/software/amazon/smithy/aws/cloudformation/traits/CfnResourceTrait.java
index 48aa7b6eb9e..c2c3504eabd 100644
--- a/smithy-aws-cloudformation-traits/src/main/java/software/amazon/smithy/aws/cloudformation/traits/CfnResourceTrait.java
+++ b/smithy-aws-cloudformation-traits/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