From af001414702bf0f16cf669ae4afe3f0c59d80d3d Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sat, 3 Nov 2018 22:17:33 -0400
Subject: [PATCH] Purge json_god

---
 lib/angel_websocket.dart    |  2 +-
 lib/io.dart                 | 16 ----------------
 lib/websocket_context.dart  |  4 ++--
 test/controller/common.dart |  4 ++++
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/lib/angel_websocket.dart b/lib/angel_websocket.dart
index b7dfc04c..1f9b6e94 100644
--- a/lib/angel_websocket.dart
+++ b/lib/angel_websocket.dart
@@ -77,7 +77,7 @@ class WebSocketAction {
       data: data['data'],
       params: data['params'] as Map<String, dynamic>);
 
-  Map toJson() {
+  Map<String, dynamic> toJson() {
     return {'id': id, 'eventName': eventName, 'data': data, 'params': params};
   }
 }
diff --git a/lib/io.dart b/lib/io.dart
index 4c5a7c9c..efd95c21 100644
--- a/lib/io.dart
+++ b/lib/io.dart
@@ -5,10 +5,8 @@ import 'dart:async';
 import 'dart:io';
 import 'package:angel_client/angel_client.dart';
 import 'package:http/http.dart' as http;
-import 'package:json_god/json_god.dart' as god;
 import 'package:web_socket_channel/web_socket_channel.dart';
 import 'package:web_socket_channel/io.dart';
-import 'angel_websocket.dart';
 import 'base_websocket_client.dart';
 export 'package:angel_client/angel_client.dart';
 export 'angel_websocket.dart';
@@ -51,9 +49,6 @@ class WebSockets extends BaseWebSocketClient {
     String uri = path.replaceAll(_straySlashes, '');
     return new IoWebSocketsService<Id, Data>(socket, this, uri, type);
   }
-
-  @override
-  serialize(x) => god.serialize(x);
 }
 
 class IoWebSocketsService<Id, Data> extends WebSocketsService<Id, Data> {
@@ -62,15 +57,4 @@ class IoWebSocketsService<Id, Data> extends WebSocketsService<Id, Data> {
   IoWebSocketsService(
       WebSocketChannel socket, WebSockets app, String uri, this.type)
       : super(socket, app, uri);
-
-  @override
-  serialize(WebSocketAction action) => god.serialize(action);
-
-  @override
-  deserialize(x) {
-    if (type != null && type != dynamic) {
-      return god.deserializeDatum(x, outputType: type) as Data;
-    } else
-      return super.deserialize(x);
-  }
 }
diff --git a/lib/websocket_context.dart b/lib/websocket_context.dart
index 74310bcb..4630fd59 100644
--- a/lib/websocket_context.dart
+++ b/lib/websocket_context.dart
@@ -44,8 +44,8 @@ class WebSocketContext {
 
   /// Sends an arbitrary [WebSocketEvent];
   void send(String eventName, data) {
-    channel.sink
-        .add(json.encode(new WebSocketEvent(eventName: eventName, data: data)));
+    channel.sink.add(json
+        .encode(new WebSocketEvent(eventName: eventName, data: data).toJson()));
   }
 
   /// Sends an error event.
diff --git a/test/controller/common.dart b/test/controller/common.dart
index b35094f2..8e624d73 100644
--- a/test/controller/common.dart
+++ b/test/controller/common.dart
@@ -10,6 +10,10 @@ class Game {
       playerOne: data['playerOne'].toString(),
       playerTwo: data['playerTwo'].toString());
 
+  Map<String, dynamic> toJson() {
+    return {'playerOne': playerOne, 'playerTwo': playerTwo};
+  }
+
   @override
   bool operator ==(other) =>
       other is Game &&