From bb696bb2817e6af945c51834d33a80e2e4a911d0 Mon Sep 17 00:00:00 2001
From: John Guo <claymore1986@gmail.com>
Date: Wed, 12 Mar 2025 21:55:35 +0800
Subject: [PATCH] refract(net/ghttp): move `Request.GetMetaTag` to
 `HandlerItemParsed.GetMetaTag` (#4191)

---
 net/ghttp/ghttp_request.go                    | 33 ---------------
 net/ghttp/ghttp_request_param_handler.go      | 41 +++++++++++++++++++
 net/ghttp/ghttp_server_router_serve.go        |  4 +-
 .../ghttp_z_unit_feature_request_test.go      |  5 ++-
 4 files changed, 46 insertions(+), 37 deletions(-)
 create mode 100644 net/ghttp/ghttp_request_param_handler.go

diff --git a/net/ghttp/ghttp_request.go b/net/ghttp/ghttp_request.go
index 306904487..e17857f44 100644
--- a/net/ghttp/ghttp_request.go
+++ b/net/ghttp/ghttp_request.go
@@ -19,7 +19,6 @@ import (
 	"github.com/gogf/gf/v2/os/gview"
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
-	"github.com/gogf/gf/v2/util/gmeta"
 	"github.com/gogf/gf/v2/util/guid"
 )
 
@@ -279,35 +278,3 @@ func (r *Request) ReloadParam() {
 	r.parsedQuery = false
 	r.bodyContent = nil
 }
-
-// GetHandlerResponse retrieves and returns the handler response object and its error.
-func (r *Request) GetHandlerResponse() interface{} {
-	return r.handlerResponse
-}
-
-// GetServeHandler retrieves and returns the user defined handler used to serve this request.
-func (r *Request) GetServeHandler() *HandlerItemParsed {
-	return r.serveHandler
-}
-
-// GetMetaTag retrieves and returns the metadata value associated with the given key from the request struct.
-// The meta value is from struct tags from g.Meta/gmeta.Meta type.
-// For example:
-//
-//	type GetMetaTagReq struct {
-//	    g.Meta `path:"/test" method:"post" summary:"meta_tag" tags:"meta"`
-//	    // ...
-//	}
-//
-// r.GetMetaTag("summary") // returns "meta_tag"
-// r.GetMetaTag("method")  // returns "post"
-func (r *Request) GetMetaTag(key string) string {
-	if r.serveHandler == nil || r.serveHandler.Handler == nil {
-		return ""
-	}
-	metaValue := gmeta.Get(r.serveHandler.Handler.Info.Type.In(1), key)
-	if metaValue != nil {
-		return metaValue.String()
-	}
-	return ""
-}
diff --git a/net/ghttp/ghttp_request_param_handler.go b/net/ghttp/ghttp_request_param_handler.go
new file mode 100644
index 000000000..f931d14e4
--- /dev/null
+++ b/net/ghttp/ghttp_request_param_handler.go
@@ -0,0 +1,41 @@
+// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package ghttp
+
+import "github.com/gogf/gf/v2/util/gmeta"
+
+// GetHandlerResponse retrieves and returns the handler response object and its error.
+func (r *Request) GetHandlerResponse() interface{} {
+	return r.handlerResponse
+}
+
+// GetServeHandler retrieves and returns the user defined handler used to serve this request.
+func (r *Request) GetServeHandler() *HandlerItemParsed {
+	return r.serveHandler
+}
+
+// GetMetaTag retrieves and returns the metadata value associated with the given key from the request struct.
+// The meta value is from struct tags from g.Meta/gmeta.Meta type.
+// For example:
+//
+//	type GetMetaTagReq struct {
+//	    g.Meta `path:"/test" method:"post" summary:"meta_tag" tags:"meta"`
+//	    // ...
+//	}
+//
+// r.GetServeHandler().GetMetaTag("summary") // returns "meta_tag"
+// r.GetServeHandler().GetMetaTag("method")  // returns "post"
+func (h *HandlerItemParsed) GetMetaTag(key string) string {
+	if h == nil || h.Handler == nil {
+		return ""
+	}
+	metaValue := gmeta.Get(h.Handler.Info.Type.In(1), key)
+	if metaValue != nil {
+		return metaValue.String()
+	}
+	return ""
+}
diff --git a/net/ghttp/ghttp_server_router_serve.go b/net/ghttp/ghttp_server_router_serve.go
index a4297414d..e9e6d9d48 100644
--- a/net/ghttp/ghttp_server_router_serve.go
+++ b/net/ghttp/ghttp_server_router_serve.go
@@ -286,6 +286,6 @@ func (item HandlerItem) MarshalJSON() ([]byte, error) {
 }
 
 // MarshalJSON implements the interface MarshalJSON for json.Marshal.
-func (item HandlerItemParsed) MarshalJSON() ([]byte, error) {
-	return json.Marshal(item.Handler)
+func (h *HandlerItemParsed) MarshalJSON() ([]byte, error) {
+	return json.Marshal(h.Handler)
 }
diff --git a/net/ghttp/ghttp_z_unit_feature_request_test.go b/net/ghttp/ghttp_z_unit_feature_request_test.go
index 1d08b19dd..bc60d8f50 100644
--- a/net/ghttp/ghttp_z_unit_feature_request_test.go
+++ b/net/ghttp/ghttp_z_unit_feature_request_test.go
@@ -875,12 +875,13 @@ func (r GetMetaTagSt) PostTest(ctx context.Context, req *GetMetaTagReq) (*GetMet
 	return &GetMetaTagRes{}, nil
 }
 
-func TestRequest_GetMetaTag(t *testing.T) {
+func TestRequest_GetServeHandler_GetMetaTag(t *testing.T) {
 	s := g.Server(guid.S())
 	s.Use(func(r *ghttp.Request) {
 		r.Response.Writef(
 			"summary:%s,method:%s",
-			r.GetMetaTag("summary"), r.GetMetaTag("method"),
+			r.GetServeHandler().GetMetaTag("summary"),
+			r.GetServeHandler().GetMetaTag("method"),
 		)
 	})
 	s.Group("/", func(grp *ghttp.RouterGroup) {