unnamed return (#8170)

1 files changed, 9 insertions, 27 deletions

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
 }