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

Reviewed-on: #97

.gitea/workflows/job_tests.yml

@@ -39,7 +39,7 @@ jobs:
       run: |
         go work init
         go work use .
-        go work use micro-tests
+        go work use micro-tests        
     - name: setup deps
       env:
         GOWORK: /workspace/${{ github.repository_owner }}/go.work
@@ -50,4 +50,4 @@ jobs:
         GOWORK: /workspace/${{ github.repository_owner }}/go.work
       run: |
         cd micro-tests
-        go test -mod readonly -v ./... || true
+        go test -mod readonly -v ./... || true        

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,10 +1,10 @@
-module go.unistack.org/micro-codec-xml/v3
+module go.unistack.org/micro-codec-xml/v4
 
-go 1.16
+go 1.19
 
 require (
-	github.com/imdario/mergo v0.3.13 // indirect
+	go.unistack.org/micro-proto/v4 v4.0.0
-	go.unistack.org/micro-proto/v3 v3.4.1
+	go.unistack.org/micro/v4 v4.0.1
-	go.unistack.org/micro/v3 v3.10.88
-	google.golang.org/protobuf v1.34.2 // indirect
 )
+
+require google.golang.org/protobuf v1.28.1 // indirect

xml.go

@@ -1,12 +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 (
 	"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{}
@@ -28,11 +29,8 @@ func (c *xmlCodec) Marshal(v interface{}, opts ...codec.Option) ([]byte, error)
 	for _, o := range opts {
 		o(&options)
 	}
-
+	if nv, nerr := rutil.StructFieldByTag(v, options.TagName, flattenTag); nerr == nil {
-	if options.Flatten {
+		v = nv
-		if nv, nerr := rutil.StructFieldByTag(v, options.TagName, flattenTag); nerr == nil {
-			v = nv
-		}
 	}
 
 	switch m := v.(type) {
@@ -55,10 +53,8 @@ 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 {
-		if nv, nerr := rutil.StructFieldByTag(v, options.TagName, flattenTag); nerr == nil {
+		v = nv
-			v = nv
-		}
 	}
 
 	switch m := v.(type) {
@@ -73,6 +69,41 @@ func (c *xmlCodec) Unmarshal(b []byte, v interface{}, opts ...codec.Option) erro
 	return xml.Unmarshal(b, v)
 }
 
+func (c *xmlCodec) ReadHeader(conn io.Reader, m *codec.Message, t codec.MessageType) error {
+	return nil
+}
+
+func (c *xmlCodec) ReadBody(conn io.Reader, v interface{}) error {
+	if v == nil {
+		return nil
+	}
+
+	buf, err := io.ReadAll(conn)
+	if err != nil {
+		return err
+	} else if len(buf) == 0 {
+		return nil
+	}
+
+	return c.Unmarshal(buf, v)
+}
+
+func (c *xmlCodec) Write(conn io.Writer, m *codec.Message, v interface{}) error {
+	if v == nil {
+		return nil
+	}
+
+	buf, err := c.Marshal(v)
+	if err != nil {
+		return err
+	} else if len(buf) == 0 {
+		return codec.ErrInvalidMessage
+	}
+
+	_, err = conn.Write(buf)
+	return err
+}
+
 func (c *xmlCodec) String() string {
 	return "xml"
 }