Refactor model loading to allow equal conflicts #520
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
mtdowling
force-pushed
the
refactor-loading
branch
2 times, most recently
from
17fe593
to
383b229
Compare
smithy-model/src/main/java/software/amazon/smithy/model/loader/IdlModelParser.java
Show resolved
Hide resolved
mtdowling
force-pushed
the
refactor-loading
branch
from
383b229
to
3fdb5d5
Compare
kstich
reviewed
Aug 4, 2020
smithy-model/src/main/java/software/amazon/smithy/model/loader/TraitContainer.java
Outdated
Show resolved
Hide resolved
smithy-model/src/test/java/software/amazon/smithy/model/loader/LoaderVisitorTest.java
Show resolved
Hide resolved
When using Smithy features like model discovery on the classpath, it's sometimes difficult to prevent the same Smithy models from being added to the model assembler multiple times. This is also true when using artifacts created for the "model" plugin for smithy-build along with model discovery. To address this, Smithy has been updated to allow conflicting shape definitions if the shapes, after they are fully built, are equivalent (meaning, they have the same exact members or references to other shapes and are the same type).
mtdowling
force-pushed
the
refactor-loading
branch
from
3fdb5d5
to
f8287d4
Compare
kstich
approved these changes
Aug 4, 2020
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.
When using Smithy features like model discovery on the classpath, it's sometimes difficult to prevent the same Smithy models from being added to the model assembler multiple times. This is also true when using artifacts created for the "model" plugin for smithy-build along with model discovery. To address this, Smithy has been updated to allow conflicting shape definitions if the shapes, after they are fully built, are equivalent (meaning, they have the same exact members or references to other shapes and are the same type).
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.