From 86307a13bec807fcf9bbce27382b187ebd29adab Mon Sep 17 00:00:00 2001 From: George Kankava Date: Mon, 1 Feb 2016 18:30:56 +0400 Subject: [PATCH] squid:S00117 - Local variable and method parameter names should comply with a naming convention. --- src/main/java/io/socket/emitter/Emitter.java | 6 ++--- .../socket/engineio/client/HandshakeData.java | 6 ++--- .../engineio/client/transports/Polling.java | 12 +++++----- .../client/transports/PollingXHR.java | 6 ++--- .../engineio/client/transports/WebSocket.java | 8 +++---- .../io/socket/engineio/parser/Parser.java | 22 +++++++++---------- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/main/java/io/socket/emitter/Emitter.java b/src/main/java/io/socket/emitter/Emitter.java index a95e2d5..6ff57b4 100644 --- a/src/main/java/io/socket/emitter/Emitter.java +++ b/src/main/java/io/socket/emitter/Emitter.java @@ -29,9 +29,9 @@ public class Emitter { ConcurrentLinkedQueue callbacks = this.callbacks.get(event); if (callbacks == null) { callbacks = new ConcurrentLinkedQueue (); - ConcurrentLinkedQueue _callbacks = this.callbacks.putIfAbsent(event, callbacks); - if (_callbacks != null) { - callbacks = _callbacks; + ConcurrentLinkedQueue tempCallbacks = this.callbacks.putIfAbsent(event, callbacks); + if (tempCallbacks != null) { + callbacks = tempCallbacks; } } callbacks.add(fn); diff --git a/src/main/java/io/socket/engineio/client/HandshakeData.java b/src/main/java/io/socket/engineio/client/HandshakeData.java index 348270f..bdee0ed 100644 --- a/src/main/java/io/socket/engineio/client/HandshakeData.java +++ b/src/main/java/io/socket/engineio/client/HandshakeData.java @@ -19,13 +19,13 @@ public class HandshakeData { /*package*/ HandshakeData(JSONObject data) throws JSONException { JSONArray upgrades = data.getJSONArray("upgrades"); int length = upgrades.length(); - String[] _upgrades = new String[length]; + String[] tempUpgrades = new String[length]; for (int i = 0; i < length; i ++) { - _upgrades[i] = upgrades.getString(i); + tempUpgrades[i] = upgrades.getString(i); } this.sid = data.getString("sid"); - this.upgrades = _upgrades; + this.upgrades = tempUpgrades; this.pingInterval = data.getLong("pingInterval"); this.pingTimeout = data.getLong("pingTimeout"); } diff --git a/src/main/java/io/socket/engineio/client/transports/Polling.java b/src/main/java/io/socket/engineio/client/transports/Polling.java index 1899241..b6d577b 100644 --- a/src/main/java/io/socket/engineio/client/transports/Polling.java +++ b/src/main/java/io/socket/engineio/client/transports/Polling.java @@ -128,8 +128,8 @@ abstract public class Polling extends Transport { if (data instanceof String) { @SuppressWarnings("unchecked") - Parser.DecodePayloadCallback _callback = callback; - Parser.decodePayload((String)data, _callback); + Parser.DecodePayloadCallback tempCallback = callback; + Parser.decodePayload((String)data, tempCallback); } else if (data instanceof byte[]) { Parser.decodePayload((byte[])data, callback); } @@ -203,19 +203,19 @@ abstract public class Polling extends Transport { query.put(this.timestampParam, Yeast.yeast()); } - String _query = ParseQS.encode(query); + String derivedQuery = ParseQS.encode(query); if (this.port > 0 && (("https".equals(schema) && this.port != 443) || ("http".equals(schema) && this.port != 80))) { port = ":" + this.port; } - if (_query.length() > 0) { - _query = "?" + _query; + if (derivedQuery.length() > 0) { + derivedQuery = "?" + derivedQuery; } boolean ipv6 = this.hostname.contains(":"); - return schema + "://" + (ipv6 ? "[" + this.hostname + "]" : this.hostname) + port + this.path + _query; + return schema + "://" + (ipv6 ? "[" + this.hostname + "]" : this.hostname) + port + this.path + derivedQuery; } abstract protected void doWrite(byte[] data, Runnable fn); diff --git a/src/main/java/io/socket/engineio/client/transports/PollingXHR.java b/src/main/java/io/socket/engineio/client/transports/PollingXHR.java index 864b114..1844cb9 100644 --- a/src/main/java/io/socket/engineio/client/transports/PollingXHR.java +++ b/src/main/java/io/socket/engineio/client/transports/PollingXHR.java @@ -281,9 +281,9 @@ public class PollingXHR extends Polling { int len = 0; byte[] buffer = new byte[1024]; while ((len = input.read(buffer)) > 0) { - byte[] _buffer = new byte[len]; - System.arraycopy(buffer, 0, _buffer, 0, len); - buffers.add(_buffer); + byte[] tempBuffer = new byte[len]; + System.arraycopy(buffer, 0, tempBuffer, 0, len); + buffers.add(tempBuffer); capacity += len; } ByteBuffer data = ByteBuffer.allocate(capacity); diff --git a/src/main/java/io/socket/engineio/client/transports/WebSocket.java b/src/main/java/io/socket/engineio/client/transports/WebSocket.java index 79c7979..bb17684 100644 --- a/src/main/java/io/socket/engineio/client/transports/WebSocket.java +++ b/src/main/java/io/socket/engineio/client/transports/WebSocket.java @@ -221,12 +221,12 @@ public class WebSocket extends Transport { query.put(this.timestampParam, Yeast.yeast()); } - String _query = ParseQS.encode(query); - if (_query.length() > 0) { - _query = "?" + _query; + String derivedQuery = ParseQS.encode(query); + if (derivedQuery.length() > 0) { + derivedQuery = "?" + derivedQuery; } boolean ipv6 = this.hostname.contains(":"); - return schema + "://" + (ipv6 ? "[" + this.hostname + "]" : this.hostname) + port + this.path + _query; + return schema + "://" + (ipv6 ? "[" + this.hostname + "]" : this.hostname) + port + this.path + derivedQuery; } } \ No newline at end of file diff --git a/src/main/java/io/socket/engineio/parser/Parser.java b/src/main/java/io/socket/engineio/parser/Parser.java index 8b75b28..29e86d9 100644 --- a/src/main/java/io/socket/engineio/parser/Parser.java +++ b/src/main/java/io/socket/engineio/parser/Parser.java @@ -45,10 +45,10 @@ public class Parser { public static void encodePacket(Packet packet, boolean utf8encode, EncodeCallback callback) throws UTF8Exception { if (packet.data instanceof byte[]) { @SuppressWarnings("unchecked") - Packet _packet = packet; + Packet packetToEncode = packet; @SuppressWarnings("unchecked") - EncodeCallback _callback = callback; - encodeByteArray(_packet, _callback); + EncodeCallback callbackToEncode = callback; + encodeByteArray(packetToEncode, callbackToEncode); return; } @@ -59,8 +59,8 @@ public class Parser { } @SuppressWarnings("unchecked") - EncodeCallback _callback = callback; - _callback.call(encoded); + EncodeCallback tempCallback = callback; + tempCallback.call(encoded); } private static void encodeByteArray(Packet packet, EncodeCallback callback) { @@ -219,8 +219,8 @@ public class Parser { } if (numberTooLong) { @SuppressWarnings("unchecked") - DecodePayloadCallback _callback = callback; - _callback.call(err, 0, 1); + DecodePayloadCallback tempCallback = callback; + tempCallback.call(err, 0, 1); return; } bufferTail.position(strLen.length() + 1); @@ -247,12 +247,12 @@ public class Parser { Object buffer = buffers.get(i); if (buffer instanceof String) { @SuppressWarnings("unchecked") - DecodePayloadCallback _callback = callback; - _callback.call(decodePacket((String)buffer, true), i, total); + DecodePayloadCallback tempCallback = callback; + tempCallback.call(decodePacket((String)buffer, true), i, total); } else if (buffer instanceof byte[]) { @SuppressWarnings("unchecked") - DecodePayloadCallback _callback = callback; - _callback.call(decodePacket((byte[])buffer), i, total); + DecodePayloadCallback tempCallback = callback; + tempCallback.call(decodePacket((byte[])buffer), i, total); } } }