Merge branch 'master' into dev

rest.go

@@ -8,9 +8,9 @@ import (
 	"net/http"
 )
 
-// JSONDecoder decodes json from given bytes buffer to target object.
-func JSONDecoder(data *bytes.Buffer, target interface{}) error {
-	err := json.Unmarshal(data.Bytes(), target)
+// JSONDecoder decodes json from given bytes array to target object.
+func JSONDecoder(data []byte, target interface{}) error {
+	err := json.Unmarshal(data, target)
 
 	return err
 }

rest_test.go

@@ -22,7 +22,7 @@ func TestJSONDecoder(t *testing.T) {
 	expected := Something{First: 15, Second: "Some string"}
 
 	var result Something
-	err := JSONDecoder(buffer, &result)
+	err := JSONDecoder(buffer.Bytes(), &result)
 	if err != nil {
 		t.Error(err)
 	}
@@ -39,7 +39,7 @@ func TestJSONDecoderBadJSON(t *testing.T) {
 	expected := Something{First: 15, Second: "Some string"}
 
 	var result Something
-	err := JSONDecoder(buffer, &result)
+	err := JSONDecoder(buffer.Bytes(), &result)
 	if err == nil {
 		t.Error("There should be an error")
 	}