Move code.gitea.io/gitea/routers/api/v1/convert to code.gitea.io/gitea/modules/convert (#8892)

lunny · web-flow · commit daab2451676b · 2019-11-10T12:41:51.000+08:00
* Move code.gitea.io/gitea/routers/api/v1/convert to code.gitea.io/gitea/modules/convert

* fix fmt
diff --git a/integrations/api_team_test.go b/integrations/api_team_test.go
@@ -11,8 +11,8 @@ import (
 	"testing"
 
 	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/modules/convert"
 	api "code.gitea.io/gitea/modules/structs"
-	"code.gitea.io/gitea/routers/api/v1/convert"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/integrations/api_team_user_test.go b/integrations/api_team_user_test.go
@@ -10,8 +10,8 @@ import (
 	"time"
 
 	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/modules/convert"
 	api "code.gitea.io/gitea/modules/structs"
-	"code.gitea.io/gitea/routers/api/v1/convert"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/modules/convert/convert.go b/modules/convert/convert.go
diff --git a/modules/convert/utils.go b/modules/convert/utils.go
diff --git a/routers/api/v1/admin/org.go b/routers/api/v1/admin/org.go
@@ -8,8 +8,8 @@ package admin
 import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/convert"
 	api "code.gitea.io/gitea/modules/structs"
-	"code.gitea.io/gitea/routers/api/v1/convert"
 	"code.gitea.io/gitea/routers/api/v1/user"
 )
 
diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go
@@ -10,10 +10,10 @@ import (
 
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/convert"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/password"
 	api "code.gitea.io/gitea/modules/structs"
-	"code.gitea.io/gitea/routers/api/v1/convert"
 	"code.gitea.io/gitea/routers/api/v1/user"
 	"code.gitea.io/gitea/services/mailer"
 )
diff --git a/routers/api/v1/org/hook.go b/routers/api/v1/org/hook.go
@@ -7,8 +7,8 @@ package org
 import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/convert"
 	api "code.gitea.io/gitea/modules/structs"
-	"code.gitea.io/gitea/routers/api/v1/convert"
 	"code.gitea.io/gitea/routers/api/v1/utils"
 )
 
diff --git a/routers/api/v1/org/member.go b/routers/api/v1/org/member.go
@@ -9,9 +9,9 @@ import (
 
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/convert"
 	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
-	"code.gitea.io/gitea/routers/api/v1/convert"
 	"code.gitea.io/gitea/routers/api/v1/user"
 )
 
diff --git a/routers/api/v1/org/org.go b/routers/api/v1/org/org.go
@@ -8,8 +8,8 @@ package org
 import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/convert"
 	api "code.gitea.io/gitea/modules/structs"
-	"code.gitea.io/gitea/routers/api/v1/convert"
 	"code.gitea.io/gitea/routers/api/v1/user"
 )
 
diff --git a/routers/api/v1/org/team.go b/routers/api/v1/org/team.go
@@ -10,9 +10,9 @@ import (
 
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/convert"
 	"code.gitea.io/gitea/modules/log"
 	api "code.gitea.io/gitea/modules/structs"
-	"code.gitea.io/gitea/routers/api/v1/convert"
 	"code.gitea.io/gitea/routers/api/v1/user"
 )
 
diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go
@@ -7,9 +7,9 @@ package repo
 
 import (
 	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/convert"
 	"code.gitea.io/gitea/modules/git"
 	api "code.gitea.io/gitea/modules/structs"
-	"code.gitea.io/gitea/routers/api/v1/convert"
 )
 
 // GetBranch get a branch of a repository
diff --git a/routers/api/v1/repo/collaborators.go b/routers/api/v1/repo/collaborators.go
@@ -10,8 +10,8 @@ import (
 
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/convert"
 	api "code.gitea.io/gitea/modules/structs"
-	"code.gitea.io/gitea/routers/api/v1/convert"
 )
 
 // ListCollaborators list a repository's collaborators
diff --git a/routers/api/v1/repo/git_hook.go b/routers/api/v1/repo/git_hook.go
@@ -6,9 +6,9 @@ package repo
 
 import (
 	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/convert"
 	"code.gitea.io/gitea/modules/git"
 	api "code.gitea.io/gitea/modules/structs"
-	"code.gitea.io/gitea/routers/api/v1/convert"
 )
 
 // ListGitHooks list all Git hooks of a repository
