fix repocard issues (#21)

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

codec/json/json.go

@@ -4,10 +4,11 @@ package json
 import (
 	"encoding/json"
 	"io"
+	"io/ioutil"
 
-	"github.com/golang/protobuf/jsonpb"
-	"github.com/golang/protobuf/proto"
 	"github.com/unistack-org/micro/v3/codec"
+	jsonpb "google.golang.org/protobuf/encoding/protojson"
+	"google.golang.org/protobuf/proto"
 )
 
 type Codec struct {
@@ -25,7 +26,11 @@ func (c *Codec) ReadBody(b interface{}) error {
 		return nil
 	}
 	if pb, ok := b.(proto.Message); ok {
-		return jsonpb.UnmarshalNext(c.Decoder, pb)
+		buf, err := ioutil.ReadAll(c.Conn)
+		if err != nil {
+			return err
+		}
+		return jsonpb.Unmarshal(buf, pb)
 	}
 	return c.Decoder.Decode(b)
 }

codec/json/marshaler.go

@@ -1,15 +1,14 @@
 package json
 
 import (
-	"bytes"
 	"encoding/json"
 
-	"github.com/golang/protobuf/jsonpb"
-	"github.com/golang/protobuf/proto"
 	"github.com/oxtoacart/bpool"
+	jsonpb "google.golang.org/protobuf/encoding/protojson"
+	"google.golang.org/protobuf/proto"
 )
 
-var jsonpbMarshaler = &jsonpb.Marshaler{}
+var jsonpbMarshaler = &jsonpb.MarshalOptions{}
 
 // create buffer pool with 16 instances each preallocated with 256 bytes
 var bufferPool = bpool.NewSizedBufferPool(16, 256)
@@ -18,19 +17,18 @@ type Marshaler struct{}
 
 func (j Marshaler) Marshal(v interface{}) ([]byte, error) {
 	if pb, ok := v.(proto.Message); ok {
-		buf := bufferPool.Get()
-		defer bufferPool.Put(buf)
-		if err := jsonpbMarshaler.Marshal(buf, pb); err != nil {
+		buf, err := jsonpbMarshaler.Marshal(pb)
+		if err != nil {
 			return nil, err
 		}
-		return buf.Bytes(), nil
+		return buf, nil
 	}
 	return json.Marshal(v)
 }
 
 func (j Marshaler) Unmarshal(d []byte, v interface{}) error {
 	if pb, ok := v.(proto.Message); ok {
-		return jsonpb.Unmarshal(bytes.NewReader(d), pb)
+		return jsonpb.Unmarshal(d, pb)
 	}
 	return json.Unmarshal(d, v)
 }