From 3d66655aaaf2f0a458ec8cffc578ca331dc056f7 Mon Sep 17 00:00:00 2001 From: Craig Jackson Date: Sun, 27 Oct 2013 11:50:42 -0700 Subject: [PATCH] Added WriteJSON/ReadJSON deprecated methods for backwards compatibility. --- json.go | 10 ++++++++++ json_test.go | 8 ++++++++ 2 files changed, 18 insertions(+) diff --git a/json.go b/json.go index 880c13b..01723b2 100644 --- a/json.go +++ b/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. // diff --git a/json_test.go b/json_test.go index 365c42a..b2e2e9a 100644 --- a/json_test.go +++ b/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) }