From 6b2fd73c0aec92ca7bf8c0e5536f79202b8677fb Mon Sep 17 00:00:00 2001 From: Faisal Hameed Date: Wed, 13 Apr 2016 10:07:33 +0500 Subject: [PATCH] Fixing squid:UselessParenthesesCheck, squid:S2293 --- .../io/reactivesocket/ConnectionSetupPayload.java | 4 ++-- src/main/java/io/reactivesocket/Frame.java | 4 ++-- src/main/java/io/reactivesocket/FrameType.java | 8 ++++---- src/main/java/io/reactivesocket/RequestHandler.java | 12 ++++++------ .../io/reactivesocket/internal/PublisherUtils.java | 2 +- .../io/reactivesocket/internal/UnicastSubject.java | 6 +++--- .../internal/frame/FrameHeaderFlyweight.java | 2 +- .../internal/frame/PayloadFragmenter.java | 6 +++--- .../perfutil/PerfUnicastSubjectNoBackpressure.java | 4 ++-- .../java/io/reactivesocket/ReactiveSocketTest.java | 6 +++--- .../io/reactivesocket/TestTransportRequestN.java | 2 +- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/main/java/io/reactivesocket/ConnectionSetupPayload.java b/src/main/java/io/reactivesocket/ConnectionSetupPayload.java index fa6e4dd07..37e33e89a 100644 --- 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 index 4de7d4df1..69f57861d 100644 --- 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 index 45b44cf27..bd9517b76 100644 --- 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 index 276e47030..d4f0a821e 100644 --- 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> NO_REQUEST_RESPONSE_HANDLER = - (payload -> PublisherUtils.errorPayload(new RuntimeException("No 'requestResponse' handler"))); + payload -> PublisherUtils.errorPayload(new RuntimeException("No 'requestResponse' handler")); public static final Function> NO_REQUEST_STREAM_HANDLER = - (payload -> PublisherUtils.errorPayload(new RuntimeException("No 'requestStream' handler"))); + payload -> PublisherUtils.errorPayload(new RuntimeException("No 'requestStream' handler")); public static final Function> NO_REQUEST_SUBSCRIPTION_HANDLER = - (payload -> PublisherUtils.errorPayload(new RuntimeException("No 'requestSubscription' handler"))); + payload -> PublisherUtils.errorPayload(new RuntimeException("No 'requestSubscription' handler")); public static final Function> 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> NO_REQUEST_CHANNEL_HANDLER = - (payloads) -> PublisherUtils.errorPayload(new RuntimeException("No 'requestChannel' handler")); + payloads -> PublisherUtils.errorPayload(new RuntimeException("No 'requestChannel' handler")); public static final Function> NO_METADATA_PUSH_HANDLER = - (payload -> PublisherUtils.errorVoid(new RuntimeException("No 'metadataPush' handler"))); + payload -> PublisherUtils.errorVoid(new RuntimeException("No 'metadataPush' handler")); public abstract Publisher handleRequestResponse(final Payload payload); diff --git a/src/main/java/io/reactivesocket/internal/PublisherUtils.java b/src/main/java/io/reactivesocket/internal/PublisherUtils.java index 78c47343a..1d863b282 100644 --- 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 fromIterable(Iterable is) { - return new PublisherIterableSource(is); + return new PublisherIterableSource<>(is); } public static final class PublisherIterableSource extends AtomicBoolean implements Publisher { diff --git a/src/main/java/io/reactivesocket/internal/UnicastSubject.java b/src/main/java/io/reactivesocket/internal/UnicastSubject.java index e59319069..fa23c366f 100644 --- 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 implements Subscriber, Publisher { private boolean subscribedTo = false; public static UnicastSubject create() { - return new UnicastSubject(null, r -> {}); + return new UnicastSubject<>(null, r -> {}); } /** @@ -46,7 +46,7 @@ public static UnicastSubject create() { * @return */ public static UnicastSubject create(BiConsumer, Long> onConnect, Consumer onRequest) { - return new UnicastSubject(onConnect, onRequest); + return new UnicastSubject<>(onConnect, onRequest); } /** @@ -54,7 +54,7 @@ public static UnicastSubject create(BiConsumer, Long> o * @return */ public static UnicastSubject create(BiConsumer, Long> onConnect) { - return new UnicastSubject(onConnect, r -> {}); + return new UnicastSubject<>(onConnect, r -> {}); } private UnicastSubject(BiConsumer, Long> onConnect, Consumer onRequest) { diff --git a/src/main/java/io/reactivesocket/internal/frame/FrameHeaderFlyweight.java b/src/main/java/io/reactivesocket/internal/frame/FrameHeaderFlyweight.java index 696d01b10..e1260d165 100644 --- 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 index 124245726..98f3aba29 100644 --- 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 iterator() @@ -84,7 +84,7 @@ public Iterator 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 index 32652f949..2f1a5945d 100644 --- a/src/perf/java/io/reactivesocket/perfutil/PerfUnicastSubjectNoBackpressure.java +++ b/src/perf/java/io/reactivesocket/perfutil/PerfUnicastSubjectNoBackpressure.java @@ -31,7 +31,7 @@ public final class PerfUnicastSubjectNoBackpressure implements Observable, private boolean subscribedTo = false; public static PerfUnicastSubjectNoBackpressure create() { - return new PerfUnicastSubjectNoBackpressure(null); + return new PerfUnicastSubjectNoBackpressure<>(null); } /** @@ -39,7 +39,7 @@ public static PerfUnicastSubjectNoBackpressure create() { * @return */ public static PerfUnicastSubjectNoBackpressure create(Consumer> onConnect) { - return new PerfUnicastSubjectNoBackpressure(onConnect); + return new PerfUnicastSubjectNoBackpressure<>(onConnect); } private PerfUnicastSubjectNoBackpressure(Consumer> onConnect) { diff --git a/src/test/java/io/reactivesocket/ReactiveSocketTest.java b/src/test/java/io/reactivesocket/ReactiveSocketTest.java index 1b680b9fd..373d337c6 100644 --- 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 lastFireAndForget = new AtomicReference(); - private AtomicReference lastMetadataPush = new AtomicReference(); - private AtomicReference lastServerError = new AtomicReference(); + private AtomicReference lastFireAndForget = new AtomicReference<>(); + private AtomicReference lastMetadataPush = new AtomicReference<>(); + private AtomicReference 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 index d0cda2c52..197118946 100644 --- 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 lastServerError = new AtomicReference(); + private AtomicReference lastServerError = new AtomicReference<>(); private CountDownLatch lastServerErrorCountDown; public void setup(TestConnectionWithControlledRequestN clientConnection, TestConnectionWithControlledRequestN serverConnection) throws InterruptedException {