types: chnage RawMessage to json.RawMessage

Author: zchee

types.go

@@ -13,6 +13,7 @@ import (
 	"github.com/francoispqt/gojay"
 )
 
+// Version represents a JSONRPC version.
 const Version = "2.0"
 
 // ID is a Request identifier.
@@ -70,20 +71,6 @@ func (m RawMessage) String() string {
 	return *(*string)(unsafe.Pointer(&m))
 }
 
-// Read implements io.Reader.
-// func (m *RawMessage) Read(p []byte) (n int, err error) {
-// 	if len(p) == 0 || p == nil {
-// 		return 0, nil
-// 	}
-// 	if m == nil {
-// 		return 0, io.EOF
-// 	}
-//
-// 	n = copy(p, *m)
-//
-// 	return n, nil
-// }
-
 // MarshalJSON implements json.Marshaler.
 //
 // The returns m as the JSON encoding of m.
@@ -108,7 +95,6 @@ func (m *RawMessage) UnmarshalJSON(data []byte) error {
 	return nil
 }
 
-// var _ io.Reader = (*RawMessage)(nil)
 var _ json.Marshaler = (*RawMessage)(nil)
 var _ json.Unmarshaler = (*RawMessage)(nil)
 
@@ -126,7 +112,7 @@ type Request struct {
 	Method string `json:"method"`
 
 	// The method's params.
-	Params *RawMessage `json:"params,omitempty"`
+	Params *json.RawMessage `json:"params,omitempty"`
 }
 
 // IsNotify returns true if this request is a notification.
@@ -151,7 +137,7 @@ type Response struct {
 
 	// The result of a request. This member is REQUIRED on success.
 	// This member MUST NOT exist if there was an error invoking the method.
-	Result *RawMessage `json:"result,omitempty"`
+	Result *json.RawMessage `json:"result,omitempty"`
 }
 
 // Combined represents a all the fields of both Request and Response.
@@ -166,14 +152,14 @@ type Combined struct {
 	Method string `json:"method"`
 
 	// The method's params.
-	Params *RawMessage `json:"params,omitempty"`
+	Params *json.RawMessage `json:"params,omitempty"`
 
 	// The error object in case a request fails.
 	Error *Error `json:"error,omitempty"`
 
 	// The result of a request. This member is REQUIRED on success.
 	// This member MUST NOT exist if there was an error invoking the method.
-	Result *RawMessage `json:"result,omitempty"`
+	Result *json.RawMessage `json:"result,omitempty"`
 }
 
 // NotificationMessage is a notification message.
@@ -187,5 +173,5 @@ type NotificationMessage struct {
 	Method string `json:"method"`
 
 	// Params is the notification's params.
-	Params *RawMessage `json:"params,omitempty"`
+	Params *json.RawMessage `json:"params,omitempty"`
 }

types_gen.go

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// Code generated by GoJay. DO NOT EDIT.
-
 package jsonrpc2
 
 import (
+	"encoding/json"
+
 	"github.com/francoispqt/gojay"
 )
 
@@ -22,7 +22,7 @@ func (v *Request) UnmarshalJSONObject(dec *gojay.Decoder, k string) error {
 		return dec.String(&v.Method)
 	case "params":
 		if v.Params == nil {
-			v.Params = &RawMessage{}
+			v.Params = &json.RawMessage{}
 		}
 		return dec.EmbeddedJSON((*gojay.EmbeddedJSON)(v.Params))
 	}
@@ -58,7 +58,7 @@ func (v *Response) UnmarshalJSONObject(dec *gojay.Decoder, k string) error {
 		return dec.Object(v.Error)
 	case "result":
 		if v.Result == nil {
-			v.Result = &RawMessage{}
+			v.Result = &json.RawMessage{}
 		}
 		return dec.EmbeddedJSON((*gojay.EmbeddedJSON)(v.Result))
 	}
@@ -94,7 +94,7 @@ func (v *Combined) UnmarshalJSONObject(dec *gojay.Decoder, k string) error {
 		return dec.String(&v.Method)
 	case "params":
 		if v.Params == nil {
-			v.Params = &RawMessage{}
+			v.Params = &json.RawMessage{}
 		}
 		return dec.EmbeddedJSON((*gojay.EmbeddedJSON)(v.Params))
 	case "error":
@@ -104,7 +104,7 @@ func (v *Combined) UnmarshalJSONObject(dec *gojay.Decoder, k string) error {
 		return dec.Object(v.Error)
 	case "result":
 		if v.Result == nil {
-			v.Result = &RawMessage{}
+			v.Result = &json.RawMessage{}
 		}
 		return dec.EmbeddedJSON((*gojay.EmbeddedJSON)(v.Result))
 	}
@@ -136,7 +136,7 @@ func (v *NotificationMessage) UnmarshalJSONObject(dec *gojay.Decoder, k string)
 		return dec.String(&v.Method)
 	case "params":
 		if v.Params == nil {
-			v.Params = &RawMessage{}
+			v.Params = &json.RawMessage{}
 		}
 		return dec.EmbeddedJSON((*gojay.EmbeddedJSON)(v.Params))
 	}