From 0c8968fb8df4ce302c928118cd81e75f5bef2861 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 30 Jan 2018 17:23:00 -0600 Subject: unnamed return (#8170) --- model/access.go | 38 +++++------------- model/analytics_row.go | 28 ++++--------- model/audit.go | 19 +++------ model/audits.go | 9 +---- model/authorize.go | 38 +++++------------- model/channel.go | 38 +++++------------- model/channel_count.go | 19 +++------ model/channel_data.go | 19 +++------ model/channel_list.go | 20 +++------- model/channel_member.go | 49 ++++++----------------- model/channel_search.go | 19 +++------ model/channel_stats.go | 19 +++------ model/channel_view.go | 38 +++++------------- model/cluster_info.go | 26 ++++-------- model/cluster_info_test.go | 1 - model/cluster_message.go | 19 +++------ model/cluster_stats.go | 19 +++------ model/command.go | 36 +++++------------ model/command_args.go | 19 +++------ model/command_response.go | 8 +--- model/compliance.go | 28 ++++--------- model/config.go | 19 +++------ model/data_retention_policy.go | 19 +++------ model/emoji.go | 36 +++++------------ model/emoji_search.go | 19 +++------ model/file.go | 19 +++------ model/file_info.go | 16 ++------ model/incoming_webhook.go | 36 +++++------------ model/initial_load.go | 19 +++------ model/job.go | 21 +++------- model/license.go | 19 +++------ model/manifest.go | 36 +++++------------ model/mfa_secret.go | 19 +++------ model/oauth.go | 53 ++++++------------------ model/outgoing_webhook.go | 63 ++++++++--------------------- model/plugins_response.go | 19 +++------ model/post.go | 19 +++------ model/post_list.go | 11 ++--- model/preference.go | 19 +++------ model/preferences.go | 8 +--- model/push_notification.go | 19 +++------ model/push_response.go | 7 +--- model/reaction.go | 14 ++----- model/saml.go | 19 +++------ model/search_params.go | 8 +--- model/security_bulletin.go | 28 ++++--------- model/session.go | 28 ++++--------- model/status.go | 36 +++++------------ model/suggest_command.go | 19 +++------ model/switch_request.go | 19 +++------ model/system.go | 19 +++------ model/team.go | 72 +++++++++------------------------ model/team_member.go | 56 +++++++------------------- model/team_stats.go | 19 +++------ model/user.go | 91 +++++++++++------------------------------- model/user_access_token.go | 36 +++++------------ model/user_autocomplete.go | 46 ++++++--------------- model/user_search.go | 19 +++------ model/utils.go | 44 ++++++-------------- model/webrtc.go | 30 ++++---------- model/websocket_message.go | 38 +++++------------- model/websocket_request.go | 19 +++------ 62 files changed, 430 insertions(+), 1235 deletions(-) diff --git a/model/access.go b/model/access.go index 551ef930f..e9603c78e 100644 --- a/model/access.go +++ b/model/access.go @@ -74,41 +74,23 @@ func (me *AccessData) IsExpired() bool { } func (ad *AccessData) ToJson() string { - b, err := json.Marshal(ad) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(ad) + return string(b) } func AccessDataFromJson(data io.Reader) *AccessData { - decoder := json.NewDecoder(data) - var ad AccessData - err := decoder.Decode(&ad) - if err == nil { - return &ad - } else { - return nil - } + var ad *AccessData + json.NewDecoder(data).Decode(&ad) + return ad } func (ar *AccessResponse) ToJson() string { - b, err := json.Marshal(ar) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(ar) + return string(b) } func AccessResponseFromJson(data io.Reader) *AccessResponse { - decoder := json.NewDecoder(data) - var ar AccessResponse - err := decoder.Decode(&ar) - if err == nil { - return &ar - } else { - return nil - } + var ar *AccessResponse + json.NewDecoder(data).Decode(&ar) + return ar } diff --git a/model/analytics_row.go b/model/analytics_row.go index 5493163dc..4615bb792 100644 --- a/model/analytics_row.go +++ b/model/analytics_row.go @@ -16,23 +16,14 @@ type AnalyticsRow struct { type AnalyticsRows []*AnalyticsRow func (me *AnalyticsRow) ToJson() string { - b, err := json.Marshal(me) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(me) + return string(b) } func AnalyticsRowFromJson(data io.Reader) *AnalyticsRow { - decoder := json.NewDecoder(data) - var me AnalyticsRow - err := decoder.Decode(&me) - if err == nil { - return &me - } else { - return nil - } + var me *AnalyticsRow + json.NewDecoder(data).Decode(&me) + return me } func (me AnalyticsRows) ToJson() string { @@ -44,12 +35,7 @@ func (me AnalyticsRows) ToJson() string { } func AnalyticsRowsFromJson(data io.Reader) AnalyticsRows { - decoder := json.NewDecoder(data) var me AnalyticsRows - err := decoder.Decode(&me) - if err == nil { - return me - } else { - return nil - } + json.NewDecoder(data).Decode(&me) + return me } diff --git a/model/audit.go b/model/audit.go index 7699cf930..e3d1bdf90 100644 --- a/model/audit.go +++ b/model/audit.go @@ -19,21 +19,12 @@ type Audit struct { } func (o *Audit) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func AuditFromJson(data io.Reader) *Audit { - decoder := json.NewDecoder(data) - var o Audit - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *Audit + json.NewDecoder(data).Decode(&o) + return o } diff --git a/model/audits.go b/model/audits.go index e57e2a3ac..3673eb618 100644 --- a/model/audits.go +++ b/model/audits.go @@ -28,12 +28,7 @@ func (o Audits) ToJson() string { } func AuditsFromJson(data io.Reader) Audits { - decoder := json.NewDecoder(data) var o Audits - err := decoder.Decode(&o) - if err == nil { - return o - } else { - return nil - } + json.NewDecoder(data).Decode(&o) + return o } diff --git a/model/authorize.go b/model/authorize.go index df07ff142..2296e7e22 100644 --- a/model/authorize.go +++ b/model/authorize.go @@ -115,43 +115,25 @@ func (ad *AuthData) PreSave() { } func (ad *AuthData) ToJson() string { - b, err := json.Marshal(ad) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(ad) + return string(b) } func AuthDataFromJson(data io.Reader) *AuthData { - decoder := json.NewDecoder(data) - var ad AuthData - err := decoder.Decode(&ad) - if err == nil { - return &ad - } else { - return nil - } + var ad *AuthData + json.NewDecoder(data).Decode(&ad) + return ad } func (ar *AuthorizeRequest) ToJson() string { - b, err := json.Marshal(ar) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(ar) + return string(b) } func AuthorizeRequestFromJson(data io.Reader) *AuthorizeRequest { - decoder := json.NewDecoder(data) - var ar AuthorizeRequest - err := decoder.Decode(&ar) - if err == nil { - return &ar - } else { - return nil - } + var ar *AuthorizeRequest + json.NewDecoder(data).Decode(&ar) + return ar } func (ad *AuthData) IsExpired() bool { diff --git a/model/channel.go b/model/channel.go index a4c733c30..ce812be3d 100644 --- a/model/channel.go +++ b/model/channel.go @@ -61,43 +61,25 @@ func (o *Channel) DeepCopy() *Channel { } func (o *Channel) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func (o *ChannelPatch) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func ChannelFromJson(data io.Reader) *Channel { - decoder := json.NewDecoder(data) - var o Channel - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *Channel + json.NewDecoder(data).Decode(&o) + return o } func ChannelPatchFromJson(data io.Reader) *ChannelPatch { - decoder := json.NewDecoder(data) - var o ChannelPatch - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *ChannelPatch + json.NewDecoder(data).Decode(&o) + return o } func (o *Channel) Etag() string { diff --git a/model/channel_count.go b/model/channel_count.go index aecb0c712..8c6d8dd0e 100644 --- a/model/channel_count.go +++ b/model/channel_count.go @@ -43,21 +43,12 @@ func (o *ChannelCounts) Etag() string { } func (o *ChannelCounts) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func ChannelCountsFromJson(data io.Reader) *ChannelCounts { - decoder := json.NewDecoder(data) - var o ChannelCounts - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *ChannelCounts + json.NewDecoder(data).Decode(&o) + return o } diff --git a/model/channel_data.go b/model/channel_data.go index 41b7eaa65..aae0a1490 100644 --- a/model/channel_data.go +++ b/model/channel_data.go @@ -23,21 +23,12 @@ func (o *ChannelData) Etag() string { } func (o *ChannelData) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func ChannelDataFromJson(data io.Reader) *ChannelData { - decoder := json.NewDecoder(data) - var o ChannelData - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *ChannelData + json.NewDecoder(data).Decode(&o) + return o } diff --git a/model/channel_list.go b/model/channel_list.go index d5a4ccb7c..1b3bda46d 100644 --- a/model/channel_list.go +++ b/model/channel_list.go @@ -41,23 +41,13 @@ func (o *ChannelList) Etag() string { } func ChannelListFromJson(data io.Reader) *ChannelList { - decoder := json.NewDecoder(data) - var o ChannelList - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *ChannelList + json.NewDecoder(data).Decode(&o) + return o } func ChannelSliceFromJson(data io.Reader) []*Channel { - decoder := json.NewDecoder(data) var o []*Channel - err := decoder.Decode(&o) - if err == nil { - return o - } else { - return nil - } + json.NewDecoder(data).Decode(&o) + return o } diff --git a/model/channel_member.go b/model/channel_member.go index e7ad8232a..e9895aea0 100644 --- a/model/channel_member.go +++ b/model/channel_member.go @@ -49,54 +49,31 @@ func (o *ChannelMembers) ToJson() string { } func (o *ChannelUnread) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func ChannelMembersFromJson(data io.Reader) *ChannelMembers { - decoder := json.NewDecoder(data) - var o ChannelMembers - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *ChannelMembers + json.NewDecoder(data).Decode(&o) + return o } func ChannelUnreadFromJson(data io.Reader) *ChannelUnread { - decoder := json.NewDecoder(data) - var o ChannelUnread - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *ChannelUnread + json.NewDecoder(data).Decode(&o) + return o } func (o *ChannelMember) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func ChannelMemberFromJson(data io.Reader) *ChannelMember { - decoder := json.NewDecoder(data) - var o ChannelMember - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *ChannelMember + json.NewDecoder(data).Decode(&o) + return o } func (o *ChannelMember) IsValid() *AppError { diff --git a/model/channel_search.go b/model/channel_search.go index d915c164e..593cf6690 100644 --- a/model/channel_search.go +++ b/model/channel_search.go @@ -14,22 +14,13 @@ type ChannelSearch struct { // ToJson convert a Channel to a json string func (c *ChannelSearch) ToJson() string { - b, err := json.Marshal(c) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(c) + return string(b) } // ChannelSearchFromJson will decode the input and return a Channel func ChannelSearchFromJson(data io.Reader) *ChannelSearch { - decoder := json.NewDecoder(data) - var cs ChannelSearch - err := decoder.Decode(&cs) - if err == nil { - return &cs - } else { - return nil - } + var cs *ChannelSearch + json.NewDecoder(data).Decode(&cs) + return cs } diff --git a/model/channel_stats.go b/model/channel_stats.go index 758aa2b15..21af920fc 100644 --- a/model/channel_stats.go +++ b/model/channel_stats.go @@ -14,21 +14,12 @@ type ChannelStats struct { } func (o *ChannelStats) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func ChannelStatsFromJson(data io.Reader) *ChannelStats { - decoder := json.NewDecoder(data) - var o ChannelStats - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *ChannelStats + json.NewDecoder(data).Decode(&o) + return o } diff --git a/model/channel_view.go b/model/channel_view.go index e7b1de306..650d14ce3 100644 --- a/model/channel_view.go +++ b/model/channel_view.go @@ -14,23 +14,14 @@ type ChannelView struct { } func (o *ChannelView) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func ChannelViewFromJson(data io.Reader) *ChannelView { - decoder := json.NewDecoder(data) - var o ChannelView - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *ChannelView + json.NewDecoder(data).Decode(&o) + return o } type ChannelViewResponse struct { @@ -39,21 +30,12 @@ type ChannelViewResponse struct { } func (o *ChannelViewResponse) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func ChannelViewResponseFromJson(data io.Reader) *ChannelViewResponse { - decoder := json.NewDecoder(data) - var o ChannelViewResponse - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *ChannelViewResponse + json.NewDecoder(data).Decode(&o) + return o } diff --git a/model/cluster_info.go b/model/cluster_info.go index c4f7e89a6..a8d63ec32 100644 --- a/model/cluster_info.go +++ b/model/cluster_info.go @@ -18,12 +18,8 @@ type ClusterInfo struct { } func (me *ClusterInfo) ToJson() string { - b, err := json.Marshal(me) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(me) + return string(b) } func (me *ClusterInfo) Copy() *ClusterInfo { @@ -32,22 +28,14 @@ func (me *ClusterInfo) Copy() *ClusterInfo { } func ClusterInfoFromJson(data io.Reader) *ClusterInfo { - decoder := json.NewDecoder(data) - var me ClusterInfo - err := decoder.Decode(&me) - if err == nil { - return &me - } else { - return nil - } + var me *ClusterInfo + json.NewDecoder(data).Decode(&me) + return me } func ClusterInfosToJson(objmap []*ClusterInfo) string { - if b, err := json.Marshal(objmap); err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(objmap) + return string(b) } func ClusterInfosFromJson(data io.Reader) []*ClusterInfo { diff --git a/model/cluster_info_test.go b/model/cluster_info_test.go index c019df40a..ec6ba6c1f 100644 --- a/model/cluster_info_test.go +++ b/model/cluster_info_test.go @@ -28,5 +28,4 @@ func TestClusterInfosJson(t *testing.T) { if clusterInfos[0].IpAddress != result[0].IpAddress { t.Fatal("Ids do not match") } - } diff --git a/model/cluster_message.go b/model/cluster_message.go index a6dec2e7f..f060c4ac8 100644 --- a/model/cluster_message.go +++ b/model/cluster_message.go @@ -35,21 +35,12 @@ type ClusterMessage struct { } func (o *ClusterMessage) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func ClusterMessageFromJson(data io.Reader) *ClusterMessage { - decoder := json.NewDecoder(data) - var o ClusterMessage - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *ClusterMessage + json.NewDecoder(data).Decode(&o) + return o } diff --git a/model/cluster_stats.go b/model/cluster_stats.go index 879487c6e..064f7b816 100644 --- a/model/cluster_stats.go +++ b/model/cluster_stats.go @@ -16,21 +16,12 @@ type ClusterStats struct { } func (me *ClusterStats) ToJson() string { - b, err := json.Marshal(me) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(me) + return string(b) } func ClusterStatsFromJson(data io.Reader) *ClusterStats { - decoder := json.NewDecoder(data) - var me ClusterStats - err := decoder.Decode(&me) - if err == nil { - return &me - } else { - return nil - } + var me *ClusterStats + json.NewDecoder(data).Decode(&me) + return me } diff --git a/model/command.go b/model/command.go index 69da41c1d..b23e5020f 100644 --- a/model/command.go +++ b/model/command.go @@ -38,43 +38,25 @@ type Command struct { } func (o *Command) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func CommandFromJson(data io.Reader) *Command { - decoder := json.NewDecoder(data) - var o Command - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *Command + json.NewDecoder(data).Decode(&o) + return o } func CommandListToJson(l []*Command) string { - b, err := json.Marshal(l) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(l) + return string(b) } func CommandListFromJson(data io.Reader) []*Command { - decoder := json.NewDecoder(data) var o []*Command - err := decoder.Decode(&o) - if err == nil { - return o - } else { - return nil - } + json.NewDecoder(data).Decode(&o) + return o } func (o *Command) IsValid() *AppError { diff --git a/model/command_args.go b/model/command_args.go index 76b03a2fa..4a635a1a1 100644 --- a/model/command_args.go +++ b/model/command_args.go @@ -23,21 +23,12 @@ type CommandArgs struct { } func (o *CommandArgs) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func CommandArgsFromJson(data io.Reader) *CommandArgs { - decoder := json.NewDecoder(data) - var o CommandArgs - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *CommandArgs + json.NewDecoder(data).Decode(&o) + return o } diff --git a/model/command_response.go b/model/command_response.go index a3a171ce4..cac7e8452 100644 --- a/model/command_response.go +++ b/model/command_response.go @@ -27,12 +27,8 @@ type CommandResponse struct { } func (o *CommandResponse) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func CommandResponseFromHTTPBody(contentType string, body io.Reader) *CommandResponse { diff --git a/model/compliance.go b/model/compliance.go index 3134ddbaa..d39a3fa77 100644 --- a/model/compliance.go +++ b/model/compliance.go @@ -38,12 +38,8 @@ type Compliance struct { type Compliances []Compliance func (o *Compliance) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func (me *Compliance) PreSave() { @@ -103,14 +99,9 @@ func (me *Compliance) IsValid() *AppError { } func ComplianceFromJson(data io.Reader) *Compliance { - decoder := json.NewDecoder(data) - var o Compliance - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *Compliance + json.NewDecoder(data).Decode(&o) + return o } func (o Compliances) ToJson() string { @@ -122,12 +113,7 @@ func (o Compliances) ToJson() string { } func CompliancesFromJson(data io.Reader) Compliances { - decoder := json.NewDecoder(data) var o Compliances - err := decoder.Decode(&o) - if err == nil { - return o - } else { - return nil - } + json.NewDecoder(data).Decode(&o) + return o } diff --git a/model/config.go b/model/config.go index 60a6d1983..525fc71ed 100644 --- a/model/config.go +++ b/model/config.go @@ -1681,12 +1681,8 @@ func (o *Config) Clone() *Config { } func (o *Config) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func (o *Config) GetSSOService(service string) *SSOSettings { @@ -1703,14 +1699,9 @@ func (o *Config) GetSSOService(service string) *SSOSettings { } func ConfigFromJson(data io.Reader) *Config { - decoder := json.NewDecoder(data) - var o Config - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *Config + json.NewDecoder(data).Decode(&o) + return o } func (o *Config) SetDefaults() { diff --git a/model/data_retention_policy.go b/model/data_retention_policy.go index 7284477e5..dbb13374d 100644 --- a/model/data_retention_policy.go +++ b/model/data_retention_policy.go @@ -16,21 +16,12 @@ type DataRetentionPolicy struct { } func (me *DataRetentionPolicy) ToJson() string { - b, err := json.Marshal(me) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(me) + return string(b) } func DataRetentionPolicyFromJson(data io.Reader) *DataRetentionPolicy { - decoder := json.NewDecoder(data) - var me DataRetentionPolicy - err := decoder.Decode(&me) - if err == nil { - return &me - } else { - return nil - } + var me *DataRetentionPolicy + json.NewDecoder(data).Decode(&me) + return me } diff --git a/model/emoji.go b/model/emoji.go index 3deff4c5f..a1703abb1 100644 --- a/model/emoji.go +++ b/model/emoji.go @@ -61,41 +61,23 @@ func (emoji *Emoji) PreUpdate() { } func (emoji *Emoji) ToJson() string { - b, err := json.Marshal(emoji) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(emoji) + return string(b) } func EmojiFromJson(data io.Reader) *Emoji { - decoder := json.NewDecoder(data) - var emoji Emoji - err := decoder.Decode(&emoji) - if err == nil { - return &emoji - } else { - return nil - } + var emoji *Emoji + json.NewDecoder(data).Decode(&emoji) + return emoji } func EmojiListToJson(emojiList []*Emoji) string { - b, err := json.Marshal(emojiList) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(emojiList) + return string(b) } func EmojiListFromJson(data io.Reader) []*Emoji { - decoder := json.NewDecoder(data) var emojiList []*Emoji - err := decoder.Decode(&emojiList) - if err == nil { - return emojiList - } else { - return nil - } + json.NewDecoder(data).Decode(&emojiList) + return emojiList } diff --git a/model/emoji_search.go b/model/emoji_search.go index 31931170e..3a768a574 100644 --- a/model/emoji_search.go +++ b/model/emoji_search.go @@ -14,21 +14,12 @@ type EmojiSearch struct { } func (es *EmojiSearch) ToJson() string { - b, err := json.Marshal(es) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(es) + return string(b) } func EmojiSearchFromJson(data io.Reader) *EmojiSearch { - decoder := json.NewDecoder(data) - var es EmojiSearch - err := decoder.Decode(&es) - if err == nil { - return &es - } else { - return nil - } + var es *EmojiSearch + json.NewDecoder(data).Decode(&es) + return es } diff --git a/model/file.go b/model/file.go index f92581469..c7ffbf0b9 100644 --- a/model/file.go +++ b/model/file.go @@ -23,21 +23,12 @@ type FileUploadResponse struct { } func FileUploadResponseFromJson(data io.Reader) *FileUploadResponse { - decoder := json.NewDecoder(data) - var o FileUploadResponse - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *FileUploadResponse + json.NewDecoder(data).Decode(&o) + return o } func (o *FileUploadResponse) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } diff --git a/model/file_info.go b/model/file_info.go index 0ee2c50d8..e0bbfcfc4 100644 --- a/model/file_info.go +++ b/model/file_info.go @@ -35,12 +35,8 @@ type FileInfo struct { } func (info *FileInfo) ToJson() string { - b, err := json.Marshal(info) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(info) + return string(b) } func FileInfoFromJson(data io.Reader) *FileInfo { @@ -55,12 +51,8 @@ func FileInfoFromJson(data io.Reader) *FileInfo { } func FileInfosToJson(infos []*FileInfo) string { - b, err := json.Marshal(infos) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(infos) + return string(b) } func FileInfosFromJson(data io.Reader) []*FileInfo { diff --git a/model/incoming_webhook.go b/model/incoming_webhook.go index 3e0488d2b..b38cfeec0 100644 --- a/model/incoming_webhook.go +++ b/model/incoming_webhook.go @@ -40,43 +40,25 @@ type IncomingWebhookRequest struct { } func (o *IncomingWebhook) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func IncomingWebhookFromJson(data io.Reader) *IncomingWebhook { - decoder := json.NewDecoder(data) - var o IncomingWebhook - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *IncomingWebhook + json.NewDecoder(data).Decode(&o) + return o } func IncomingWebhookListToJson(l []*IncomingWebhook) string { - b, err := json.Marshal(l) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(l) + return string(b) } func IncomingWebhookListFromJson(data io.Reader) []*IncomingWebhook { - decoder := json.NewDecoder(data) var o []*IncomingWebhook - err := decoder.Decode(&o) - if err == nil { - return o - } else { - return nil - } + json.NewDecoder(data).Decode(&o) + return o } func (o *IncomingWebhook) IsValid() *AppError { diff --git a/model/initial_load.go b/model/initial_load.go index 71ba17696..3be680446 100644 --- a/model/initial_load.go +++ b/model/initial_load.go @@ -19,21 +19,12 @@ type InitialLoad struct { } func (me *InitialLoad) ToJson() string { - b, err := json.Marshal(me) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(me) + return string(b) } func InitialLoadFromJson(data io.Reader) *InitialLoad { - decoder := json.NewDecoder(data) - var o InitialLoad - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *InitialLoad + json.NewDecoder(data).Decode(&o) + return o } diff --git a/model/job.go b/model/job.go index 9a7566025..e10ed1f5d 100644 --- a/model/job.go +++ b/model/job.go @@ -71,11 +71,8 @@ func (j *Job) IsValid() *AppError { } func (js *Job) ToJson() string { - if b, err := json.Marshal(js); err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(js) + return string(b) } func JobFromJson(data io.Reader) *Job { @@ -88,11 +85,8 @@ func JobFromJson(data io.Reader) *Job { } func JobsToJson(jobs []*Job) string { - if b, err := json.Marshal(jobs); err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(jobs) + return string(b) } func JobsFromJson(data io.Reader) []*Job { @@ -105,11 +99,8 @@ func JobsFromJson(data io.Reader) []*Job { } func (js *Job) DataToJson() string { - if b, err := json.Marshal(js.Data); err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(js.Data) + return string(b) } type Worker interface { diff --git a/model/license.go b/model/license.go index a81f882ca..f96cba06c 100644 --- a/model/license.go +++ b/model/license.go @@ -169,23 +169,14 @@ func (l *License) IsStarted() bool { } func (l *License) ToJson() string { - b, err := json.Marshal(l) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(l) + return string(b) } func LicenseFromJson(data io.Reader) *License { - decoder := json.NewDecoder(data) - var o License - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *License + json.NewDecoder(data).Decode(&o) + return o } func (lr *LicenseRecord) IsValid() *AppError { diff --git a/model/manifest.go b/model/manifest.go index 03d78f84e..5ba4854b6 100644 --- a/model/manifest.go +++ b/model/manifest.go @@ -142,43 +142,25 @@ type ManifestWebapp struct { } func (m *Manifest) ToJson() string { - b, err := json.Marshal(m) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(m) + return string(b) } func ManifestListToJson(m []*Manifest) string { - b, err := json.Marshal(m) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(m) + return string(b) } func ManifestFromJson(data io.Reader) *Manifest { - decoder := json.NewDecoder(data) - var m Manifest - err := decoder.Decode(&m) - if err == nil { - return &m - } else { - return nil - } + var m *Manifest + json.NewDecoder(data).Decode(&m) + return m } func ManifestListFromJson(data io.Reader) []*Manifest { - decoder := json.NewDecoder(data) var manifests []*Manifest - err := decoder.Decode(&manifests) - if err == nil { - return manifests - } else { - return nil - } + json.NewDecoder(data).Decode(&manifests) + return manifests } func (m *Manifest) HasClient() bool { diff --git a/model/mfa_secret.go b/model/mfa_secret.go index 99580f5f3..23a903c89 100644 --- a/model/mfa_secret.go +++ b/model/mfa_secret.go @@ -14,21 +14,12 @@ type MfaSecret struct { } func (me *MfaSecret) ToJson() string { - b, err := json.Marshal(me) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(me) + return string(b) } func MfaSecretFromJson(data io.Reader) *MfaSecret { - decoder := json.NewDecoder(data) - var me MfaSecret - err := decoder.Decode(&me) - if err == nil { - return &me - } else { - return nil - } + var me *MfaSecret + json.NewDecoder(data).Decode(&me) + return me } diff --git a/model/oauth.go b/model/oauth.go index 3139aefed..70e8a3f26 100644 --- a/model/oauth.go +++ b/model/oauth.go @@ -110,12 +110,8 @@ func (a *OAuthApp) PreUpdate() { // ToJson convert a User to a json string func (a *OAuthApp) ToJson() string { - b, err := json.Marshal(a) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(a) + return string(b) } // Generate a valid strong etag so the browser can cache the results @@ -140,52 +136,29 @@ func (a *OAuthApp) IsValidRedirectURL(url string) bool { // OAuthAppFromJson will decode the input and return a User func OAuthAppFromJson(data io.Reader) *OAuthApp { - decoder := json.NewDecoder(data) - var app OAuthApp - err := decoder.Decode(&app) - if err == nil { - return &app - } else { - return nil - } + var app *OAuthApp + json.NewDecoder(data).Decode(&app) + return app } func OAuthAppMapToJson(a map[string]*OAuthApp) string { - b, err := json.Marshal(a) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(a) + return string(b) } func OAuthAppMapFromJson(data io.Reader) map[string]*OAuthApp { - decoder := json.NewDecoder(data) var apps map[string]*OAuthApp - err := decoder.Decode(&apps) - if err == nil { - return apps - } else { - return nil - } + json.NewDecoder(data).Decode(&apps) + return apps } func OAuthAppListToJson(l []*OAuthApp) string { - b, err := json.Marshal(l) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(l) + return string(b) } func OAuthAppListFromJson(data io.Reader) []*OAuthApp { - decoder := json.NewDecoder(data) var o []*OAuthApp - err := decoder.Decode(&o) - if err == nil { - return o - } else { - return nil - } + json.NewDecoder(data).Decode(&o) + return o } diff --git a/model/outgoing_webhook.go b/model/outgoing_webhook.go index b00171845..b5dbf34d9 100644 --- a/model/outgoing_webhook.go +++ b/model/outgoing_webhook.go @@ -58,12 +58,8 @@ type OutgoingWebhookResponse struct { const OUTGOING_HOOK_RESPONSE_TYPE_COMMENT = "comment" func (o *OutgoingWebhookPayload) ToJSON() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func (o *OutgoingWebhookPayload) ToFormValues() string { @@ -85,63 +81,36 @@ func (o *OutgoingWebhookPayload) ToFormValues() string { } func (o *OutgoingWebhook) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func OutgoingWebhookFromJson(data io.Reader) *OutgoingWebhook { - decoder := json.NewDecoder(data) - var o OutgoingWebhook - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *OutgoingWebhook + json.NewDecoder(data).Decode(&o) + return o } func OutgoingWebhookListToJson(l []*OutgoingWebhook) string { - b, err := json.Marshal(l) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(l) + return string(b) } func OutgoingWebhookListFromJson(data io.Reader) []*OutgoingWebhook { - decoder := json.NewDecoder(data) var o []*OutgoingWebhook - err := decoder.Decode(&o) - if err == nil { - return o - } else { - return nil - } + json.NewDecoder(data).Decode(&o) + return o } func (o *OutgoingWebhookResponse) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func OutgoingWebhookResponseFromJson(data io.Reader) *OutgoingWebhookResponse { - decoder := json.NewDecoder(data) - var o OutgoingWebhookResponse - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *OutgoingWebhookResponse + json.NewDecoder(data).Decode(&o) + return o } func (o *OutgoingWebhook) IsValid() *AppError { diff --git a/model/plugins_response.go b/model/plugins_response.go index 74c89af26..b6c01b642 100644 --- a/model/plugins_response.go +++ b/model/plugins_response.go @@ -19,21 +19,12 @@ type PluginsResponse struct { } func (m *PluginsResponse) ToJson() string { - b, err := json.Marshal(m) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(m) + return string(b) } func PluginsResponseFromJson(data io.Reader) *PluginsResponse { - decoder := json.NewDecoder(data) - var m PluginsResponse - err := decoder.Decode(&m) - if err == nil { - return &m - } else { - return nil - } + var m *PluginsResponse + json.NewDecoder(data).Decode(&m) + return m } diff --git a/model/post.go b/model/post.go index f3d990a87..391b948f4 100644 --- a/model/post.go +++ b/model/post.go @@ -130,14 +130,9 @@ func (o *Post) ToJson() string { } func PostFromJson(data io.Reader) *Post { - decoder := json.NewDecoder(data) - var o Post - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *Post + json.NewDecoder(data).Decode(&o) + return o } func (o *Post) Etag() string { @@ -349,12 +344,8 @@ func (o *Post) ChannelMentions() (names []string) { } func (r *PostActionIntegrationRequest) ToJson() string { - b, err := json.Marshal(r) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(r) + return string(b) } func (o *Post) Attachments() []*SlackAttachment { diff --git a/model/post_list.go b/model/post_list.go index 09cddfdcf..27c22e7bd 100644 --- a/model/post_list.go +++ b/model/post_list.go @@ -132,12 +132,7 @@ func (o *PostList) IsChannelId(channelId string) bool { } func PostListFromJson(data io.Reader) *PostList { - decoder := json.NewDecoder(data) - var o PostList - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *PostList + json.NewDecoder(data).Decode(&o) + return o } diff --git a/model/preference.go b/model/preference.go index 5d462de8b..dc97314c5 100644 --- a/model/preference.go +++ b/model/preference.go @@ -47,23 +47,14 @@ type Preference struct { } func (o *Preference) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func PreferenceFromJson(data io.Reader) *Preference { - decoder := json.NewDecoder(data) - var o Preference - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *Preference + json.NewDecoder(data).Decode(&o) + return o } func (o *Preference) IsValid() *AppError { diff --git a/model/preferences.go b/model/preferences.go index b982e309d..172e1aa83 100644 --- a/model/preferences.go +++ b/model/preferences.go @@ -11,12 +11,8 @@ import ( type Preferences []Preference func (o *Preferences) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func PreferencesFromJson(data io.Reader) (Preferences, error) { diff --git a/model/push_notification.go b/model/push_notification.go index 69719e74c..0d7ba77ac 100644 --- a/model/push_notification.go +++ b/model/push_notification.go @@ -47,12 +47,8 @@ type PushNotification struct { } func (me *PushNotification) ToJson() string { - b, err := json.Marshal(me) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(me) + return string(b) } func (me *PushNotification) SetDeviceIdAndPlatform(deviceId string) { @@ -66,12 +62,7 @@ func (me *PushNotification) SetDeviceIdAndPlatform(deviceId string) { } func PushNotificationFromJson(data io.Reader) *PushNotification { - decoder := json.NewDecoder(data) - var me PushNotification - err := decoder.Decode(&me) - if err == nil { - return &me - } else { - return nil - } + var me *PushNotification + json.NewDecoder(data).Decode(&me) + return me } diff --git a/model/push_response.go b/model/push_response.go index 095986f3e..1434a2b11 100644 --- a/model/push_response.go +++ b/model/push_response.go @@ -38,11 +38,8 @@ func NewErrorPushResponse(message string) PushResponse { } func (me *PushResponse) ToJson() string { - if b, err := json.Marshal(me); err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(me) + return string(b) } func PushResponseFromJson(data io.Reader) PushResponse { diff --git a/model/reaction.go b/model/reaction.go index 8c9b67029..c1b9c499a 100644 --- a/model/reaction.go +++ b/model/reaction.go @@ -18,11 +18,8 @@ type Reaction struct { } func (o *Reaction) ToJson() string { - if b, err := json.Marshal(o); err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func ReactionFromJson(data io.Reader) *Reaction { @@ -36,11 +33,8 @@ func ReactionFromJson(data io.Reader) *Reaction { } func ReactionsToJson(o []*Reaction) string { - if b, err := json.Marshal(o); err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func ReactionsFromJson(data io.Reader) []*Reaction { diff --git a/model/saml.go b/model/saml.go index f5826a95d..e74750156 100644 --- a/model/saml.go +++ b/model/saml.go @@ -29,21 +29,12 @@ type SamlCertificateStatus struct { } func (s *SamlCertificateStatus) ToJson() string { - b, err := json.Marshal(s) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(s) + return string(b) } func SamlCertificateStatusFromJson(data io.Reader) *SamlCertificateStatus { - decoder := json.NewDecoder(data) - var status SamlCertificateStatus - err := decoder.Decode(&status) - if err == nil { - return &status - } else { - return nil - } + var status *SamlCertificateStatus + json.NewDecoder(data).Decode(&status) + return status } diff --git a/model/search_params.go b/model/search_params.go index 2feea8da1..1692b3aaf 100644 --- a/model/search_params.go +++ b/model/search_params.go @@ -21,12 +21,8 @@ type SearchParams struct { } func (o *SearchParams) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } var searchFlags = [...]string{"from", "channel", "in"} diff --git a/model/security_bulletin.go b/model/security_bulletin.go index b8c1dc48d..958b9c9e3 100644 --- a/model/security_bulletin.go +++ b/model/security_bulletin.go @@ -16,23 +16,14 @@ type SecurityBulletin struct { type SecurityBulletins []SecurityBulletin func (me *SecurityBulletin) ToJson() string { - b, err := json.Marshal(me) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(me) + return string(b) } func SecurityBulletinFromJson(data io.Reader) *SecurityBulletin { - decoder := json.NewDecoder(data) - var o SecurityBulletin - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *SecurityBulletin + json.NewDecoder(data).Decode(&o) + return o } func (me SecurityBulletins) ToJson() string { @@ -44,12 +35,7 @@ func (me SecurityBulletins) ToJson() string { } func SecurityBulletinsFromJson(data io.Reader) SecurityBulletins { - decoder := json.NewDecoder(data) var o SecurityBulletins - err := decoder.Decode(&o) - if err == nil { - return o - } else { - return nil - } + json.NewDecoder(data).Decode(&o) + return o } diff --git a/model/session.go b/model/session.go index 704af067c..a407af26a 100644 --- a/model/session.go +++ b/model/session.go @@ -43,23 +43,14 @@ func (me *Session) DeepCopy() *Session { } func (me *Session) ToJson() string { - b, err := json.Marshal(me) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(me) + return string(b) } func SessionFromJson(data io.Reader) *Session { - decoder := json.NewDecoder(data) - var me Session - err := decoder.Decode(&me) - if err == nil { - return &me - } else { - return nil - } + var me *Session + json.NewDecoder(data).Decode(&me) + return me } func (me *Session) PreSave() { @@ -140,12 +131,7 @@ func SessionsToJson(o []*Session) string { } func SessionsFromJson(data io.Reader) []*Session { - decoder := json.NewDecoder(data) var o []*Session - err := decoder.Decode(&o) - if err == nil { - return o - } else { - return nil - } + json.NewDecoder(data).Decode(&o) + return o } diff --git a/model/status.go b/model/status.go index 6da6161eb..cd9e32ed3 100644 --- a/model/status.go +++ b/model/status.go @@ -27,43 +27,25 @@ type Status struct { } func (o *Status) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func StatusFromJson(data io.Reader) *Status { - decoder := json.NewDecoder(data) - var o Status - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *Status + json.NewDecoder(data).Decode(&o) + return o } func StatusListToJson(u []*Status) string { - b, err := json.Marshal(u) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(u) + return string(b) } func StatusListFromJson(data io.Reader) []*Status { - decoder := json.NewDecoder(data) var statuses []*Status - err := decoder.Decode(&statuses) - if err == nil { - return statuses - } else { - return nil - } + json.NewDecoder(data).Decode(&statuses) + return statuses } func StatusMapToInterfaceMap(statusMap map[string]*Status) map[string]interface{} { diff --git a/model/suggest_command.go b/model/suggest_command.go index 3d066499a..44f46bf7a 100644 --- a/model/suggest_command.go +++ b/model/suggest_command.go @@ -14,21 +14,12 @@ type SuggestCommand struct { } func (o *SuggestCommand) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func SuggestCommandFromJson(data io.Reader) *SuggestCommand { - decoder := json.NewDecoder(data) - var o SuggestCommand - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *SuggestCommand + json.NewDecoder(data).Decode(&o) + return o } diff --git a/model/switch_request.go b/model/switch_request.go index 100392944..e153c92f4 100644 --- a/model/switch_request.go +++ b/model/switch_request.go @@ -19,23 +19,14 @@ type SwitchRequest struct { } func (o *SwitchRequest) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func SwitchRequestFromJson(data io.Reader) *SwitchRequest { - decoder := json.NewDecoder(data) - var o SwitchRequest - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *SwitchRequest + json.NewDecoder(data).Decode(&o) + return o } func (o *SwitchRequest) EmailToOAuth() bool { diff --git a/model/system.go b/model/system.go index e2f4283a4..020c50858 100644 --- a/model/system.go +++ b/model/system.go @@ -22,21 +22,12 @@ type System struct { } func (o *System) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func SystemFromJson(data io.Reader) *System { - decoder := json.NewDecoder(data) - var o System - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *System + json.NewDecoder(data).Decode(&o) + return o } diff --git a/model/team.go b/model/team.go index 4fe03f2fc..5b6eb1fa0 100644 --- a/model/team.go +++ b/model/team.go @@ -54,14 +54,9 @@ type Invites struct { } func InvitesFromJson(data io.Reader) *Invites { - decoder := json.NewDecoder(data) - var o Invites - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *Invites + json.NewDecoder(data).Decode(&o) + return o } func (o *Invites) ToEmailList() []string { @@ -73,72 +68,41 @@ func (o *Invites) ToEmailList() []string { } func (o *Invites) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func (o *Team) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func TeamFromJson(data io.Reader) *Team { - decoder := json.NewDecoder(data) - var o Team - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *Team + json.NewDecoder(data).Decode(&o) + return o } func TeamMapToJson(u map[string]*Team) string { - b, err := json.Marshal(u) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(u) + return string(b) } func TeamMapFromJson(data io.Reader) map[string]*Team { - decoder := json.NewDecoder(data) var teams map[string]*Team - err := decoder.Decode(&teams) - if err == nil { - return teams - } else { - return nil - } + json.NewDecoder(data).Decode(&teams) + return teams } func TeamListToJson(t []*Team) string { - b, err := json.Marshal(t) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(t) + return string(b) } func TeamListFromJson(data io.Reader) []*Team { - decoder := json.NewDecoder(data) var teams []*Team - err := decoder.Decode(&teams) - if err == nil { - return teams - } else { - return nil - } + json.NewDecoder(data).Decode(&teams) + return teams } func (o *Team) Etag() string { diff --git a/model/team_member.go b/model/team_member.go index 6c70b75eb..2fcd1e151 100644 --- a/model/team_member.go +++ b/model/team_member.go @@ -24,43 +24,25 @@ type TeamUnread struct { } func (o *TeamMember) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func (o *TeamUnread) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func TeamMemberFromJson(data io.Reader) *TeamMember { - decoder := json.NewDecoder(data) - var o TeamMember - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *TeamMember + json.NewDecoder(data).Decode(&o) + return o } func TeamUnreadFromJson(data io.Reader) *TeamUnread { - decoder := json.NewDecoder(data) - var o TeamUnread - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *TeamUnread + json.NewDecoder(data).Decode(&o) + return o } func TeamMembersToJson(o []*TeamMember) string { @@ -72,14 +54,9 @@ func TeamMembersToJson(o []*TeamMember) string { } func TeamMembersFromJson(data io.Reader) []*TeamMember { - decoder := json.NewDecoder(data) var o []*TeamMember - err := decoder.Decode(&o) - if err == nil { - return o - } else { - return nil - } + json.NewDecoder(data).Decode(&o) + return o } func TeamsUnreadToJson(o []*TeamUnread) string { @@ -91,14 +68,9 @@ func TeamsUnreadToJson(o []*TeamUnread) string { } func TeamsUnreadFromJson(data io.Reader) []*TeamUnread { - decoder := json.NewDecoder(data) var o []*TeamUnread - err := decoder.Decode(&o) - if err == nil { - return o - } else { - return nil - } + json.NewDecoder(data).Decode(&o) + return o } func (o *TeamMember) IsValid() *AppError { diff --git a/model/team_stats.go b/model/team_stats.go index e94ed37bc..0d688b806 100644 --- a/model/team_stats.go +++ b/model/team_stats.go @@ -15,21 +15,12 @@ type TeamStats struct { } func (o *TeamStats) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func TeamStatsFromJson(data io.Reader) *TeamStats { - decoder := json.NewDecoder(data) - var o TeamStats - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *TeamStats + json.NewDecoder(data).Decode(&o) + return o } diff --git a/model/user.go b/model/user.go index 4c08eac24..901e8d7ad 100644 --- a/model/user.go +++ b/model/user.go @@ -298,30 +298,18 @@ func (u *User) Patch(patch *UserPatch) { // ToJson convert a User to a json string func (u *User) ToJson() string { - b, err := json.Marshal(u) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(u) + return string(b) } func (u *UserPatch) ToJson() string { - b, err := json.Marshal(u) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(u) + return string(b) } func (u *UserAuth) ToJson() string { - b, err := json.Marshal(u) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(u) + return string(b) } // Generate a valid strong etag so the browser can cache the results @@ -488,76 +476,43 @@ func (u *User) IsSAMLUser() bool { // UserFromJson will decode the input and return a User func UserFromJson(data io.Reader) *User { - decoder := json.NewDecoder(data) - var user User - err := decoder.Decode(&user) - if err == nil { - return &user - } else { - return nil - } + var user *User + json.NewDecoder(data).Decode(&user) + return user } func UserPatchFromJson(data io.Reader) *UserPatch { - decoder := json.NewDecoder(data) - var user UserPatch - err := decoder.Decode(&user) - if err == nil { - return &user - } else { - return nil - } + var user *UserPatch + json.NewDecoder(data).Decode(&user) + return user } func UserAuthFromJson(data io.Reader) *UserAuth { - decoder := json.NewDecoder(data) - var user UserAuth - err := decoder.Decode(&user) - if err == nil { - return &user - } else { - return nil - } + var user *UserAuth + json.NewDecoder(data).Decode(&user) + return user } func UserMapToJson(u map[string]*User) string { - b, err := json.Marshal(u) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(u) + return string(b) } func UserMapFromJson(data io.Reader) map[string]*User { - decoder := json.NewDecoder(data) var users map[string]*User - err := decoder.Decode(&users) - if err == nil { - return users - } else { - return nil - } + json.NewDecoder(data).Decode(&users) + return users } func UserListToJson(u []*User) string { - b, err := json.Marshal(u) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(u) + return string(b) } func UserListFromJson(data io.Reader) []*User { - decoder := json.NewDecoder(data) var users []*User - err := decoder.Decode(&users) - if err == nil { - return users - } else { - return nil - } + json.NewDecoder(data).Decode(&users) + return users } // HashPassword generates a hash using the bcrypt.GenerateFromPassword diff --git a/model/user_access_token.go b/model/user_access_token.go index e189ec233..bffd9fcb5 100644 --- a/model/user_access_token.go +++ b/model/user_access_token.go @@ -43,41 +43,23 @@ func (t *UserAccessToken) PreSave() { } func (t *UserAccessToken) ToJson() string { - b, err := json.Marshal(t) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(t) + return string(b) } func UserAccessTokenFromJson(data io.Reader) *UserAccessToken { - decoder := json.NewDecoder(data) - var t UserAccessToken - err := decoder.Decode(&t) - if err == nil { - return &t - } else { - return nil - } + var t *UserAccessToken + json.NewDecoder(data).Decode(&t) + return t } func UserAccessTokenListToJson(t []*UserAccessToken) string { - b, err := json.Marshal(t) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(t) + return string(b) } func UserAccessTokenListFromJson(data io.Reader) []*UserAccessToken { - decoder := json.NewDecoder(data) var t []*UserAccessToken - err := decoder.Decode(&t) - if err == nil { - return t - } else { - return nil - } + json.NewDecoder(data).Decode(&t) + return t } diff --git a/model/user_autocomplete.go b/model/user_autocomplete.go index 43c030b8e..b5edb45be 100644 --- a/model/user_autocomplete.go +++ b/model/user_autocomplete.go @@ -23,12 +23,8 @@ type UserAutocomplete struct { } func (o *UserAutocomplete) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func UserAutocompleteFromJson(data io.Reader) *UserAutocomplete { @@ -43,41 +39,23 @@ func UserAutocompleteFromJson(data io.Reader) *UserAutocomplete { } func (o *UserAutocompleteInChannel) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func UserAutocompleteInChannelFromJson(data io.Reader) *UserAutocompleteInChannel { - decoder := json.NewDecoder(data) - var o UserAutocompleteInChannel - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *UserAutocompleteInChannel + json.NewDecoder(data).Decode(&o) + return o } func (o *UserAutocompleteInTeam) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func UserAutocompleteInTeamFromJson(data io.Reader) *UserAutocompleteInTeam { - decoder := json.NewDecoder(data) - var o UserAutocompleteInTeam - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *UserAutocompleteInTeam + json.NewDecoder(data).Decode(&o) + return o } diff --git a/model/user_search.go b/model/user_search.go index 6213b16e4..94596bdcd 100644 --- a/model/user_search.go +++ b/model/user_search.go @@ -20,22 +20,13 @@ type UserSearch struct { // ToJson convert a User to a json string func (u *UserSearch) ToJson() string { - b, err := json.Marshal(u) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(u) + return string(b) } // UserSearchFromJson will decode the input and return a User func UserSearchFromJson(data io.Reader) *UserSearch { - decoder := json.NewDecoder(data) - var us UserSearch - err := decoder.Decode(&us) - if err == nil { - return &us - } else { - return nil - } + var us *UserSearch + json.NewDecoder(data).Decode(&us) + return us } diff --git a/model/utils.go b/model/utils.go index 648e67c75..331a1aaaa 100644 --- a/model/utils.go +++ b/model/utils.go @@ -79,12 +79,8 @@ func (er *AppError) SystemMessage(T goi18n.TranslateFunc) string { } func (er *AppError) ToJson() string { - b, err := json.Marshal(er) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(er) + return string(b) } // AppErrorFromJson will decode the input and return an AppError @@ -152,20 +148,14 @@ func GetMillis() int64 { // MapToJson converts a map to a json string func MapToJson(objmap map[string]string) string { - if b, err := json.Marshal(objmap); err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(objmap) + return string(b) } // MapToJson converts a map to a json string func MapBoolToJson(objmap map[string]bool) string { - if b, err := json.Marshal(objmap); err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(objmap) + return string(b) } // MapFromJson will decode the key/value pair map @@ -193,11 +183,8 @@ func MapBoolFromJson(data io.Reader) map[string]bool { } func ArrayToJson(objmap []string) string { - if b, err := json.Marshal(objmap); err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(objmap) + return string(b) } func ArrayFromJson(data io.Reader) []string { @@ -229,11 +216,8 @@ func ArrayFromInterface(data interface{}) []string { } func StringInterfaceToJson(objmap map[string]interface{}) string { - if b, err := json.Marshal(objmap); err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(objmap) + return string(b) } func StringInterfaceFromJson(data io.Reader) map[string]interface{} { @@ -248,12 +232,8 @@ func StringInterfaceFromJson(data io.Reader) map[string]interface{} { } func StringToJson(s string) string { - b, err := json.Marshal(s) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(s) + return string(b) } func StringFromJson(data io.Reader) string { diff --git a/model/webrtc.go b/model/webrtc.go index fa15a4b71..59797a5ba 100644 --- a/model/webrtc.go +++ b/model/webrtc.go @@ -22,32 +22,18 @@ type GatewayResponse struct { } func GatewayResponseFromJson(data io.Reader) *GatewayResponse { - decoder := json.NewDecoder(data) - var o GatewayResponse - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *GatewayResponse + json.NewDecoder(data).Decode(&o) + return o } func (o *WebrtcInfoResponse) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func WebrtcInfoResponseFromJson(data io.Reader) *WebrtcInfoResponse { - decoder := json.NewDecoder(data) - var o WebrtcInfoResponse - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *WebrtcInfoResponse + json.NewDecoder(data).Decode(&o) + return o } diff --git a/model/websocket_message.go b/model/websocket_message.go index bf2535dc3..0aab74865 100644 --- a/model/websocket_message.go +++ b/model/websocket_message.go @@ -82,23 +82,14 @@ func (o *WebSocketEvent) EventType() string { } func (o *WebSocketEvent) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func WebSocketEventFromJson(data io.Reader) *WebSocketEvent { - decoder := json.NewDecoder(data) - var o WebSocketEvent - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *WebSocketEvent + json.NewDecoder(data).Decode(&o) + return o } type WebSocketResponse struct { @@ -129,21 +120,12 @@ func (o *WebSocketResponse) EventType() string { } func (o *WebSocketResponse) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func WebSocketResponseFromJson(data io.Reader) *WebSocketResponse { - decoder := json.NewDecoder(data) - var o WebSocketResponse - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *WebSocketResponse + json.NewDecoder(data).Decode(&o) + return o } diff --git a/model/websocket_request.go b/model/websocket_request.go index 7dc0b4335..4da626e23 100644 --- a/model/websocket_request.go +++ b/model/websocket_request.go @@ -23,21 +23,12 @@ type WebSocketRequest struct { } func (o *WebSocketRequest) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func WebSocketRequestFromJson(data io.Reader) *WebSocketRequest { - decoder := json.NewDecoder(data) - var o WebSocketRequest - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *WebSocketRequest + json.NewDecoder(data).Decode(&o) + return o } -- cgit v1.2.3-1-g7c22