Skip to content
This repository was archived by the owner on Jun 8, 2019. It is now read-only.

Commit 3603911

Browse files
quantonganhquantonganh
committed
pass *Options as it is
1 parent 25c336e commit 3603911

19 files changed

+29
-175
lines changed

‎gitea/admin_org.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,12 @@
55
package gitea
66

77
import (
8-
"bytes"
9-
"encoding/json"
108
"fmt"
119
)
1210

1311
// AdminCreateOrg create an organization
1412
func (c *Client) AdminCreateOrg(user string, opt CreateOrgOption) (*Organization, error) {
15-
body, err := json.Marshal(&opt)
16-
if err != nil {
17-
return nil, err
18-
}
1913
org := new(Organization)
2014
return org, c.getParsedResponse("POST", fmt.Sprintf("/admin/users/%s/orgs", user),
21-
jsonHeader, bytes.NewReader(body), org)
15+
jsonHeader, opt, org)
2216
}

‎gitea/admin_repo.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,12 @@
55
package gitea
66

77
import (
8-
"bytes"
9-
"encoding/json"
108
"fmt"
119
)
1210

1311
// AdminCreateRepo create a repo
1412
func (c *Client) AdminCreateRepo(user string, opt CreateRepoOption) (*Repository, error) {
15-
body, err := json.Marshal(&opt)
16-
if err != nil {
17-
return nil, err
18-
}
1913
repo := new(Repository)
2014
return repo, c.getParsedResponse("POST", fmt.Sprintf("/admin/users/%s/repos", user),
21-
jsonHeader, bytes.NewReader(body), repo)
15+
jsonHeader, opt, repo)
2216
}

