Corrections following recommendations

3 files changed, 32 insertions, 30 deletions

diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 0152eec29a..04b392fc9b 100644
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -185,7 +185,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 				m.Get("/archive/*", repo.GetArchive)
 				m.Group("/branches", func() {
 					m.Get("",repo.ListBranches)
-					m.Get("/:id",repo.GetBranch)
+					m.Get("/:branchname",repo.GetBranch)
 				})
 				m.Group("/keys", func() {
 					m.Combo("").Get(repo.ListDeployKeys).
diff --git a/routers/api/v1/convert/convert.go b/routers/api/v1/convert/convert.go
index d20732bfd6..57b3d44e2c 100644
--- a/routers/api/v1/convert/convert.go
+++ b/routers/api/v1/convert/convert.go
@@ -16,26 +16,6 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-// ToApiBranch converts user to its API format.
-func ToApiBranch(b *models.Branch,c *git.Commit) *api.Branch {
-	return &api.Branch{
-			Name: b.Name,
-			Commit: ToApiCommit(c),
-		}
-}
-// ToApiCommit converts user to its API format.
-func ToApiCommit(c *git.Commit) *api.PayloadCommit {
-	return &api.PayloadCommit{
-		ID: c.ID.String(),
-		Message: c.Message(),
-		URL: "Not implemented",
-		Author: &api.PayloadAuthor{
-			Name: c.Committer.Name,
-			Email: c.Committer.Email,
-			/* UserName: c.Committer.UserName, */
-		},
-	}
-}
 // ToApiUser converts user to its API format.
 func ToApiUser(u *models.User) *api.User {
 	return &api.User{
@@ -71,6 +51,28 @@ func ToApiRepository(owner *models.User, repo *models.Repository, permission api
 	}
 }
 
+// ToApiBranch converts user to its API format.
+func ToApiBranch(b *models.Branch,c *git.Commit) *api.Branch {
+	return &api.Branch{
+			Name: b.Name,
+			Commit: ToApiCommit(c),
+		}
+}
+
+// ToApiCommit converts user to its API format.
+func ToApiCommit(c *git.Commit) *api.PayloadCommit {
+	return &api.PayloadCommit{
+		ID: c.ID.String(),
+		Message: c.Message(),
+		URL: "Not implemented",
+		Author: &api.PayloadAuthor{
+			Name: c.Committer.Name,
+			Email: c.Committer.Email,
+			/* UserName: c.Committer.UserName, */
+		},
+	}
+}
+
 // ToApiPublicKey converts public key to its API format.
 func ToApiPublicKey(apiLink string, key *models.PublicKey) *api.PublicKey {
 	return &api.PublicKey{
diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go
index 2f4c36f751..d322b6b592 100644
--- a/routers/api/v1/repo/branch.go
+++ b/routers/api/v1/repo/branch.go
@@ -1,4 +1,4 @@
-// Copyright 2014 The Gogs Authors. All rights reserved.
+// Copyright 2016 The Gogs Authors. All rights reserved.
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
@@ -14,32 +14,32 @@ import (
 // Temporary: https://gist.github.com/sapk/df64347ff218baf4a277#get-a-branch
 // https://github.com/gogits/go-gogs-client/wiki/Repositories-Branches#get-a-branch
 func GetBranch(ctx *middleware.Context) {
-	//Getting the branch requested
-	branch, err := ctx.Repo.Repository.GetBranch(ctx.Params(":id"))
+	// Getting the branch requested
+	branch, err := ctx.Repo.Repository.GetBranch(ctx.Params(":branchname"))
 	if err != nil {
 		ctx.APIError(500, "Repository.GetBranch", err)
 		return
 	}
-	//Getting the last commit of the branch
+	// Getting the last commit of the branch
 	c, err := branch.GetCommit()
 	if err != nil {
 		ctx.APIError(500, "Branch.GetCommit", err)
 		return
 	}
-	//Converting to API format and send payload
+	// Converting to API format and send payload
 	ctx.JSON(200, convert.ToApiBranch(branch,c))
 }
 
 // Temporary: https://gist.github.com/sapk/df64347ff218baf4a277#list-branches
 // https://github.com/gogits/go-gogs-client/wiki/Repositories-Branches#list-branches
 func ListBranches(ctx *middleware.Context) {
-	//Listing of branches
+	// Listing of branches
 	Branches, err := ctx.Repo.Repository.GetBranches()
 	if err != nil {
 		ctx.APIError(500, "Repository.GetBranches", err)
 		return
 	}
-	//Getting the last commit of each branch
+	// Getting the last commit of each branch
 	apiBranches := make([]*api.Branch, len(Branches))
 	for i := range Branches {
 		c, err := Branches[i].GetCommit()
@@ -47,9 +47,9 @@ func ListBranches(ctx *middleware.Context) {
 			ctx.APIError(500, "Branch.GetCommit", err)
 			return
 		}
-		//Converting to API format
+		// Converting to API format
 		apiBranches[i] = convert.ToApiBranch(Branches[i],c)
 	}
-	//Sending the payload
+	// Sending the payload
 	ctx.JSON(200, &apiBranches)
 }