fix codes due to static codes analysis (#2935)

gogf · Sep 7, 2023 · 7e16d9b · 7e16d9b
1 parent d49dccb
commit 7e16d9b
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 63 deletions.
diff --git a/net/ghttp/ghttp_request.go b/net/ghttp/ghttp_request.go
@@ -63,11 +63,6 @@ type Request struct {
 	originUrlPath   string                 // Original URL path that passed from client.
 }
 
-type handlerResponse struct {
-	Object interface{}
-	Error  error
-}
-
 // staticFile is the file struct for static file service.
 type staticFile struct {
 	File  *gres.File // Resource file object.

diff --git a/net/ghttp/ghttp_request_middleware.go b/net/ghttp/ghttp_request_middleware.go
@@ -101,9 +101,9 @@ func (m *middleware) Next() {
 				loop = false
 			}
 		}, func(ctx context.Context, exception error) {
-			if v, ok := exception.(error); ok && gerror.HasStack(v) {
+			if gerror.HasStack(exception) {
 				// It's already an error that has stack info.
-				m.request.error = v
+				m.request.error = exception
 			} else {
 				// Create a new error with stack info.
 				// Note that there's a skip pointing the start stacktrace

diff --git a/net/ghttp/ghttp_request_param_request.go b/net/ghttp/ghttp_request_param_request.go
@@ -232,7 +232,7 @@ func (r *Request) mergeInTagStructValue(data map[string]interface{}, pointer int
 		)
 
 		for k, v := range r.Header {
-			if v != nil && len(v) > 0 {
+			if len(v) > 0 {
 				headerMap[k] = v[0]
 			}
 		}

diff --git a/net/ghttp/ghttp_server_graceful.go b/net/ghttp/ghttp_server_graceful.go
@@ -97,11 +97,6 @@ func (s *gracefulServer) Fd() uintptr {
 	return 0
 }
 
-// setFd sets the file descriptor for current server.
-func (s *gracefulServer) setFd(fd int) {
-	s.fd = uintptr(fd)
-}
-
 // CreateListener creates listener on configured address.
 func (s *gracefulServer) CreateListener() error {
 	ln, err := s.getNetListener()

diff --git a/net/ghttp/ghttp_server_router.go b/net/ghttp/ghttp_server_router.go
@@ -159,6 +159,8 @@ func (s *Server) doSetHandler(
 					switch item.Type {
 					case HandlerTypeHandler, HandlerTypeObject:
 						duplicatedHandler = items[i]
+					}
+					if duplicatedHandler != nil {
 						break
 					}
 				}

diff --git a/net/ghttp/ghttp_z_bench_test.go b/net/ghttp/ghttp_z_bench_test.go
@@ -14,7 +14,7 @@ import (
 func Benchmark_TrimRightCharWithStrings(b *testing.B) {
 	for i := 0; i < b.N; i++ {
 		path := "//////////"
-		path = strings.TrimRight(path, "/")
+		strings.TrimRight(path, "/")
 	}
 }
 

diff --git a/net/ghttp/ghttp_z_unit_feature_middleware_basic_test.go b/net/ghttp/ghttp_z_unit_feature_middleware_basic_test.go
@@ -205,8 +205,8 @@ func Test_Middleware_Status(t *testing.T) {
 		t.Assert(client.GetContent(ctx, "/user/list"), "200")
 
 		resp, err := client.Get(ctx, "/")
-		defer resp.Close()
 		t.AssertNil(err)
+		defer resp.Close()
 		t.Assert(resp.StatusCode, 404)
 	})
 }
@@ -664,7 +664,7 @@ func Test_Middleware_Panic(t *testing.T) {
 			group.Middleware(func(r *ghttp.Request) {
 				i++
 				panic("error")
-				r.Middleware.Next()
+				// r.Middleware.Next()
 			}, func(r *ghttp.Request) {
 				i++
 				r.Middleware.Next()

diff --git a/net/ghttp/ghttp_z_unit_feature_request_ctx_test.go b/net/ghttp/ghttp_z_unit_feature_request_ctx_test.go
@@ -9,11 +9,11 @@ package ghttp_test
 import (
 	"context"
 	"fmt"
-	"github.com/gogf/gf/v2/encoding/gbase64"
 	"net/http"
 	"testing"
 	"time"
 
+	"github.com/gogf/gf/v2/encoding/gbase64"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/ghttp"
 	"github.com/gogf/gf/v2/test/gtest"
@@ -213,15 +213,17 @@ func Test_Request_BasicAuth(t *testing.T) {
 }
 
 func Test_Request_SetCtx(t *testing.T) {
+	type ctxKey string
+	const testkey ctxKey = "test"
 	s := g.Server(guid.S())
 	s.Group("/", func(group *ghttp.RouterGroup) {
 		group.Middleware(func(r *ghttp.Request) {
-			ctx := context.WithValue(r.Context(), "test", 1)
+			ctx := context.WithValue(r.Context(), testkey, 1)
 			r.SetCtx(ctx)
 			r.Middleware.Next()
 		})
 		group.ALL("/", func(r *ghttp.Request) {
-			r.Response.Write(r.Context().Value("test"))
+			r.Response.Write(r.Context().Value(testkey))
 		})
 	})
 	s.SetDumpRouterMap(false)
@@ -238,15 +240,17 @@ func Test_Request_SetCtx(t *testing.T) {
 }
 
 func Test_Request_GetCtx(t *testing.T) {
+	type ctxKey string
+	const testkey ctxKey = "test"
 	s := g.Server(guid.S())
 	s.Group("/", func(group *ghttp.RouterGroup) {
 		group.Middleware(func(r *ghttp.Request) {
-			ctx := context.WithValue(r.GetCtx(), "test", 1)
+			ctx := context.WithValue(r.GetCtx(), testkey, 1)
 			r.SetCtx(ctx)
 			r.Middleware.Next()
 		})
 		group.ALL("/", func(r *ghttp.Request) {
-			r.Response.Write(r.Context().Value("test"))
+			r.Response.Write(r.Context().Value(testkey))
 		})
 	})
 	s.SetDumpRouterMap(false)
@@ -290,9 +294,6 @@ func Test_Request_Form(t *testing.T) {
 		Id   int
 		Name string
 	}
-	type Default struct {
-		D string
-	}
 	s := g.Server(guid.S())
 	s.Group("/", func(group *ghttp.RouterGroup) {
 		group.ALL("/", func(r *ghttp.Request) {

diff --git a/net/ghttp/ghttp_z_unit_feature_router_basic_test.go b/net/ghttp/ghttp_z_unit_feature_router_basic_test.go
@@ -122,23 +122,23 @@ func Test_Router_Method(t *testing.T) {
 		client.SetPrefix(fmt.Sprintf("http://127.0.0.1:%d", s.GetListenedPort()))
 
 		resp1, err := client.Get(ctx, "/get")
-		defer resp1.Close()
 		t.AssertNil(err)
+		defer resp1.Close()
 		t.Assert(resp1.StatusCode, 200)
 
 		resp2, err := client.Post(ctx, "/get")
-		defer resp2.Close()
 		t.AssertNil(err)
+		defer resp2.Close()
 		t.Assert(resp2.StatusCode, 404)
 
 		resp3, err := client.Get(ctx, "/post")
-		defer resp3.Close()
 		t.AssertNil(err)
+		defer resp3.Close()
 		t.Assert(resp3.StatusCode, 404)
 
 		resp4, err := client.Post(ctx, "/post")
-		defer resp4.Close()
 		t.AssertNil(err)
+		defer resp4.Close()
 		t.Assert(resp4.StatusCode, 200)
 	})
 }
@@ -194,28 +194,28 @@ func Test_Router_Status(t *testing.T) {
 		client.SetPrefix(fmt.Sprintf("http://127.0.0.1:%d", s.GetListenedPort()))
 
 		resp1, err := client.Get(ctx, "/200")
-		defer resp1.Close()
 		t.AssertNil(err)
+		defer resp1.Close()
 		t.Assert(resp1.StatusCode, 200)
 
 		resp2, err := client.Get(ctx, "/300")
-		defer resp2.Close()
 		t.AssertNil(err)
+		defer resp2.Close()
 		t.Assert(resp2.StatusCode, 300)
 
 		resp3, err := client.Get(ctx, "/400")
-		defer resp3.Close()
 		t.AssertNil(err)
+		defer resp3.Close()
 		t.Assert(resp3.StatusCode, 400)
 
 		resp4, err := client.Get(ctx, "/500")
-		defer resp4.Close()
 		t.AssertNil(err)
+		defer resp4.Close()
 		t.Assert(resp4.StatusCode, 500)
 
 		resp5, err := client.Get(ctx, "/404")
-		defer resp5.Close()
 		t.AssertNil(err)
+		defer resp5.Close()
 		t.Assert(resp5.StatusCode, 404)
 	})
 }
@@ -239,8 +239,8 @@ func Test_Router_CustomStatusHandler(t *testing.T) {
 
 		t.Assert(client.GetContent(ctx, "/"), "hello")
 		resp, err := client.Get(ctx, "/ThisDoesNotExist")
-		defer resp.Close()
 		t.AssertNil(err)
+		defer resp.Close()
 		t.Assert(resp.StatusCode, 404)
 		t.Assert(resp.ReadAllString(), "404 page")
 	})
@@ -263,8 +263,8 @@ func Test_Router_404(t *testing.T) {
 
 		t.Assert(client.GetContent(ctx, "/"), "hello")
 		resp, err := client.Get(ctx, "/ThisDoesNotExist")
-		defer resp.Close()
 		t.AssertNil(err)
+		defer resp.Close()
 		t.Assert(resp.StatusCode, 404)
 	})
 }

diff --git a/net/ghttp/ghttp_z_unit_feature_router_domain_basic_test.go b/net/ghttp/ghttp_z_unit_feature_router_domain_basic_test.go
@@ -86,23 +86,23 @@ func Test_Router_DomainMethod(t *testing.T) {
 		client.SetPrefix(fmt.Sprintf("http://127.0.0.1:%d", s.GetListenedPort()))
 
 		resp1, err := client.Get(ctx, "/get")
-		defer resp1.Close()
 		t.AssertNil(err)
+		defer resp1.Close()
 		t.Assert(resp1.StatusCode, 404)
 
 		resp2, err := client.Post(ctx, "/get")
-		defer resp2.Close()
 		t.AssertNil(err)
+		defer resp2.Close()
 		t.Assert(resp2.StatusCode, 404)
 
 		resp3, err := client.Get(ctx, "/post")
-		defer resp3.Close()
 		t.AssertNil(err)
+		defer resp3.Close()
 		t.Assert(resp3.StatusCode, 404)
 
 		resp4, err := client.Post(ctx, "/post")
-		defer resp4.Close()
 		t.AssertNil(err)
+		defer resp4.Close()
 		t.Assert(resp4.StatusCode, 404)
 	})
 
@@ -111,23 +111,23 @@ func Test_Router_DomainMethod(t *testing.T) {
 		client.SetPrefix(fmt.Sprintf("http://localhost:%d", s.GetListenedPort()))
 
 		resp1, err := client.Get(ctx, "/get")
-		defer resp1.Close()
 		t.AssertNil(err)
+		defer resp1.Close()
 		t.Assert(resp1.StatusCode, 200)
 
 		resp2, err := client.Post(ctx, "/get")
-		defer resp2.Close()
 		t.AssertNil(err)
+		defer resp2.Close()
 		t.Assert(resp2.StatusCode, 404)
 
 		resp3, err := client.Get(ctx, "/post")
-		defer resp3.Close()
 		t.AssertNil(err)
+		defer resp3.Close()
 		t.Assert(resp3.StatusCode, 404)
 
 		resp4, err := client.Post(ctx, "/post")
-		defer resp4.Close()
 		t.AssertNil(err)
+		defer resp4.Close()
 		t.Assert(resp4.StatusCode, 200)
 	})
 
@@ -136,23 +136,23 @@ func Test_Router_DomainMethod(t *testing.T) {
 		client.SetPrefix(fmt.Sprintf("http://local:%d", s.GetListenedPort()))
 
 		resp1, err := client.Get(ctx, "/get")
-		defer resp1.Close()
 		t.AssertNil(err)
+		defer resp1.Close()
 		t.Assert(resp1.StatusCode, 200)
 
 		resp2, err := client.Post(ctx, "/get")
-		defer resp2.Close()
 		t.AssertNil(err)
+		defer resp2.Close()
 		t.Assert(resp2.StatusCode, 404)
 
 		resp3, err := client.Get(ctx, "/post")
-		defer resp3.Close()
 		t.AssertNil(err)
+		defer resp3.Close()
 		t.Assert(resp3.StatusCode, 404)
 
 		resp4, err := client.Post(ctx, "/post")
-		defer resp4.Close()
 		t.AssertNil(err)
+		defer resp4.Close()
 		t.Assert(resp4.StatusCode, 200)
 	})
 }
@@ -182,71 +182,71 @@ func Test_Router_DomainStatus(t *testing.T) {
 		client.SetPrefix(fmt.Sprintf("http://127.0.0.1:%d", s.GetListenedPort()))
 
 		resp1, err := client.Get(ctx, "/200")
-		defer resp1.Close()
 		t.AssertNil(err)
+		defer resp1.Close()
 		t.Assert(resp1.StatusCode, 404)
 
 		resp2, err := client.Get(ctx, "/300")
-		defer resp2.Close()
 		t.AssertNil(err)
+		defer resp2.Close()
 		t.Assert(resp2.StatusCode, 404)
 
 		resp3, err := client.Get(ctx, "/400")
-		defer resp3.Close()
 		t.AssertNil(err)
+		defer resp3.Close()
 		t.Assert(resp3.StatusCode, 404)
 
 		resp4, err := client.Get(ctx, "/500")
-		defer resp4.Close()
 		t.AssertNil(err)
+		defer resp4.Close()
 		t.Assert(resp4.StatusCode, 404)
 	})
 	gtest.C(t, func(t *gtest.T) {
 		client := g.Client()
 		client.SetPrefix(fmt.Sprintf("http://localhost:%d", s.GetListenedPort()))
 
 		resp1, err := client.Get(ctx, "/200")
-		defer resp1.Close()
 		t.AssertNil(err)
+		defer resp1.Close()
 		t.Assert(resp1.StatusCode, 200)
 
 		resp2, err := client.Get(ctx, "/300")
-		defer resp2.Close()
 		t.AssertNil(err)
+		defer resp2.Close()
 		t.Assert(resp2.StatusCode, 300)
 
 		resp3, err := client.Get(ctx, "/400")
-		defer resp3.Close()
 		t.AssertNil(err)
+		defer resp3.Close()
 		t.Assert(resp3.StatusCode, 400)
 
 		resp4, err := client.Get(ctx, "/500")
-		defer resp4.Close()
 		t.AssertNil(err)
+		defer resp4.Close()
 		t.Assert(resp4.StatusCode, 500)
 	})
 	gtest.C(t, func(t *gtest.T) {
 		client := g.Client()
 		client.SetPrefix(fmt.Sprintf("http://local:%d", s.GetListenedPort()))
 
 		resp1, err := client.Get(ctx, "/200")
-		defer resp1.Close()
 		t.AssertNil(err)
+		defer resp1.Close()
 		t.Assert(resp1.StatusCode, 200)
 
 		resp2, err := client.Get(ctx, "/300")
-		defer resp2.Close()
 		t.AssertNil(err)
+		defer resp2.Close()
 		t.Assert(resp2.StatusCode, 300)
 
 		resp3, err := client.Get(ctx, "/400")
-		defer resp3.Close()
 		t.AssertNil(err)
+		defer resp3.Close()
 		t.Assert(resp3.StatusCode, 400)
 
 		resp4, err := client.Get(ctx, "/500")
-		defer resp4.Close()
 		t.AssertNil(err)
+		defer resp4.Close()
 		t.Assert(resp4.StatusCode, 500)
 	})
 }