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/authorize.go | 38 ++++++++++---------------------------- 1 file changed, 10 insertions(+), 28 deletions(-) (limited to 'model/authorize.go') 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 { -- cgit v1.2.3-1-g7c22