fix for discriminated union transform #176
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
lewisjkl
commented
Jul 16, 2024
| val componentSchemas: Map[String, Schema] = openapi | ||
| val componentSchemas: Map[ShapeId, Schema] = openapi |
There was a problem hiding this comment.
Change to using full ShapeId instead of just shape name
lewisjkl
commented
Jul 16, 2024
| @@ -130,6 +137,7 @@ class DiscriminatedUnionMemberComponents() extends OpenApiMapper { | |||
| .asJava | |||
| ) | |||
| schemaBuilder | |||
| .removeExtension(DiscriminatedUnionShapeId.SHAPE_ID_KEY) | |||
There was a problem hiding this comment.
Remove the extension so it is not included in the final OpenAPI file
lewisjkl
commented
Jul 16, 2024
|
|
||
| import software.amazon.smithy.model.node.Node | ||
|
|
||
| class DiscriminatedUnionShapeId() extends JsonSchemaMapper { |
There was a problem hiding this comment.
A JsonSchemaMapper has to be used to get access to the full ShapeId, OpenAPI mappers do not have this information available (as far as I can tell).
Baccata
approved these changes
Jul 17, 2024
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 fixes an issue with there being two shapes from different namespaces with the same name where one of them is a discriminated union. The discriminated union transformation added in #173 did not use a full ShapeId for determining which shape is which, but rather only a name. There is no direct way to handle this, thus I used the OpenAPI extensions to carry the ShapeId and used that. See the files for more commentary about this.