Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ignore null field in UnmarshalJSON. #382

Merged
merged 1 commit into from
Nov 1, 2023
Merged

Ignore null field in UnmarshalJSON. #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 26 additions & 24 deletions generator/src/main/resources/line-bot-sdk-go-generator/model/struct.pebble
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,38 +48,40 @@ func (cr *{{model.classname}}) UnmarshalJSON(data []byte) error {
var raw map[string]json.RawMessage
err := json.Unmarshal(data, &raw)
if err != nil {
return err
return fmt.Errorf("JSON parse error in map: %w", err)
}

{% for var in model.allVars %}
if raw["{{var.baseName}}"] != nil {
{% if var.vendorExtensions["x-is-discriminator"] %}
if raw{{ var.baseName }}, ok := raw["{{ var.baseName }}"]; ok && raw{{ var.baseName }} != nil {
{{ var.name }}, err := Unmarshal{{ var.baseType }}(raw{{ var.baseName }})
if err != nil {
return err
}
cr.{{ var.name | capitalize }} = {{ var.name }}
}
if raw{{ var.baseName }}, ok := raw["{{ var.baseName }}"]; ok && raw{{ var.baseName }} != nil {
{{ var.name }}, err := Unmarshal{{ var.baseType }}(raw{{ var.baseName }})
if err != nil {
return fmt.Errorf("JSON parse error in {{var.baseType}}(discriminator): %w", err)
}
cr.{{ var.name | capitalize }} = {{ var.name }}
}
{% elseif var.vendorExtensions["x-is-discriminator-array"] %}
var raw{{ var.baseName }} []json.RawMessage
err = json.Unmarshal(raw["{{ var.baseName }}"], &raw{{ var.baseName }})
if err != nil {
return err
}
var raw{{ var.baseName }} []json.RawMessage
err = json.Unmarshal(raw["{{ var.baseName }}"], &raw{{ var.baseName }})
if err != nil {
return fmt.Errorf("JSON parse error in {{var.baseName}}({{var.baseType}}): %w", err)
}

for _, data := range raw{{ var.baseName }} {
e, err := Unmarshal{{ var.complexType }}(data)
if err != nil {
return fmt.Errorf("JSON parse error in Unmarshal{{ var.complexType }}: %w, body: %s", err, string(data))
}
cr.{{ var.name | capitalize }} = append(cr.{{ var.name | capitalize }}, e)
}
for _, data := range raw{{ var.baseName }} {
e, err := Unmarshal{{ var.complexType }}(data)
if err != nil {
return fmt.Errorf("JSON parse error in {{ var.complexType }}(discriminator array): %w", err)
}
cr.{{ var.name | capitalize }} = append(cr.{{ var.name | capitalize }}, e)
}
{% else %}
err = json.Unmarshal(raw["{{ var.baseName }}"], &cr.{{ var.name | capitalize }})
if err != nil {
return err
}
err = json.Unmarshal(raw["{{ var.baseName }}"], &cr.{{ var.name | capitalize }})
if err != nil {
return fmt.Errorf("JSON parse error in {{var.baseType}}({{var.name | capitalize}}): %w", err)
}
{% endif %}
}
{% endfor %}

return nil
Expand Down
44 changes: 28 additions & 16 deletions linebot/messaging_api/model_audience_match_messages_request.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,31 +49,43 @@ func (cr *AudienceMatchMessagesRequest) UnmarshalJSON(data []byte) error {
var raw map[string]json.RawMessage
err := json.Unmarshal(data, &raw)
if err != nil {
return err
return fmt.Errorf("JSON parse error in map: %w", err)
}

var rawmessages []json.RawMessage
err = json.Unmarshal(raw["messages"], &rawmessages)
if err != nil {
return err
}
if raw["messages"] != nil {

for _, data := range rawmessages {
e, err := UnmarshalMessage(data)
var rawmessages []json.RawMessage
err = json.Unmarshal(raw["messages"], &rawmessages)
if err != nil {
return fmt.Errorf("JSON parse error in UnmarshalMessage: %w, body: %s", err, string(data))
return fmt.Errorf("JSON parse error in messages(array): %w", err)
}

for _, data := range rawmessages {
e, err := UnmarshalMessage(data)
if err != nil {
return fmt.Errorf("JSON parse error in Message(discriminator array): %w", err)
}
cr.Messages = append(cr.Messages, e)
}
cr.Messages = append(cr.Messages, e)

}

err = json.Unmarshal(raw["to"], &cr.To)
if err != nil {
return err
if raw["to"] != nil {

err = json.Unmarshal(raw["to"], &cr.To)
if err != nil {
return fmt.Errorf("JSON parse error in array(To): %w", err)
}

}

err = json.Unmarshal(raw["notificationDisabled"], &cr.NotificationDisabled)
if err != nil {
return err
if raw["notificationDisabled"] != nil {

err = json.Unmarshal(raw["notificationDisabled"], &cr.NotificationDisabled)
if err != nil {
return fmt.Errorf("JSON parse error in bool(NotificationDisabled): %w", err)
}

}

return nil
Expand Down
34 changes: 21 additions & 13 deletions linebot/messaging_api/model_broadcast_request.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,26 +44,34 @@ func (cr *BroadcastRequest) UnmarshalJSON(data []byte) error {
var raw map[string]json.RawMessage
err := json.Unmarshal(data, &raw)
if err != nil {
return err
return fmt.Errorf("JSON parse error in map: %w", err)
}

var rawmessages []json.RawMessage
err = json.Unmarshal(raw["messages"], &rawmessages)
if err != nil {
return err
}
if raw["messages"] != nil {

for _, data := range rawmessages {
e, err := UnmarshalMessage(data)
var rawmessages []json.RawMessage
err = json.Unmarshal(raw["messages"], &rawmessages)
if err != nil {
return fmt.Errorf("JSON parse error in UnmarshalMessage: %w, body: %s", err, string(data))
return fmt.Errorf("JSON parse error in messages(array): %w", err)
}
cr.Messages = append(cr.Messages, e)

for _, data := range rawmessages {
e, err := UnmarshalMessage(data)
if err != nil {
return fmt.Errorf("JSON parse error in Message(discriminator array): %w", err)
}
cr.Messages = append(cr.Messages, e)
}

}

err = json.Unmarshal(raw["notificationDisabled"], &cr.NotificationDisabled)
if err != nil {
return err
if raw["notificationDisabled"] != nil {

err = json.Unmarshal(raw["notificationDisabled"], &cr.NotificationDisabled)
if err != nil {
return fmt.Errorf("JSON parse error in bool(NotificationDisabled): %w", err)
}

}

return nil
Expand Down
106 changes: 71 additions & 35 deletions linebot/messaging_api/model_buttons_template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,64 +75,100 @@ func (cr *ButtonsTemplate) UnmarshalJSON(data []byte) error {
var raw map[string]json.RawMessage
err := json.Unmarshal(data, &raw)
if err != nil {
return err
return fmt.Errorf("JSON parse error in map: %w", err)
}

err = json.Unmarshal(raw["type"], &cr.Type)
if err != nil {
return err
}
if raw["type"] != nil {

err = json.Unmarshal(raw["type"], &cr.Type)
if err != nil {
return fmt.Errorf("JSON parse error in string(Type): %w", err)
}

err = json.Unmarshal(raw["thumbnailImageUrl"], &cr.ThumbnailImageUrl)
if err != nil {
return err
}

err = json.Unmarshal(raw["imageAspectRatio"], &cr.ImageAspectRatio)
if err != nil {
return err
if raw["thumbnailImageUrl"] != nil {

err = json.Unmarshal(raw["thumbnailImageUrl"], &cr.ThumbnailImageUrl)
if err != nil {
return fmt.Errorf("JSON parse error in string(ThumbnailImageUrl): %w", err)
}

}

err = json.Unmarshal(raw["imageSize"], &cr.ImageSize)
if err != nil {
return err
if raw["imageAspectRatio"] != nil {

err = json.Unmarshal(raw["imageAspectRatio"], &cr.ImageAspectRatio)
if err != nil {
return fmt.Errorf("JSON parse error in string(ImageAspectRatio): %w", err)
}

}

err = json.Unmarshal(raw["imageBackgroundColor"], &cr.ImageBackgroundColor)
if err != nil {
return err
if raw["imageSize"] != nil {

err = json.Unmarshal(raw["imageSize"], &cr.ImageSize)
if err != nil {
return fmt.Errorf("JSON parse error in string(ImageSize): %w", err)
}

}

err = json.Unmarshal(raw["title"], &cr.Title)
if err != nil {
return err
if raw["imageBackgroundColor"] != nil {

err = json.Unmarshal(raw["imageBackgroundColor"], &cr.ImageBackgroundColor)
if err != nil {
return fmt.Errorf("JSON parse error in string(ImageBackgroundColor): %w", err)
}

}

err = json.Unmarshal(raw["text"], &cr.Text)
if err != nil {
return err
if raw["title"] != nil {

err = json.Unmarshal(raw["title"], &cr.Title)
if err != nil {
return fmt.Errorf("JSON parse error in string(Title): %w", err)
}

}

if rawdefaultAction, ok := raw["defaultAction"]; ok && rawdefaultAction != nil {
DefaultAction, err := UnmarshalAction(rawdefaultAction)
if raw["text"] != nil {

err = json.Unmarshal(raw["text"], &cr.Text)
if err != nil {
return err
return fmt.Errorf("JSON parse error in string(Text): %w", err)
}
cr.DefaultAction = DefaultAction

}

var rawactions []json.RawMessage
err = json.Unmarshal(raw["actions"], &rawactions)
if err != nil {
return err
if raw["defaultAction"] != nil {

if rawdefaultAction, ok := raw["defaultAction"]; ok && rawdefaultAction != nil {
DefaultAction, err := UnmarshalAction(rawdefaultAction)
if err != nil {
return fmt.Errorf("JSON parse error in Action(discriminator): %w", err)
}
cr.DefaultAction = DefaultAction
}

}

for _, data := range rawactions {
e, err := UnmarshalAction(data)
if raw["actions"] != nil {

var rawactions []json.RawMessage
err = json.Unmarshal(raw["actions"], &rawactions)
if err != nil {
return fmt.Errorf("JSON parse error in UnmarshalAction: %w, body: %s", err, string(data))
return fmt.Errorf("JSON parse error in actions(array): %w", err)
}
cr.Actions = append(cr.Actions, e)

for _, data := range rawactions {
e, err := UnmarshalAction(data)
if err != nil {
return fmt.Errorf("JSON parse error in Action(discriminator array): %w", err)
}
cr.Actions = append(cr.Actions, e)
}

}

return nil
Expand Down
Loading