mirror/protobuf-go
1
0
Fork 0
mirror of https://github.com/protocolbuffers/protobuf-go.git synced 2025-02-21 09:40:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

encoding: add TODOs for producing better error messages with handling of Any

Browse Source 
Change-Id: Iaab531d8ae454715338bf079a2749afeedc978f9
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/175577
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
This commit is contained in:
Herbie Ong 2019-05-06 18:45:33 -07:00
parent e5e4f36f7d
commit 9c1004563f
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
encoding/jsonpb/well_known_types.go
View File

@ -178,6 +178,9 @@ func (o MarshalOptions) marshalAny(m pref.Message) error {
em := emt.New()
// TODO: Need to set types registry in binary unmarshaling.
// TODO: If binary unmarshaling returns required not set error, need to
// return another required not set error that contains both the path to this
// field and the path inside the embedded message.
err = proto.UnmarshalOptions{
AllowPartial: o.AllowPartial,
}.Unmarshal(valueVal.Bytes(), em.Interface())
@ -249,6 +252,9 @@ func (o UnmarshalOptions) unmarshalAny(m pref.Message) error {
}
// Serialize the embedded message and assign the resulting bytes to the
// proto value field.
// TODO: If binary marshaling returns required not set error, need to return
// another required not set error that contains both the path to this field
// and the path inside the embedded message.
b, err := proto.MarshalOptions{
AllowPartial: o.AllowPartial,
Deterministic: true,

3
encoding/textpb/decode.go
View File

@ -500,6 +500,9 @@ func (o UnmarshalOptions) unmarshalAny(tfield [2]text.Value, knownFields pref.Kn
return err
}
// Serialize the embedded message and assign the resulting bytes to the value field.
// TODO: If binary marshaling returns required not set error, need to
// return another required not set error that contains both the path to this
// field and the path inside the embedded message.
b, err := proto.MarshalOptions{
AllowPartial: o.AllowPartial,
Deterministic: true,

3
encoding/textpb/encode.go
View File

@ -362,6 +362,9 @@ func (o MarshalOptions) marshalAny(m pref.Message) (text.Value, error) {
}
em := emt.New().Interface()
// TODO: Need to set types registry in binary unmarshaling.
// TODO: If binary unmarshaling returns required not set error, need to
// return another required not set error that contains both the path to this
// field and the path inside the embedded message.
err = proto.UnmarshalOptions{
AllowPartial: o.AllowPartial,
}.Unmarshal(value.Bytes(), em)