chore(binding): Update Level

Change-Id: Ib6cce6176d6c2c731d28caf20eaa4584bb09a0ef

Author: andeya

binding/README.md

@@ -112,6 +112,6 @@ The level of handling tags:
 
 |level|default|description|
 |-----|-------|-----------|
-|OnlyFirst|Yes|Handle only the first level field tags
-|FirstForUntagged|No|For untagged fields, only the first level is handled|
-|Any|No|Handle any level field tags|
+|OnlyFirst|No|Handle only the first level fields
+|FirstAndTagged|Yes|Handle the first level fields and all the tagged fields|
+|Any|No|Handle any level fields|

binding/bind.go

@@ -15,11 +15,11 @@ import (
 type Level uint8
 
 const (
-	// OnlyFirst handle only the first level field tags
+	// OnlyFirst handle only the first level fields
 	OnlyFirst Level = iota
-	// FirstForUntagged for untagged fields, only the first level is handled
-	FirstForUntagged
-	// Any handle any level field tags
+	// FirstAndTagged handle the first level fields and all the tagged fields
+	FirstAndTagged
+	// Any handle any level fields
 	Any
 )
 
@@ -42,18 +42,18 @@ func New(tagName string) *Binding {
 		vd:    validator.New(tagName),
 		recvs: goutil.AtomicMap(),
 	}
-	return b.SetLevel(OnlyFirst).SetErrorFactory(nil, nil)
+	return b.SetLevel(FirstAndTagged).SetErrorFactory(nil, nil)
 }
 
 // SetLevel set the level of handling tags.
 // NOTE:
 //  default is First
 func (b *Binding) SetLevel(level Level) *Binding {
 	switch level {
-	case OnlyFirst, FirstForUntagged, Any:
+	case OnlyFirst, FirstAndTagged, Any:
 		b.level = level
 	default:
-		b.level = OnlyFirst
+		b.level = FirstAndTagged
 	}
 	return b
 }
@@ -149,7 +149,7 @@ func (b *Binding) getObjOrPrepare(value reflect.Value) (*receiver, error) {
 				return true
 			}
 
