From d6d2f16d1a221c6fd9984684d5a1b9fc5b02a881 Mon Sep 17 00:00:00 2001 From: Faisal Hameed Date: Tue, 12 Apr 2016 21:34:29 +0500 Subject: [PATCH] Fixing squid:S1118 - Utility classes should not have public constructors. --- src/main/java/io/reactivesocket/Frame.java | 21 +++++++++++++++++++ .../java/io/reactivesocket/FrameType.java | 2 ++ .../reactivesocket/exceptions/Exceptions.java | 3 +++ .../internal/PublisherUtils.java | 2 ++ .../internal/frame/ByteBufferUtil.java | 3 +++ .../internal/frame/ErrorFrameFlyweight.java | 3 +++ .../internal/frame/FrameHeaderFlyweight.java | 3 +++ .../frame/KeepaliveFrameFlyweight.java | 2 ++ .../internal/frame/LeaseFrameFlyweight.java | 2 ++ .../internal/frame/RequestFrameFlyweight.java | 3 +++ .../frame/RequestNFrameFlyweight.java | 2 ++ .../internal/frame/SetupFrameFlyweight.java | 2 ++ src/test/java/io/reactivesocket/TestUtil.java | 2 ++ 13 files changed, 50 insertions(+) diff --git a/src/main/java/io/reactivesocket/Frame.java b/src/main/java/io/reactivesocket/Frame.java index 4de7d4df1..bd432d69a 100644 --- a/src/main/java/io/reactivesocket/Frame.java +++ b/src/main/java/io/reactivesocket/Frame.java @@ -257,6 +257,9 @@ public void wrap(final int streamId, final FrameType type, final ByteBuffer data // SETUP specific getters public static class Setup { + + private Setup() {} + public static Frame from( int flags, int keepaliveInterval, @@ -317,6 +320,9 @@ public static String dataMimeType(final Frame frame) public static class Error { + + private Error() {} + public static Frame from( int streamId, final Throwable throwable, @@ -360,6 +366,8 @@ public static int errorCode(final Frame frame) public static class Lease { + private Lease() {} + public static Frame from(int ttl, int numberOfRequests, ByteBuffer metadata) { final Frame frame = POOL.acquireFrame(LeaseFrameFlyweight.computeFrameLength(metadata.remaining())); @@ -383,6 +391,8 @@ public static int numberOfRequests(final Frame frame) public static class RequestN { + private RequestN() {} + public static Frame from(int streamId, int requestN) { final Frame frame = POOL.acquireFrame(RequestNFrameFlyweight.computeFrameLength()); @@ -400,6 +410,8 @@ public static long requestN(final Frame frame) public static class Request { + private Request() {} + public static Frame from(int streamId, FrameType type, Payload payload, int initialRequestN) { final ByteBuffer d = payload.getData() != null ? payload.getData() : NULL_BYTEBUFFER; @@ -473,6 +485,9 @@ public static boolean isRequestChannelComplete(final Frame frame) public static class Response { + + private Response() {} + public static Frame from(int streamId, FrameType type, Payload payload) { final ByteBuffer data = payload.getData() != null ? payload.getData() : NULL_BYTEBUFFER; @@ -507,6 +522,9 @@ public static Frame from(int streamId, FrameType type) public static class Cancel { + + private Cancel() {} + public static Frame from(int streamId) { final Frame frame = @@ -520,6 +538,9 @@ public static Frame from(int streamId) public static class Keepalive { + + private Keepalive() {} + public static Frame from(ByteBuffer data, boolean respond) { final Frame frame = diff --git a/src/main/java/io/reactivesocket/FrameType.java b/src/main/java/io/reactivesocket/FrameType.java index 45b44cf27..993b39f87 100644 --- a/src/main/java/io/reactivesocket/FrameType.java +++ b/src/main/java/io/reactivesocket/FrameType.java @@ -47,6 +47,8 @@ public enum FrameType private static class Flags { + private Flags() {} + private static final int CAN_HAVE_DATA = 0b0001; private static final int CAN_HAVE_METADATA = 0b0010; private static final int CAN_HAVE_METADATA_AND_DATA = 0b0011; diff --git a/src/main/java/io/reactivesocket/exceptions/Exceptions.java b/src/main/java/io/reactivesocket/exceptions/Exceptions.java index 7b2581b80..fa57c74d0 100644 --- a/src/main/java/io/reactivesocket/exceptions/Exceptions.java +++ b/src/main/java/io/reactivesocket/exceptions/Exceptions.java @@ -23,6 +23,9 @@ import static java.nio.charset.StandardCharsets.UTF_8; public class Exceptions { + + private Exceptions() {} + public static Throwable from(Frame frame) { final int errorCode = Frame.Error.errorCode(frame); String message = ""; diff --git a/src/main/java/io/reactivesocket/internal/PublisherUtils.java b/src/main/java/io/reactivesocket/internal/PublisherUtils.java index 78c47343a..ff273e4bf 100644 --- a/src/main/java/io/reactivesocket/internal/PublisherUtils.java +++ b/src/main/java/io/reactivesocket/internal/PublisherUtils.java @@ -34,6 +34,8 @@ public class PublisherUtils { + private PublisherUtils() {} + // TODO: be better about using scheduler for this public static final ScheduledExecutorService SCHEDULER_THREAD = Executors.newScheduledThreadPool(1, (r) -> { diff --git a/src/main/java/io/reactivesocket/internal/frame/ByteBufferUtil.java b/src/main/java/io/reactivesocket/internal/frame/ByteBufferUtil.java index b6cc0fa0c..48774aca4 100644 --- a/src/main/java/io/reactivesocket/internal/frame/ByteBufferUtil.java +++ b/src/main/java/io/reactivesocket/internal/frame/ByteBufferUtil.java @@ -19,6 +19,9 @@ public class ByteBufferUtil { + + private ByteBufferUtil() {} + /** * Slice a portion of the {@link ByteBuffer} while preserving the buffers position and limit. * diff --git a/src/main/java/io/reactivesocket/internal/frame/ErrorFrameFlyweight.java b/src/main/java/io/reactivesocket/internal/frame/ErrorFrameFlyweight.java index e5df2ff11..fdb9f57e0 100644 --- a/src/main/java/io/reactivesocket/internal/frame/ErrorFrameFlyweight.java +++ b/src/main/java/io/reactivesocket/internal/frame/ErrorFrameFlyweight.java @@ -32,6 +32,9 @@ import java.nio.ByteOrder; public class ErrorFrameFlyweight { + + private ErrorFrameFlyweight() {} + // defined error codes public static final int INVALID_SETUP = 0x0001; public static final int UNSUPPORTED_SETUP = 0x0002; diff --git a/src/main/java/io/reactivesocket/internal/frame/FrameHeaderFlyweight.java b/src/main/java/io/reactivesocket/internal/frame/FrameHeaderFlyweight.java index 696d01b10..a7af81839 100644 --- a/src/main/java/io/reactivesocket/internal/frame/FrameHeaderFlyweight.java +++ b/src/main/java/io/reactivesocket/internal/frame/FrameHeaderFlyweight.java @@ -37,6 +37,9 @@ */ public class FrameHeaderFlyweight { + + private FrameHeaderFlyweight() {} + public static final ByteBuffer NULL_BYTEBUFFER = ByteBuffer.allocate(0); public static final int FRAME_HEADER_LENGTH; diff --git a/src/main/java/io/reactivesocket/internal/frame/KeepaliveFrameFlyweight.java b/src/main/java/io/reactivesocket/internal/frame/KeepaliveFrameFlyweight.java index 1c90b935b..a25350539 100644 --- a/src/main/java/io/reactivesocket/internal/frame/KeepaliveFrameFlyweight.java +++ b/src/main/java/io/reactivesocket/internal/frame/KeepaliveFrameFlyweight.java @@ -23,6 +23,8 @@ public class KeepaliveFrameFlyweight { + private KeepaliveFrameFlyweight() {} + private static final int PAYLOAD_OFFSET = FrameHeaderFlyweight.FRAME_HEADER_LENGTH; public static int computeFrameLength(final int dataLength) diff --git a/src/main/java/io/reactivesocket/internal/frame/LeaseFrameFlyweight.java b/src/main/java/io/reactivesocket/internal/frame/LeaseFrameFlyweight.java index 1b9b4d0a7..ceed7ee62 100644 --- a/src/main/java/io/reactivesocket/internal/frame/LeaseFrameFlyweight.java +++ b/src/main/java/io/reactivesocket/internal/frame/LeaseFrameFlyweight.java @@ -25,6 +25,8 @@ public class LeaseFrameFlyweight { + private LeaseFrameFlyweight() {} + // relative to start of passed offset private static final int TTL_FIELD_OFFSET = FrameHeaderFlyweight.FRAME_HEADER_LENGTH; private static final int NUM_REQUESTS_FIELD_OFFSET = TTL_FIELD_OFFSET + BitUtil.SIZE_OF_INT; diff --git a/src/main/java/io/reactivesocket/internal/frame/RequestFrameFlyweight.java b/src/main/java/io/reactivesocket/internal/frame/RequestFrameFlyweight.java index fdbcdd735..6db2ba997 100644 --- a/src/main/java/io/reactivesocket/internal/frame/RequestFrameFlyweight.java +++ b/src/main/java/io/reactivesocket/internal/frame/RequestFrameFlyweight.java @@ -25,6 +25,9 @@ public class RequestFrameFlyweight { + + private RequestFrameFlyweight() {} + public static final int FLAGS_REQUEST_CHANNEL_C = 0b0001_0000_0000_0000; public static final int FLAGS_REQUEST_CHANNEL_N = 0b0000_1000_0000_0000; diff --git a/src/main/java/io/reactivesocket/internal/frame/RequestNFrameFlyweight.java b/src/main/java/io/reactivesocket/internal/frame/RequestNFrameFlyweight.java index bf7f311d7..7ff679a90 100644 --- a/src/main/java/io/reactivesocket/internal/frame/RequestNFrameFlyweight.java +++ b/src/main/java/io/reactivesocket/internal/frame/RequestNFrameFlyweight.java @@ -24,6 +24,8 @@ public class RequestNFrameFlyweight { + private RequestNFrameFlyweight() {} + // relative to start of passed offset private static final int REQUEST_N_FIELD_OFFSET = FrameHeaderFlyweight.FRAME_HEADER_LENGTH; diff --git a/src/main/java/io/reactivesocket/internal/frame/SetupFrameFlyweight.java b/src/main/java/io/reactivesocket/internal/frame/SetupFrameFlyweight.java index 2e3d3ae17..db9df1d79 100644 --- a/src/main/java/io/reactivesocket/internal/frame/SetupFrameFlyweight.java +++ b/src/main/java/io/reactivesocket/internal/frame/SetupFrameFlyweight.java @@ -26,6 +26,8 @@ public class SetupFrameFlyweight { + private SetupFrameFlyweight() {} + public static final int FLAGS_WILL_HONOR_LEASE = 0b0010_0000; public static final int FLAGS_STRICT_INTERPRETATION = 0b0001_0000; diff --git a/src/test/java/io/reactivesocket/TestUtil.java b/src/test/java/io/reactivesocket/TestUtil.java index 4245f24c5..0ea5d7b12 100644 --- a/src/test/java/io/reactivesocket/TestUtil.java +++ b/src/test/java/io/reactivesocket/TestUtil.java @@ -22,6 +22,8 @@ public class TestUtil { + private TestUtil() {} + public static Frame utf8EncodedRequestFrame(final int streamId, final FrameType type, final String data, final int initialRequestN) { return Frame.Request.from(streamId, type, new Payload()