From d3644045011ebeac19e580f4c123e1ff8966d394 Mon Sep 17 00:00:00 2001 From: Christian Ivan Date: Wed, 2 Dec 2015 17:17:46 +0700 Subject: [PATCH 1/5] Code Quality Improvement - Collection.isEmpty() should be used to test for emptiness --- src/main/java/io/socket/client/Manager.java | 4 ++-- src/main/java/io/socket/client/Socket.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/socket/client/Manager.java b/src/main/java/io/socket/client/Manager.java index b5cd07c..8fb7209 100644 --- a/src/main/java/io/socket/client/Manager.java +++ b/src/main/java/io/socket/client/Manager.java @@ -416,7 +416,7 @@ public class Manager extends Emitter { /*package*/ void destroy(Socket socket) { this.connected.remove(socket); - if (this.connected.size() > 0) return; + if (!this.connected.isEmpty()) return; this.close(); } @@ -447,7 +447,7 @@ public class Manager extends Emitter { } private void processPacketQueue() { - if (this.packetBuffer.size() > 0 && !this.encoding) { + if (!this.packetBuffer.isEmpty() && !this.encoding) { Packet pack = this.packetBuffer.remove(0); this.packet(pack); } diff --git a/src/main/java/io/socket/client/Socket.java b/src/main/java/io/socket/client/Socket.java index 88f897e..f43a4c2 100644 --- a/src/main/java/io/socket/client/Socket.java +++ b/src/main/java/io/socket/client/Socket.java @@ -312,7 +312,7 @@ public class Socket extends Emitter { } if (this.connected) { - if (args.size() == 0) return; + if (args.isEmpty()) return; String event = args.remove(0).toString(); super.emit(event, args.toArray()); } else { From 2b7a40b96a049b51dac6242c2114d56d3e7afef0 Mon Sep 17 00:00:00 2001 From: Christian Ivan Date: Wed, 2 Dec 2015 17:25:37 +0700 Subject: [PATCH 2/5] Code Quality Improvement - Redundant Field Initializer --- src/main/java/io/socket/backo/Backoff.java | 4 ++-- src/main/java/io/socket/client/Manager.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/socket/backo/Backoff.java b/src/main/java/io/socket/backo/Backoff.java index 4252266..5f9a450 100644 --- a/src/main/java/io/socket/backo/Backoff.java +++ b/src/main/java/io/socket/backo/Backoff.java @@ -5,8 +5,8 @@ public class Backoff { private long ms = 100; private long max = 10000; private int factor = 2; - private double jitter = 0.0; - private int attempts = 0; + private double jitter; + private int attempts; public Backoff() {} diff --git a/src/main/java/io/socket/client/Manager.java b/src/main/java/io/socket/client/Manager.java index b5cd07c..6346a30 100644 --- a/src/main/java/io/socket/client/Manager.java +++ b/src/main/java/io/socket/client/Manager.java @@ -72,7 +72,7 @@ public class Manager extends Emitter { /*package*/ static SSLContext defaultSSLContext; /*package*/ static HostnameVerifier defaultHostnameVerifier; - /*package*/ ReadyState readyState = null; + /*package*/ ReadyState readyState; private boolean _reconnection; private boolean skipReconnect; From eac538dfe07a4554eaf2fd0dfa84df5cc8741f38 Mon Sep 17 00:00:00 2001 From: Christian Ivan Date: Wed, 2 Dec 2015 17:22:00 +0700 Subject: [PATCH 3/5] Code Quality Improvement - Objects should be compared with "equals()" Update --- src/main/java/io/socket/client/Socket.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/socket/client/Socket.java b/src/main/java/io/socket/client/Socket.java index 88f897e..5949459 100644 --- a/src/main/java/io/socket/client/Socket.java +++ b/src/main/java/io/socket/client/Socket.java @@ -454,7 +454,7 @@ public class Socket extends Emitter { } catch (JSONException e) { v = null; } - data[i] = v == JSONObject.NULL ? null : v; + data[i] = JSONObject.NULL.equals(v) ? null : v; } return data; } From 2143774a1e77acfa80530eed2868112c47c0ed68 Mon Sep 17 00:00:00 2001 From: Christian Ivan Date: Thu, 3 Dec 2015 12:20:29 +0700 Subject: [PATCH 4/5] Code Quality Improvement - Exception handlers should preserve the original exception Update Update --- src/main/java/io/socket/client/Socket.java | 2 ++ src/main/java/io/socket/hasbinary/HasBinary.java | 10 ++++++++-- src/main/java/io/socket/parser/Binary.java | 10 +++++++++- src/main/java/io/socket/parser/Parser.java | 2 ++ 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/socket/client/Socket.java b/src/main/java/io/socket/client/Socket.java index 88f897e..67ad210 100644 --- a/src/main/java/io/socket/client/Socket.java +++ b/src/main/java/io/socket/client/Socket.java @@ -10,6 +10,7 @@ import org.json.JSONException; import org.json.JSONObject; import java.util.*; +import java.util.logging.Level; import java.util.logging.Logger; /** @@ -452,6 +453,7 @@ public class Socket extends Emitter { try { v = array.get(i); } catch (JSONException e) { + logger.log(Level.WARNING, "An error occured while retrieving data from JSONArray", e); v = null; } data[i] = v == JSONObject.NULL ? null : v; diff --git a/src/main/java/io/socket/hasbinary/HasBinary.java b/src/main/java/io/socket/hasbinary/HasBinary.java index 368c061..630be88 100644 --- a/src/main/java/io/socket/hasbinary/HasBinary.java +++ b/src/main/java/io/socket/hasbinary/HasBinary.java @@ -3,11 +3,15 @@ package io.socket.hasbinary; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import java.util.logging.Level; +import java.util.logging.Logger; import java.util.Iterator; public class HasBinary { - + + private static final Logger logger = Logger.getLogger(HasBinary.class.getName()); + private HasBinary() {} public static boolean hasBinary(Object data) { @@ -29,6 +33,7 @@ public class HasBinary { try { v = _obj.isNull(i) ? null : _obj.get(i); } catch (JSONException e) { + logger.log(Level.WARNING, "An error occured while retrieving data from JSONArray", e); return false; } if (_hasBinary(v)) { @@ -44,7 +49,8 @@ public class HasBinary { try { v = _obj.get(key); } catch (JSONException e) { - return false; + logger.log(Level.WARNING, "An error occured while retrieving data from JSONObject", e); + return false; } if (_hasBinary(v)) { return true; diff --git a/src/main/java/io/socket/parser/Binary.java b/src/main/java/io/socket/parser/Binary.java index 7cb158d..904b2b2 100644 --- a/src/main/java/io/socket/parser/Binary.java +++ b/src/main/java/io/socket/parser/Binary.java @@ -7,13 +7,16 @@ import org.json.JSONObject; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; public class Binary { private static final String KEY_PLACEHOLDER = "_placeholder"; private static final String KEY_NUM = "num"; - + + private static final Logger logger = Logger.getLogger(Binary.class.getName()); public static DeconstructedPacket deconstructPacket(Packet packet) { List buffers = new ArrayList(); @@ -36,6 +39,7 @@ public class Binary { placeholder.put(KEY_PLACEHOLDER, true); placeholder.put(KEY_NUM, buffers.size()); } catch (JSONException e) { + logger.log(Level.WARNING, "An error occured while putting data to JSONObject", e); return null; } buffers.add((byte[])data); @@ -48,6 +52,7 @@ public class Binary { try { newData.put(i, _deconstructPacket(_data.get(i), buffers)); } catch (JSONException e) { + logger.log(Level.WARNING, "An error occured while putting packet data to JSONObject", e); return null; } } @@ -61,6 +66,7 @@ public class Binary { try { newData.put(key, _deconstructPacket(_data.get(key), buffers)); } catch (JSONException e) { + logger.log(Level.WARNING, "An error occured while putting data to JSONObject", e); return null; } } @@ -83,6 +89,7 @@ public class Binary { try { _data.put(i, _reconstructPacket(_data.get(i), buffers)); } catch (JSONException e) { + logger.log(Level.WARNING, "An error occured while putting packet data to JSONObject", e); return null; } } @@ -99,6 +106,7 @@ public class Binary { try { _data.put(key, _reconstructPacket(_data.get(key), buffers)); } catch (JSONException e) { + logger.log(Level.WARNING, "An error occured while putting data to JSONObject", e); return null; } } diff --git a/src/main/java/io/socket/parser/Parser.java b/src/main/java/io/socket/parser/Parser.java index 806c00c..22eb3fc 100644 --- a/src/main/java/io/socket/parser/Parser.java +++ b/src/main/java/io/socket/parser/Parser.java @@ -7,6 +7,7 @@ import org.json.JSONTokener; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.logging.Level; import java.util.logging.Logger; public class Parser { @@ -227,6 +228,7 @@ public class Parser { str.charAt(++i); p.data = new JSONTokener(str.substring(i)).nextValue(); } catch (JSONException e) { + logger.log(Level.WARNING, "An error occured while retrieving data from JSONTokener", e); return error(); } } From fff5cb3e25caaf284c4122ad54dd0bb4fb6363bb Mon Sep 17 00:00:00 2001 From: Christian Ivan Date: Wed, 2 Dec 2015 17:13:28 +0700 Subject: [PATCH 5/5] Code Quality Improvement - Constructors should only call non-overridable methods update --- src/main/java/io/socket/client/Manager.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/socket/client/Manager.java b/src/main/java/io/socket/client/Manager.java index b5cd07c..829cecd 100644 --- a/src/main/java/io/socket/client/Manager.java +++ b/src/main/java/io/socket/client/Manager.java @@ -180,7 +180,7 @@ public class Manager extends Emitter { return this; } - public long reconnectionDelay() { + public final long reconnectionDelay() { return this._reconnectionDelay; } @@ -192,7 +192,7 @@ public class Manager extends Emitter { return this; } - public double randomizationFactor() { + public final double randomizationFactor() { return this._randomizationFactor; } @@ -204,7 +204,7 @@ public class Manager extends Emitter { return this; } - public long reconnectionDelayMax() { + public final long reconnectionDelayMax() { return this._reconnectionDelayMax; }