Parcourir la source

Added WriteJSON/ReadJSON deprecated methods for backwards compatibility.

Craig Jackson il y a 12 ans
Parent
commit
3d66655aaa
2 fichiers modifiés avec 18 ajouts et 0 suppressions
  1. 10 0
      json.go
  2. 8 0
      json_test.go

+ 10 - 0
json.go

@@ -8,6 +8,11 @@ import (
 	"encoding/json"
 )
 
+// DEPRECATED: use c.WriteJSON instead.
+func WriteJSON(c *Conn, v interface{}) error {
+	return c.WriteJSON(v)
+}
+
 // WriteJSON writes the JSON encoding of v to the connection.
 //
 // See the documentation for encoding/json Marshal for details about the
@@ -25,6 +30,11 @@ func (c *Conn) WriteJSON(v interface{}) error {
 	return err2
 }
 
+// DEPRECATED: use c.WriteJSON instead.
+func ReadJSON(c *Conn, v interface{}) error {
+	return c.ReadJSON(v)
+}
+
 // ReadJSON reads the next JSON-encoded message from the connection and stores
 // it in the value pointed to by v.
 //

+ 8 - 0
json_test.go

@@ -23,10 +23,18 @@ func TestJSON(t *testing.T) {
 	expect.A = 1
 	expect.B = "hello"
 
+	if err := WriteJSON(wc, &expect); err != nil {
+		t.Fatal("write", err)
+	}
+
 	if err := wc.WriteJSON(&expect); err != nil {
 		t.Fatal("write", err)
 	}
 
+	if err := ReadJSON(rc, &expect); err != nil {
+		t.Fatal("read", err)
+	}
+
 	if err := rc.ReadJSON(&actual); err != nil {
 		t.Fatal("read", err)
 	}