mirrors/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-04-26 13:40:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add openapi3.Unmarshal

Browse source 
Fixes #7442
Fixes #7443
This commit is contained in:
Bjørn Erik Pedersen 2020-06-30 16:11:05 +02:00
parent 58c0f5e617
commit 12a65e76df
12 changed files with 268 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

24
parser/metadecoders/decoder.go
View file

@ -63,7 +63,7 @@ func (d Decoder) UnmarshalToMap(data []byte, f Format) (map[string]interface{},
return m, nil
}
err := d.unmarshal(data, f, &m)
err := d.UnmarshalTo(data, f, &m)
return m, err
}
@ -122,13 +122,13 @@ func (d Decoder) Unmarshal(data []byte, f Format) (interface{}, error) {
}
var v interface{}
err := d.unmarshal(data, f, &v)
err := d.UnmarshalTo(data, f, &v)
return v, err
}
// unmarshal unmarshals data in format f into v.
func (d Decoder) unmarshal(data []byte, f Format, v interface{}) error {
// UnmarshalTo unmarshals data in format f into v.
func (d Decoder) UnmarshalTo(data []byte, f Format, v interface{}) error {
var err error
@ -156,15 +156,17 @@ func (d Decoder) unmarshal(data []byte, f Format, v interface{}) error {
case *interface{}:
ptr = *v.(*interface{})
default:
return errors.Errorf("unknown type %T in YAML unmarshal", v)
// Not a map.
}
if mm, changed := stringifyMapKeys(ptr); changed {
switch v.(type) {
case *map[string]interface{}:
*v.(*map[string]interface{}) = mm.(map[string]interface{})
case *interface{}:
*v.(*interface{}) = mm
if ptr != nil {
if mm, changed := stringifyMapKeys(ptr); changed {
switch v.(type) {
case *map[string]interface{}:
*v.(*map[string]interface{}) = mm.(map[string]interface{})
case *interface{}:
*v.(*interface{}) = mm
}
}
}
case CSV: