marshal_jsonpb: Added nil slice default value #854
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
Codecov Report
@@ Coverage Diff @@
## master #854 +/- ##
==========================================
- Coverage 51.66% 51.63% -0.03%
==========================================
Files 39 39
Lines 3782 3788 +6
==========================================
+ Hits 1954 1956 +2
- Misses 1643 1647 +4
Partials 185 185
Continue to review full report at Codecov.
|
johanbrandhorst
requested changes
Jan 18, 2019
runtime/marshal_jsonpb.go
Outdated
| if rv.Kind() == reflect.Slice { | ||
| if rv.IsNil() && j.EmitDefaults { | ||
| return []byte("[]"), nil | ||
| } |
There was a problem hiding this comment.
I suppose we could put this all in one big if instead to reduce indentation?
There was a problem hiding this comment.
That works for me, honestly wasn't sure if you wanted me to return "null" if j.EmitDefaults wasn't set. I can make it all one big if.
👍
|
Thanks for the contribution! |
adasari
pushed a commit
to adasari/grpc-gateway
that referenced
this pull request
Apr 9, 2020
* marshal_jsonpb: Added nil slice default value * marshal_jsonpb: reduced indentation
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.
I noticed that when using the repeated response body, that when an empty array is returned from the grpc server, it is translated to a nil object
([]*examplepb.RepeatedResponseBodyOut_Response)(nil), which does not implement theproto.Messageinterface, and therefore is marshalled locally in theruntime.JSONPbimplementation asnulleven ifEmitDefaultsis set on the marshaller.I updated the marshaller to check for the case mentioned above and to make sure it behaves according to the
EmitDefaultsoption correctly. Let me know if I missed anything on it.Thanks!