Encoding and JSON support for single unknown enum fields #2961
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
oldergod
force-pushed
the
bquenaudon.2024-05-20.interoptestforunrecognized
branch
from
3fcb049
to
af0aa6e
Compare
oldergod
commented
May 23, 2024
Comment on lines
76
to
91
| // We peekJson in order to be able to read the value twice if need be. | ||
| val peekInput = input.peekJson() | ||
| val value = jsonAdapters[index].fromJson(peekInput) | ||
| val protoAdapter = fieldBinding.adapter | ||
| if ((value as? WireEnum)?.value == -1 && | ||
| protoAdapter.syntax == Syntax.PROTO_3 && | ||
| protoAdapter is EnumAdapter<*> | ||
| ) { | ||
| // The tag for this enum's constant is unknown to our runtime. It has been assigned to | ||
| // `UNRECOGNIZED(-1)` and we put its actual value in the unknown fields. | ||
| builder.addUnknownField(fieldBinding.tag, FieldEncoding.VARINT, input.nextInt()) | ||
| } else { | ||
| // We need to skip it since we passed our peeked Json to the json adapter. | ||
| input.skipValue() | ||
| } |
There was a problem hiding this comment.
I have currently no idea how to do that on the Gson side
oldergod
force-pushed
the
bquenaudon.2024-05-20.interoptestforunrecognized
branch
from
bc8766a
to
66853e3
Compare
Base automatically changed from
bquenaudon.2024-05-16.unrecognized_encoding
to
master
May 24, 2024 10:19
psymoon
approved these changes
Jun 4, 2024
psymoon
reviewed
Jun 4, 2024
|
|
||
| val value = jsonAdapters[index].fromJson(input) | ||
| // We peekJson in order to be able to read the value twice if need be. |
There was a problem hiding this comment.
Suggested change
| // We peekJson in order to be able to read the value twice if need be. | |
| // We peekJson in order to be able to read the value twice if need to access for building unknown values. |
oldergod
force-pushed
the
bquenaudon.2024-05-20.interoptestforunrecognized
branch
from
66853e3
to
438d05c
Compare
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 an enum has the specific proto3 generated
UNRECOGNIZEDconstant and that the value is set to it, the message needs not to send anything on encoding + needs some magic on JSON serialization to replace it by the actual constant tag.Look at the first commit to see the actual change without the generated code noise.
#2725