Fix JsonSchemaGenerator to handle StructInfo with same alias and name #5788
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
|
|
JonathanSawyer
changed the title
JonathanSawyer
requested review from
ikhoon,
jrhee17,
minwoox and
trustin
as code owners
JonathanSawyer
changed the title
|
@jrhee17 I was wondering whether this could be added to the 1.29.1 milestone? |
|
Sorry I'm late and thanks for the fix, @JonathanSawyer! 🙇 |
minwoox
pushed a commit
that referenced
this pull request
Jun 28, 2024
…#5788) Motivation: - The `StructInfo` `alias` has the same value as the `name` causing a duplicate key exception when building `typeSignatureToStructMappingBuilder`. - Occurred when setting up a HTTP service which consumes protobuf messages Modifications: - Checks that the `struct` and `alias` don't have the same name to avoid duplicate key exception (alias is created here https://github.com/line/armeria/blob/main/protobuf/src/main/java/com/linecorp/armeria/server/protobuf/ProtobufDescriptiveTypeInfoProvider.java#L106) Result: - Improves the `JsonSchemaGenerator.java` for the documentation service by allowing resources to have the same alias and name as is the default behavior of https://github.com/line/armeria/blob/main/protobuf/src/main/java/com/linecorp/armeria/server/protobuf/ProtobufDescriptiveTypeInfoProvider.java#L106 <!-- Visit this URL to learn more about how to write a pull request description: https://armeria.dev/community/developer-guide#how-to-write-pull-request-description -->
|
Tested and working 🙇 |
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.
Motivation:
StructInfoaliashas the same value as thenamecausing a duplicate key exception when buildingtypeSignatureToStructMappingBuilder.Modifications:
structandaliasdon't have the same name to avoid duplicate key exception (alias is created here https://github.com/line/armeria/blob/main/protobuf/src/main/java/com/linecorp/armeria/server/protobuf/ProtobufDescriptiveTypeInfoProvider.java#L106)Result:
JsonSchemaGenerator.javafor the documentation service by allowing resources to have the same alias and name as is the default behavior of https://github.com/line/armeria/blob/main/protobuf/src/main/java/com/linecorp/armeria/server/protobuf/ProtobufDescriptiveTypeInfoProvider.java#L106