Allow specifying xml namespace prefix #195
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JordonPhillips
force-pushed
the
xmlns-prefix
branch
from
0488166 to
4241042
Compare
kstich
requested changes
Oct 29, 2019
| @@ -156,7 +156,7 @@ structure xmlFlattened {} | |||
| /// used in the model. | |||
| @trait | |||
| @tags(["diff.error.const"]) | |||
| @pattern("^[a-zA-Z_][a-zA-Z_0-9-]*$") | |||
| @pattern("^[a-zA-Z_][a-zA-Z_0-9-]*(:[a-zA-Z_][a-zA-Z_0-9-]*)?$") | |||
There was a problem hiding this comment.
This pattern update should be reflected in the xmlName trait spec's ABNF.
kstich
approved these changes
Oct 29, 2019
mtdowling
requested changes
Oct 29, 2019
docs/source/spec/xml.rst
Outdated
| @@ -221,8 +221,9 @@ following document: | |||
| ``-``. Values for an ``xmlName`` adhere to the following ABNF. | |||
|
|
|||
| .. productionlist:: smithy | |||
| xml_name :(ALPHA / "_") | |||
| name :(ALPHA / "_") | |||
There was a problem hiding this comment.
Do we already use the name production anywhere else? I think this might break how we link to them across "smithy" production lists. Maybe xml_name and xml_identifier?
docs/source/spec/xml.rst
Outdated
| ``-``. Values for ``prefix`` adhere to the following ABNF. | ||
|
|
||
| .. productionlist:: smithy | ||
| prefix :(ALPHA / "_") |
| @@ -75,6 +91,11 @@ public Builder uri(String uri) { | |||
| return this; | |||
| } | |||
|
|
|||
| public Builder prefix(String prefix) { | |||
| this.prefix = Objects.requireNonNull(prefix); | |||
There was a problem hiding this comment.
You should allow null in order to clear out the prefix.
| Builder traitBuilder = builder() | ||
| .sourceLocation(getSourceLocation()) | ||
| .uri(getUri()); | ||
| getPrefix().ifPresent(traitBuilder::prefix); |
There was a problem hiding this comment.
Given that you should allow nulls for this value in the builder anyways (it's optional), you could just chain here and pass in the potentially null property of prefix.
mtdowling
approved these changes
Oct 29, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This updates the xmlnamespace trait to allow specifying a prefix to
pull the namespace into. It further updates the pattern for the
xmlname trait to allow specifying a name with a prefix, e.g.
myprefix:myname.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.