style: unified app.HandleFunc style

cloudwego · Jul 29, 2024 · 3ffc942 · 3ffc942
1 parent 231bdf8
commit 3ffc942
Show file tree

Hide file tree

Showing 34 changed files with 54 additions and 54 deletions.
diff --git a/bizdemo/tiktok_demo/main.go b/bizdemo/tiktok_demo/main.go
diff --git a/file/html-fs/main.go b/file/html-fs/main.go
@@ -33,7 +33,7 @@ func main() {
 	fs := &app.FS{Root: root, PathRewrite: getPathRewriter(prefix)}
 	h.StaticFS(prefix, fs)
 
-	h.GET("/", func(c context.Context, ctx *app.RequestContext) {
+	h.GET("/", func(ctx context.Context, c *app.RequestContext) {
 		ctx.HTML(200, "index.html", nil)
 	})
 	h.Spin()

diff --git a/file/html/main.go b/file/html/main.go
@@ -29,7 +29,7 @@ func main() {
 
 	h.Static("/", "./assets")
 
-	h.GET("/", func(c context.Context, ctx *app.RequestContext) {
+	h.GET("/", func(ctx context.Context, c *app.RequestContext) {
 		ctx.HTML(200, "index.html", nil)
 	})
 	h.Spin()

diff --git a/hex/hex_trans_handler.go b/hex/hex_trans_handler.go
@@ -90,7 +90,7 @@ func initHertz() *route.Engine {
 	h := hertzServer.New()
 
 	// add a ping route to test
-	h.GET("/ping", func(c context.Context, ctx *app.RequestContext) {
+	h.GET("/ping", func(ctx context.Context, c *app.RequestContext) {
 		ctx.JSON(consts.StatusOK, utils.H{"ping": "pong"})
 	})
 

diff --git a/hz/template/main.go b/hz/template/main.go
diff --git a/hz/template/template/layout.yaml b/hz/template/template/layout.yaml
@@ -34,7 +34,7 @@ layouts:
       	h := server.New(server.WithHostPorts(address))
 
         // add a ping route to test
-        h.GET("/ping", func(c context.Context, ctx *app.RequestContext) {
+        h.GET("/ping", func(ctx context.Context, c *app.RequestContext) {
         	ctx.JSON(consts.StatusOK, utils.H{"ping": "pong"})
         })
 
@@ -561,4 +561,4 @@ layouts:
       CURDIR=$(cd $(dirname $0); pwd)
       BinaryName={{.ServiceName}}
       echo "$CURDIR/bin/${BinaryName}"
-      exec $CURDIR/bin/${BinaryName}
+      exec $CURDIR/bin/${BinaryName}
diff --git a/hz_kitex_demo/hertz-server/main.go b/hz_kitex_demo/hertz-server/main.go
diff --git a/middleware/csrf/custom_errorfunc/main.go b/middleware/csrf/custom_errorfunc/main.go
@@ -60,10 +60,10 @@ func main() {
 	h.Use(sessions.New("csrf-session", store))
 	h.Use(csrf.New(csrf.WithErrorFunc(myErrFunc)))
 
-	h.GET("/protected", func(c context.Context, ctx *app.RequestContext) {
+	h.GET("/protected", func(ctx context.Context, c *app.RequestContext) {
 		ctx.String(200, csrf.GetToken(ctx))
 	})
-	h.POST("/protected", func(c context.Context, ctx *app.RequestContext) {
+	h.POST("/protected", func(ctx context.Context, c *app.RequestContext) {
 		ctx.String(200, "CSRF token is valid")
 	})
 

diff --git a/middleware/csrf/custom_extractor/main.go b/middleware/csrf/custom_extractor/main.go
@@ -42,10 +42,10 @@ func main() {
 	h.Use(sessions.New("csrf-session", store))
 	h.Use(csrf.New(csrf.WithExtractor(myExtractor)))
 
-	h.GET("/protected", func(c context.Context, ctx *app.RequestContext) {
+	h.GET("/protected", func(ctx context.Context, c *app.RequestContext) {
 		ctx.String(200, csrf.GetToken(ctx))
 	})
-	h.POST("/protected", func(c context.Context, ctx *app.RequestContext) {
+	h.POST("/protected", func(ctx context.Context, c *app.RequestContext) {
 		ctx.String(200, "CSRF token is valid")
 	})
 

diff --git a/middleware/csrf/custom_ignoremethods/main.go b/middleware/csrf/custom_ignoremethods/main.go
@@ -33,11 +33,11 @@ func main() {
 	h.Use(sessions.New("csrf-session", store))
 	h.Use(csrf.New(csrf.WithIgnoredMethods([]string{"GET", "HEAD", "TRACE"})))
 
-	h.GET("/protected", func(c context.Context, ctx *app.RequestContext) {
+	h.GET("/protected", func(ctx context.Context, c *app.RequestContext) {
 		ctx.String(200, csrf.GetToken(ctx))
 	})
 
-	h.OPTIONS("/protected", func(c context.Context, ctx *app.RequestContext) {
+	h.OPTIONS("/protected", func(ctx context.Context, c *app.RequestContext) {
 		ctx.String(200, "success")
 	})
 	h.Spin()

diff --git a/middleware/csrf/custom_keylookup/main.go b/middleware/csrf/custom_keylookup/main.go
@@ -32,10 +32,10 @@ func main() {
 	h.Use(sessions.New("csrf-session", store))
 	h.Use(csrf.New(csrf.WithKeyLookUp("form:csrf")))
 
-	h.GET("/protected", func(c context.Context, ctx *app.RequestContext) {
+	h.GET("/protected", func(ctx context.Context, c *app.RequestContext) {
 		ctx.String(200, csrf.GetToken(ctx))
 	})
-	h.POST("/protected", func(c context.Context, ctx *app.RequestContext) {
+	h.POST("/protected", func(ctx context.Context, c *app.RequestContext) {
 		ctx.String(200, "CSRF token is valid")
 	})
 

diff --git a/middleware/csrf/custom_next/main.go b/middleware/csrf/custom_next/main.go
@@ -42,7 +42,7 @@ func main() {
 	//  skip csrf middleware when request method is post
 	h.Use(csrf.New(csrf.WithNext(isPostMethod)))
 
-	h.POST("/protected", func(c context.Context, ctx *app.RequestContext) {
+	h.POST("/protected", func(ctx context.Context, c *app.RequestContext) {
 		ctx.String(200, "success even no csrf-token in header")
 	})
 	h.Spin()

diff --git a/middleware/csrf/custom_secret/main.go b/middleware/csrf/custom_secret/main.go
@@ -33,10 +33,10 @@ func main() {
 	h.Use(sessions.New("csrf-session", store))
 	h.Use(csrf.New(csrf.WithSecret("your_secret")))
 
-	h.GET("/protected", func(c context.Context, ctx *app.RequestContext) {
+	h.GET("/protected", func(ctx context.Context, c *app.RequestContext) {
 		ctx.String(200, csrf.GetToken(ctx))
 	})
-	h.POST("/protected", func(c context.Context, ctx *app.RequestContext) {
+	h.POST("/protected", func(ctx context.Context, c *app.RequestContext) {
 		ctx.String(200, "CSRF token is valid")
 	})
 

diff --git a/middleware/csrf/default/main.go b/middleware/csrf/default/main.go
@@ -33,11 +33,11 @@ func main() {
 	h.Use(sessions.New("csrf-session", store))
 	h.Use(csrf.New())
 
-	h.GET("/protected", func(c context.Context, ctx *app.RequestContext) {
+	h.GET("/protected", func(ctx context.Context, c *app.RequestContext) {
 		ctx.String(200, csrf.GetToken(ctx))
 	})
 
-	h.POST("/protected", func(c context.Context, ctx *app.RequestContext) {
+	h.POST("/protected", func(ctx context.Context, c *app.RequestContext) {
 		ctx.String(200, "CSRF token is valid")
 	})
 

diff --git a/middleware/loadbalance/round_robin/server/main.go b/middleware/loadbalance/round_robin/server/main.go
@@ -50,7 +50,7 @@ func main() {
 					Tags:        nil,
 				}),
 			)
-			h.GET("/ping", func(c context.Context, ctx *app.RequestContext) {
+			h.GET("/ping", func(ctx context.Context, c *app.RequestContext) {
 				ctx.JSON(consts.StatusOK, utils.H{"addr": addr})
 			})
 			h.Spin()

diff --git a/middleware/pprof/custom_prefix/server.go b/middleware/pprof/custom_prefix/server.go
@@ -32,7 +32,7 @@ func main() {
 	// default is "debug/pprof"
 	pprof.Register(h, "dev/pprof")
 
-	h.GET("/ping", func(c context.Context, ctx *app.RequestContext) {
+	h.GET("/ping", func(ctx context.Context, c *app.RequestContext) {
 		ctx.JSON(consts.StatusOK, utils.H{"ping": "pong"})
 	})
 

diff --git a/middleware/pprof/custom_router_group/server.go b/middleware/pprof/custom_router_group/server.go
@@ -33,7 +33,7 @@ func main() {
 
 	adminGroup := h.Group("/admin")
 
-	adminGroup.GET("/ping", func(c context.Context, ctx *app.RequestContext) {
+	adminGroup.GET("/ping", func(ctx context.Context, c *app.RequestContext) {
 		ctx.JSON(consts.StatusOK, utils.H{"ping": "pong"})
 	})
 

diff --git a/middleware/pprof/default/server.go b/middleware/pprof/default/server.go
@@ -31,7 +31,7 @@ func main() {
 
 	pprof.Register(h)
 
-	h.GET("/ping", func(c context.Context, ctx *app.RequestContext) {
+	h.GET("/ping", func(ctx context.Context, c *app.RequestContext) {
 		ctx.JSON(consts.StatusOK, utils.H{"ping": "pong"})
 	})
 

diff --git a/monitoring/README.md b/monitoring/README.md
@@ -18,11 +18,11 @@ func main() {
 ...
 	h := server.Default(server.WithHostPorts("127.0.0.1:8080"), server.WithTracer(prometheus.NewServerTracer(":9091", "/hertz")))
 
-	h.GET("/metricGet", func(c context.Context, ctx *app.RequestContext) {
+	h.GET("/metricGet", func(ctx context.Context, c *app.RequestContext) {
 		ctx.String(200, "hello get")
 	})
 
-	h.POST("/metricPost", func(c context.Context, ctx *app.RequestContext) {
+	h.POST("/metricPost", func(ctx context.Context, c *app.RequestContext) {
 		time.Sleep(100 * time.Millisecond)
 		ctx.String(200, "hello post")
 	})
@@ -55,4 +55,4 @@ func main() {
 
    `histogram_quantile(0.9,sum(rate(hertz_server_latency_us_bucket{statusCode="200"}[1m]))by(le))`
 
-For more information about hertz monitoring, please click [monitoring](https://www.cloudwego.io/zh/docs/hertz/tutorials/framework-exten/monitor/)
+For more information about hertz monitoring, please click [monitoring](https://www.cloudwego.io/zh/docs/hertz/tutorials/framework-exten/monitor/)
diff --git a/monitoring/main.go b/monitoring/main.go
@@ -35,11 +35,11 @@ func main() {
 		),
 	)
 
-	h.GET("/metricGet", func(c context.Context, ctx *app.RequestContext) {
+	h.GET("/metricGet", func(ctx context.Context, c *app.RequestContext) {
 		ctx.String(200, "hello get")
 	})
 
-	h.POST("/metricPost", func(c context.Context, ctx *app.RequestContext) {
+	h.POST("/metricPost", func(ctx context.Context, c *app.RequestContext) {
 		time.Sleep(100 * time.Millisecond)
 		ctx.String(200, "hello post")
 	})

diff --git a/multiple_service/main.go b/multiple_service/main.go
@@ -30,15 +30,15 @@ var wg sync.WaitGroup
 
 func hertz1() {
 	h := server.Default(server.WithHostPorts(":8080"))
-	h.GET("/ping", func(c context.Context, ctx *app.RequestContext) {
+	h.GET("/ping", func(ctx context.Context, c *app.RequestContext) {
 		ctx.JSON(consts.StatusOK, utils.H{"ping": "pong1"})
 	})
 	h.Spin()
 }
 
 func hertz2() {
 	h := server.Default(server.WithHostPorts(":8081"))
-	h.GET("/ping", func(c context.Context, ctx *app.RequestContext) {
+	h.GET("/ping", func(ctx context.Context, c *app.RequestContext) {
 		ctx.JSON(consts.StatusOK, utils.H{"ping": "pong2"})
 	})
 	h.Spin()

diff --git a/opentelemetry/README.md b/opentelemetry/README.md
@@ -108,7 +108,7 @@ func init()  {
 #### log with context
 
 ```go
-h.GET("/ping", func(c context.Context, ctx *app.RequestContext) {
+h.GET("/ping", func(ctx context.Context, c *app.RequestContext) {
     req := &api.Request{Message: "my request"}
     resp, err := client.Echo(c, req)
     if err != nil {

diff --git a/opentelemetry/hertz/server/main.go b/opentelemetry/hertz/server/main.go
@@ -65,7 +65,7 @@ func main() {
 		hlog.Fatal(err)
 	}
 
-	h.GET("/ping", func(c context.Context, ctx *app.RequestContext) {
+	h.GET("/ping", func(ctx context.Context, c *app.RequestContext) {
 		req := &api.Request{Message: "my request"}
 		resp, err := client.Echo(c, req)
 		if err != nil {

diff --git a/protocol/http1/main.go b/protocol/http1/main.go
@@ -28,7 +28,7 @@ import (
 func main() {
 	h := server.Default(server.WithHostPorts("127.0.0.1:8080"))
 
-	h.GET("/ping", func(c context.Context, ctx *app.RequestContext) {
+	h.GET("/ping", func(ctx context.Context, c *app.RequestContext) {
 		ctx.JSON(consts.StatusOK, utils.H{"ping": "pong"})
 	})
 

diff --git a/protocol/tls/main.go b/protocol/tls/main.go
@@ -50,13 +50,13 @@ func main() {
 
 	h := server.Default(server.WithTLS(cfg), server.WithHostPorts(":8443"))
 
-	h.Use(func(c context.Context, ctx *app.RequestContext) {
+	h.Use(func(ctx context.Context, c *app.RequestContext) {
 		fmt.Fprint(ctx, "Before real handle...\n")
 		ctx.Next(c)
 		fmt.Fprint(ctx, "After real handle...\n")
 	})
 
-	h.GET("/ping", func(c context.Context, ctx *app.RequestContext) {
+	h.GET("/ping", func(ctx context.Context, c *app.RequestContext) {
 		ctx.String(consts.StatusOK, "TLS test\n")
 	})
 

diff --git a/render/html/main.go b/render/html/main.go
@@ -42,13 +42,13 @@ func main() {
 	})
 	h.LoadHTMLGlob("render/html/*")
 
-	h.GET("/index", func(c context.Context, ctx *app.RequestContext) {
+	h.GET("/index", func(ctx context.Context, c *app.RequestContext) {
 		ctx.HTML(http.StatusOK, "index.tmpl", utils.H{
 			"title": "Main website",
 		})
 	})
 
-	h.GET("/raw", func(c context.Context, ctx *app.RequestContext) {
+	h.GET("/raw", func(ctx context.Context, c *app.RequestContext) {
 		ctx.HTML(http.StatusOK, "template1.html", map[string]interface{}{
 			"now": time.Date(2017, 0o7, 0o1, 0, 0, 0, 0, time.UTC),
 		})

diff --git a/reverseproxy/customize_error/main.go b/reverseproxy/customize_error/main.go
@@ -36,7 +36,7 @@ func main() {
 		c.String(404, "fake 404 not found")
 	})
 
-	h.GET("/proxy/backend", func(cc context.Context, c *app.RequestContext) {
+	h.GET("/proxy/backend", func(ctx context.Context, c *app.RequestContext) {
 		c.JSON(200, utils.H{
 			"msg": "proxy success!!",
 		})

diff --git a/reverseproxy/discovery/registry/main.go b/reverseproxy/discovery/registry/main.go
@@ -38,7 +38,7 @@ func main() {
 			Weight:      10,
 		}),
 	)
-	h.GET("/backend", func(cc context.Context, c *app.RequestContext) {
+	h.GET("/backend", func(ctx context.Context, c *app.RequestContext) {
 		c.JSON(consts.StatusOK, utils.H{"ping": "pong"})
 	})
 	h.Spin()

diff --git a/reverseproxy/standard/main.go b/reverseproxy/standard/main.go
@@ -30,7 +30,7 @@ func main() {
 	if err != nil {
 		panic(err)
 	}
-	h.GET("/proxy/backend", func(cc context.Context, c *app.RequestContext) {
+	h.GET("/proxy/backend", func(ctx context.Context, c *app.RequestContext) {
 		if param := c.Query("who"); param != "" {
 			c.JSON(200, utils.H{
 				"who": param,

diff --git a/reverseproxy/tls/main.go b/reverseproxy/tls/main.go
@@ -64,7 +64,7 @@ func main() {
 			server.WithTransport(standard.NewTransporter),
 		)
 
-		h.GET("/backend", func(cc context.Context, c *app.RequestContext) {
+		h.GET("/backend", func(ctx context.Context, c *app.RequestContext) {
 			c.JSON(200, utils.H{"msg": "pong"})
 		})
 		h.Spin()

diff --git a/reverseproxy/use_middleware/main.go b/reverseproxy/use_middleware/main.go
@@ -35,7 +35,7 @@ func main() {
 		panic(err)
 	}
 
-	r.Use(func(c context.Context, ctx *app.RequestContext) {
+	r.Use(func(ctx context.Context, c *app.RequestContext) {
 		if ctx.Query("country") == "cn" {
 			proxy.ServeHTTP(c, ctx)
 			ctx.Response.Header.Set("key", "value")
@@ -45,13 +45,13 @@ func main() {
 		}
 	})
 
-	r.GET("/backend", func(c context.Context, ctx *app.RequestContext) {
+	r.GET("/backend", func(ctx context.Context, c *app.RequestContext) {
 		ctx.JSON(200, utils.H{
 			"message": "pong1",
 		})
 	})
 
-	r2.GET("/backend", func(c context.Context, ctx *app.RequestContext) {
+	r2.GET("/backend", func(ctx context.Context, c *app.RequestContext) {
 		ctx.JSON(200, utils.H{
 			"message": "pong2",
 		})