Skip to content

Commit

Permalink
Add validator for xmlFlattened + xmlName
Browse files Browse the repository at this point in the history
Adds a validator for the xmlFlattened trait that checks if the member's
target is a list that has a member with xmlName, and that xmlName
doesn't match the name of the xmlFlattened member. xmlFlattened causes
the xmlName of the list member to be ignored. This is called out in our
docs:
https://smithy.io/2.0/spec/protocol-traits.html#flattened-list-serialization,
but we were missing a validator for it. It is a warning because you might
mean to do this, i.e. if the list is used in multiple places.

I also added some suppressions to our protocol tests that are testing
the behavior for models that would trip up this validator.
  • Loading branch information
milesziemer committed Nov 1, 2024
1 parent ce7b765 commit 81b6261
Show file tree
Hide file tree
Showing 7 changed files with 126 additions and 0 deletions.
10 changes: 10 additions & 0 deletions smithy-aws-protocol-tests/model/awsQuery/main.smithy
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
$version: "2.0"

metadata suppressions = [
{
id: "XmlFlattenedTrait"
namespace: "aws.protocoltests.query"
reason: """
Some tests are for asserting the correct behavior in the case that
xmlFlattened is wrong and trips this validator."""
}
]

namespace aws.protocoltests.query

use aws.api#service
Expand Down
10 changes: 10 additions & 0 deletions smithy-aws-protocol-tests/model/ec2Query/main.smithy
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,16 @@

$version: "2.0"

metadata suppressions = [
{
id: "XmlFlattenedTrait"
namespace: "aws.protocoltests.ec2"
reason: """
Some tests are for asserting the correct behavior in the case that
xmlFlattened is wrong and trips this validator."""
}
]

namespace aws.protocoltests.ec2

use aws.api#service
Expand Down
10 changes: 10 additions & 0 deletions smithy-aws-protocol-tests/model/restXml/main.smithy
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
$version: "2.0"

metadata suppressions = [
{
id: "XmlFlattenedTrait"
namespace: "aws.protocoltests.restxml"
reason: """
Some tests are for asserting the correct behavior in the case that
xmlFlattened is wrong and trips this validator."""
}
]

namespace aws.protocoltests.restxml

use aws.api#service
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/*
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
* SPDX-License-Identifier: Apache-2.0
*/

package software.amazon.smithy.model.validation.validators;

import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import software.amazon.smithy.model.Model;
import software.amazon.smithy.model.shapes.ListShape;
import software.amazon.smithy.model.shapes.MemberShape;
import software.amazon.smithy.model.shapes.Shape;
import software.amazon.smithy.model.traits.XmlFlattenedTrait;
import software.amazon.smithy.model.traits.XmlNameTrait;
import software.amazon.smithy.model.validation.AbstractValidator;
import software.amazon.smithy.model.validation.ValidationEvent;

/**
* Validates that xmlFlattened members aren't unintentionally ignoring the
* xmlName of their targets.
*/
public final class XmlFlattenedTraitValidator extends AbstractValidator {
@Override
public List<ValidationEvent> validate(Model model) {
List<ValidationEvent> events = new ArrayList<>();
for (MemberShape member : model.getMemberShapesWithTrait(XmlFlattenedTrait.class)) {
// Don't emit the event if they're being explicit about the xmlName on this member
if (member.hasTrait(XmlNameTrait.class)) {
continue;
}

model.getShape(member.getTarget())
.flatMap(Shape::asListShape)
.flatMap(listShape -> validateMemberTargetingList(member, listShape))
.ifPresent(events::add);
}
return events;
}

private Optional<ValidationEvent> validateMemberTargetingList(MemberShape member, ListShape targetList) {
return targetList.getMember().getTrait(XmlNameTrait.class)
.filter(xmlName -> !member.getMemberName().equals(xmlName.getValue()))
.map(xmlName -> warning(member, String.format(
"Member is `@xmlFlattened`, so `@xmlName` of target's member (`%s`) has no effect."
+ " The flattened list elements will have the name of this member - `%s`. If this"
+ " is unintended, you can add `@xmlName(\"%s\")` to this member.",
targetList.getMember().getId(), member.getMemberName(), xmlName.getValue())));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,4 @@ software.amazon.smithy.model.validation.validators.UnitTypeValidator
software.amazon.smithy.model.validation.validators.UnstableTraitValidator
software.amazon.smithy.model.validation.validators.XmlNamespaceTraitValidator
software.amazon.smithy.model.validation.validators.TraitValidatorsValidator
software.amazon.smithy.model.validation.validators.XmlFlattenedTraitValidator
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[WARNING] smithy.example#Struct$flattenedNoXmlName: Member is `@xmlFlattened`, so `@xmlName` of target's member (`smithy.example#ListWithXmlName$member`) has no effect. The flattened list elements will have the name of this member - `flattenedNoXmlName`. If this is unintended, you can add `@xmlName("customMember")` to this member. | XmlFlattenedTrait
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
$version: "2"

namespace smithy.example

structure Struct {
// No event because not flattened
notFlattened: ListWithXmlName

// Event because flattened and non-matching member name
@xmlFlattened
flattenedNoXmlName: ListWithXmlName

// No event because the member name matches the xml name
@xmlFlattened
customMember: ListWithXmlName

// No event because you're being explicit about the name to use
@xmlFlattened
@xmlName("customMember")
flattenedMatchingXmlName: ListWithXmlName

// No event because you're being explicit about the name to use
@xmlFlattened
@xmlName("Bar")
flattenedNonMatchingXmlName: ListWithXmlName

// Validator doesn't apply to maps
@xmlFlattened
flattenedMap: MapWithXmlName
}

list ListWithXmlName {
@xmlName("customMember")
member: String
}

map MapWithXmlName {
@xmlName("customKey")
key: String

@xmlName("customValue")
value: String
}

0 comments on commit 81b6261

Please sign in to comment.