chore(binding): Optimizing the performance of bindings

Change-Id: I7c4ddb77ad5fb87e77986c37399951015e689412

Author: andeya

binding/bind.go

@@ -2,7 +2,6 @@ package binding
 
 import (
 	jsonpkg "encoding/json"
-	"mime/multipart"
 	"net/http"
 	"reflect"
 	"strings"
@@ -168,28 +167,18 @@ func (b *Binding) bindStruct(structPointer interface{}, structValue reflect.Valu
 		return
 	}
 
-	bodyCodec, bodyBytes, err := recv.getBodyInfo(req)
+	var bodyString string
+	bodyCodec, bodyBytes, postForm, fileHeaders, err := recv.getBodyInfo(req)
 	if len(bodyBytes) > 0 {
 		err = b.prebindBody(structPointer, structValue, bodyCodec, bodyBytes)
-	}
-	if err != nil {
-		return
-	}
-	bodyString := ameda.UnsafeBytesToString(bodyBytes)
-	postForm, err := req.GetPostForm()
-	if err != nil {
-		return
-	}
-	var fileHeaders map[string][]*multipart.FileHeader
-	if _req, ok := req.(requestWithFileHeader); ok {
-		fileHeaders, err = _req.GetFileHeaders()
 		if err != nil {
 			return
 		}
+		bodyString = ameda.UnsafeBytesToString(bodyBytes)
 	}
 	queryValues := recv.getQuery(req)
 	cookies := recv.getCookies(req)
-	var h http.Header
+	h := recv.getHeader(req)
 	for _, param := range recv.params {
 		for i, info := range param.tagInfos {
 			var found bool
@@ -204,9 +193,6 @@ func (b *Binding) bindStruct(structPointer interface{}, structValue reflect.Valu
 			case cookie:
 				found, err = param.bindCookie(info, expr, cookies)
 			case header:
-				if h == nil {
-					h = req.GetHeader()
-				}
 				found, err = param.bindHeader(info, expr, h)
 			case form, json, protobuf:
 				if info.paramIn == in(bodyCodec) {

binding/receiver.go

@@ -1,6 +1,7 @@
 package binding
 
 import (
+	"mime/multipart"
 	"net/http"
 	"net/url"
 	"reflect"
@@ -51,7 +52,7 @@ const (
 )
 
 type receiver struct {
-	hasPath, hasQuery, hasBody, hasCookie, hasDefaultVal, hasVd bool
+	hasPath, hasQuery, hasForm, hasJson, hasProtobuf, hasRawBody, hasHeader, hasCookie, hasDefaultVal, hasVd bool
 
 	params []*paramInfo
 
@@ -64,10 +65,18 @@ func (r *receiver) assginIn(i in, v bool) {
 		r.hasPath = r.hasPath || v
 	case query:
 		r.hasQuery = r.hasQuery || v
-	case form, json, protobuf, raw_body:
-		r.hasBody = r.hasBody || v
+	case form:
+		r.hasForm = r.hasForm || v
+	case json:
+		r.hasJson = r.hasJson || v
+	case protobuf:
+		r.hasProtobuf = r.hasProtobuf || v
+	case raw_body:
+		r.hasRawBody = r.hasRawBody || v
 	case cookie:
 		r.hasCookie = r.hasCookie || v
+	case header:
+		r.hasHeader = r.hasHeader || v
 	case default_val:
 		r.hasDefaultVal = r.hasDefaultVal || v
 	}
@@ -99,13 +108,29 @@ func (r *receiver) getOrAddParam(fh *tagexpr.FieldHandler, bindErrFactory func(f
 	return p
 }
 
-func (r *receiver) getBodyInfo(req Request) (codec, []byte, error) {
-	if r.hasBody {
-		c := getBodyCodec(req)
-		b, err := req.GetBody()
-		return c, b, err
+func (r *receiver) hasBody() bool {
+	return r.hasForm || r.hasProtobuf || r.hasJson || r.hasRawBody
+}
+
+func (r *receiver) getBodyInfo(req Request) (
+	bodyCodec codec, bodyBytes []byte, postForm url.Values,
+	fileHeaders map[string][]*multipart.FileHeader, err error,
+) {
+	bodyCodec = bodyUnsupport
+	if !r.hasBody() {
+		return
+	}
+	bodyCodec = getBodyCodec(req)
+	bodyBytes, err = req.GetBody()
+	if err == nil && r.hasForm {
+		postForm, err = req.GetPostForm()
+		if err == nil {
+			if _req, ok := req.(requestWithFileHeader); ok {
+				fileHeaders, err = _req.GetFileHeaders()
+			}
+		}
 	}
-	return bodyUnsupport, nil, nil
+	return
 }
 
 func (b *Binding) prebindBody(pointer interface{}, val reflect.Value, bodyCodec codec, bodyBytes []byte) error {
@@ -137,6 +162,13 @@ func (r *receiver) getCookies(req Request) []*http.Cookie {
 	return nil
 }
 
+func (r *receiver) getHeader(req Request) http.Header {
+	if r.hasHeader {
+		return req.GetHeader()
+	}
+	return nil
+}
+
 func (r *receiver) initParams() {
 	names := make(map[string][maxIn]string, len(r.params))
 	for _, p := range r.params {