Support all struct types for JSON encoding #2824
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
quanturium
changed the title
|
Cc @oldergod for kotlin changes, I mostly focus on the SwiftGenerator. as a nit maybe remove WIP from commit message? |
|
Thank you for the contribution! |
|
Thank you! Two things:
|
oldergod
changed the title
quanturium
force-pushed
the
support-struct-json
branch
from
6d94607
to
900759c
Compare
|
Addressed feedback above |
dnkoutso
reviewed
Feb 12, 2024
| | "struct": {"key1":"value1"} | ||
| |} | ||
| """.trimMargin() | ||
| assertJsonEquals(gson.toJson(value), json) |
There was a problem hiding this comment.
does this test fail without your change? Just verifying!
There was a problem hiding this comment.
The test wasn't properly testing out the constructor creation which I just fixed. To your question, yes it does. Here is the issue:
java.util.NoSuchElementException: ArrayDeque is empty.
at kotlin.collections.ArrayDeque.removeFirst(ArrayDeque.kt:145)
at com.squareup.wire.KotlinConstructorBuilder.build(KotlinConstructorBuilder.kt:114)
at com.squareup.wire.MessageTypeAdapter.read(MessageTypeAdapter.kt:77)
at com.squareup.wire.MessageTypeAdapter.read(MessageTypeAdapter.kt:25)
at com.google.gson.TypeAdapter$1.read(TypeAdapter.java:204)
^ This is due to the custom re-ordering we were doing pre this PR
quanturium
force-pushed
the
support-struct-json
branch
from
900759c
to
91dae9c
Compare
|
I don't think the jvm17 check failure is related to my PR. |
|
Thanks a lot |
|
@oldergod Thanks a lot for merging this PR. What timeline shall we expect for the next version of wire including this? |
|
It's on 4.9.7 |
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.
The current implementation of
KotlinConstructorBuilder.ktfor constructor parameters order implemented here and here makes an inference that is incorrect:repeatedfields andisMapfields are not the only proto types that are represented as aListorMapkotlin types.google.protobuf.Struct,google.protobuf.ListValueare also represented asListandMapkotlin types making the current mapping incorrect. This lead to the following exception:This PR fixes this by just removing the extra logic for parameter ordering since this commit fixed the issue by correctly ordering constructor parameters.
cc @dnkoutso