rename interface to JSONSerializer

Author: aldas

bind.go

@@ -65,7 +65,7 @@ func (b *DefaultBinder) BindBody(c Context, i interface{}) (err error) {
 	ctype := req.Header.Get(HeaderContentType)
 	switch {
 	case strings.HasPrefix(ctype, MIMEApplicationJSON):
-		if err = c.Echo().JSONCodec.Decode(c, i); err != nil {
+		if err = c.Echo().JSONSerializer.Deserialize(c, i); err != nil {
 			switch err.(type) {
 			case *HTTPError:
 				return err

context.go

@@ -465,7 +465,7 @@ func (c *context) jsonPBlob(code int, callback string, i interface{}) (err error
 	if _, err = c.response.Write([]byte(callback + "(")); err != nil {
 		return
 	}
-	if err = c.echo.JSONCodec.Encode(c, i, indent); err != nil {
+	if err = c.echo.JSONSerializer.Serialize(c, i, indent); err != nil {
 		return
 	}
 	if _, err = c.response.Write([]byte(");")); err != nil {
@@ -477,7 +477,7 @@ func (c *context) jsonPBlob(code int, callback string, i interface{}) (err error
 func (c *context) json(code int, i interface{}, indent string) error {
 	c.writeContentType(MIMEApplicationJSONCharsetUTF8)
 	c.response.Status = code
-	return c.echo.JSONCodec.Encode(c, i, indent)
+	return c.echo.JSONSerializer.Serialize(c, i, indent)
 }
 
 func (c *context) JSON(code int, i interface{}) (err error) {

echo.go

@@ -90,7 +90,7 @@ type (
 		HidePort         bool
 		HTTPErrorHandler HTTPErrorHandler
 		Binder           Binder
-		JSONCodec        JSONCodec
+		JSONSerializer   JSONSerializer
 		Validator        Validator
 		Renderer         Renderer
 		Logger           Logger
@@ -126,10 +126,10 @@ type (
 		Validate(i interface{}) error
 	}
 
-	// JSONCodec is the interface that encodes and decodes JSON to and from interfaces.
-	JSONCodec interface {
-		Encode(c Context, i interface{}, indent string) error
-		Decode(c Context, i interface{}) error
+	// JSONSerializer is the interface that encodes and decodes JSON to and from interfaces.
+	JSONSerializer interface {
+		Serialize(c Context, i interface{}, indent string) error
+		Deserialize(c Context, i interface{}) error
 	}
 
 	// Renderer is the interface that wraps the Render function.
@@ -322,7 +322,7 @@ func New() (e *Echo) {
 	e.TLSServer.Handler = e
 	e.HTTPErrorHandler = e.DefaultHTTPErrorHandler
 	e.Binder = &DefaultBinder{}
-	e.JSONCodec = &DefaultJSONCodec{}
+	e.JSONSerializer = &DefaultJSONSerializer{}
 	e.Logger.SetLevel(log.ERROR)
 	e.StdLogger = stdLog.New(e.Logger.Output(), e.Logger.Prefix()+": ", 0)
 	e.pool.New = func() interface{} {

json.go

@@ -6,21 +6,21 @@ import (
 	"net/http"
 )
 
-// DefaultJSONCodec implements JSON encoding using encoding/json.
-type DefaultJSONCodec struct{}
+// DefaultJSONSerializer implements JSON encoding using encoding/json.
+type DefaultJSONSerializer struct{}
 
-// Encode converts an interface into a json and writes it to the response.
+// Serialize converts an interface into a json and writes it to the response.
 // You can optionally use the indent parameter to produce pretty JSONs.
-func (d DefaultJSONCodec) Encode(c Context, i interface{}, indent string) error {
+func (d DefaultJSONSerializer) Serialize(c Context, i interface{}, indent string) error {
 	enc := json.NewEncoder(c.Response())
 	if indent != "" {
 		enc.SetIndent("", indent)
 	}
 	return enc.Encode(i)
 }
 
-// Decode reads a JSON from a request body and converts it into an interface.
-func (d DefaultJSONCodec) Decode(c Context, i interface{}) error {
+// Deserialize reads a JSON from a request body and converts it into an interface.
+func (d DefaultJSONSerializer) Deserialize(c Context, i interface{}) error {
 	err := json.NewDecoder(c.Request().Body).Decode(i)
 	if ute, ok := err.(*json.UnmarshalTypeError); ok {
 		return NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Unmarshal type error: expected=%v, got=%v, field=%v, offset=%v", ute.Type, ute.Value, ute.Field, ute.Offset)).SetInternal(err)

json_test.go

@@ -31,17 +31,17 @@ func TestDefaultJSONCodec_Encode(t *testing.T) {
 	// Default JSON encoder
 	//--------
 
-	enc := new(DefaultJSONCodec)
+	enc := new(DefaultJSONSerializer)
 
-	err := enc.Encode(c, user{1, "Jon Snow"}, "")
+	err := enc.Serialize(c, user{1, "Jon Snow"}, "")
 	if assert.NoError(err) {
 		assert.Equal(userJSON+"\n", rec.Body.String())
 	}
 
 	req = httptest.NewRequest(http.MethodPost, "/", nil)
 	rec = httptest.NewRecorder()
 	c = e.NewContext(req, rec).(*context)
-	err = enc.Encode(c, user{1, "Jon Snow"}, "  ")
+	err = enc.Serialize(c, user{1, "Jon Snow"}, "  ")
 	if assert.NoError(err) {
 		assert.Equal(userJSONPretty+"\n", rec.Body.String())
 	}
@@ -70,10 +70,10 @@ func TestDefaultJSONCodec_Decode(t *testing.T) {
 	// Default JSON encoder
 	//--------
 
-	enc := new(DefaultJSONCodec)
+	enc := new(DefaultJSONSerializer)
 
 	var u = user{}
-	err := enc.Decode(c, &u)
+	err := enc.Deserialize(c, &u)
 	if assert.NoError(err) {
 		assert.Equal(u, user{ID: 1, Name: "Jon Snow"})
 	}
@@ -82,7 +82,7 @@ func TestDefaultJSONCodec_Decode(t *testing.T) {
 	req = httptest.NewRequest(http.MethodPost, "/", strings.NewReader(invalidContent))
 	rec = httptest.NewRecorder()
 	c = e.NewContext(req, rec).(*context)
-	err = enc.Decode(c, &userUnmarshalSyntaxError)
+	err = enc.Deserialize(c, &userUnmarshalSyntaxError)
 	assert.IsType(&HTTPError{}, err)
 	assert.EqualError(err, "code=400, message=Syntax error: offset=1, error=invalid character 'i' looking for beginning of value, internal=invalid character 'i' looking for beginning of value")
 
@@ -94,7 +94,7 @@ func TestDefaultJSONCodec_Decode(t *testing.T) {
 	req = httptest.NewRequest(http.MethodPost, "/", strings.NewReader(userJSON))
 	rec = httptest.NewRecorder()
 	c = e.NewContext(req, rec).(*context)
-	err = enc.Decode(c, &userUnmarshalTypeError)
+	err = enc.Deserialize(c, &userUnmarshalTypeError)
 	assert.IsType(&HTTPError{}, err)
 	assert.EqualError(err, "code=400, message=Unmarshal type error: expected=string, got=number, field=id, offset=7, internal=json: cannot unmarshal number into Go struct field .id of type string")