From 3d98ed9fe9c524fc7cf24235197b8ae3afb159a3 Mon Sep 17 00:00:00 2001
From: nkzawa <naoyuki.kanezawa@gmail.com>
Date: Fri, 14 Jul 2017 11:50:25 +0900
Subject: [PATCH] simplify custom encoder/decoder

---
 src/main/java/io/socket/client/Manager.java  |  9 ++++-----
 src/main/java/io/socket/parser/IOParser.java | 13 ++-----------
 src/main/java/io/socket/parser/Parser.java   |  4 ----
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/src/main/java/io/socket/client/Manager.java b/src/main/java/io/socket/client/Manager.java
index 450c579..6fab3ab 100644
--- a/src/main/java/io/socket/client/Manager.java
+++ b/src/main/java/io/socket/client/Manager.java
@@ -149,10 +149,8 @@ public class Manager extends Emitter {
         this.uri = uri;
         this.encoding = false;
         this.packetBuffer = new ArrayList<Packet>();
-
-        Parser parser = opts.parser != null ? opts.parser : new IOParser();
-        this.encoder = parser.getEncoder();
-        this.decoder = parser.getDecoder();
+        this.encoder = opts.encoder != null ? opts.encoder : new IOParser.Encoder();
+        this.decoder = opts.decoder != null ? opts.decoder : new IOParser.Decoder();
     }
 
     private void emitAll(String event, Object... args) {
@@ -634,7 +632,8 @@ public class Manager extends Emitter {
         public long reconnectionDelay;
         public long reconnectionDelayMax;
         public double randomizationFactor;
-        public Parser parser;
+        public Parser.Encoder encoder;
+        public Parser.Decoder decoder;
 
         /**
          * Connection timeout (ms). Set -1 to disable.
diff --git a/src/main/java/io/socket/parser/IOParser.java b/src/main/java/io/socket/parser/IOParser.java
index 3e51f11..787d35a 100644
--- a/src/main/java/io/socket/parser/IOParser.java
+++ b/src/main/java/io/socket/parser/IOParser.java
@@ -1,5 +1,6 @@
 package io.socket.parser;
 
+import io.socket.client.IO;
 import io.socket.hasbinary.HasBinary;
 import org.json.JSONException;
 import org.json.JSONTokener;
@@ -18,17 +19,7 @@ final public class IOParser implements Parser {
         return new Packet<String>(ERROR, "parser error");
     }
 
-    public IOParser() {}
-
-    @Override
-    public Parser.Encoder getEncoder () {
-        return new Encoder();
-    }
-
-    @Override
-    public Parser.Decoder getDecoder () {
-        return new Decoder();
-    }
+    private IOParser() {}
 
     final public static class Encoder implements Parser.Encoder {
 
diff --git a/src/main/java/io/socket/parser/Parser.java b/src/main/java/io/socket/parser/Parser.java
index fc9d88b..b4808b0 100644
--- a/src/main/java/io/socket/parser/Parser.java
+++ b/src/main/java/io/socket/parser/Parser.java
@@ -63,10 +63,6 @@ public interface Parser {
         "BINARY_ACK"
     };
 
-    public Encoder getEncoder();
-
-    public Decoder getDecoder();
-
     public static interface Encoder {
 
         public void encode(Packet obj, Callback callback);