From d559587807c0f6f4e258140342a6d085839bdb9a Mon Sep 17 00:00:00 2001
From: Vasiliy Tolstov <v.tolstov@unistack.org>
Date: Sat, 21 Mar 2020 12:40:58 +0300
Subject: [PATCH] client/grpc: remove json-iterator usage (#1387)

* minimize external deps and binary size
* if user wants json-iterator codec it must be used in server and
  client code. so best to use it via go-plugins

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
---
 client/grpc/codec.go | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/client/grpc/codec.go b/client/grpc/codec.go
index 9f89647a..a7ee99fc 100644
--- a/client/grpc/codec.go
+++ b/client/grpc/codec.go
@@ -1,6 +1,7 @@
 package grpc
 
 import (
+	"encoding/json"
 	"fmt"
 	"strings"
 
@@ -8,7 +9,6 @@ import (
 
 	"github.com/golang/protobuf/jsonpb"
 	"github.com/golang/protobuf/proto"
-	jsoniter "github.com/json-iterator/go"
 	"github.com/micro/go-micro/v2/codec"
 	"github.com/micro/go-micro/v2/codec/bytes"
 	"google.golang.org/grpc"
@@ -21,6 +21,7 @@ type bytesCodec struct{}
 type wrapCodec struct{ encoding.Codec }
 
 var jsonpbMarshaler = &jsonpb.Marshaler{}
+var useNumber bool
 
 var (
 	defaultGRPCCodecs = map[string]encoding.Codec{
@@ -33,18 +34,11 @@ var (
 		"application/grpc+proto":   protoCodec{},
 		"application/grpc+bytes":   bytesCodec{},
 	}
-
-	json = jsoniter.ConfigCompatibleWithStandardLibrary
 )
 
 // UseNumber fix unmarshal Number(8234567890123456789) to interface(8.234567890123457e+18)
 func UseNumber() {
-	json = jsoniter.Config{
-		UseNumber:              true,
-		EscapeHTML:             true,
-		SortMapKeys:            true,
-		ValidateJsonRawMessage: true,
-	}.Froze()
+	useNumber = true
 }
 
 func (w wrapCodec) String() string {
@@ -134,7 +128,12 @@ func (jsonCodec) Unmarshal(data []byte, v interface{}) error {
 	if pb, ok := v.(proto.Message); ok {
 		return jsonpb.Unmarshal(b.NewReader(data), pb)
 	}
-	return json.Unmarshal(data, v)
+
+	dec := json.NewDecoder(b.NewReader(data))
+	if useNumber {
+		dec.UseNumber()
+	}
+	return dec.Decode(v)
 }
 
 func (jsonCodec) Name() string {