Merge pull request 'Update workflows' (#97) from atolstikhin/micro-codec-xml:master into master

Reviewed-on: #97

codec_test.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	"go.unistack.org/micro/v3/codec"
+	"go.unistack.org/micro/v4/codec"
 )
 
 func TestFrame(t *testing.T) {
@@ -28,7 +28,7 @@ func TestFrameFlatten(t *testing.T) {
 		Name: &codec.Frame{Data: []byte("test")},
 	}
 
-	buf, err := NewCodec(codec.Flatten(true)).Marshal(s)
+	buf, err := NewCodec().Marshal(s)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -36,3 +36,15 @@ func TestFrameFlatten(t *testing.T) {
 		t.Fatalf("bytes not equal %s != %s", buf, `test`)
 	}
 }
+
+func TestReadBody(t *testing.T) {
+	s := &struct {
+		Name string
+	}{}
+	c := NewCodec()
+	b := bytes.NewReader(nil)
+	err := c.ReadBody(b, s)
+	if err != nil {
+		t.Fatal(err)
+	}
+}

go.mod

@@ -1,15 +1,10 @@
-module go.unistack.org/micro-codec-xml/v3
+module go.unistack.org/micro-codec-xml/v4
 
-go 1.21
+go 1.19
-
-toolchain go1.23.4
 
 require (
-	go.unistack.org/micro-proto/v3 v3.4.1
+	go.unistack.org/micro-proto/v4 v4.0.0
-	go.unistack.org/micro/v3 v3.10.88
+	go.unistack.org/micro/v4 v4.0.1
 )
 
-require (
+require google.golang.org/protobuf v1.28.1 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
-	google.golang.org/protobuf v1.35.2 // indirect
-)

go.sum

@@ -1,8 +1,12 @@
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
-go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
+go.unistack.org/micro-proto/v4 v4.0.0 h1:+TAwKSlx48eLsNO2E2cO0JLE8we1KU2AuWe9Q310FuU=
-go.unistack.org/micro/v3 v3.10.88 h1:MxlzP+77Y6Kphb3lzHxROL4XfE/WdCQMQpnPv4D9Z8U=
+go.unistack.org/micro-proto/v4 v4.0.0/go.mod h1:ArmK7o+uFvxSY3dbJhKBBX4Pm1rhWdLEFf3LxBrMtec=
-go.unistack.org/micro/v3 v3.10.88/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
+go.unistack.org/micro/v4 v4.0.1 h1:xo1IxbVfgh8i0eY0VeYa3cbb13u5n/Mxnp3FOgWD4Jo=
-google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
+go.unistack.org/micro/v4 v4.0.1/go.mod h1:p/J5UcSJjfHsWGT31uKoghQ5rUQZzQJBAFy+Z4+ZVMs=
-google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
+google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=

xml.go

@@ -1,14 +1,13 @@
 // Package xml provides a xml codec
-package xml // import "go.unistack.org/micro-codec-xml/v3"
+package xml // import "go.unistack.org/micro-codec-xml/v4"
 
 import (
-	"bytes"
 	"encoding/xml"
 	"io"
 
-	pb "go.unistack.org/micro-proto/v3/codec"
+	pb "go.unistack.org/micro-proto/v4/codec"
-	"go.unistack.org/micro/v3/codec"
+	"go.unistack.org/micro/v4/codec"
-	rutil "go.unistack.org/micro/v3/util/reflect"
+	rutil "go.unistack.org/micro/v4/util/reflect"
 )
 
 var _ codec.Codec = &xmlCodec{}
@@ -21,18 +20,6 @@ const (
 	flattenTag = "flatten"
 )
 