diff --git a/routers/api/v1/repo/hook.go b/routers/api/v1/repo/hook.go
@@ -7,10 +7,10 @@ package repo
 import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/convert"
 	"code.gitea.io/gitea/modules/git"
 	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/webhook"
-	"code.gitea.io/gitea/routers/api/v1/convert"
 	"code.gitea.io/gitea/routers/api/v1/utils"
 )
 
diff --git a/routers/api/v1/repo/key.go b/routers/api/v1/repo/key.go
@@ -9,9 +9,9 @@ import (
 
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/convert"
 	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
-	"code.gitea.io/gitea/routers/api/v1/convert"
 )
 
 // appendPrivateInformation appends the owner and key type information to api.PublicKey
diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go
@@ -16,6 +16,7 @@ import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/auth"
 	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/convert"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/migrations"
 	"code.gitea.io/gitea/modules/notification"
@@ -24,7 +25,6 @@ import (
 	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/modules/validation"
-	"code.gitea.io/gitea/routers/api/v1/convert"
 	mirror_service "code.gitea.io/gitea/services/mirror"
 	repo_service "code.gitea.io/gitea/services/repository"
 )
diff --git a/routers/api/v1/repo/star.go b/routers/api/v1/repo/star.go
@@ -6,8 +6,8 @@ package repo
 
 import (
 	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/convert"
 	api "code.gitea.io/gitea/modules/structs"
-	"code.gitea.io/gitea/routers/api/v1/convert"
 )
 
 // ListStargazers list a repository's stargazers
diff --git a/routers/api/v1/repo/subscriber.go b/routers/api/v1/repo/subscriber.go
@@ -6,8 +6,8 @@ package repo
 
 import (
 	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/convert"
 	api "code.gitea.io/gitea/modules/structs"
-	"code.gitea.io/gitea/routers/api/v1/convert"
 )
 
 // ListSubscribers list a repo's subscribers (i.e. watchers)
diff --git a/routers/api/v1/repo/tag.go b/routers/api/v1/repo/tag.go
@@ -8,8 +8,8 @@ import (
 	"net/http"
 
 	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/convert"
 	api "code.gitea.io/gitea/modules/structs"
-	"code.gitea.io/gitea/routers/api/v1/convert"
 )
 
 // ListTags list all the tags of a repository
diff --git a/routers/api/v1/repo/topic.go b/routers/api/v1/repo/topic.go
@@ -10,9 +10,9 @@ import (
 
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/convert"
 	"code.gitea.io/gitea/modules/log"
 	api "code.gitea.io/gitea/modules/structs"
-	"code.gitea.io/gitea/routers/api/v1/convert"
 )
 
 // ListTopics returns list of current topics for repo
diff --git a/routers/api/v1/user/email.go b/routers/api/v1/user/email.go
@@ -7,9 +7,9 @@ package user
 import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/convert"
 	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
-	"code.gitea.io/gitea/routers/api/v1/convert"
 )
 
 // ListEmails list all of the authenticated user's email addresses
diff --git a/routers/api/v1/user/follower.go b/routers/api/v1/user/follower.go
@@ -7,8 +7,8 @@ package user
 import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/convert"
 	api "code.gitea.io/gitea/modules/structs"
-	"code.gitea.io/gitea/routers/api/v1/convert"
 )
 
 func responseAPIUsers(ctx *context.APIContext, users []*models.User) {
diff --git a/routers/api/v1/user/gpg_key.go b/routers/api/v1/user/gpg_key.go
@@ -7,8 +7,8 @@ package user
 import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/convert"
 	api "code.gitea.io/gitea/modules/structs"
-	"code.gitea.io/gitea/routers/api/v1/convert"
 )
 
 func listGPGKeys(ctx *context.APIContext, uid int64) {
diff --git a/routers/api/v1/user/key.go b/routers/api/v1/user/key.go
@@ -7,9 +7,9 @@ package user
 import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/convert"
 	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
-	"code.gitea.io/gitea/routers/api/v1/convert"
 	"code.gitea.io/gitea/routers/api/v1/repo"
 )
 
