Fixing squid:UselessParenthesesCheck, squid:S2293

Faisal Hameed · Faisal Hameed · commit 6b2fd73c0aec · 2016-04-14T21:36:42.000+05:00
diff --git a/src/main/java/io/reactivesocket/ConnectionSetupPayload.java b/src/main/java/io/reactivesocket/ConnectionSetupPayload.java
@@ -154,11 +154,11 @@ public int getFlags()
 
 	public boolean willClientHonorLease()
 	{
-		return (HONOR_LEASE == (getFlags() & HONOR_LEASE));
+		return HONOR_LEASE == (getFlags() & HONOR_LEASE);
 	}
 
 	public boolean doesClientRequestStrictInterpretation()
 	{
-		return (STRICT_INTERPRETATION == (getFlags() & STRICT_INTERPRETATION));
+		return STRICT_INTERPRETATION == (getFlags() & STRICT_INTERPRETATION);
 	}
 }
diff --git a/src/main/java/io/reactivesocket/Frame.java b/src/main/java/io/reactivesocket/Frame.java
@@ -337,7 +337,7 @@ public static Frame from(
             final Throwable throwable,
             ByteBuffer metadata
         ) {
-            String data = (throwable.getMessage() == null ? "" : throwable.getMessage());
+            String data = throwable.getMessage() == null ? "" : throwable.getMessage();
             byte[] bytes = data.getBytes(Charset.forName("UTF-8"));
             final ByteBuffer dataBuffer = ByteBuffer.wrap(bytes);
 
@@ -525,7 +525,7 @@ public static Frame from(ByteBuffer data, boolean respond)
             final Frame frame =
                 POOL.acquireFrame(FrameHeaderFlyweight.computeFrameHeaderLength(FrameType.KEEPALIVE, 0, data.remaining()));
 
-            final int flags = (respond ? FrameHeaderFlyweight.FLAGS_KEEPALIVE_R : 0);
+            final int flags = respond ? FrameHeaderFlyweight.FLAGS_KEEPALIVE_R : 0;
 
             frame.length = FrameHeaderFlyweight.encode(
                 frame.directBuffer, frame.offset, 0, flags, FrameType.KEEPALIVE, Frame.NULL_BYTEBUFFER, data);
diff --git a/src/main/java/io/reactivesocket/FrameType.java b/src/main/java/io/reactivesocket/FrameType.java
@@ -92,22 +92,22 @@ public int getEncodedType() {
 
     public boolean isRequestType()
     {
-        return (Flags.IS_REQUEST_TYPE == (flags & Flags.IS_REQUEST_TYPE));
+        return Flags.IS_REQUEST_TYPE == (flags & Flags.IS_REQUEST_TYPE);
     }
 
     public boolean hasInitialRequestN()
     {
-        return (Flags.HAS_INITIAL_REQUEST_N == (flags & Flags.HAS_INITIAL_REQUEST_N));
+        return Flags.HAS_INITIAL_REQUEST_N == (flags & Flags.HAS_INITIAL_REQUEST_N);
     }
 
     public boolean canHaveData()
     {
-        return (Flags.CAN_HAVE_DATA == (flags & Flags.CAN_HAVE_DATA));
+        return Flags.CAN_HAVE_DATA == (flags & Flags.CAN_HAVE_DATA);
     }
 
     public boolean canHaveMetadata()
     {
-        return (Flags.CAN_HAVE_METADATA == (flags & Flags.CAN_HAVE_METADATA));
+        return Flags.CAN_HAVE_METADATA == (flags & Flags.CAN_HAVE_METADATA);
     }
 
     // TODO: offset of metadata and data (simplify parsing) naming: endOfFrameHeaderOffset()
diff --git a/src/main/java/io/reactivesocket/RequestHandler.java b/src/main/java/io/reactivesocket/RequestHandler.java
@@ -23,22 +23,22 @@
 public abstract class RequestHandler {
 
 	public static final Function<Payload, Publisher<Payload>> NO_REQUEST_RESPONSE_HANDLER =
-		(payload -> PublisherUtils.errorPayload(new RuntimeException("No 'requestResponse' handler")));
+		payload -> PublisherUtils.errorPayload(new RuntimeException("No 'requestResponse' handler"));
 
 	public static final Function<Payload, Publisher<Payload>> NO_REQUEST_STREAM_HANDLER =
-		(payload -> PublisherUtils.errorPayload(new RuntimeException("No 'requestStream' handler")));
+		payload -> PublisherUtils.errorPayload(new RuntimeException("No 'requestStream' handler"));
 
 	public static final Function<Payload, Publisher<Payload>> NO_REQUEST_SUBSCRIPTION_HANDLER =
-		(payload -> PublisherUtils.errorPayload(new RuntimeException("No 'requestSubscription' handler")));
+		payload -> PublisherUtils.errorPayload(new RuntimeException("No 'requestSubscription' handler"));
 
 	public static final Function<Payload, Publisher<Void>> NO_FIRE_AND_FORGET_HANDLER =
-		(payload -> PublisherUtils.errorVoid(new RuntimeException("No 'fireAndForget' handler")));
+		payload -> PublisherUtils.errorVoid(new RuntimeException("No 'fireAndForget' handler"));
 
 	public static final Function<Publisher<Payload>, Publisher<Payload>> NO_REQUEST_CHANNEL_HANDLER =
-		(payloads) -> PublisherUtils.errorPayload(new RuntimeException("No 'requestChannel' handler"));
+		payloads -> PublisherUtils.errorPayload(new RuntimeException("No 'requestChannel' handler"));
 
 	public static final Function<Payload, Publisher<Void>> NO_METADATA_PUSH_HANDLER =
-		(payload -> PublisherUtils.errorVoid(new RuntimeException("No 'metadataPush' handler")));
+		payload -> PublisherUtils.errorVoid(new RuntimeException("No 'metadataPush' handler"));
 
 	public abstract Publisher<Payload> handleRequestResponse(final Payload payload);
 
diff --git a/src/main/java/io/reactivesocket/internal/PublisherUtils.java b/src/main/java/io/reactivesocket/internal/PublisherUtils.java
@@ -209,7 +209,7 @@ public void cancel()
 	}
 	
 	public static final Publisher<Frame> fromIterable(Iterable<Frame> is) {
-		return new PublisherIterableSource<Frame>(is);
+		return new PublisherIterableSource<>(is);
 	}
 	
 	public static final class PublisherIterableSource<T> extends AtomicBoolean implements Publisher<T> {
diff --git a/src/main/java/io/reactivesocket/internal/UnicastSubject.java b/src/main/java/io/reactivesocket/internal/UnicastSubject.java
@@ -37,7 +37,7 @@ public final class UnicastSubject<T> implements Subscriber<T>, Publisher<T> {
 	private boolean subscribedTo = false;
 
 	public static <T> UnicastSubject<T> create() {
-		return new UnicastSubject<T>(null, r -> {});
+		return new UnicastSubject<>(null, r -> {});
 	}
 
 	/**
@@ -46,15 +46,15 @@ public static <T> UnicastSubject<T> create() {
 	 * @return
 	 */
 	public static <T> UnicastSubject<T> create(BiConsumer<UnicastSubject<T>, Long> onConnect, Consumer<Long> onRequest) {
-		return new UnicastSubject<T>(onConnect, onRequest);
+		return new UnicastSubject<>(onConnect, onRequest);
 	}
 	
 	/**
 	 * @param onConnect Called when first requestN > 0 occurs.
 	 * @return
 	 */
 	public static <T> UnicastSubject<T> create(BiConsumer<UnicastSubject<T>, Long> onConnect) {
-		return new UnicastSubject<T>(onConnect,  r -> {});
+		return new UnicastSubject<>(onConnect,  r -> {});
 	}
 
 	private UnicastSubject(BiConsumer<UnicastSubject<T>, Long> onConnect, Consumer<Long> onRequest) {
diff --git a/src/main/java/io/reactivesocket/internal/frame/FrameHeaderFlyweight.java b/src/main/java/io/reactivesocket/internal/frame/FrameHeaderFlyweight.java
@@ -266,7 +266,7 @@ private static int metadataFieldLength(final DirectBuffer directBuffer, final in
 
         if (FLAGS_M == (FLAGS_M & directBuffer.getShort(offset + FLAGS_FIELD_OFFSET, ByteOrder.BIG_ENDIAN)))
         {
-            metadataLength = (directBuffer.getInt(metadataOffset(directBuffer, offset), ByteOrder.BIG_ENDIAN) & 0xFFFFFF);
+            metadataLength = directBuffer.getInt(metadataOffset(directBuffer, offset), ByteOrder.BIG_ENDIAN) & 0xFFFFFF;
         }
 
         return metadataLength;
diff --git a/src/main/java/io/reactivesocket/internal/frame/PayloadFragmenter.java b/src/main/java/io/reactivesocket/internal/frame/PayloadFragmenter.java
@@ -74,7 +74,7 @@ public static boolean requiresFragmenting(final int metadataMtu, final int dataM
         final ByteBuffer metadata = payload.getMetadata();
         final ByteBuffer data = payload.getData();
 
-        return (metadata.remaining() > metadataMtu || data.remaining() > dataMtu);
+        return metadata.remaining() > metadataMtu || data.remaining() > dataMtu;
     }
 
     public Iterator<Frame> iterator()
@@ -84,7 +84,7 @@ public Iterator<Frame> iterator()
 
     public boolean hasNext()
     {
-        return (dataOffset < data.capacity() || metadataOffset < metadata.remaining());
+        return dataOffset < data.capacity() || metadataOffset < metadata.remaining();
     }
 
     public Frame next()
@@ -103,7 +103,7 @@ public Frame next()
         metadataOffset += metadataLength;
         dataOffset += dataLength;
 
-        final boolean isMoreFollowing = (metadataOffset < metadata.remaining() || dataOffset < data.remaining());
+        final boolean isMoreFollowing = metadataOffset < metadata.remaining() || dataOffset < data.remaining();
         int flags = 0;
 
         if (Type.RESPONSE == type)
diff --git a/src/perf/java/io/reactivesocket/perfutil/PerfUnicastSubjectNoBackpressure.java b/src/perf/java/io/reactivesocket/perfutil/PerfUnicastSubjectNoBackpressure.java
@@ -31,15 +31,15 @@ public final class PerfUnicastSubjectNoBackpressure<T> implements Observable<T>,
 	private boolean subscribedTo = false;
 
 	public static <T> PerfUnicastSubjectNoBackpressure<T> create() {
-		return new PerfUnicastSubjectNoBackpressure<T>(null);
+		return new PerfUnicastSubjectNoBackpressure<>(null);
 	}
 
 	/**
 	 * @param onConnect Called when first requestN > 0 occurs.
 	 * @return
 	 */
 	public static <T> PerfUnicastSubjectNoBackpressure<T> create(Consumer<PerfUnicastSubjectNoBackpressure<T>> onConnect) {
-		return new PerfUnicastSubjectNoBackpressure<T>(onConnect);
+		return new PerfUnicastSubjectNoBackpressure<>(onConnect);
 	}
 
 	private PerfUnicastSubjectNoBackpressure(Consumer<PerfUnicastSubjectNoBackpressure<T>> onConnect) {
diff --git a/src/test/java/io/reactivesocket/ReactiveSocketTest.java b/src/test/java/io/reactivesocket/ReactiveSocketTest.java
@@ -48,9 +48,9 @@ public class ReactiveSocketTest {
 	private ReactiveSocket socketServer;
 	private ReactiveSocket socketClient;
 	private AtomicBoolean helloSubscriptionRunning = new AtomicBoolean(false);
-	private AtomicReference<String> lastFireAndForget = new AtomicReference<String>();
-	private AtomicReference<String> lastMetadataPush = new AtomicReference<String>();
-	private AtomicReference<Throwable> lastServerError = new AtomicReference<Throwable>();
+	private AtomicReference<String> lastFireAndForget = new AtomicReference<>();
+	private AtomicReference<String> lastMetadataPush = new AtomicReference<>();
+	private AtomicReference<Throwable> lastServerError = new AtomicReference<>();
 	private CountDownLatch lastServerErrorCountDown;
 	private CountDownLatch fireAndForgetOrMetadataPush;
 
diff --git a/src/test/java/io/reactivesocket/TestTransportRequestN.java b/src/test/java/io/reactivesocket/TestTransportRequestN.java
@@ -165,7 +165,7 @@ public void testRequestChannelUpstreamWithNFromTransport() throws InterruptedExc
 	private ReactiveSocket socketServer;
 	private ReactiveSocket socketClient;
 	private AtomicBoolean helloSubscriptionRunning = new AtomicBoolean(false);
-	private AtomicReference<Throwable> lastServerError = new AtomicReference<Throwable>();
+	private AtomicReference<Throwable> lastServerError = new AtomicReference<>();
 	private CountDownLatch lastServerErrorCountDown;
 
 	public void setup(TestConnectionWithControlledRequestN clientConnection, TestConnectionWithControlledRequestN serverConnection) throws InterruptedException {

Original file line number	Diff line number	Diff line change
`@@ -154,11 +154,11 @@ public int getFlags()`
`154`	`154`
`155`	`155`	`public boolean willClientHonorLease()`
`156`	`156`	`{`
`157`		`- return (HONOR_LEASE == (getFlags() & HONOR_LEASE));`
	`157`	`+ return HONOR_LEASE == (getFlags() & HONOR_LEASE);`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`public boolean doesClientRequestStrictInterpretation()`
`161`	`161`	`{`
`162`		`- return (STRICT_INTERPRETATION == (getFlags() & STRICT_INTERPRETATION));`
	`162`	`+ return STRICT_INTERPRETATION == (getFlags() & STRICT_INTERPRETATION);`
`163`	`163`	`}`
`164`	`164`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,22 +92,22 @@ public int getEncodedType() {`
`92`	`92`
`93`	`93`	`public boolean isRequestType()`
`94`	`94`	`{`
`95`		`- return (Flags.IS_REQUEST_TYPE == (flags & Flags.IS_REQUEST_TYPE));`
	`95`	`+ return Flags.IS_REQUEST_TYPE == (flags & Flags.IS_REQUEST_TYPE);`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`public boolean hasInitialRequestN()`
`99`	`99`	`{`
`100`		`- return (Flags.HAS_INITIAL_REQUEST_N == (flags & Flags.HAS_INITIAL_REQUEST_N));`
	`100`	`+ return Flags.HAS_INITIAL_REQUEST_N == (flags & Flags.HAS_INITIAL_REQUEST_N);`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`public boolean canHaveData()`
`104`	`104`	`{`
`105`		`- return (Flags.CAN_HAVE_DATA == (flags & Flags.CAN_HAVE_DATA));`
	`105`	`+ return Flags.CAN_HAVE_DATA == (flags & Flags.CAN_HAVE_DATA);`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`public boolean canHaveMetadata()`
`109`	`109`	`{`
`110`		`- return (Flags.CAN_HAVE_METADATA == (flags & Flags.CAN_HAVE_METADATA));`
	`110`	`+ return Flags.CAN_HAVE_METADATA == (flags & Flags.CAN_HAVE_METADATA);`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`// TODO: offset of metadata and data (simplify parsing) naming: endOfFrameHeaderOffset()`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ public void cancel()`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`public static final Publisher<Frame> fromIterable(Iterable<Frame> is) {`
`212`		`- return new PublisherIterableSource<Frame>(is);`
	`212`	`+ return new PublisherIterableSource<>(is);`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`public static final class PublisherIterableSource<T> extends AtomicBoolean implements Publisher<T> {`
Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ private static int metadataFieldLength(final DirectBuffer directBuffer, final in`
`266`	`266`
`267`	`267`	`if (FLAGS_M == (FLAGS_M & directBuffer.getShort(offset + FLAGS_FIELD_OFFSET, ByteOrder.BIG_ENDIAN)))`
`268`	`268`	`{`
`269`		`- metadataLength = (directBuffer.getInt(metadataOffset(directBuffer, offset), ByteOrder.BIG_ENDIAN) & 0xFFFFFF);`
	`269`	`+ metadataLength = directBuffer.getInt(metadataOffset(directBuffer, offset), ByteOrder.BIG_ENDIAN) & 0xFFFFFF;`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`return metadataLength;`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public static boolean requiresFragmenting(final int metadataMtu, final int dataM`
`74`	`74`	`final ByteBuffer metadata = payload.getMetadata();`
`75`	`75`	`final ByteBuffer data = payload.getData();`
`76`	`76`
`77`		`- return (metadata.remaining() > metadataMtu \|\| data.remaining() > dataMtu);`
	`77`	`+ return metadata.remaining() > metadataMtu \|\| data.remaining() > dataMtu;`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`public Iterator<Frame> iterator()`
`@@ -84,7 +84,7 @@ public Iterator<Frame> iterator()`
`84`	`84`
`85`	`85`	`public boolean hasNext()`
`86`	`86`	`{`
`87`		`- return (dataOffset < data.capacity() \|\| metadataOffset < metadata.remaining());`
	`87`	`+ return dataOffset < data.capacity() \|\| metadataOffset < metadata.remaining();`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`public Frame next()`
`@@ -103,7 +103,7 @@ public Frame next()`
`103`	`103`	`metadataOffset += metadataLength;`
`104`	`104`	`dataOffset += dataLength;`
`105`	`105`
`106`		`- final boolean isMoreFollowing = (metadataOffset < metadata.remaining() \|\| dataOffset < data.remaining());`
	`106`	`+ final boolean isMoreFollowing = metadataOffset < metadata.remaining() \|\| dataOffset < data.remaining();`
`107`	`107`	`int flags = 0;`
`108`	`108`
`109`	`109`	`if (Type.RESPONSE == type)`