-type unmarshalStrictKey struct{}
-
-func UnmarshalStrict(b bool) codec.Option {
-	return codec.SetOption(unmarshalStrictKey{}, b)
-}
-
-type unmarshalXML11Key struct{}
-
-func UnmarshalXML11(b bool) codec.Option {
-	return codec.SetOption(unmarshalXML11Key{}, b)
-}
-
 func (c *xmlCodec) Marshal(v interface{}, opts ...codec.Option) ([]byte, error) {
 	if v == nil {
 		return nil, nil
@@ -42,22 +29,15 @@ func (c *xmlCodec) Marshal(v interface{}, opts ...codec.Option) ([]byte, error)
 	for _, o := range opts {
 		o(&options)
 	}
-
-	if options.Flatten {
 	if nv, nerr := rutil.StructFieldByTag(v, options.TagName, flattenTag); nerr == nil {
 		v = nv
 	}
-	}
 
 	switch m := v.(type) {
 	case *codec.Frame:
 		return m.Data, nil
 	case *pb.Frame:
 		return m.Data, nil
-	case codec.RawMessage:
-		return []byte(m), nil
-	case *codec.RawMessage:
-		return []byte(*m), nil
 	}
 
 	return xml.Marshal(v)
@@ -73,11 +53,9 @@ func (c *xmlCodec) Unmarshal(b []byte, v interface{}, opts ...codec.Option) erro
 		o(&options)
 	}
 
-	if options.Flatten {
 	if nv, nerr := rutil.StructFieldByTag(v, options.TagName, flattenTag); nerr == nil {
 		v = nv
 	}
-	}
 
 	switch m := v.(type) {
 	case *codec.Frame:
@@ -86,74 +64,44 @@ func (c *xmlCodec) Unmarshal(b []byte, v interface{}, opts ...codec.Option) erro
 	case *pb.Frame:
 		m.Data = b
 		return nil
-	case *codec.RawMessage:
+	}
-		*m = append((*m)[0:0], b...)
+
-		return nil
+	return xml.Unmarshal(b, v)
-	case codec.RawMessage:
+}
-		copy(m, b)
+
+func (c *xmlCodec) ReadHeader(conn io.Reader, m *codec.Message, t codec.MessageType) error {
 	return nil
 }
 
-	var unmarshalStrict bool
+func (c *xmlCodec) ReadBody(conn io.Reader, v interface{}) error {
-	var unmarshalXML11 bool
+	if v == nil {
-	if options.Context != nil {
+		return nil
-		if v, ok := options.Context.Value(unmarshalStrictKey{}).(bool); ok {
-			unmarshalStrict = v
-		}
-		if v, ok := options.Context.Value(unmarshalXML11Key{}).(bool); ok {
-			unmarshalXML11 = v
-		}
 	}
 
-	var r io.Reader
+	buf, err := io.ReadAll(conn)
-
+	if err != nil {
-	if unmarshalXML11 {
+		return err
-		r = newReader(b)
+	} else if len(buf) == 0 {
-	} else {
+		return nil
-		r = bytes.NewReader(b)
 	}
 
-	d := xml.NewDecoder(r)
+	return c.Unmarshal(buf, v)
-
-	if unmarshalStrict {
-		d.Strict = true
 }
 
-	return d.Decode(v)
+func (c *xmlCodec) Write(conn io.Writer, m *codec.Message, v interface{}) error {
+	if v == nil {
+		return nil
 	}
 
-type reader struct {
+	buf, err := c.Marshal(v)
-	s        []byte
+	if err != nil {
-	i        int64 // current reading index
+		return err
-	prevRune int   // index of previous rune; or < 0
+	} else if len(buf) == 0 {
-	skip     bool
+		return codec.ErrInvalidMessage
 	}
 
-func newReader(b []byte) io.Reader {
+	_, err = conn.Write(buf)
-	return &reader{b, 0, -1, false}
+	return err
-}
-
-var (
-	srcP = []byte(`version="1.1"`)
-	srcL = len(srcP)
-	dstP = []byte(`version="1.0"`)
-)
-
-func (r *reader) Read(b []byte) (n int, err error) {
-	if r.i >= int64(len(r.s)) {
-		return 0, io.EOF
-	}
-	r.prevRune = -1
-	n = copy(b, r.s[r.i:])
-	if !r.skip {
-		if idx := bytes.Index(b, srcP); idx > 0 {
-			copy(b[idx:idx+srcL], dstP)
-			r.skip = true
-		}
-	}
-
-	r.i += int64(n)
-	return
 }
 
 func (c *xmlCodec) String() string {