diff --git a/net/ghttp/ghttp_request_param_request.go b/net/ghttp/ghttp_request_param_request.go index a2874d9de92..601e3f06a92 100644 --- a/net/ghttp/ghttp_request_param_request.go +++ b/net/ghttp/ghttp_request_param_request.go @@ -183,7 +183,7 @@ func (r *Request) doGetRequestStruct(pointer interface{}, mapping ...map[string] return data, nil } // `in` Tag Struct values. - if err = r.mergeInTagStructValue(data, pointer); err != nil { + if err = r.mergeInTagStructValue(data); err != nil { return data, nil } @@ -239,7 +239,7 @@ func (r *Request) mergeDefaultStructValue(data map[string]interface{}, pointer i } // mergeInTagStructValue merges the request parameters with header or cookie values from struct `in` tag definition. -func (r *Request) mergeInTagStructValue(data map[string]interface{}, pointer interface{}) error { +func (r *Request) mergeInTagStructValue(data map[string]interface{}) error { fields := r.serveHandler.Handler.Info.ReqStructFields if len(fields) > 0 { var ( diff --git a/net/ghttp/ghttp_server_service_handler.go b/net/ghttp/ghttp_server_service_handler.go index 76de26aaae8..7e248c75c5e 100644 --- a/net/ghttp/ghttp_server_service_handler.go +++ b/net/ghttp/ghttp_server_service_handler.go @@ -282,20 +282,3 @@ func createRouterFunc(funcInfo handlerFuncInfo) func(r *Request) { } } } - -// trimGeneric removes type definitions string from response type name if generic -func trimGeneric(structName string) string { - var ( - leftBraceIndex = strings.LastIndex(structName, "[") // for generic, it is faster to start at the end than at the beginning - rightBraceIndex = strings.LastIndex(structName, "]") - ) - if leftBraceIndex == -1 || rightBraceIndex == -1 { - // not found '[' or ']' - return structName - } else if leftBraceIndex+1 == rightBraceIndex { - // may be a slice, because generic is '[X]', not '[]' - // to be compatible with bad return parameter type: []XxxRes - return structName - } - return structName[:leftBraceIndex] -}