Unified util classes

Author: SgtSilvio

src/main/java/com/hivemq/client/internal/logging/InternalLoggerFactory.java

@@ -22,7 +22,7 @@
 /**
  * @author Silvio Giebl
  */
-public class InternalLoggerFactory {
+public final class InternalLoggerFactory {
 
     private static final boolean SLF4J_AVAILABLE;
 
@@ -44,4 +44,6 @@ private static boolean isAvailable(final @NotNull String className) {
         }
         return new InternalNoopLogger(clazz);
     }
+
+    private InternalLoggerFactory() {}
 }

src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttMessageDecoderUtil.java

@@ -29,9 +29,7 @@
  *
  * @author Silvio Giebl
  */
-public class MqttMessageDecoderUtil {
-
-    private MqttMessageDecoderUtil() {}
+public final class MqttMessageDecoderUtil {
 
     public static void checkFixedHeaderFlags(final int expected, final int actual) throws MqttDecoderException {
         if (expected != actual) {
@@ -79,4 +77,6 @@ public static int decodePublishPacketIdentifier(final @NotNull MqttQos qos, fina
         }
         return in.readUnsignedShort();
     }
+
+    private MqttMessageDecoderUtil() {}
 }

src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3MessageDecoderUtil.java

@@ -25,11 +25,11 @@
  *
  * @author Silvio Giebl
  */
-class Mqtt3MessageDecoderUtil {
-
-    private Mqtt3MessageDecoderUtil() {}
+final class Mqtt3MessageDecoderUtil {
 
     static @NotNull MqttDecoderException wrongReturnCode() {
         return new MqttDecoderException("wrong return code");
     }
+
+    private Mqtt3MessageDecoderUtil() {}
 }

src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5MessageDecoderUtil.java

@@ -40,9 +40,7 @@
  *
  * @author Silvio Giebl
  */
-class Mqtt5MessageDecoderUtil {
-
-    private Mqtt5MessageDecoderUtil() {}
+final class Mqtt5MessageDecoderUtil {
 
     static @NotNull MqttDecoderException wrongReasonCode() {
         return new MqttDecoderException("wrong reason code");
@@ -264,4 +262,6 @@ private static void checkProblemInformationRequested(
     static long decodeSessionExpiryInterval(final long current, final @NotNull ByteBuf in) throws MqttDecoderException {
         return unsignedIntOnlyOnce(current, SESSION_EXPIRY_INTERVAL_FROM_CONNECT, "session expiry interval", in);
     }
+
+    private Mqtt5MessageDecoderUtil() {}
 }

src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/MqttMessageEncoderUtil.java

@@ -33,9 +33,7 @@
  *
  * @author Silvio Giebl
  */
-public class MqttMessageEncoderUtil {
-
-    private MqttMessageEncoderUtil() {}
+public final class MqttMessageEncoderUtil {
 
     /**
      * Calculates the encoded length of a MQTT message with the given remaining length.
@@ -96,4 +94,6 @@ public static void encodeOrEmpty(final @Nullable ByteBuffer byteBuffer, final @N
                 message.getType() + " exceeded maximum packet size, minimal possible encoded length: " + encodedLength +
                         ", maximum: " + maxPacketSize + ".");
     }
+
+    private MqttMessageEncoderUtil() {}
 }

src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5MessageEncoderUtil.java

@@ -32,9 +32,7 @@
  *
  * @author Silvio Giebl
  */
-class Mqtt5MessageEncoderUtil {
-
-    private Mqtt5MessageEncoderUtil() {}
+final class Mqtt5MessageEncoderUtil {
 
     static int propertyEncodedLength(final @NotNull MqttUtf8StringImpl string) {
         return 1 + string.encodedLength();
@@ -147,4 +145,6 @@ static void encodeVariableByteIntegerProperty(
             encodeVariableByteIntegerProperty(propertyIdentifier, value, out);
         }
     }
+
+    private Mqtt5MessageEncoderUtil() {}
 }

src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttBinaryData.java

@@ -29,13 +29,11 @@
  *
  * @author Silvio Giebl
  */
-public class MqttBinaryData {
+public final class MqttBinaryData {
 
     public static final int MAX_LENGTH = 65_535;
     public static final int EMPTY_LENGTH = 2;
 
-    private MqttBinaryData() {}
-
     /**
      * Decodes binary data from the given byte buffer at the current reader index.
      *
@@ -154,4 +152,6 @@ public static int encodedLength(final @NotNull byte[] binary) {
     public static int encodedLength(final @NotNull ByteBuffer byteBuffer) {
         return 2 + byteBuffer.remaining();
     }
+
+    private MqttBinaryData() {}
 }

src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttVariableByteInteger.java

@@ -25,7 +25,7 @@
  *
  * @author Silvio Giebl
  */
-public class MqttVariableByteInteger {
+public final class MqttVariableByteInteger {
 
     public static final int NOT_ENOUGH_BYTES = -1;
     public static final int TOO_LARGE = -2;
@@ -40,8 +40,6 @@ public class MqttVariableByteInteger {
     public static final int FOUR_BYTES_MAX_VALUE = (1 << (VALUE_BITS * 4)) - 1;
     public static final int MAXIMUM_PACKET_SIZE_LIMIT = 1 + 4 + FOUR_BYTES_MAX_VALUE;
 
-    private MqttVariableByteInteger() {}
-
     /**
      * Decodes a variable byte integer from the given byte buffer at the current reader index.
      * <p>
@@ -128,4 +126,6 @@ public static int encodedLength(final int value) {
         }
         return length;
     }
+
+    private MqttVariableByteInteger() {}
 }

src/main/java/com/hivemq/client/internal/mqtt/exceptions/MqttClientStateExceptions.java

@@ -23,7 +23,7 @@
 /**
  * @author Silvio Giebl
  */
-public class MqttClientStateExceptions {
+public final class MqttClientStateExceptions {
 
     public static @NotNull MqttClientStateException notConnected() {
         return new MqttClientStateException("MQTT client is not connected.");
@@ -32,4 +32,6 @@ public class MqttClientStateExceptions {
     public static @NotNull MqttClientStateException alreadyConnected() {
         return new MqttClientStateException("MQTT client is already connected or connecting.");
     }
+
+    private MqttClientStateExceptions() {}
 }

src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectUtil.java

@@ -31,7 +31,7 @@
  *
  * @author Silvio Giebl
  */
-public class MqttDisconnectUtil {
+public final class MqttDisconnectUtil {
 
     /**
      * Closes the channel from the client side without sending a DISCONNECT message.
@@ -97,4 +97,6 @@ static void fireDisconnectEvent(
         channel.config().setAutoRead(false);
         channel.pipeline().fireUserEventTriggered(disconnectEvent);
     }
+
+    private MqttDisconnectUtil() {}
 }