From 819ec2164c39d232b7fcecad7a332722ebba984c Mon Sep 17 00:00:00 2001
From: t29kida <tkida0929@gmail.com>
Date: Fri, 21 May 2021 13:13:47 +0900
Subject: [PATCH 1/2] improve code quality

* fill empty block of code
---
 CHANGELOG.md             | 1 +
 server/web/controller.go | 3 ++-
 server/web/tree.go       | 6 ++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60346a21..71fbd0e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,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)
diff --git a/server/web/controller.go b/server/web/controller.go
index a767fac4..c3a79ac8 100644
--- a/server/web/controller.go
+++ b/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":
diff --git a/server/web/tree.go b/server/web/tree.go
index 3716d4f4..fbe06f5e 100644
--- a/server/web/tree.go
+++ b/server/web/tree.go
@@ -294,7 +294,8 @@ 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:]
 	}
@@ -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

From 068573bfe354f99b16c7c4fc8783ed3fda5e00c5 Mon Sep 17 00:00:00 2001
From: t29kida <tkida0929@gmail.com>
Date: Fri, 21 May 2021 17:44:04 +0900
Subject: [PATCH 2/2] resolve code about  deepsource test case

* Empty string test can be improved CRT-A0004
---
 server/web/tree.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/web/tree.go b/server/web/tree.go
index fbe06f5e..4088e83e 100644
--- a/server/web/tree.go
+++ b/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)
@@ -300,7 +300,7 @@ func (t *Tree) match(treePattern string, pattern string, wildcardValues []string
 		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
@@ -329,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