feat: new impl

Author: thinkgos

context.go

@@ -214,19 +214,7 @@ func (r *Encoding) BindQuery(req *http.Request, v any) error {
 }
 
 // BindUri binds the passed struct pointer using the uri codec.Marshaler.
-// NOTE: before use this, you should set uri params in the request context with RequestWithUri.
-//
-// Deprecated: Use BindURI instead.
-func (r *Encoding) BindUri(req *http.Request, v any) error {
-	raws := FromRequestUri(req)
-	if raws == nil {
-		return errors.New("encoding: must be request with uri in context")
-	}
-	return r.mimeUri.Decode(raws, v)
-}
-
-// BindUri binds the passed struct pointer using the uri codec.Marshaler.
-func (r *Encoding) BindURI(raws url.Values, v any) error {
+func (r *Encoding) BindUri(raws url.Values, v any) error {
 	return r.mimeUri.Decode(raws, v)
 }
 

context_test.go

@@ -494,108 +494,10 @@ func Test_Encoding_BindQuery(t *testing.T) {
 	}
 }
 
-// Deprecated: Because BindUri is deprecated.
 func Test_Encoding_BindUri(t *testing.T) {
 	registry := New()
 	require.NoError(t, registry.Register(MIMEURI, form.New("json")))
 
-	tests := []struct {
-		name    string
-		genReq  func() (*http.Request, error)
-		want    any
-		wantErr bool
-	}{
-		{
-			"uri - no proto",
-			func() (*http.Request, error) {
-				r, err := http.NewRequest(http.MethodGet, "http://example.com/foo/bar", nil)
-				if err != nil {
-					return nil, err
-				}
-
-				param := url.Values{}
-				param.Add("id", "foo")
-				param.Add("name", "bar")
-				return RequestWithUri(r, param), nil
-			},
-			&TestMode{
-				Id:   "foo",
-				Name: "bar",
-			},
-			false,
-		},
-		{
-			"uri - proto",
-			func() (*http.Request, error) {
-				r, err := http.NewRequest(http.MethodGet, "http://example.com?id=11&uint32=1234&bool=true", nil)
-				if err != nil {
-					return nil, err
-				}
-				param := url.Values{}
-				param.Add("id", "11")
-				param.Add("uint32", "1234")
-				param.Add("bool", "true")
-				return RequestWithUri(r, param), nil
-			},
-			&examplepb.Complex{
-				Id:     11,
-				Uint32: wrapperspb.UInt32(1234),
-				Bool:   wrapperspb.Bool(true),
-			},
-			false,
-		},
-		{
-			"uri - always in context",
-			func() (*http.Request, error) {
-				r, err := http.NewRequest(http.MethodGet, "http://example.com?id=11&uint32=1234&bool=true", nil)
-				if err != nil {
-					return nil, err
-				}
-				r.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-				return RequestWithUri(r, nil), nil
-			},
-			&examplepb.Complex{},
-			false,
-		},
-		{
-			"uri - no existing in context",
-			func() (*http.Request, error) {
-				r, err := http.NewRequest(http.MethodGet, "http://example.com?id=11&uint32=1234&bool=true", nil)
-				if err != nil {
-					return nil, err
-				}
-				r.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-				return r, nil
-			},
-			&examplepb.Complex{},
-			true,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			req, err := tt.genReq()
-			if err != nil {
-				t.Errorf("genReq() error = %v", err)
-			}
-			got := alloc(reflect.TypeOf(tt.want))
-			if err = registry.BindUri(req, got.Interface()); (err != nil) != tt.wantErr {
-				t.Errorf("BindUri() error = %v, wantErr %v", err, tt.wantErr)
-			}
-			if _, ok := tt.want.(proto.Message); ok {
-				if diff := proto.Equal(got.Interface().(proto.Message), tt.want.(proto.Message)); !diff {
-					t.Errorf("got = %v, want %v", got, tt.want)
-				}
-			} else {
-				require.Equal(t, got.Interface(), tt.want)
-			}
-		})
-	}
-}
-
-func Test_Encoding_BindURI(t *testing.T) {
-	registry := New()
-	require.NoError(t, registry.Register(MIMEURI, form.New("json")))
-
 	tests := []struct {
 		name    string
 		genUri  func() (url.Values, error)
@@ -640,7 +542,7 @@ func Test_Encoding_BindURI(t *testing.T) {
 				t.Errorf("genUri() error = %v", err)
 			}
 			got := alloc(reflect.TypeOf(tt.want))
-			if err = registry.BindURI(raws, got.Interface()); (err != nil) != tt.wantErr {
+			if err = registry.BindUri(raws, got.Interface()); (err != nil) != tt.wantErr {
 				t.Errorf("BindURI() error = %v, wantErr %v", err, tt.wantErr)
 			}
 			if _, ok := tt.want.(proto.Message); ok {

encoding.go

@@ -1,6 +1,6 @@
 module github.com/things-go/encoding
 
-go 1.20
+go 1.21
 
 require (
 	github.com/go-playground/form/v4 v4.2.1