Fix createTrait to carry forward the sourceLocation

Most existing createTrait methods do this, but these ones were missing that logic.
gosar · Jul 19, 2021 · 93e995d · 93e995d
1 parent 8593209
commit 93e995d
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 16 deletions.
diff --git a/...-traits/src/main/java/software/amazon/smithy/aws/iam/traits/DefineConditionKeysTrait.java b/...-traits/src/main/java/software/amazon/smithy/aws/iam/traits/DefineConditionKeysTrait.java
@@ -53,8 +53,7 @@ public Provider() {
 
         @Override
         public Trait createTrait(ShapeId target, Node value) {
-            // BUG: sourceLocation
-            Builder builder = builder();
+            Builder builder = builder().sourceLocation(value);
             for (Map.Entry<StringNode, Node> entry : value.expectObjectNode().getMembers().entrySet()) {
                 ConditionKeyDefinition definition = ConditionKeyDefinition.fromNode(
                         entry.getValue().expectObjectNode());

diff --git a/smithy-aws-traits/src/main/java/software/amazon/smithy/aws/traits/ArnReferenceTrait.java b/smithy-aws-traits/src/main/java/software/amazon/smithy/aws/traits/ArnReferenceTrait.java
@@ -53,9 +53,8 @@ public Provider() {
 
         @Override
         public Trait createTrait(ShapeId target, Node value) {
-            //BUG: sourcelocation
             ObjectNode objectNode = value.expectObjectNode();
-            Builder builder = builder();
+            Builder builder = builder().sourceLocation(value);
             objectNode.getStringMember(TYPE)
                     .map(StringNode::getValue)
                     .ifPresent(builder::type);

diff --git a/smithy-aws-traits/src/main/java/software/amazon/smithy/aws/traits/ArnTrait.java b/smithy-aws-traits/src/main/java/software/amazon/smithy/aws/traits/ArnTrait.java
@@ -70,9 +70,8 @@ public Provider() {
 
         @Override
         public Trait createTrait(ShapeId target, Node value) {
-            // BUG: sourceLocation
-            Builder builder = builder();
             ObjectNode objectNode = value.expectObjectNode();
+            Builder builder = builder().sourceLocation(value);
             builder.template(objectNode.expectStringMember(TEMPLATE).getValue());
             builder.absolute(objectNode.getBooleanMemberOrDefault(ABSOLUTE));
             builder.noRegion(objectNode.getBooleanMemberOrDefault(NO_REGION));

diff --git a/smithy-aws-traits/src/main/java/software/amazon/smithy/aws/traits/ServiceTrait.java b/smithy-aws-traits/src/main/java/software/amazon/smithy/aws/traits/ServiceTrait.java
@@ -60,9 +60,8 @@ public Provider() {
 
         @Override
         public Trait createTrait(ShapeId target, Node value) {
-            // BUG sourceLocation
             ObjectNode objectNode = value.expectObjectNode();
-            Builder builder = builder();
+            Builder builder = builder().sourceLocation(value);
             String sdkId = objectNode.getStringMember("sdkId")
                     .map(StringNode::getValue)
                     .orElseThrow(() -> new SourceException(String.format(

diff --git a/...ws-traits/src/main/java/software/amazon/smithy/aws/traits/auth/CognitoUserPoolsTrait.java b/...ws-traits/src/main/java/software/amazon/smithy/aws/traits/auth/CognitoUserPoolsTrait.java
@@ -51,9 +51,9 @@ public Provider() {
 
         @Override
         public Trait createTrait(ShapeId target, Node value) {
-            // BUG: sourceLocation
             ObjectNode objectNode = value.expectObjectNode();
             return builder()
+                    .sourceLocation(value)
                     .providerArns(objectNode.expectArrayMember(PROVIDER_ARNS).getElementsAs(StringNode::getValue))
                     .build();
         }

diff --git a/...tware/amazon/smithy/aws/traits/clientendpointdiscovery/ClientDiscoveredEndpointTrait.java b/...tware/amazon/smithy/aws/traits/clientendpointdiscovery/ClientDiscoveredEndpointTrait.java
@@ -91,9 +91,9 @@ public Provider() {
 
         @Override
         public ClientDiscoveredEndpointTrait createTrait(ShapeId target, Node value) {
-            // BUG: sourceLocation
             ObjectNode objectNode = value.expectObjectNode();
             return builder()
+                    .sourceLocation(value)
                     .required(objectNode.getBooleanMemberOrDefault(REQUIRED, true))
                     .build();
         }

diff --git a/...ftware/amazon/smithy/aws/traits/clientendpointdiscovery/ClientEndpointDiscoveryTrait.java b/...ftware/amazon/smithy/aws/traits/clientendpointdiscovery/ClientEndpointDiscoveryTrait.java
@@ -146,9 +146,10 @@ public Provider() {
 
         @Override
         public ClientEndpointDiscoveryTrait createTrait(ShapeId target, Node value) {
-            // BUG: sourceLocation
             ObjectNode objectNode = value.expectObjectNode();
-            Builder builder = builder().operation(objectNode.expectStringMember(OPERATION).expectShapeId());
+            Builder builder = builder()
+                    .sourceLocation(value)
+                    .operation(objectNode.expectStringMember(OPERATION).expectShapeId());
             objectNode.getStringMember(ERROR).ifPresent(error -> builder.error(error.expectShapeId()));
             return builder.build();
         }

diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/traits/AuthTrait.java b/smithy-model/src/main/java/software/amazon/smithy/model/traits/AuthTrait.java
@@ -60,7 +60,6 @@ public Provider() {
 
         @Override
         public Trait createTrait(ShapeId target, Node value) {
-            // BUG: sourceLocation
             List<ShapeId> values = new ArrayList<>();
             for (StringNode node : value.expectArrayNode().getElementsAs(StringNode.class)) {
                 values.add(node.expectShapeId());

diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/traits/HttpErrorTrait.java b/smithy-model/src/main/java/software/amazon/smithy/model/traits/HttpErrorTrait.java
@@ -45,7 +45,6 @@ public Provider() {
 
         @Override
         public Trait createTrait(ShapeId target, Node value) {
-            // BUG: sourcelocation
             return new HttpErrorTrait(value.expectNumberNode().getValue().intValue(), value.getSourceLocation());
         }
     }

diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/traits/LengthTrait.java b/smithy-model/src/main/java/software/amazon/smithy/model/traits/LengthTrait.java
@@ -109,7 +109,6 @@ public ShapeId getShapeId() {
 
         @Override
         public LengthTrait createTrait(ShapeId target, Node value) {
-            // BUG: sourceLocation
             ObjectNode objectNode = value.expectObjectNode();
             Long minValue = objectNode.getMember("min")
                     .map(v -> v.expectNumberNode().getValue().longValue()).orElse(null);

diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/traits/RangeTrait.java b/smithy-model/src/main/java/software/amazon/smithy/model/traits/RangeTrait.java
@@ -110,7 +110,6 @@ public ShapeId getShapeId() {
 
         @Override
         public RangeTrait createTrait(ShapeId target, Node value) {
-            // BUG: sourceLocation
             ObjectNode objectNode = value.expectObjectNode();
             BigDecimal minValue = objectNode.getMember("min")
                     .map(node -> new BigDecimal(node.expectNumberNode().getValue().toString())).orElse(null);