From a6c71f5945b98c68ea029b94281b0bdc2be1fc3d Mon Sep 17 00:00:00 2001
From: Malte Isberner <malte@redhat.com>
Date: Sun, 7 Nov 2021 16:59:22 +0100
Subject: [PATCH] Make RawMessage an alias of json.RawMessage, instead of
 introducing a new type.

---
 adapter.go                              |  3 ++-
 config.go                               |  1 -
 misc_tests/jsoniter_raw_message_test.go | 14 ++++++------
 reflect_json_raw_message.go             | 30 -------------------------
 4 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/adapter.go b/adapter.go
index 92d2cc4a..c317e77a 100644
--- a/adapter.go
+++ b/adapter.go
@@ -2,11 +2,12 @@ package jsoniter
 
 import (
 	"bytes"
+	"encoding/json"
 	"io"
 )
 
 // RawMessage to make replace json with jsoniter
-type RawMessage []byte
+type RawMessage = json.RawMessage
 
 // Unmarshal adapts to json/encoding Unmarshal API
 //
diff --git a/config.go b/config.go
index 2adcdc3b..d2b21997 100644
--- a/config.go
+++ b/config.go
@@ -194,7 +194,6 @@ func (cfg *frozenConfig) validateJsonRawMessage(extension EncoderExtension) {
 		return len(*((*json.RawMessage)(ptr))) == 0
 	}}
 	extension[reflect2.TypeOfPtr((*json.RawMessage)(nil)).Elem()] = encoder
-	extension[reflect2.TypeOfPtr((*RawMessage)(nil)).Elem()] = encoder
 }
 
 func (cfg *frozenConfig) useNumber(extension DecoderExtension) {
diff --git a/misc_tests/jsoniter_raw_message_test.go b/misc_tests/jsoniter_raw_message_test.go
index 86af5efe..c7630efe 100644
--- a/misc_tests/jsoniter_raw_message_test.go
+++ b/misc_tests/jsoniter_raw_message_test.go
@@ -10,7 +10,7 @@ import (
 
 func Test_jsoniter_RawMessage(t *testing.T) {
 	should := require.New(t)
-	var data jsoniter.RawMessage
+	var data json.RawMessage
 	should.Nil(jsoniter.Unmarshal([]byte(`[1,2,3]`), &data))
 	should.Equal(`[1,2,3]`, string(data))
 	str, err := jsoniter.MarshalToString(data)
@@ -20,8 +20,8 @@ func Test_jsoniter_RawMessage(t *testing.T) {
 
 func Test_encode_map_of_jsoniter_raw_message(t *testing.T) {
 	should := require.New(t)
-	type RawMap map[string]*jsoniter.RawMessage
-	value := jsoniter.RawMessage("[]")
+	type RawMap map[string]*json.RawMessage
+	value := json.RawMessage("[]")
 	rawMap := RawMap{"hello": &value}
 	output, err := jsoniter.MarshalToString(rawMap)
 	should.Nil(err)
@@ -44,7 +44,7 @@ func Test_marshal_invalid_json_raw_message(t *testing.T) {
 
 func Test_marshal_nil_json_raw_message(t *testing.T) {
 	type A struct {
-		Nil1 jsoniter.RawMessage `json:"raw1"`
+		Nil1 json.RawMessage `json:"raw1"`
 		Nil2 json.RawMessage     `json:"raw2"`
 	}
 
@@ -72,9 +72,9 @@ func Test_raw_message_memory_not_copied_issue(t *testing.T) {
 		BiddingMax  *float32             `json:"bidding_max"`
 		BiddingMin  *float32             `json:"bidding_min"`
 		BiddingType *string              `json:"bidding_type"`
-		Freq        *jsoniter.RawMessage `json:"freq"`
-		Targeting   *jsoniter.RawMessage `json:"targeting"`
-		Url         *jsoniter.RawMessage `json:"url"`
+		Freq        *json.RawMessage `json:"freq"`
+		Targeting   *json.RawMessage `json:"targeting"`
+		Url         *json.RawMessage `json:"url"`
 		Speed       *int                 `json:"speed" db:"speed"`
 	}
 
diff --git a/reflect_json_raw_message.go b/reflect_json_raw_message.go
index eba434f2..24d3fbac 100644
--- a/reflect_json_raw_message.go
+++ b/reflect_json_raw_message.go
@@ -7,15 +7,11 @@ import (
 )
 
 var jsonRawMessageType = reflect2.TypeOfPtr((*json.RawMessage)(nil)).Elem()
-var jsoniterRawMessageType = reflect2.TypeOfPtr((*RawMessage)(nil)).Elem()
 
 func createEncoderOfJsonRawMessage(ctx *ctx, typ reflect2.Type) ValEncoder {
 	if typ == jsonRawMessageType {
 		return &jsonRawMessageCodec{}
 	}
-	if typ == jsoniterRawMessageType {
-		return &jsoniterRawMessageCodec{}
-	}
 	return nil
 }
 
@@ -23,9 +19,6 @@ func createDecoderOfJsonRawMessage(ctx *ctx, typ reflect2.Type) ValDecoder {
 	if typ == jsonRawMessageType {
 		return &jsonRawMessageCodec{}
 	}
-	if typ == jsoniterRawMessageType {
-		return &jsoniterRawMessageCodec{}
-	}
 	return nil
 }
 
@@ -51,26 +44,3 @@ func (codec *jsonRawMessageCodec) Encode(ptr unsafe.Pointer, stream *Stream) {
 func (codec *jsonRawMessageCodec) IsEmpty(ptr unsafe.Pointer) bool {
 	return len(*((*json.RawMessage)(ptr))) == 0
 }
-
-type jsoniterRawMessageCodec struct {
-}
-
-func (codec *jsoniterRawMessageCodec) Decode(ptr unsafe.Pointer, iter *Iterator) {
-	if iter.ReadNil() {
-		*((*RawMessage)(ptr)) = nil
-	} else {
-		*((*RawMessage)(ptr)) = iter.SkipAndReturnBytes()
-	}
-}
-
-func (codec *jsoniterRawMessageCodec) Encode(ptr unsafe.Pointer, stream *Stream) {
-	if *((*RawMessage)(ptr)) == nil {
-		stream.WriteNil()
-	} else {
-		stream.WriteRaw(string(*((*RawMessage)(ptr))))
-	}
-}
-
-func (codec *jsoniterRawMessageCodec) IsEmpty(ptr unsafe.Pointer) bool {
-	return len(*((*RawMessage)(ptr))) == 0
-}