‎gitea/admin_user.go

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,8 @@ type CreateUserOption struct {
2929

3030
// AdminCreateUser create a user
3131
func (c *Client) AdminCreateUser(opt CreateUserOption) (*User, error) {
32-
body, err := json.Marshal(&opt)
33-
if err != nil {
34-
return nil, err
35-
}
3632
user := new(User)
37-
return user, c.getParsedResponse("POST", "/admin/users", jsonHeader, bytes.NewReader(body), user)
33+
return user, c.getParsedResponse("POST", "/admin/users", jsonHeader, opt, user)
3834
}
3935

4036
// EditUserOption edit user options
@@ -76,10 +72,6 @@ func (c *Client) AdminDeleteUser(user string) error {
7672

7773
// AdminCreateUserPublicKey create one user with options
7874
func (c *Client) AdminCreateUserPublicKey(user string, opt CreateKeyOption) (*PublicKey, error) {
79-
body, err := json.Marshal(&opt)
80-
if err != nil {
81-
return nil, err
82-
}
8375
key := new(PublicKey)
84-
return key, c.getParsedResponse("POST", fmt.Sprintf("/admin/users/%s/keys", user), jsonHeader, bytes.NewReader(body), key)
76+
return key, c.getParsedResponse("POST", fmt.Sprintf("/admin/users/%s/keys", user), jsonHeader, opt, key)
8577
}

‎gitea/fork.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
package gitea
66

77
import (
8-
"bytes"
9-
"encoding/json"
108
"fmt"
119
)
1210

@@ -27,13 +25,9 @@ type CreateForkOption struct {
2725

2826
// CreateFork create a fork of a repository
2927
func (c *Client) CreateFork(user, repo string, form CreateForkOption) (*Repository, error) {
30-
body, err := json.Marshal(form)
31-
if err != nil {
32-
return nil, err
33-
}
3428
fork := new(Repository)
3529
err = c.getParsedResponse("POST",
3630
fmt.Sprintf("/repos/%s/%s/forks", user, repo),
37-
jsonHeader, bytes.NewReader(body), &fork)
31+
jsonHeader, form, &fork)
3832
return fork, err
3933
}

‎gitea/hook.go

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,22 +74,14 @@ type CreateHookOption struct {
7474

7575
// CreateOrgHook create one hook for an organization, with options
7676
func (c *Client) CreateOrgHook(org string, opt CreateHookOption) (*Hook, error) {
77-
body, err := json.Marshal(&opt)
78-
if err != nil {
79-
return nil, err
80-
}
8177
h := new(Hook)
82-
return h, c.getParsedResponse("POST", fmt.Sprintf("/orgs/%s/hooks", org), jsonHeader, bytes.NewReader(body), h)
78+
return h, c.getParsedResponse("POST", fmt.Sprintf("/orgs/%s/hooks", org), jsonHeader, opt, h)
8379
}
8480

8581
// CreateRepoHook create one hook for a repository, with options
8682
func (c *Client) CreateRepoHook(user, repo string, opt CreateHookOption) (*Hook, error) {
87-
body, err := json.Marshal(&opt)
88-
if err != nil {
89-
return nil, err
90-
}
9183
h := new(Hook)
92-
return h, c.getParsedResponse("POST", fmt.Sprintf("/repos/%s/%s/hooks", user, repo), jsonHeader, bytes.NewReader(body), h)
84+
return h, c.getParsedResponse("POST", fmt.Sprintf("/repos/%s/%s/hooks", user, repo), jsonHeader, opt, h)
9385
}
9486

9587
// EditHookOption options when modify one hook

‎gitea/issue.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,13 +130,9 @@ type EditIssueOption struct {
130130

131131
// EditIssue modify an existing issue for a given repository
132132
func (c *Client) EditIssue(owner, repo string, index int64, opt EditIssueOption) (*Issue, error) {
133-
body, err := json.Marshal(&opt)
134-
if err != nil {
135-
return nil, err
136-
}
137133
issue := new(Issue)
138134
return issue, c.getParsedResponse("PATCH", fmt.Sprintf("/repos/%s/%s/issues/%d", owner, repo, index),
139-
jsonHeader, bytes.NewReader(body), issue)
135+
jsonHeader, opt, issue)
140136
}
141137

142138
// StartIssueStopWatch starts a stopwatch for an existing issue for a given

‎gitea/issue_comment.go

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
package gitea
66

77
import (
8-
"bytes"
9-
"encoding/json"
108
"fmt"
119
"time"
1210
)
@@ -45,12 +43,8 @@ type CreateIssueCommentOption struct {
4543

4644
// CreateIssueComment create comment on an issue.
4745
func (c *Client) CreateIssueComment(owner, repo string, index int64, opt CreateIssueCommentOption) (*Comment, error) {
48-
body, err := json.Marshal(&opt)
49-
if err != nil {
50-
return nil, err
51-
}
5246
comment := new(Comment)
53-
return comment, c.getParsedResponse("POST", fmt.Sprintf("/repos/%s/%s/issues/%d/comments", owner, repo, index), jsonHeader, bytes.NewReader(body), comment)
47+
return comment, c.getParsedResponse("POST", fmt.Sprintf("/repos/%s/%s/issues/%d/comments", owner, repo, index), jsonHeader, opt, comment)
5448
}
5549

5650
// EditIssueCommentOption options for editing a comment
@@ -61,12 +55,8 @@ type EditIssueCommentOption struct {
6155

6256
// EditIssueComment edits an issue comment.
6357
func (c *Client) EditIssueComment(owner, repo string, index, commentID int64, opt EditIssueCommentOption) (*Comment, error) {
64-
body, err := json.Marshal(&opt)
65-
if err != nil {
66-
return nil, err
67-
}
6858
comment := new(Comment)
69-
return comment, c.getParsedResponse("PATCH", fmt.Sprintf("/repos/:%s/:%s/issues/%d/comments/%d", owner, repo, index, commentID), jsonHeader, bytes.NewReader(body), comment)
59+
return comment, c.getParsedResponse("PATCH", fmt.Sprintf("/repos/:%s/:%s/issues/%d/comments/%d", owner, repo, index, commentID), jsonHeader, opt, comment)
7060
}
7161

7262
// DeleteIssueComment deletes an issue comment.

‎gitea/issue_label.go

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
package gitea
66

77
import (
8-
"bytes"
9-
"encoding/json"
108
"fmt"
119
)
1210

@@ -44,13 +42,9 @@ type CreateLabelOption struct {
4442

4543
// CreateLabel create one label of repository
4644
func (c *Client) CreateLabel(owner, repo string, opt CreateLabelOption) (*Label, error) {
47-
body, err := json.Marshal(&opt)
48-
if err != nil {
49-
return nil, err
50-
}
5145
label := new(Label)
5246
return label, c.getParsedResponse("POST", fmt.Sprintf("/repos/%s/%s/labels", owner, repo),
53-
jsonHeader, bytes.NewReader(body), label)
47+
jsonHeader, opt, label)
5448
}
5549

5650
// EditLabelOption options for editing a label
@@ -61,12 +55,8 @@ type EditLabelOption struct {
6155

6256
// EditLabel modify one label with options
6357
func (c *Client) EditLabel(owner, repo string, id int64, opt EditLabelOption) (*Label, error) {
64-
body, err := json.Marshal(&opt)
65-
if err != nil {
66-
return nil, err
67-
}
6858
label := new(Label)
69-
return label, c.getParsedResponse("PATCH", fmt.Sprintf("/repos/%s/%s/labels/%d", owner, repo, id), jsonHeader, bytes.NewReader(body), label)
59+
return label, c.getParsedResponse("PATCH", fmt.Sprintf("/repos/%s/%s/labels/%d", owner, repo, id), jsonHeader, opt, label)
7060
}
7161

7262
// DeleteLabel delete one label of repository by id
@@ -90,22 +80,14 @@ func (c *Client) GetIssueLabels(owner, repo string, index int64) ([]*Label, erro
9080

9181
// AddIssueLabels add one or more labels to one issue
9282
func (c *Client) AddIssueLabels(owner, repo string, index int64, opt IssueLabelsOption) ([]*Label, error) {
93-
body, err := json.Marshal(&opt)
94-
if err != nil {
95-
return nil, err
96-
}
9783
var labels []*Label
98-
return labels, c.getParsedResponse("POST", fmt.Sprintf("/repos/%s/%s/issues/%d/labels", owner, repo, index), jsonHeader, bytes.NewReader(body), &labels)
84+
return labels, c.getParsedResponse("POST", fmt.Sprintf("/repos/%s/%s/issues/%d/labels", owner, repo, index), jsonHeader, opt, &labels)
9985
}
10086

10187
// ReplaceIssueLabels replace old labels of issue with new labels
10288
func (c *Client) ReplaceIssueLabels(owner, repo string, index int64, opt IssueLabelsOption) ([]*Label, error) {
103-
body, err := json.Marshal(&opt)
104-
if err != nil {
105-
return nil, err
106-
}
10789
var labels []*Label
108-
return labels, c.getParsedResponse("PUT", fmt.Sprintf("/repos/%s/%s/issues/%d/labels", owner, repo, index), jsonHeader, bytes.NewReader(body), &labels)
90+
return labels, c.getParsedResponse("PUT", fmt.Sprintf("/repos/%s/%s/issues/%d/labels", owner, repo, index), jsonHeader, opt, &labels)
10991
}
11092

11193
// DeleteIssueLabel delete one label of one issue by issue id and label id

‎gitea/issue_milestone.go

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
package gitea
66

77
import (
8-
"bytes"
9-
"encoding/json"
108
"fmt"
119
"time"
1210
)
@@ -47,12 +45,8 @@ type CreateMilestoneOption struct {
4745

4846
// CreateMilestone create one milestone with options
4947
func (c *Client) CreateMilestone(owner, repo string, opt CreateMilestoneOption) (*Milestone, error) {
50-
body, err := json.Marshal(&opt)
51-
if err != nil {
52-
return nil, err
53-
}
5448
milestone := new(Milestone)
55-
return milestone, c.getParsedResponse("POST", fmt.Sprintf("/repos/%s/%s/milestones", owner, repo), jsonHeader, bytes.NewReader(body), milestone)
49+
return milestone, c.getParsedResponse("POST", fmt.Sprintf("/repos/%s/%s/milestones", owner, repo), jsonHeader, opt, milestone)
5650
}
5751

5852
// EditMilestoneOption options for editing a milestone
@@ -65,12 +59,8 @@ type EditMilestoneOption struct {
6559

6660
// EditMilestone modify milestone with options
6761
func (c *Client) EditMilestone(owner, repo string, id int64, opt EditMilestoneOption) (*Milestone, error) {
68-
body, err := json.Marshal(&opt)
69-
if err != nil {
70-
return nil, err
71-
}
7262
milestone := new(Milestone)
73-
return milestone, c.getParsedResponse("PATCH", fmt.Sprintf("/repos/%s/%s/milestones/%d", owner, repo, id), jsonHeader, bytes.NewReader(body), milestone)
63+
return milestone, c.getParsedResponse("PATCH", fmt.Sprintf("/repos/%s/%s/milestones/%d", owner, repo, id), jsonHeader, opt, milestone)
7464
}
7565

7666
// DeleteMilestone delete one milestone by milestone id

‎gitea/issue_tracked_time.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
package gitea
66

77
import (
8-
"bytes"
9-
"encoding/json"
108
"fmt"
119
"time"
1210
)
@@ -52,13 +50,9 @@ type AddTimeOption struct {
5250

5351
// AddTime adds time to issue with the given index
5452
func (c *Client) AddTime(owner, repo string, index int64, opt AddTimeOption) (*TrackedTime, error) {
55-
body, err := json.Marshal(&opt)
56-
if err != nil {
57-
return nil, err
58-
}
5953
t := new(TrackedTime)
6054
return t, c.getParsedResponse("POST", fmt.Sprintf("/repos/%s/%s/issues/%d/times", owner, repo, index),
61-
jsonHeader, bytes.NewReader(body), t)
55+
jsonHeader, opt, t)
6256
}
6357

6458
// ListTrackedTimes get tracked times of one issue via issue id

‎gitea/pull.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
package gitea
66

77
import (
8-
"bytes"
9-
"encoding/json"
108
"fmt"
119
"time"
1210
)
@@ -115,13 +113,9 @@ type EditPullRequestOption struct {
115113

116114
// EditPullRequest modify pull request with PR id and options
117115
func (c *Client) EditPullRequest(owner, repo string, index int64, opt EditPullRequestOption) (*PullRequest, error) {
118-
body, err := json.Marshal(&opt)
119-
if err != nil {
120-
return nil, err
121-
}
122116
pr := new(PullRequest)
123117
return pr, c.getParsedResponse("PATCH", fmt.Sprintf("/repos/%s/%s/issues/%d", owner, repo, index),
124-
jsonHeader, bytes.NewReader(body), pr)
118+
jsonHeader, opt, pr)
125119
}
126120

127121
// MergePullRequest merge a PR to repository by PR id

‎gitea/release.go

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
package gitea
66

77
import (
8-
"bytes"
9-
"encoding/json"
108
"fmt"
119
"time"
1210
)
@@ -62,14 +60,10 @@ type CreateReleaseOption struct {
6260

6361
// CreateRelease create a release
6462
func (c *Client) CreateRelease(user, repo string, form CreateReleaseOption) (*Release, error) {
65-
body, err := json.Marshal(form)
66-
if err != nil {
67-
return nil, err
68-
}
6963
r := new(Release)
7064
err = c.getParsedResponse("POST",
7165
fmt.Sprintf("/repos/%s/%s/releases", user, repo),
72-
jsonHeader, bytes.NewReader(body), r)
66+
jsonHeader, form, r)
7367
return r, err
7468
}
7569

@@ -85,14 +79,10 @@ type EditReleaseOption struct {
8579

8680
// EditRelease edit a release
8781
func (c *Client) EditRelease(user, repo string, id int64, form EditReleaseOption) (*Release, error) {
88-
body, err := json.Marshal(form)
89-
if err != nil {
90-
return nil, err
91-
}
9282
r := new(Release)
9383
err = c.getParsedResponse("PATCH",
9484
fmt.Sprintf("/repos/%s/%s/releases/%d", user, repo, id),
95-
jsonHeader, bytes.NewReader(body), r)
85+
jsonHeader, form, r)
9686
return r, err
9787
}
9888

0 commit comments

Comments
 (0)