diff --git a/routers/api/v1/user/user.go b/routers/api/v1/user/user.go
@@ -10,8 +10,8 @@ import (
 
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/convert"
 	api "code.gitea.io/gitea/modules/structs"
-	"code.gitea.io/gitea/routers/api/v1/convert"
 
 	"github.com/unknwon/com"
 )
diff --git a/routers/api/v1/utils/hook.go b/routers/api/v1/utils/hook.go
@@ -11,9 +11,9 @@ import (
 
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/convert"
 	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/webhook"
-	"code.gitea.io/gitea/routers/api/v1/convert"
 	"code.gitea.io/gitea/routers/utils"
 
 	"github.com/unknwon/com"

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ import (`
`11`	`11`	`"testing"`
`12`	`12`
`13`	`13`	`"code.gitea.io/gitea/models"`
	`14`	`+ "code.gitea.io/gitea/modules/convert"`
`14`	`15`	`api "code.gitea.io/gitea/modules/structs"`
`15`		`- "code.gitea.io/gitea/routers/api/v1/convert"`
`16`	`16`
`17`	`17`	`"github.com/stretchr/testify/assert"`
`18`	`18`	`)`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ import (`
`10`	`10`	`"time"`
`11`	`11`
`12`	`12`	`"code.gitea.io/gitea/models"`
	`13`	`+ "code.gitea.io/gitea/modules/convert"`
`13`	`14`	`api "code.gitea.io/gitea/modules/structs"`
`14`		`- "code.gitea.io/gitea/routers/api/v1/convert"`
`15`	`15`	`"github.com/stretchr/testify/assert"`
`16`	`16`	`)`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ package admin`
`8`	`8`	`import (`
`9`	`9`	`"code.gitea.io/gitea/models"`
`10`	`10`	`"code.gitea.io/gitea/modules/context"`
	`11`	`+ "code.gitea.io/gitea/modules/convert"`
`11`	`12`	`api "code.gitea.io/gitea/modules/structs"`
`12`		`- "code.gitea.io/gitea/routers/api/v1/convert"`
`13`	`13`	`"code.gitea.io/gitea/routers/api/v1/user"`
`14`	`14`	`)`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ package org`
`7`	`7`	`import (`
`8`	`8`	`"code.gitea.io/gitea/models"`
`9`	`9`	`"code.gitea.io/gitea/modules/context"`
	`10`	`+ "code.gitea.io/gitea/modules/convert"`
`10`	`11`	`api "code.gitea.io/gitea/modules/structs"`
`11`		`- "code.gitea.io/gitea/routers/api/v1/convert"`
`12`	`12`	`"code.gitea.io/gitea/routers/api/v1/utils"`
`13`	`13`	`)`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ import (`
`9`	`9`
`10`	`10`	`"code.gitea.io/gitea/models"`
`11`	`11`	`"code.gitea.io/gitea/modules/context"`
	`12`	`+ "code.gitea.io/gitea/modules/convert"`
`12`	`13`	`"code.gitea.io/gitea/modules/setting"`
`13`	`14`	`api "code.gitea.io/gitea/modules/structs"`
`14`		`- "code.gitea.io/gitea/routers/api/v1/convert"`
`15`	`15`	`"code.gitea.io/gitea/routers/api/v1/user"`
`16`	`16`	`)`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ package org`
`8`	`8`	`import (`
`9`	`9`	`"code.gitea.io/gitea/models"`
`10`	`10`	`"code.gitea.io/gitea/modules/context"`
	`11`	`+ "code.gitea.io/gitea/modules/convert"`
`11`	`12`	`api "code.gitea.io/gitea/modules/structs"`
`12`		`- "code.gitea.io/gitea/routers/api/v1/convert"`
`13`	`13`	`"code.gitea.io/gitea/routers/api/v1/user"`
`14`	`14`	`)`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@ import (`
`10`	`10`
`11`	`11`	`"code.gitea.io/gitea/models"`
`12`	`12`	`"code.gitea.io/gitea/modules/context"`
	`13`	`+ "code.gitea.io/gitea/modules/convert"`
`13`	`14`	`"code.gitea.io/gitea/modules/log"`
`14`	`15`	`api "code.gitea.io/gitea/modules/structs"`
`15`		`- "code.gitea.io/gitea/routers/api/v1/convert"`
`16`	`16`	`"code.gitea.io/gitea/routers/api/v1/user"`
`17`	`17`	`)`
`18`	`18`