From 5dce12e0f6395672aa74b7a5ee0f3abd61b1cd6d Mon Sep 17 00:00:00 2001 From: Zeeshan Asghar Date: Sun, 17 Jan 2016 20:13:53 +0500 Subject: [PATCH] suid:UselessParenthesesCheck Useless parentheses around expressions should be removed to prevent ay misunderstading --- .../java/net/spy/memcached/compat/SpyObject.java | 2 +- .../java/net/spy/memcached/compat/SpyThread.java | 2 +- .../spy/memcached/compat/log/AbstractLogger.java | 2 +- .../spy/memcached/compat/log/DefaultLogger.java | 6 +++--- .../java/net/spy/memcached/compat/log/Level.java | 2 +- .../spy/memcached/compat/log/Log4JLogger.java | 6 +++--- .../spy/memcached/compat/log/LoggerFactory.java | 8 ++++---- .../net/spy/memcached/compat/log/SunLogger.java | 6 +++--- .../memcached/protocol/TCPMemcachedNodeImpl.java | 4 ++-- .../memcached/protocol/binary/OperationImpl.java | 2 +- .../protocol/binary/ReplicaGetOperationImpl.java | 2 +- .../protocol/binary/SingleKeyOperationImpl.java | 8 ++++---- .../memcached/tapmessage/ResponseMessage.java | 2 +- .../transcoders/SerializingTranscoder.java | 16 ++++++++-------- 14 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/main/java/net/spy/memcached/compat/SpyObject.java b/src/main/java/net/spy/memcached/compat/SpyObject.java index 0c4e0d251..23e07e653 100644 --- a/src/main/java/net/spy/memcached/compat/SpyObject.java +++ b/src/main/java/net/spy/memcached/compat/SpyObject.java @@ -48,6 +48,6 @@ protected Logger getLogger() { if (logger == null) { logger = LoggerFactory.getLogger(getClass()); } - return (logger); + return logger; } } diff --git a/src/main/java/net/spy/memcached/compat/SpyThread.java b/src/main/java/net/spy/memcached/compat/SpyThread.java index 861383090..56e25e3f1 100644 --- a/src/main/java/net/spy/memcached/compat/SpyThread.java +++ b/src/main/java/net/spy/memcached/compat/SpyThread.java @@ -59,6 +59,6 @@ protected Logger getLogger() { if (logger == null) { logger = LoggerFactory.getLogger(getClass()); } - return (logger); + return logger; } } diff --git a/src/main/java/net/spy/memcached/compat/log/AbstractLogger.java b/src/main/java/net/spy/memcached/compat/log/AbstractLogger.java index 74cd55741..c8a70c21a 100644 --- a/src/main/java/net/spy/memcached/compat/log/AbstractLogger.java +++ b/src/main/java/net/spy/memcached/compat/log/AbstractLogger.java @@ -45,7 +45,7 @@ protected AbstractLogger(String nm) { * Get the name of this logger. */ public String getName() { - return (name); + return name; } /** diff --git a/src/main/java/net/spy/memcached/compat/log/DefaultLogger.java b/src/main/java/net/spy/memcached/compat/log/DefaultLogger.java index c3b7c2461..3d7f9e8a1 100644 --- a/src/main/java/net/spy/memcached/compat/log/DefaultLogger.java +++ b/src/main/java/net/spy/memcached/compat/log/DefaultLogger.java @@ -49,7 +49,7 @@ public DefaultLogger(String name) { */ @Override public boolean isTraceEnabled() { - return (false); + return false; } /** @@ -57,7 +57,7 @@ public boolean isTraceEnabled() { */ @Override public boolean isDebugEnabled() { - return (false); + return false; } /** @@ -65,7 +65,7 @@ public boolean isDebugEnabled() { */ @Override public boolean isInfoEnabled() { - return (true); + return true; } /** diff --git a/src/main/java/net/spy/memcached/compat/log/Level.java b/src/main/java/net/spy/memcached/compat/log/Level.java index d6d89e9d5..afdba0269 100644 --- a/src/main/java/net/spy/memcached/compat/log/Level.java +++ b/src/main/java/net/spy/memcached/compat/log/Level.java @@ -58,6 +58,6 @@ public enum Level { */ @Override public String toString() { - return ("{LogLevel: " + name() + "}"); + return "{LogLevel: " + name() + "}"; } } diff --git a/src/main/java/net/spy/memcached/compat/log/Log4JLogger.java b/src/main/java/net/spy/memcached/compat/log/Log4JLogger.java index e0e7338b2..0401bafde 100644 --- a/src/main/java/net/spy/memcached/compat/log/Log4JLogger.java +++ b/src/main/java/net/spy/memcached/compat/log/Log4JLogger.java @@ -47,17 +47,17 @@ public Log4JLogger(String name) { @Override public boolean isTraceEnabled() { - return (l4jLogger.isTraceEnabled()); + return l4jLogger.isTraceEnabled(); } @Override public boolean isDebugEnabled() { - return (l4jLogger.isDebugEnabled()); + return l4jLogger.isDebugEnabled(); } @Override public boolean isInfoEnabled() { - return (l4jLogger.isInfoEnabled()); + return l4jLogger.isInfoEnabled(); } /** diff --git a/src/main/java/net/spy/memcached/compat/log/LoggerFactory.java b/src/main/java/net/spy/memcached/compat/log/LoggerFactory.java index 9623e2f90..8961945ed 100644 --- a/src/main/java/net/spy/memcached/compat/log/LoggerFactory.java +++ b/src/main/java/net/spy/memcached/compat/log/LoggerFactory.java @@ -70,7 +70,7 @@ private static void init() { * @return a Logger instance */ public static Logger getLogger(Class clazz) { - return (getLogger(clazz.getName())); + return getLogger(clazz.getName()); } /** @@ -84,7 +84,7 @@ public static Logger getLogger(String name) { throw new NullPointerException("Logger name may not be null."); } init(); - return (instance.internalGetLogger(name)); + return instance.internalGetLogger(name); } // Get an instance of Logger from internal mechanisms. @@ -105,7 +105,7 @@ private Logger internalGetLogger(String name) { rv = tmp == null ? newLogger : tmp; } - return (rv); + return rv; } private Logger getNewInstance(String name) throws InstantiationException, @@ -117,7 +117,7 @@ private Logger getNewInstance(String name) throws InstantiationException, Object[] args = { name }; Logger rv = instanceConstructor.newInstance(args); - return (rv); + return rv; } // Find the appropriate constructor diff --git a/src/main/java/net/spy/memcached/compat/log/SunLogger.java b/src/main/java/net/spy/memcached/compat/log/SunLogger.java index af57d517e..8f30df2c3 100644 --- a/src/main/java/net/spy/memcached/compat/log/SunLogger.java +++ b/src/main/java/net/spy/memcached/compat/log/SunLogger.java @@ -50,17 +50,17 @@ public SunLogger(String name) { @Override public boolean isTraceEnabled() { - return (sunLogger.isLoggable(java.util.logging.Level.FINEST)); + return sunLogger.isLoggable(java.util.logging.Level.FINEST); } @Override public boolean isDebugEnabled() { - return (sunLogger.isLoggable(java.util.logging.Level.FINE)); + return sunLogger.isLoggable(java.util.logging.Level.FINE); } @Override public boolean isInfoEnabled() { - return (sunLogger.isLoggable(java.util.logging.Level.INFO)); + return sunLogger.isLoggable(java.util.logging.Level.INFO); } /** diff --git a/src/main/java/net/spy/memcached/protocol/TCPMemcachedNodeImpl.java b/src/main/java/net/spy/memcached/protocol/TCPMemcachedNodeImpl.java index 52deeb04b..546e42936 100644 --- a/src/main/java/net/spy/memcached/protocol/TCPMemcachedNodeImpl.java +++ b/src/main/java/net/spy/memcached/protocol/TCPMemcachedNodeImpl.java @@ -445,7 +445,7 @@ public final boolean isActive() { * @see net.spy.memcached.MemcachedNode#isAuthenticated() */ public boolean isAuthenticated() { - return (0 == authLatch.getCount()); + return 0 == authLatch.getCount(); } /* @@ -624,7 +624,7 @@ public final void setupForAuth() { reconnectBlocked = new ArrayList(inputQueue.size() + 1); inputQueue.drainTo(reconnectBlocked); } - assert (inputQueue.size() == 0); + assert inputQueue.size() == 0; setupResend(); } else { authLatch = new CountDownLatch(0); diff --git a/src/main/java/net/spy/memcached/protocol/binary/OperationImpl.java b/src/main/java/net/spy/memcached/protocol/binary/OperationImpl.java index a56463620..6217c3e61 100644 --- a/src/main/java/net/spy/memcached/protocol/binary/OperationImpl.java +++ b/src/main/java/net/spy/memcached/protocol/binary/OperationImpl.java @@ -285,7 +285,7 @@ static int decodeShort(byte[] data, int i) { } static int decodeByte(byte[] data, int i) { - return (data[i] & 0xff); + return data[i] & 0xff; } static int decodeInt(byte[] data, int i) { return (data[i] & 0xff) << 24 diff --git a/src/main/java/net/spy/memcached/protocol/binary/ReplicaGetOperationImpl.java b/src/main/java/net/spy/memcached/protocol/binary/ReplicaGetOperationImpl.java index 4be0e169b..c45892a8a 100644 --- a/src/main/java/net/spy/memcached/protocol/binary/ReplicaGetOperationImpl.java +++ b/src/main/java/net/spy/memcached/protocol/binary/ReplicaGetOperationImpl.java @@ -54,7 +54,7 @@ public void initialize() { protected void decodePayload(byte[] pl) { final int flags = decodeInt(pl, 0); final byte[] data = new byte[pl.length - EXTRA_HDR_LEN - keyLen]; - System.arraycopy(pl, (EXTRA_HDR_LEN + keyLen), data, 0, + System.arraycopy(pl, EXTRA_HDR_LEN + keyLen, data, 0, pl.length - EXTRA_HDR_LEN - keyLen); ReplicaGetOperation.Callback gcb = (ReplicaGetOperation.Callback) getCallback(); diff --git a/src/main/java/net/spy/memcached/protocol/binary/SingleKeyOperationImpl.java b/src/main/java/net/spy/memcached/protocol/binary/SingleKeyOperationImpl.java index 71bc2083a..47b16e79c 100644 --- a/src/main/java/net/spy/memcached/protocol/binary/SingleKeyOperationImpl.java +++ b/src/main/java/net/spy/memcached/protocol/binary/SingleKeyOperationImpl.java @@ -63,14 +63,14 @@ public void setNotMyVbucketNodes(Collection nodes) { } public void setVBucket(String k, short vb) { - assert k.equals(key) : (k + " doesn't match the key " + key - + " for this operation"); + assert k.equals(key) : k + " doesn't match the key " + key + + " for this operation"; vbucket = vb; } public short getVBucket(String k) { - assert k.equals(key) : (k + " doesn't match the key " + key - + " for this operation"); + assert k.equals(key) : k + " doesn't match the key " + key + + " for this operation"; return vbucket; } diff --git a/src/main/java/net/spy/memcached/tapmessage/ResponseMessage.java b/src/main/java/net/spy/memcached/tapmessage/ResponseMessage.java index 1cd7734c4..2299ac16a 100644 --- a/src/main/java/net/spy/memcached/tapmessage/ResponseMessage.java +++ b/src/main/java/net/spy/memcached/tapmessage/ResponseMessage.java @@ -97,7 +97,7 @@ public ResponseMessage(byte[] b) { key = new byte[keylength]; System.arraycopy(b, KEY_OFFSET + engineprivate, key, 0, keylength); value = new byte[b.length - keylength - engineprivate - KEY_OFFSET]; - System.arraycopy(b, (b.length - value.length), value, 0, value.length); + System.arraycopy(b, b.length - value.length, value, 0, value.length); } else if (opcode.equals(TapOpcode.DELETE)) { itemflags = 0; itemexpiry = 0; diff --git a/src/main/java/net/spy/memcached/transcoders/SerializingTranscoder.java b/src/main/java/net/spy/memcached/transcoders/SerializingTranscoder.java index 0c85123cc..13af9238a 100644 --- a/src/main/java/net/spy/memcached/transcoders/SerializingTranscoder.java +++ b/src/main/java/net/spy/memcached/transcoders/SerializingTranscoder.java @@ -39,14 +39,14 @@ public class SerializingTranscoder extends BaseSerializingTranscoder implements // Special flags for specially handled types. private static final int SPECIAL_MASK = 0xff00; - static final int SPECIAL_BOOLEAN = (1 << 8); - static final int SPECIAL_INT = (2 << 8); - static final int SPECIAL_LONG = (3 << 8); - static final int SPECIAL_DATE = (4 << 8); - static final int SPECIAL_BYTE = (5 << 8); - static final int SPECIAL_FLOAT = (6 << 8); - static final int SPECIAL_DOUBLE = (7 << 8); - static final int SPECIAL_BYTEARRAY = (8 << 8); + static final int SPECIAL_BOOLEAN = 1 << 8; + static final int SPECIAL_INT = 2 << 8; + static final int SPECIAL_LONG = 3 << 8; + static final int SPECIAL_DATE = 4 << 8; + static final int SPECIAL_BYTE = 5 << 8; + static final int SPECIAL_FLOAT = 6 << 8; + static final int SPECIAL_DOUBLE = 7 << 8; + static final int SPECIAL_BYTEARRAY = 8 << 8; private final TranscoderUtils tu = new TranscoderUtils(true);