Make error message more clear for duplicate shapes #324
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
This commit updates model loaders to fail at the point that a duplicate
shape definition is detected in a file. This results in clearer error
messages when a shape is defined with the same name, particularly if one
conflicting shape supports members while the other does not. Previously,
in this case, a cryptic error message would be returned stating that a
member cannot be added to a builder:
Member `example.foo#Bar$Baz` cannot be added to
software.amazon.smithy.model.shapes.OperationShape$Builder
This now becomes:
[ERROR] -: Duplicate shape definition for
`example.foo#Bar$Baz` found at
`/path/file.smithy [3, 1]` and `/path/file.smithy [5, 1]` | Model
mtdowling
commented
Mar 26, 2020
| @@ -54,28 +53,18 @@ private ModelLoader() {} | |||
| * @throws SourceException if there is an error reading from the contents. | |||
| */ | |||
| static boolean load(String filename, Supplier<InputStream> contentSupplier, LoaderVisitor visitor) { | |||
| try { | |||
There was a problem hiding this comment.
This try/catch wasn't necessary
kstich
approved these changes
Mar 26, 2020
Merged
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 commit updates model loaders to fail at the point that a duplicate
shape definition is detected in a file. This results in clearer error
messages when a shape is defined with the same name, particularly if one
conflicting shape supports members while the other does not. Previously,
in this case, a cryptic error message would be returned stating that a
member cannot be added to a builder:
This now becomes:
Issue #, if available:
Description of changes:
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.