-		case FirstForUntagged:
+		case FirstAndTagged:
 			if len(paths) > 0 {
 				var canHandle bool
 				evals = fh.EvalFuncs()

binding/bind_test.go

@@ -29,7 +29,7 @@ func TestRawBody(t *testing.T) {
 	bodyBytes := []byte("rawbody.............")
 	req := newRequest("", nil, nil, bytes.NewReader(bodyBytes))
 	recv := new(Recv)
-	binder := binding.New("api").SetLevel(binding.FirstForUntagged)
+	binder := binding.New("api")
 	err := binder.BindAndValidate(recv, req, nil)
 	assert.NotNil(t, err)
 	assert.Equal(t, err.Error(), "too long")
@@ -59,7 +59,7 @@ func TestQueryString(t *testing.T) {
 	}
 	req := newRequest("http://localhost:8080/?a=a1&a=a2&b=b1&c=c1&c=c2&d=d1&d=d2&y=y1", nil, nil, nil)
 	recv := new(Recv)
-	binder := binding.New("api").SetLevel(binding.FirstForUntagged)
+	binder := binding.New("api")
 	err := binder.BindAndValidate(recv, req, nil)
 	assert.Nil(t, err)
 	assert.Equal(t, []string{"a1", "a2"}, (**recv.X).A)
@@ -83,7 +83,7 @@ func TestQueryNum(t *testing.T) {
 	}
 	req := newRequest("http://localhost:8080/?a=11&a=12&b=21&c=31&c=32&d=41&d=42&y=true", nil, nil, nil)
 	recv := new(Recv)
-	binder := binding.New("api").SetLevel(binding.FirstForUntagged)
+	binder := binding.New("api")
 	err := binder.BindAndValidate(recv, req, nil)
 	assert.Nil(t, err)
 	assert.Equal(t, []int{11, 12}, (**recv.X).A)
@@ -116,7 +116,7 @@ func TestHeaderString(t *testing.T) {
 	header.Add("X-Y", "y1")
 	req := newRequest("", header, nil, nil)
 	recv := new(Recv)
-	binder := binding.New("api").SetLevel(binding.FirstForUntagged)
+	binder := binding.New("api")
 	err := binder.BindAndValidate(recv, req, nil)
 	assert.Nil(t, err)
 	assert.Equal(t, []string{"a1", "a2"}, (**recv.X).A)
@@ -149,7 +149,7 @@ func TestHeaderNum(t *testing.T) {
 	header.Add("X-Y", "true")
 	req := newRequest("", header, nil, nil)
 	recv := new(Recv)
-	binder := binding.New("api").SetLevel(binding.FirstForUntagged)
+	binder := binding.New("api")
 	err := binder.BindAndValidate(recv, req, nil)
 	assert.Nil(t, err)
 	assert.Equal(t, []int{11, 12}, (**recv.X).A)
@@ -183,7 +183,7 @@ func TestCookieString(t *testing.T) {
 	}
 	req := newRequest("", nil, cookies, nil)
 	recv := new(Recv)
-	binder := binding.New("api").SetLevel(binding.FirstForUntagged)
+	binder := binding.New("api")
 	err := binder.BindAndValidate(recv, req, nil)
 	assert.Nil(t, err)
 	assert.Equal(t, []string{"a1", "a2"}, (**recv.X).A)
@@ -217,7 +217,7 @@ func TestCookieNum(t *testing.T) {
 	}
 	req := newRequest("", nil, cookies, nil)
 	recv := new(Recv)
-	binder := binding.New("api").SetLevel(binding.FirstForUntagged)
+	binder := binding.New("api")
 	err := binder.BindAndValidate(recv, req, nil)
 	assert.Nil(t, err)
 	assert.Equal(t, []int{11, 12}, (**recv.X).A)
@@ -258,7 +258,7 @@ func TestFormString(t *testing.T) {
 		header.Set("Content-Type", contentType)
 		req := newRequest("", header, nil, bodyReader)
 		recv := new(Recv)
-		binder := binding.New("api").SetLevel(binding.FirstForUntagged)
+		binder := binding.New("api")
 		err := binder.BindAndValidate(recv, req, nil)
 		assert.Nil(t, err)
 		assert.Equal(t, []string{"a1", "a2"}, (**recv.X).A)
@@ -300,7 +300,7 @@ func TestFormNum(t *testing.T) {
 		header.Set("Content-Type", contentType)
 		req := newRequest("", header, nil, bodyReader)
 		recv := new(Recv)
-		binder := binding.New("api").SetLevel(binding.FirstForUntagged)
+		binder := binding.New("api")
 		err := binder.BindAndValidate(recv, req, nil)
 		assert.Nil(t, err)
 		assert.Equal(t, []int{11, 12}, (**recv.X).A)
@@ -338,7 +338,7 @@ func TestJSON(t *testing.T) {
 	header.Set("Content-Type", "application/json")
 	req := newRequest("", header, nil, bodyReader)
 	recv := new(Recv)
-	binder := binding.New("api").SetLevel(binding.FirstForUntagged)
+	binder := binding.New("api")
 	err := binder.BindAndValidate(recv, req, nil)
 	assert.Nil(t, err)
 	assert.Equal(t, []string{"a1", "a2"}, (**recv.X).A)
@@ -384,7 +384,7 @@ func TestPath(t *testing.T) {
 
 	req := newRequest("", nil, nil, nil)
 	recv := new(Recv)
-	binder := binding.New("api").SetLevel(binding.FirstForUntagged)
+	binder := binding.New("api")
 	err := binder.BindAndValidate(recv, req, new(testPathParams))
 	assert.Nil(t, err)
 	assert.Equal(t, []string{"a1"}, (**recv.X).A)