Merge pull request #4624 from t29kida/fix-sonar-problem

improve code quality

CHANGELOG.md

@@ -50,6 +50,7 @@
 
 ## Fix Sonar
 
+- [4624](https://github.com/beego/beego/pull/4624)
 - [4608](https://github.com/beego/beego/pull/4608)
 - [4473](https://github.com/beego/beego/pull/4473)
 - [4474](https://github.com/beego/beego/pull/4474)

server/web/controller.go

@@ -250,7 +250,8 @@ func (c *Controller) Bind(obj interface{}) error {
 		return c.BindJson(obj)
 	}
 	i, l := 0, len(ct[0])
-	for ; i < l && ct[0][i] != ';'; i++ {
+	for i < l && ct[0][i] != ';' {
+		i++
 	}
 	switch ct[0][0:i] {
 	case "application/json":

server/web/tree.go

@@ -284,7 +284,7 @@ func (t *Tree) addseg(segments []string, route interface{}, wildcards []string,
 
 // Match router to runObject & params
 func (t *Tree) Match(pattern string, ctx *context.Context) (runObject interface{}) {
-	if len(pattern) == 0 || pattern[0] != '/' {
+	if pattern == "" || pattern[0] != '/' {
 		return nil
 	}
 	w := make([]string, 0, 20)
@@ -294,12 +294,13 @@ func (t *Tree) Match(pattern string, ctx *context.Context) (runObject interface{
 func (t *Tree) match(treePattern string, pattern string, wildcardValues []string, ctx *context.Context) (runObject interface{}) {
 	if len(pattern) > 0 {
 		i, l := 0, len(pattern)
-		for ; i < l && pattern[i] == '/'; i++ {
+		for i < l && pattern[i] == '/' {
+			i++
 		}
 		pattern = pattern[i:]
 	}
 	// Handle leaf nodes:
-	if len(pattern) == 0 {
+	if pattern == "" {
 		for _, l := range t.leaves {
 			if ok := l.match(treePattern, wildcardValues, ctx); ok {
 				return l.runObject
@@ -316,7 +317,8 @@ func (t *Tree) match(treePattern string, pattern string, wildcardValues []string
 	}
 	var seg string
 	i, l := 0, len(pattern)
-	for ; i < l && pattern[i] != '/'; i++ {
+	for i < l && pattern[i] != '/' {
+		i++
 	}
 	if i == 0 {
 		seg = pattern
@@ -327,7 +329,7 @@ func (t *Tree) match(treePattern string, pattern string, wildcardValues []string
 	}
 	for _, subTree := range t.fixrouters {
 		if subTree.prefix == seg {
-			if len(pattern) != 0 && pattern[0] == '/' {
+			if pattern != "" && pattern[0] == '/' {
 				treePattern = pattern[1:]
 			} else {
 				treePattern = pattern