Small refactoring

Author: egorov-accedo

src/main/java/com/clusterws/Channel.java

@@ -3,7 +3,7 @@
 import java.util.List;
 
 public class Channel {
-    public interface IChannelListener{
+    public interface IChannelListener {
         void onDataReceived(String channelName, Object data);
     }
 
@@ -16,13 +16,13 @@ public Channel(String channelName, ClusterWS clusterWS) {
         mClusterWS = clusterWS;
     }
 
-    public Channel watch(IChannelListener listener){
+    public Channel watch(IChannelListener listener) {
         mChannelListener = listener;
         return this;
     }
 
-    public Channel publish(Object data){
-        mClusterWS.send(mChannelName,data,"publish");
+    public Channel publish(Object data) {
+        mClusterWS.send(mChannelName, data, "publish");
         return this;
     }
 
@@ -42,7 +42,7 @@ void onMessage(Object data) {
         }
     }
 
-    void subscribe(){
-        mClusterWS.send("subscribe",mChannelName,"system");
+    void subscribe() {
+        mClusterWS.send("subscribe", mChannelName, "system");
     }
 }

src/main/java/com/clusterws/Emitter.java

@@ -3,28 +3,28 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 class Emitter {
-    private ConcurrentHashMap<String,IEmitterListener> mEvents;
+    private ConcurrentHashMap<String, IEmitterListener> mEvents;
 
     Emitter() {
         mEvents = new ConcurrentHashMap<>();
     }
 
-    void addEventListener(String event, IEmitterListener listener){
-        if (mEvents.containsKey(event)){
-            mEvents.replace(event,listener);
+    void addEventListener(String event, IEmitterListener listener) {
+        if (mEvents.containsKey(event)) {
+            mEvents.replace(event, listener);
         } else {
-            mEvents.put(event,listener);
+            mEvents.put(event, listener);
         }
     }
 
-    void emit(String event, Object object){
+    void emit(String event, Object object) {
         IEmitterListener listener = mEvents.get(event);
-        if (listener != null){
+        if (listener != null) {
             listener.onDataReceived(object);
         }
     }
 
-    void removeAllEvents(){
+    void removeAllEvents() {
         mEvents = new ConcurrentHashMap<>();
     }
 }

src/main/java/com/clusterws/IClusterWSListener.java

@@ -2,6 +2,8 @@
 
 public interface IClusterWSListener {
     void onConnected();
+
     void onError(Exception exception);
+
     void onDisconnected(int code, String reason);
 }

src/main/java/com/clusterws/ISocketEvents.java

@@ -4,9 +4,13 @@
 
 public interface ISocketEvents {
     void onOpen();
+
     void onError(Exception exception);
+
     void onClose(int code, String reason);
+
     void onBinaryMessage(ByteBuffer bytes);
+
     void onMessage(String message);
 
 }

src/main/java/com/clusterws/MessageHandler.java

@@ -4,16 +4,15 @@
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.TimerTask;
 
 
 class MessageHandler {
-    String messageEncode(String event, Object data, String type){
+    String messageEncode(String event, Object data, String type) {
         JSONObject jsonObject = new JSONObject();
         JSONArray jsonArray = new JSONArray();
-        switch (type){
+        switch (type) {
             case "publish":
                 jsonArray.add("p");
                 jsonArray.add(event);
@@ -27,18 +26,18 @@ String messageEncode(String event, Object data, String type){
                 jsonObject.put("#", jsonArray);
                 return jsonObject.toJSONString();
             case "system":
-                switch (event){
+                switch (event) {
                     case "subscribe":
                         jsonArray.add("s");
                         jsonArray.add("s");
                         jsonArray.add(data);
-                        jsonObject.put("#",jsonArray);
+                        jsonObject.put("#", jsonArray);
                         return jsonObject.toJSONString();
                     case "unsubscribe":
                         jsonArray.add("s");
                         jsonArray.add("u");
                         jsonArray.add(data);
-                        jsonObject.put("#",jsonArray);
+                        jsonObject.put("#", jsonArray);
                         return jsonObject.toJSONString();
                 }
             case "ping":
@@ -48,9 +47,9 @@ String messageEncode(String event, Object data, String type){
         }
     }
 
-    void messageDecode(final ClusterWS socket, String message){
+    void messageDecode(final ClusterWS socket, String message) {
         JSONArray jsonArray = JSON.parseObject(message).getJSONArray("#");
-        switch (jsonArray.getString(0)){
+        switch (jsonArray.getString(0)) {
             case "p":
                 //
                 List<Channel> channelArrayList = socket.getChannels();
@@ -64,10 +63,10 @@ void messageDecode(final ClusterWS socket, String message){
                 }
                 break;
             case "e":
-                socket.getEmitter().emit(jsonArray.getString(1),jsonArray.get(2));
+                socket.getEmitter().emit(jsonArray.getString(1), jsonArray.get(2));
                 break;
             case "s":
-                if (jsonArray.getString(1).equals("c")){
+                if (jsonArray.getString(1).equals("c")) {
                     socket.getPingHandler().getPingTimer().scheduleAtFixedRate(new TimerTask() {
                         @Override
                         public void run() {
@@ -78,10 +77,10 @@ public void run() {
                                 cancel();
                             }
                         }
-                    },0,jsonArray.getJSONObject(2).getInteger("ping"));
+                    }, 0, jsonArray.getJSONObject(2).getInteger("ping"));
                     boolean useBinary = jsonArray.getJSONObject(2).getBoolean("binary");
                     socket.setUseBinary(useBinary);
-                    if (socket.getClusterWSListener() != null){
+                    if (socket.getClusterWSListener() != null) {
                         socket.getClusterWSListener().onConnected();
                     }
                 }

src/main/java/com/clusterws/PingHandler.java

@@ -15,7 +15,7 @@ void incrementMissedPing() {
         mMissedPing++;
     }
 
-    void setMissedPingToZero(){
+    void setMissedPingToZero() {
         mMissedPing = 0;
     }
 

src/main/java/com/clusterws/Socket.java

@@ -27,7 +27,7 @@ public void onMessage(String message) {
 
     @Override
     public void onClose(int code, String reason, boolean remote) {
-        mSocketEvents.onClose(code,reason);
+        mSocketEvents.onClose(code, reason);
     }
 
     @Override