refactor: json config

cloudwego · Dec 1, 2023 · 7cbbfba · 7cbbfba
1 parent a327795
commit 7cbbfba
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 10 deletions.
diff --git a/pkg/common/json/sonic.go → internal/json/sonic.go b/pkg/common/json/sonic.go → internal/json/sonic.go
diff --git a/pkg/common/json/std.go → internal/json/std.go b/pkg/common/json/std.go → internal/json/std.go
diff --git a/pkg/app/server/binding/config.go b/pkg/app/server/binding/config.go
@@ -23,12 +23,14 @@ import (
 	"time"
 
 	exprValidator "github.com/bytedance/go-tagexpr/v2/validator"
+	hJson "github.com/cloudwego/hertz/internal/json"
 	inDecoder "github.com/cloudwego/hertz/pkg/app/server/binding/internal/decoder"
-	hJson "github.com/cloudwego/hertz/pkg/common/json"
 	"github.com/cloudwego/hertz/pkg/protocol"
 	"github.com/cloudwego/hertz/pkg/route/param"
 )
 
+type JSONUnmarshaler func(data []byte, v interface{}) error
+
 // BindConfig contains options for default bind behavior.
 type BindConfig struct {
 	// LooseZeroMode if set to true,
@@ -63,6 +65,8 @@ type BindConfig struct {
 	// The default is false.
 	// It is used for BindJSON().
 	EnableDecoderDisallowUnknownFields bool
+
+	JSONUnmarshalFunc JSONUnmarshaler
 	// TypeUnmarshalFuncs registers customized type unmarshaler.
 	// NOTE:
 	// time.Time is registered by default
@@ -78,6 +82,7 @@ func NewBindConfig() *BindConfig {
 		DisableStructFieldResolve:          false,
 		EnableDecoderUseNumber:             false,
 		EnableDecoderDisallowUnknownFields: false,
+		JSONUnmarshalFunc:                  hJson.Unmarshal,
 		TypeUnmarshalFuncs:                 make(map[reflect.Type]inDecoder.CustomizeDecodeFunc),
 		Validator:                          defaultValidate,
 	}
@@ -127,8 +132,8 @@ func (config *BindConfig) initTypeUnmarshal() {
 // NOTE:
 //
 //	UseThirdPartyJSONUnmarshaler will remain in effect once it has been called.
-func (config *BindConfig) UseThirdPartyJSONUnmarshaler(fn func(data []byte, v interface{}) error) {
-	hJson.Unmarshal = fn
+func (config *BindConfig) UseThirdPartyJSONUnmarshaler(fn JSONUnmarshaler) {
+	config.JSONUnmarshalFunc = fn
 }
 
 // UseStdJSONUnmarshaler uses encoding/json as json library

diff --git a/pkg/app/server/binding/default.go b/pkg/app/server/binding/default.go
@@ -71,8 +71,8 @@ import (
 
 	exprValidator "github.com/bytedance/go-tagexpr/v2/validator"
 	"github.com/cloudwego/hertz/internal/bytesconv"
+	hJson "github.com/cloudwego/hertz/internal/json"
 	inDecoder "github.com/cloudwego/hertz/pkg/app/server/binding/internal/decoder"
-	hJson "github.com/cloudwego/hertz/pkg/common/json"
 	"github.com/cloudwego/hertz/pkg/common/utils"
 	"github.com/cloudwego/hertz/pkg/protocol"
 	"github.com/cloudwego/hertz/pkg/protocol/consts"
@@ -325,7 +325,11 @@ func (b *defaultBinder) preBindBody(req *protocol.Request, v interface{}) error
 	ct := bytesconv.B2s(req.Header.ContentType())
 	switch utils.FilterContentType(ct) {
 	case consts.MIMEApplicationJSON:
-		return hJson.Unmarshal(req.Body(), v)
+		fn := b.config.JSONUnmarshalFunc
+		if fn == nil {
+			fn = hJson.Unmarshal
+		}
+		return fn(req.Body(), v)
 	case consts.MIMEPROTOBUF:
 		msg, ok := v.(proto.Message)
 		if !ok {

diff --git a/pkg/app/server/binding/internal/decoder/map_type_decoder.go b/pkg/app/server/binding/internal/decoder/map_type_decoder.go
@@ -45,7 +45,7 @@ import (
 	"reflect"
 
 	"github.com/cloudwego/hertz/internal/bytesconv"
-	hJson "github.com/cloudwego/hertz/pkg/common/json"
+	hJson "github.com/cloudwego/hertz/internal/json"
 	"github.com/cloudwego/hertz/pkg/protocol"
 	"github.com/cloudwego/hertz/pkg/route/param"
 )

diff --git a/pkg/app/server/binding/internal/decoder/slice_type_decoder.go b/pkg/app/server/binding/internal/decoder/slice_type_decoder.go
@@ -46,7 +46,7 @@ import (
 	"reflect"
 
 	"github.com/cloudwego/hertz/internal/bytesconv"
-	hJson "github.com/cloudwego/hertz/pkg/common/json"
+	hJson "github.com/cloudwego/hertz/internal/json"
 	"github.com/cloudwego/hertz/pkg/protocol"
 	"github.com/cloudwego/hertz/pkg/route/param"
 )

diff --git a/pkg/app/server/binding/internal/decoder/struct_type_decoder.go b/pkg/app/server/binding/internal/decoder/struct_type_decoder.go
@@ -21,8 +21,8 @@ import (
 	"reflect"
 
 	"github.com/cloudwego/hertz/internal/bytesconv"
+	hjson "github.com/cloudwego/hertz/internal/json"
 	"github.com/cloudwego/hertz/pkg/common/hlog"
-	hjson "github.com/cloudwego/hertz/pkg/common/json"
 	"github.com/cloudwego/hertz/pkg/protocol"
 	"github.com/cloudwego/hertz/pkg/route/param"
 )

diff --git a/pkg/app/server/binding/internal/decoder/text_decoder.go b/pkg/app/server/binding/internal/decoder/text_decoder.go
@@ -46,7 +46,7 @@ import (
 	"strconv"
 
 	"github.com/cloudwego/hertz/internal/bytesconv"
-	hJson "github.com/cloudwego/hertz/pkg/common/json"
+	hJson "github.com/cloudwego/hertz/internal/json"
 )
 
 type TextDecoder interface {

diff --git a/pkg/app/server/render/json.go b/pkg/app/server/render/json.go
@@ -45,7 +45,7 @@ import (
 	"bytes"
 	"encoding/json"
 
-	hjson "github.com/cloudwego/hertz/pkg/common/json"
+	hjson "github.com/cloudwego/hertz/internal/json"
 	"github.com/cloudwego/hertz/pkg/protocol"
 )
 
@@ -58,10 +58,12 @@ func init() {
 	ResetJSONMarshal(hjson.Marshal)
 }
 
+// Deprecated:
 func ResetJSONMarshal(fn JSONMarshaler) {
 	jsonMarshalFunc = fn
 }
 
+// Deprecated:
 func ResetStdJSONMarshal() {
 	ResetJSONMarshal(json.Marshal)
 }