GODRIVER-946: Add IndentExtJSON and MarshalExtJSONIndent functions #781
Conversation
bson/marshal.go
Outdated
| return formatted, nil | ||
| } | ||
|
|
||
| func MarshalExtJSONIndent(val interface{}, canonical, escapeHTML bool, dst *bytes.Buffer, prefix, indent string) ([]byte, error) { |
There was a problem hiding this comment.
Modified this function's parameters as well to match json.Indent()'s parameters.
There was a problem hiding this comment.
Assume you mean modified IndentExtJSON to match json.Indent()'s params; that sounds good.
There was a problem hiding this comment.
MarshalExtJSONIndent accepts an output bytes.Buffer param and returns a []byte, both containing the same value. Remove the redundant bytes.Buffer param (follows the json.MarshalIndent function signature).
There was a problem hiding this comment.
I agree on removing the redundant bytes.Buffer param. Interestingly, many of the other MarshalExtJSON function above also have a redundant output param and return value (changing those would be API-breaking, though).
bson/marshal.go
Outdated
| return formatted, nil | ||
| } | ||
|
|
||
| func MarshalExtJSONIndent(val interface{}, canonical, escapeHTML bool, dst *bytes.Buffer, prefix, indent string) ([]byte, error) { |
There was a problem hiding this comment.
Assume you mean modified IndentExtJSON to match json.Indent()'s params; that sounds good.
bson/marshal.go
Outdated
| return formatted, nil | ||
| } | ||
|
|
||
| func MarshalExtJSONIndent(val interface{}, canonical, escapeHTML bool, dst *bytes.Buffer, prefix, indent string) ([]byte, error) { |
There was a problem hiding this comment.
MarshalExtJSONIndent accepts an output bytes.Buffer param and returns a []byte, both containing the same value. Remove the redundant bytes.Buffer param (follows the json.MarshalIndent function signature).
… to match json package
bson/marshal.go
Outdated
| return formatted, nil | ||
| } | ||
|
|
||
| func MarshalExtJSONIndent(val interface{}, canonical, escapeHTML bool, dst *bytes.Buffer, prefix, indent string) ([]byte, error) { |
There was a problem hiding this comment.
I agree on removing the redundant bytes.Buffer param. Interestingly, many of the other MarshalExtJSON function above also have a redundant output param and return value (changing those would be API-breaking, though).
bson/marshal.go
Outdated
| @@ -221,3 +224,25 @@ func MarshalExtJSONAppendWithContext(ec bsoncodec.EncodeContext, dst []byte, val | |||
|
|
|||
| return *sw, nil | |||
| } | |||
|
|
|||
| func IndentExtJSON(dst *bytes.Buffer, src []byte, prefix, indent string) error { | |||
| err := json.Indent(dst, src, prefix, indent) | |||
There was a problem hiding this comment.
Optional: This can be simplified to just return any error returned by json.Indent
E.g.
return json.Indent(dst, src, prefix, indent)
GODRIVER-946
Adds IndentExtJSON and MarshalExtJSONIndent functions to marshal.go that use the json and bytes go packages. Also adds test coverage to marshal_test.go to verify that these functions behave as expected.