From 8fe46ec8d6cf4f854260a29b8227fd3147d9d0fa Mon Sep 17 00:00:00 2001
From: Silvio Giebl <silvio.giebl@hivemq.com>
Date: Fri, 17 Apr 2020 14:20:20 +0200
Subject: [PATCH] Uniform code style config

---
 .idea/codeStyles/Project.xml                  |  5 ++--
 .../reactor/operators/FluxWithSingleMap.java  | 12 +++++---
 .../operators/FluxWithSinglePublishOn.java    |  4 ++-
 .../client/rx/reactor/FluxWithSingle.java     |  9 ++++--
 .../client/rx/reactor/FluxWithSingleItem.java |  3 +-
 .../rx/reactor/FluxWithSingleSplit.java       |  3 +-
 .../client/rx/reactor/FluxWithSingleTest.java | 15 ++++++----
 .../client/internal/mqtt/MqttAsyncClient.java | 24 ++++++++++-----
 .../internal/mqtt/MqttClientConfig.java       |  6 ++--
 .../mqtt/MqttClientConnectionConfig.java      |  2 --
 .../mqtt/MqttClientExecutorConfigImpl.java    |  3 +-
 .../mqtt/MqttClientSslConfigImpl.java         |  6 ++--
 .../mqtt/MqttClientTransportConfigImpl.java   |  9 ++++--
 .../internal/mqtt/MqttProxyConfigImpl.java    |  7 +++--
 .../mqtt/MqttRxClientBuilderBase.java         |  3 +-
 .../mqtt/MqttWebSocketConfigImpl.java         |  4 ++-
 .../advanced/MqttClientAdvancedConfig.java    |  3 +-
 .../mqtt/codec/decoder/MqttDecoder.java       |  3 +-
 .../codec/decoder/MqttDecoderContext.java     | 10 +++++--
 .../mqtt3/Mqtt3ClientMessageDecoders.java     | 12 +++++---
 .../mqtt5/Mqtt5ClientMessageDecoders.java     | 15 ++++++----
 .../mqtt5/Mqtt5MessageDecoderUtil.java        | 10 +++++--
 .../mqtt/codec/encoder/MqttEncoder.java       |  3 +-
 .../mqtt3/Mqtt3ClientMessageEncoders.java     | 12 +++++---
 .../encoder/mqtt3/Mqtt3MessageEncoder.java    |  4 ++-
 .../encoder/mqtt3/Mqtt3PublishEncoder.java    |  6 ++--
 .../codec/encoder/mqtt5/Mqtt5AuthEncoder.java | 15 +++++++---
 .../mqtt5/Mqtt5ClientMessageEncoders.java     | 15 ++++++----
 .../encoder/mqtt5/Mqtt5ConnectEncoder.java    | 24 +++++++++++----
 .../mqtt5/Mqtt5MessageEncoderUtil.java        |  3 +-
 ...Mqtt5MessageWithUserPropertiesEncoder.java | 24 +++++++++++----
 .../encoder/mqtt5/Mqtt5PublishEncoder.java    | 23 ++++++++++----
 .../encoder/mqtt5/Mqtt5SubscribeEncoder.java  | 15 +++++++---
 .../mqtt5/Mqtt5UnsubscribeEncoder.java        | 15 +++++++---
 .../datatypes/MqttTopicFilterImplBuilder.java |  3 +-
 .../mqtt/handler/MqttChannelInitializer.java  |  9 ++++--
 .../internal/mqtt/handler/MqttSession.java    |  9 ++++--
 .../handler/auth/MqttConnectAuthHandler.java  |  3 +-
 .../handler/connect/MqttConnAckSingle.java    | 30 +++++++++++++------
 .../handler/connect/MqttConnectHandler.java   |  6 ++--
 .../disconnect/MqttDisconnectHandler.java     |  3 +-
 .../disconnect/MqttDisconnectUtil.java        |  9 ++++--
 .../proxy/MqttProxyAdapterHandler.java        | 12 +++++---
 .../handler/proxy/MqttProxyInitializer.java   |  6 ++--
 .../MqttGlobalIncomingPublishFlow.java        |  6 ++--
 .../MqttGlobalIncomingPublishFlowable.java    |  3 +-
 .../incoming/MqttIncomingPublishFlow.java     |  6 ++--
 .../incoming/MqttIncomingPublishFlows.java    |  6 ++--
 .../incoming/MqttSubscribedPublishFlow.java   |  6 ++--
 .../MqttSubscribedPublishFlowTree.java        | 12 +++++---
 .../MqttSubscribedPublishFlowable.java        |  3 +-
 .../incoming/MqttSubscribedPublishFlows.java  |  3 +-
 .../publish/outgoing/MqttAckFlowableFlow.java |  3 +-
 .../outgoing/MqttOutgoingQosHandler.java      |  3 +-
 .../publish/outgoing/MqttPubRelWithFlow.java  |  4 ++-
 .../mqtt/handler/ssl/MqttSslInitializer.java  |  6 ++--
 .../subscribe/MqttSubscribeWithFlow.java      |  3 +-
 .../handler/websocket/MqttWebSocketCodec.java |  3 +-
 .../websocket/MqttWebSocketInitializer.java   |  6 ++--
 .../MqttWebsocketHandshakeHandler.java        |  6 ++--
 .../internal/mqtt/ioc/ConnectionModule.java   |  3 +-
 .../MqttClientConnectedContextImpl.java       |  6 ++--
 .../MqttClientDisconnectedContextImpl.java    | 12 +++++---
 .../mqtt/lifecycle/MqttClientReconnector.java |  4 ++-
 .../Mqtt3ClientConnectedContextView.java      |  6 ++--
 .../Mqtt3ClientDisconnectedContextView.java   | 12 +++++---
 .../MqttMessageWithUserProperties.java        |  9 ++++--
 .../internal/mqtt/message/auth/MqttAuth.java  |  6 ++--
 .../mqtt/message/connect/MqttConnect.java     | 10 +++++--
 .../connect/MqttConnectRestrictions.java      | 11 +++++--
 .../message/connect/MqttStatefulConnect.java  |  3 +-
 .../message/connect/connack/MqttConnAck.java  | 15 ++++++----
 .../connack/MqttConnAckRestrictions.java      | 10 +++++--
 .../connect/mqtt3/Mqtt3ConnectView.java       |  8 +++--
 .../message/disconnect/MqttDisconnect.java    |  6 ++--
 .../mqtt/message/publish/MqttPublish.java     | 17 +++++++----
 .../message/publish/MqttPublishResult.java    |  7 +++--
 .../message/publish/MqttStatefulPublish.java  |  5 +++-
 .../mqtt/message/publish/MqttWillPublish.java | 13 +++++---
 .../publish/mqtt3/Mqtt3PublishView.java       | 12 ++++++--
 .../message/publish/puback/MqttPubAck.java    |  6 ++--
 .../message/publish/pubcomp/MqttPubComp.java  |  6 ++--
 .../message/publish/pubrec/MqttPubRec.java    |  6 ++--
 .../message/publish/pubrel/MqttPubRel.java    |  6 ++--
 .../message/subscribe/MqttSubscription.java   |  7 +++--
 .../message/subscribe/suback/MqttSubAck.java  |  6 ++--
 .../unsubscribe/unsuback/MqttUnsubAck.java    |  6 ++--
 .../mqtt/mqtt3/Mqtt3AsyncClientView.java      | 24 ++++++++++-----
 .../netty/DefaultChannelOutboundHandler.java  | 12 +++++---
 .../client/internal/rx/RxFutureConverter.java |  6 ++--
 .../rx/operators/FlowableWithSingleMap.java   |  6 ++--
 .../FlowableWithSingleObserveOn.java          |  6 ++--
 .../client/internal/util/ByteArrayUtil.java   |  8 +++--
 .../util/collections/ImmutableArray.java      |  4 ++-
 .../internal/util/collections/Index.java      |  3 +-
 .../internal/util/collections/IntIndex.java   |  3 +-
 .../client/mqtt/mqtt3/Mqtt3AsyncClient.java   | 24 ++++++++++-----
 .../client/mqtt/mqtt5/Mqtt5AsyncClient.java   | 24 ++++++++++-----
 .../qos1/Mqtt5IncomingQos1Interceptor.java    |  3 +-
 .../qos2/Mqtt5IncomingQos2Interceptor.java    |  6 ++--
 .../qos2/Mqtt5OutgoingQos2Interceptor.java    |  4 ++-
 .../auth/Mqtt5EnhancedAuthMechanism.java      |  6 ++--
 .../hivemq/client/rx/FlowableWithSingle.java  |  3 +-
 .../com/hivemq/client/util/KeyStoreUtil.java  |  3 +-
 .../client/example/Mqtt3ClientExample.java    |  7 +++--
 .../decoder/AbstractMqttDecoderTest.java      |  3 +-
 .../mqtt3/Mqtt3PublishDecoderTest.java        |  6 +++-
 .../mqtt3/Mqtt3ConnectEncoderTest.java        | 13 +++++---
 .../encoder/mqtt5/Mqtt5AuthEncoderTest.java   |  3 +-
 .../mqtt5/Mqtt5ConnectEncoderTest.java        | 12 +++++---
 .../mqtt5/Mqtt5PublishEncoderTest.java        | 15 +++++++---
 .../mqtt5/Mqtt5UnsubscribeEncoderTest.java    |  3 +-
 .../MqttSharedTopicFilterImplTest.java        | 18 +++++++----
 .../datatypes/MqttTopicFilterImplTest.java    |  6 ++--
 .../MqttSubscribedPublishFlowTreeTest.java    |  8 +++--
 .../MqttSubscribedPublishFlowsTest.java       | 24 ++++++++++-----
 .../client/rx/FlowableWithSingleItem.java     |  3 +-
 .../client/rx/FlowableWithSingleSplit.java    |  6 ++--
 .../client/rx/FlowableWithSingleTest.java     | 15 ++++++----
 .../client/util/TestKeyStoreGenerator.java    |  4 ++-
 120 files changed, 692 insertions(+), 313 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 431a32b81..6055d9646 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,7 +1,7 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <option name="LINE_SEPARATOR" value="&#10;" />
     <option name="FORMATTER_TAGS_ENABLED" value="true" />
-    <option name="WRAP_COMMENTS" value="true" />
     <JavaCodeStyleSettings>
       <option name="ANNOTATION_PARAMETER_WRAP" value="1" />
       <option name="JD_INDENT_ON_CONTINUATION" value="true" />
@@ -10,13 +10,14 @@
       <option name="RIGHT_MARGIN" value="120" />
       <option name="KEEP_LINE_BREAKS" value="false" />
       <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
+      <option name="KEEP_BLANK_LINES_BETWEEN_PACKAGE_DECLARATION_AND_HEADER" value="1" />
       <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
       <option name="BLANK_LINES_BEFORE_PACKAGE" value="1" />
       <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
       <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
       <option name="CALL_PARAMETERS_WRAP" value="1" />
       <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
-      <option name="METHOD_PARAMETERS_WRAP" value="1" />
+      <option name="METHOD_PARAMETERS_WRAP" value="5" />
       <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
       <option name="RESOURCE_LIST_WRAP" value="1" />
       <option name="EXTENDS_LIST_WRAP" value="1" />
diff --git a/reactor/src/main/java/com/hivemq/client/internal/rx/reactor/operators/FluxWithSingleMap.java b/reactor/src/main/java/com/hivemq/client/internal/rx/reactor/operators/FluxWithSingleMap.java
index 69c6ce071..897fa6569 100644
--- a/reactor/src/main/java/com/hivemq/client/internal/rx/reactor/operators/FluxWithSingleMap.java
+++ b/reactor/src/main/java/com/hivemq/client/internal/rx/reactor/operators/FluxWithSingleMap.java
@@ -36,7 +36,8 @@
 public class FluxWithSingleMap<F, S, FM, SM> extends FluxWithSingleOperator<F, S, FM, SM> {
 
     public static <F, S, FM, SM> @NotNull FluxWithSingleMap<F, S, FM, SM> mapBoth(
-            final @NotNull FluxWithSingle<F, S> source, final @Nullable Function<? super F, ? extends FM> fluxMapper,
+            final @NotNull FluxWithSingle<F, S> source,
+            final @Nullable Function<? super F, ? extends FM> fluxMapper,
             final @NotNull Function<? super S, ? extends SM> singleMapper) {
 
         return new FluxWithSingleMap<>(source, fluxMapper, singleMapper);
@@ -52,7 +53,8 @@ public class FluxWithSingleMap<F, S, FM, SM> extends FluxWithSingleOperator<F, S
     private final @NotNull Function<? super S, ? extends SM> singleMapper;
 
     private FluxWithSingleMap(
-            final @NotNull FluxWithSingle<F, S> source, final @Nullable Function<? super F, ? extends FM> fluxMapper,
+            final @NotNull FluxWithSingle<F, S> source,
+            final @Nullable Function<? super F, ? extends FM> fluxMapper,
             final @NotNull Function<? super S, ? extends SM> singleMapper) {
 
         super(source);
@@ -93,7 +95,8 @@ private static class MapSubscriber<F, S, FM, SM, T extends CoreSubscriber<? supe
         private @Nullable Subscription subscription;
 
         MapSubscriber(
-                final @NotNull T subscriber, final @Nullable Function<? super F, ? extends FM> fluxMapper,
+                final @NotNull T subscriber,
+                final @Nullable Function<? super F, ? extends FM> fluxMapper,
                 final @NotNull Function<? super S, ? extends SM> singleMapper) {
 
             this.subscriber = subscriber;
@@ -177,7 +180,8 @@ private static class Conditional<F, S, FM, SM, T extends Fuseable.ConditionalSub
                 implements CoreWithSingleConditionalSubscriber<F, S> {
 
             Conditional(
-                    final @NotNull T subscriber, final @Nullable Function<? super F, ? extends FM> fluxMapper,
+                    final @NotNull T subscriber,
+                    final @Nullable Function<? super F, ? extends FM> fluxMapper,
                     final @NotNull Function<? super S, ? extends SM> singleMapper) {
 
                 super(subscriber, fluxMapper, singleMapper);
diff --git a/reactor/src/main/java/com/hivemq/client/internal/rx/reactor/operators/FluxWithSinglePublishOn.java b/reactor/src/main/java/com/hivemq/client/internal/rx/reactor/operators/FluxWithSinglePublishOn.java
index 545c0fc81..e4d45f2a6 100644
--- a/reactor/src/main/java/com/hivemq/client/internal/rx/reactor/operators/FluxWithSinglePublishOn.java
+++ b/reactor/src/main/java/com/hivemq/client/internal/rx/reactor/operators/FluxWithSinglePublishOn.java
@@ -32,7 +32,9 @@ public class FluxWithSinglePublishOn<F, S> extends FluxWithSingleOperator<F, S,
     private final int prefetch;
 
     public FluxWithSinglePublishOn(
-            final @NotNull FluxWithSingle<F, S> source, final @NotNull Scheduler scheduler, final boolean delayError,
+            final @NotNull FluxWithSingle<F, S> source,
+            final @NotNull Scheduler scheduler,
+            final boolean delayError,
             final int prefetch) {
 
         super(source);
diff --git a/reactor/src/main/java/com/hivemq/client/rx/reactor/FluxWithSingle.java b/reactor/src/main/java/com/hivemq/client/rx/reactor/FluxWithSingle.java
index 4d5efec74..3a598770b 100644
--- a/reactor/src/main/java/com/hivemq/client/rx/reactor/FluxWithSingle.java
+++ b/reactor/src/main/java/com/hivemq/client/rx/reactor/FluxWithSingle.java
@@ -254,7 +254,8 @@ public final void subscribeBoth(final @NotNull WithSingleSubscriber<? super F, ?
      * @see #subscribe(Consumer, Consumer, Runnable)
      */
     public final @NotNull CompletableFuture<S> subscribeSingleFuture(
-            final @NotNull Consumer<? super F> consumer, final @NotNull Consumer<? super Throwable> errorConsumer,
+            final @NotNull Consumer<? super F> consumer,
+            final @NotNull Consumer<? super Throwable> errorConsumer,
             final @NotNull Runnable completeConsumer) {
 
         final SingleFutureSubscriber<F, S> singleFutureSubscriber = new SingleFutureSubscriber<>(this);
@@ -284,8 +285,10 @@ public final void subscribeBoth(final @NotNull WithSingleSubscriber<? super F, ?
      * @see #subscribe(Consumer, Consumer, Runnable, Context)
      */
     public final @NotNull CompletableFuture<S> subscribeSingleFuture(
-            final @NotNull Consumer<? super F> consumer, final @NotNull Consumer<? super Throwable> errorConsumer,
-            final @NotNull Runnable completeConsumer, final @NotNull Context initialContext) {
+            final @NotNull Consumer<? super F> consumer,
+            final @NotNull Consumer<? super Throwable> errorConsumer,
+            final @NotNull Runnable completeConsumer,
+            final @NotNull Context initialContext) {
 
         final SingleFutureSubscriber<F, S> singleFutureSubscriber = new SingleFutureSubscriber<>(this);
         final CompletableFuture<S> future = singleFutureSubscriber.getFutureBeforeSubscribe();
diff --git a/reactor/src/test/java/com/hivemq/client/rx/reactor/FluxWithSingleItem.java b/reactor/src/test/java/com/hivemq/client/rx/reactor/FluxWithSingleItem.java
index 70400e5b8..c6c6d1a16 100644
--- a/reactor/src/test/java/com/hivemq/client/rx/reactor/FluxWithSingleItem.java
+++ b/reactor/src/test/java/com/hivemq/client/rx/reactor/FluxWithSingleItem.java
@@ -56,7 +56,8 @@ private static class SingleItemSubscriber<F, S> implements CoreSubscriber<F>, Su
         private @Nullable Subscription subscription;
 
         SingleItemSubscriber(
-                final @NotNull CoreWithSingleSubscriber<? super F, ? super S> subscriber, final @NotNull S single,
+                final @NotNull CoreWithSingleSubscriber<? super F, ? super S> subscriber,
+                final @NotNull S single,
                 final int index) {
 
             this.subscriber = subscriber;
diff --git a/reactor/src/test/java/com/hivemq/client/rx/reactor/FluxWithSingleSplit.java b/reactor/src/test/java/com/hivemq/client/rx/reactor/FluxWithSingleSplit.java
index c9c7c900c..d84d2bd87 100644
--- a/reactor/src/test/java/com/hivemq/client/rx/reactor/FluxWithSingleSplit.java
+++ b/reactor/src/test/java/com/hivemq/client/rx/reactor/FluxWithSingleSplit.java
@@ -59,7 +59,8 @@ private static class SplitSubscriber<U, F, S> implements Subscriber<U>, Subscrip
         private @Nullable Subscription subscription;
 
         SplitSubscriber(
-                final @NotNull Subscriber<? super F> subscriber, final @NotNull Class<F> flowableClass,
+                final @NotNull Subscriber<? super F> subscriber,
+                final @NotNull Class<F> flowableClass,
                 final @NotNull Class<S> singleClass) {
 
             this.subscriber = subscriber;
diff --git a/reactor/src/test/java/com/hivemq/client/rx/reactor/FluxWithSingleTest.java b/reactor/src/test/java/com/hivemq/client/rx/reactor/FluxWithSingleTest.java
index 8ac443821..0872ecae9 100644
--- a/reactor/src/test/java/com/hivemq/client/rx/reactor/FluxWithSingleTest.java
+++ b/reactor/src/test/java/com/hivemq/client/rx/reactor/FluxWithSingleTest.java
@@ -799,9 +799,12 @@ public void onError(final @NotNull Throwable t) {}
     }
 
     private @NotNull CompletableFuture<StringBuilder> subscribeSingleFuture(
-            final int args, final @NotNull FluxWithSingle<String, StringBuilder> fluxWithSingle,
-            final @NotNull AtomicInteger onNextCounter, final @NotNull AtomicInteger onErrorCounter,
-            final @NotNull AtomicInteger onCompleteCounter, final @NotNull CountDownLatch latch) {
+            final int args,
+            final @NotNull FluxWithSingle<String, StringBuilder> fluxWithSingle,
+            final @NotNull AtomicInteger onNextCounter,
+            final @NotNull AtomicInteger onErrorCounter,
+            final @NotNull AtomicInteger onCompleteCounter,
+            final @NotNull CountDownLatch latch) {
 
         switch (args) {
             case 0:
@@ -863,8 +866,10 @@ public void onError(final @NotNull Throwable t) {
     }
 
     private @NotNull CompletableFuture<StringBuilder> subscribeSingleFuture(
-            final int args, final @NotNull FluxWithSingle<String, StringBuilder> fluxWithSingle,
-            final @NotNull AtomicInteger onNextCounter, final @NotNull AtomicInteger onErrorCounter,
+            final int args,
+            final @NotNull FluxWithSingle<String, StringBuilder> fluxWithSingle,
+            final @NotNull AtomicInteger onNextCounter,
+            final @NotNull AtomicInteger onErrorCounter,
             final @NotNull AtomicInteger onCompleteCounter) {
 
         return subscribeSingleFuture(
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java
index 4ed4ec6e1..9e22cd153 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java
@@ -137,7 +137,8 @@ public class MqttAsyncClient implements Mqtt5AsyncClient {
 
     @Override
     public @NotNull CompletableFuture<@NotNull Mqtt5SubAck> subscribe(
-            final @Nullable Mqtt5Subscribe subscribe, final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
+            final @Nullable Mqtt5Subscribe subscribe,
+            final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
             final @Nullable Executor executor) {
 
         return subscribe(subscribe, callback, executor, false);
@@ -145,7 +146,8 @@ public class MqttAsyncClient implements Mqtt5AsyncClient {
 
     @Override
     public @NotNull CompletableFuture<@NotNull Mqtt5SubAck> subscribe(
-            final @Nullable Mqtt5Subscribe subscribe, final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
+            final @Nullable Mqtt5Subscribe subscribe,
+            final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
             final boolean manualAcknowledgement) {
 
         final MqttSubscribe mqttSubscribe = MqttChecks.subscribe(subscribe);
@@ -157,8 +159,10 @@ public class MqttAsyncClient implements Mqtt5AsyncClient {
 
     @Override
     public @NotNull CompletableFuture<@NotNull Mqtt5SubAck> subscribe(
-            final @Nullable Mqtt5Subscribe subscribe, final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
-            final @Nullable Executor executor, final boolean manualAcknowledgement) {
+            final @Nullable Mqtt5Subscribe subscribe,
+            final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
+            final @Nullable Executor executor,
+            final boolean manualAcknowledgement) {
 
         final MqttSubscribe mqttSubscribe = MqttChecks.subscribe(subscribe);
         Checks.notNull(callback, "Callback");
@@ -183,7 +187,8 @@ public void publishes(
 
     @Override
     public void publishes(
-            final @Nullable MqttGlobalPublishFilter filter, final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
+            final @Nullable MqttGlobalPublishFilter filter,
+            final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
             final @Nullable Executor executor) {
 
         publishes(filter, callback, executor, false);
@@ -191,7 +196,8 @@ public void publishes(
 
     @Override
     public void publishes(
-            final @Nullable MqttGlobalPublishFilter filter, final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
+            final @Nullable MqttGlobalPublishFilter filter,
+            final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
             final boolean manualAcknowledgement) {
 
         Checks.notNull(filter, "Global publish filter");
@@ -202,8 +208,10 @@ public void publishes(
 
     @Override
     public void publishes(
-            final @Nullable MqttGlobalPublishFilter filter, final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
-            final @Nullable Executor executor, final boolean manualAcknowledgement) {
+            final @Nullable MqttGlobalPublishFilter filter,
+            final @Nullable Consumer<@NotNull Mqtt5Publish> callback,
+            final @Nullable Executor executor,
+            final boolean manualAcknowledgement) {
 
         Checks.notNull(filter, "Global publish filter");
         Checks.notNull(callback, "Callback");
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java
index b46de9ee0..63e6630de 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java
@@ -72,10 +72,12 @@ public class MqttClientConfig implements Mqtt5ClientConfig {
     private boolean republishIfSessionExpired;
 
     public MqttClientConfig(
-            final @NotNull MqttVersion mqttVersion, final @NotNull MqttClientIdentifierImpl clientIdentifier,
+            final @NotNull MqttVersion mqttVersion,
+            final @NotNull MqttClientIdentifierImpl clientIdentifier,
             final @NotNull MqttClientTransportConfigImpl transportConfig,
             final @NotNull MqttClientExecutorConfigImpl executorConfig,
-            final @NotNull MqttClientAdvancedConfig advancedConfig, final @NotNull ConnectDefaults connectDefaults,
+            final @NotNull MqttClientAdvancedConfig advancedConfig,
+            final @NotNull ConnectDefaults connectDefaults,
             final @NotNull ImmutableList<MqttClientConnectedListener> connectedListeners,
             final @NotNull ImmutableList<MqttClientDisconnectedListener> disconnectedListeners) {
 
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConnectionConfig.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConnectionConfig.java
index 53fcdcf27..b48f1c175 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConnectionConfig.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConnectionConfig.java
@@ -62,7 +62,6 @@ public class MqttClientConnectionConfig
     private final @NotNull Channel channel;
     private final int flags;
 
-    // @formatter:off
     public MqttClientConnectionConfig(
             final @NotNull MqttClientTransportConfigImpl transportConfig,
             final int keepAlive,
@@ -86,7 +85,6 @@ public MqttClientConnectionConfig(
             final boolean sharedSubscriptionAvailable,
             final boolean subscriptionIdentifiersAvailable,
             final @NotNull Channel channel) {
-    // @formatter:on
 
         this.transportConfig = transportConfig;
         this.keepAlive = (short) keepAlive;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientExecutorConfigImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientExecutorConfigImpl.java
index 300abcb79..fc100df20 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientExecutorConfigImpl.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientExecutorConfigImpl.java
@@ -40,7 +40,8 @@ public class MqttClientExecutorConfigImpl implements MqttClientExecutorConfig {
     private final @NotNull Scheduler applicationScheduler;
 
     MqttClientExecutorConfigImpl(
-            final @Nullable Executor nettyExecutor, final int nettyThreads,
+            final @Nullable Executor nettyExecutor,
+            final int nettyThreads,
             final @NotNull Scheduler applicationScheduler) {
 
         this.nettyExecutor = nettyExecutor;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientSslConfigImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientSslConfigImpl.java
index 1109211bd..55b8c2a98 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientSslConfigImpl.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientSslConfigImpl.java
@@ -57,8 +57,10 @@ public class MqttClientSslConfigImpl implements MqttClientSslConfig {
 
     MqttClientSslConfigImpl(
             final @Nullable KeyManagerFactory keyManagerFactory,
-            final @Nullable TrustManagerFactory trustManagerFactory, final @Nullable ImmutableList<String> cipherSuites,
-            final @Nullable ImmutableList<String> protocols, final int handshakeTimeoutMs,
+            final @Nullable TrustManagerFactory trustManagerFactory,
+            final @Nullable ImmutableList<String> cipherSuites,
+            final @Nullable ImmutableList<String> protocols,
+            final int handshakeTimeoutMs,
             final @Nullable HostnameVerifier hostnameVerifier) {
 
         this.keyManagerFactory = keyManagerFactory;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImpl.java
index c759cf645..5ec9c1a5f 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImpl.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImpl.java
@@ -43,9 +43,12 @@ public class MqttClientTransportConfigImpl implements MqttClientTransportConfig
     private final int mqttConnectTimeoutMs;
 
     MqttClientTransportConfigImpl(
-            final @NotNull InetSocketAddress serverAddress, final @Nullable InetSocketAddress localAddress,
-            final @Nullable MqttClientSslConfigImpl sslConfig, final @Nullable MqttWebSocketConfigImpl webSocketConfig,
-            final @Nullable MqttProxyConfigImpl proxyConfig, final int socketConnectTimeoutMs,
+            final @NotNull InetSocketAddress serverAddress,
+            final @Nullable InetSocketAddress localAddress,
+            final @Nullable MqttClientSslConfigImpl sslConfig,
+            final @Nullable MqttWebSocketConfigImpl webSocketConfig,
+            final @Nullable MqttProxyConfigImpl proxyConfig,
+            final int socketConnectTimeoutMs,
             final int mqttConnectTimeoutMs) {
 
         this.serverAddress = serverAddress;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImpl.java
index 9692da38e..2cf06759c 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImpl.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImpl.java
@@ -37,8 +37,11 @@ public class MqttProxyConfigImpl implements MqttProxyConfig {
     private final int handshakeTimeoutMs;
 
     MqttProxyConfigImpl(
-            final @NotNull MqttProxyProtocol protocol, final @NotNull InetSocketAddress address,
-            final @Nullable String username, final @Nullable String password, final int handshakeTimeoutMs) {
+            final @NotNull MqttProxyProtocol protocol,
+            final @NotNull InetSocketAddress address,
+            final @Nullable String username,
+            final @Nullable String password,
+            final int handshakeTimeoutMs) {
 
         this.protocol = protocol;
         this.address = address;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java
index f6e4edcc9..4a43e671c 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java
@@ -205,7 +205,8 @@ protected MqttRxClientBuilderBase(final @NotNull MqttRxClientBuilderBase<?> clie
     }
 
     protected @NotNull MqttClientConfig buildClientConfig(
-            final @NotNull MqttVersion mqttVersion, final @NotNull MqttClientAdvancedConfig advancedConfig,
+            final @NotNull MqttVersion mqttVersion,
+            final @NotNull MqttClientAdvancedConfig advancedConfig,
             final @NotNull MqttClientConfig.ConnectDefaults connectDefaults) {
 
         return new MqttClientConfig(mqttVersion, identifier, buildTransportConfig(), executorConfig, advancedConfig,
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttWebSocketConfigImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttWebSocketConfigImpl.java
index d13894a11..c3431a18f 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/MqttWebSocketConfigImpl.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttWebSocketConfigImpl.java
@@ -36,7 +36,9 @@ public class MqttWebSocketConfigImpl implements MqttWebSocketConfig {
     private final int handshakeTimeoutMs;
 
     MqttWebSocketConfigImpl(
-            final @NotNull String serverPath, final @NotNull String queryString, final @NotNull String subprotocol,
+            final @NotNull String serverPath,
+            final @NotNull String queryString,
+            final @NotNull String subprotocol,
             final int handshakeTimeoutMs) {
 
         this.serverPath = serverPath;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttClientAdvancedConfig.java b/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttClientAdvancedConfig.java
index 1323b3434..a44ba9319 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttClientAdvancedConfig.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttClientAdvancedConfig.java
@@ -35,7 +35,8 @@ public class MqttClientAdvancedConfig implements Mqtt5ClientAdvancedConfig {
     private final @Nullable MqttClientInterceptors interceptors;
 
     MqttClientAdvancedConfig(
-            final boolean allowServerReAuth, final boolean validatePayloadFormat,
+            final boolean allowServerReAuth,
+            final boolean validatePayloadFormat,
             final @Nullable MqttClientInterceptors interceptors) {
 
         this.allowServerReAuth = allowServerReAuth;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttDecoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttDecoder.java
index b38bb9e0c..8abec3f1b 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttDecoder.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttDecoder.java
@@ -50,7 +50,8 @@ public class MqttDecoder extends ByteToMessageDecoder {
 
     @Inject
     MqttDecoder(
-            final @NotNull MqttMessageDecoders decoders, final @NotNull MqttClientConfig clientConfig,
+            final @NotNull MqttMessageDecoders decoders,
+            final @NotNull MqttClientConfig clientConfig,
             final @NotNull MqttConnect connect) {
 
         this.decoders = decoders;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttDecoderContext.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttDecoderContext.java
index d14102d35..cce067581 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttDecoderContext.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttDecoderContext.java
@@ -34,9 +34,13 @@ public class MqttDecoderContext {
     private final boolean directBufferCorrelationData;
 
     MqttDecoderContext(
-            final int maximumPacketSize, final int topicAliasMaximum, final boolean problemInformationRequested,
-            final boolean responseInformationRequested, final boolean validatePayloadFormat,
-            final boolean directBufferPayload, final boolean directBufferAuth,
+            final int maximumPacketSize,
+            final int topicAliasMaximum,
+            final boolean problemInformationRequested,
+            final boolean responseInformationRequested,
+            final boolean validatePayloadFormat,
+            final boolean directBufferPayload,
+            final boolean directBufferAuth,
             final boolean directBufferCorrelationData) {
 
         this.maximumPacketSize = maximumPacketSize;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3ClientMessageDecoders.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3ClientMessageDecoders.java
index a3c5ef48c..b70a8df4c 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3ClientMessageDecoders.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3ClientMessageDecoders.java
@@ -34,10 +34,14 @@ public class Mqtt3ClientMessageDecoders extends MqttMessageDecoders {
 
     @Inject
     Mqtt3ClientMessageDecoders(
-            final @NotNull Mqtt3ConnAckDecoder connAckDecoder, final @NotNull Mqtt3PublishDecoder publishDecoder,
-            final @NotNull Mqtt3PubAckDecoder pubAckDecoder, final @NotNull Mqtt3PubRecDecoder pubRecDecoder,
-            final @NotNull Mqtt3PubRelDecoder pubRelDecoder, final @NotNull Mqtt3PubCompDecoder pubCompDecoder,
-            final @NotNull Mqtt3SubAckDecoder subAckDecoder, final @NotNull Mqtt3UnsubAckDecoder unsubAckDecoder,
+            final @NotNull Mqtt3ConnAckDecoder connAckDecoder,
+            final @NotNull Mqtt3PublishDecoder publishDecoder,
+            final @NotNull Mqtt3PubAckDecoder pubAckDecoder,
+            final @NotNull Mqtt3PubRecDecoder pubRecDecoder,
+            final @NotNull Mqtt3PubRelDecoder pubRelDecoder,
+            final @NotNull Mqtt3PubCompDecoder pubCompDecoder,
+            final @NotNull Mqtt3SubAckDecoder subAckDecoder,
+            final @NotNull Mqtt3UnsubAckDecoder unsubAckDecoder,
             final @NotNull MqttPingRespDecoder pingRespDecoder) {
 
         decoders[Mqtt3MessageType.CONNACK.getCode()] = connAckDecoder;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5ClientMessageDecoders.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5ClientMessageDecoders.java
index 48eb1e740..00c7af4be 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5ClientMessageDecoders.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5ClientMessageDecoders.java
@@ -34,11 +34,16 @@ public class Mqtt5ClientMessageDecoders extends MqttMessageDecoders {
 
     @Inject
     Mqtt5ClientMessageDecoders(
-            final @NotNull Mqtt5ConnAckDecoder connAckDecoder, final @NotNull Mqtt5PublishDecoder publishDecoder,
-            final @NotNull Mqtt5PubAckDecoder pubAckDecoder, final @NotNull Mqtt5PubRecDecoder pubRecDecoder,
-            final @NotNull Mqtt5PubRelDecoder pubRelDecoder, final @NotNull Mqtt5PubCompDecoder pubCompDecoder,
-            final @NotNull Mqtt5SubAckDecoder subAckDecoder, final @NotNull Mqtt5UnsubAckDecoder unsubAckDecoder,
-            final @NotNull MqttPingRespDecoder pingRespDecoder, final @NotNull Mqtt5DisconnectDecoder disconnectDecoder,
+            final @NotNull Mqtt5ConnAckDecoder connAckDecoder,
+            final @NotNull Mqtt5PublishDecoder publishDecoder,
+            final @NotNull Mqtt5PubAckDecoder pubAckDecoder,
+            final @NotNull Mqtt5PubRecDecoder pubRecDecoder,
+            final @NotNull Mqtt5PubRelDecoder pubRelDecoder,
+            final @NotNull Mqtt5PubCompDecoder pubCompDecoder,
+            final @NotNull Mqtt5SubAckDecoder subAckDecoder,
+            final @NotNull Mqtt5UnsubAckDecoder unsubAckDecoder,
+            final @NotNull MqttPingRespDecoder pingRespDecoder,
+            final @NotNull Mqtt5DisconnectDecoder disconnectDecoder,
             final @NotNull Mqtt5AuthDecoder authDecoder) {
 
         decoders[Mqtt5MessageType.CONNACK.getCode()] = connAckDecoder;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5MessageDecoderUtil.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5MessageDecoderUtil.java
index 061ea6ddf..7beccb86b 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5MessageDecoderUtil.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5MessageDecoderUtil.java
@@ -166,7 +166,9 @@ static long unsignedIntOnlyOnce(
     }
 
     static @NotNull ByteBuffer decodeBinaryDataOnlyOnce(
-            final @Nullable ByteBuffer current, final @NotNull String name, final @NotNull ByteBuf in,
+            final @Nullable ByteBuffer current,
+            final @NotNull String name,
+            final @NotNull ByteBuf in,
             final boolean direct) throws MqttDecoderException {
 
         if (current != null) {
@@ -224,7 +226,8 @@ private static void checkProblemInformationRequested(
     }
 
     static @NotNull MqttUtf8StringImpl decodeReasonStringIfRequested(
-            final @Nullable MqttUtf8StringImpl current, final @NotNull ByteBuf in,
+            final @Nullable MqttUtf8StringImpl current,
+            final @NotNull ByteBuf in,
             final @NotNull MqttDecoderContext context) throws MqttDecoderException {
 
         checkProblemInformationRequested("reason string", context);
@@ -233,7 +236,8 @@ private static void checkProblemInformationRequested(
 
     static @NotNull ImmutableList.Builder<MqttUserPropertyImpl> decodeUserPropertyIfRequested(
             final @Nullable ImmutableList.Builder<MqttUserPropertyImpl> userPropertiesBuilder,
-            final @NotNull ByteBuf in, final @NotNull MqttDecoderContext context) throws MqttDecoderException {
+            final @NotNull ByteBuf in,
+            final @NotNull MqttDecoderContext context) throws MqttDecoderException {
 
         checkProblemInformationRequested("user property", context);
         return decodeUserProperty(userPropertiesBuilder, in);
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/MqttEncoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/MqttEncoder.java
index 199d12dfd..3b99bb907 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/MqttEncoder.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/MqttEncoder.java
@@ -56,7 +56,8 @@ public void onConnected(final @NotNull MqttClientConnectionConfig connectionConf
 
     @Override
     public void write(
-            final @NotNull ChannelHandlerContext ctx, final @NotNull Object msg,
+            final @NotNull ChannelHandlerContext ctx,
+            final @NotNull Object msg,
             final @NotNull ChannelPromise promise) {
 
         if (msg instanceof MqttMessage) {
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3ClientMessageEncoders.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3ClientMessageEncoders.java
index b9d408060..3e978f027 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3ClientMessageEncoders.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3ClientMessageEncoders.java
@@ -34,11 +34,15 @@ public class Mqtt3ClientMessageEncoders extends MqttMessageEncoders {
 
     @Inject
     Mqtt3ClientMessageEncoders(
-            final @NotNull Mqtt3ConnectEncoder connectEncoder, final @NotNull Mqtt3PublishEncoder publishEncoder,
-            final @NotNull Mqtt3PubAckEncoder pubAckEncoder, final @NotNull Mqtt3PubRecEncoder pubRecEncoder,
-            final @NotNull Mqtt3PubRelEncoder pubRelEncoder, final @NotNull Mqtt3PubCompEncoder pubCompEncoder,
+            final @NotNull Mqtt3ConnectEncoder connectEncoder,
+            final @NotNull Mqtt3PublishEncoder publishEncoder,
+            final @NotNull Mqtt3PubAckEncoder pubAckEncoder,
+            final @NotNull Mqtt3PubRecEncoder pubRecEncoder,
+            final @NotNull Mqtt3PubRelEncoder pubRelEncoder,
+            final @NotNull Mqtt3PubCompEncoder pubCompEncoder,
             final @NotNull Mqtt3SubscribeEncoder subscribeEncoder,
-            final @NotNull Mqtt3UnsubscribeEncoder unsubscribeEncoder, final @NotNull MqttPingReqEncoder pingReqEncoder,
+            final @NotNull Mqtt3UnsubscribeEncoder unsubscribeEncoder,
+            final @NotNull MqttPingReqEncoder pingReqEncoder,
             final @NotNull Mqtt3DisconnectEncoder disconnectEncoder) {
 
         encoders[Mqtt3MessageType.CONNECT.getCode()] = connectEncoder;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3MessageEncoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3MessageEncoder.java
index d5d60a075..c0c2c5b93 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3MessageEncoder.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3MessageEncoder.java
@@ -44,7 +44,9 @@ abstract class Mqtt3MessageEncoder<M extends MqttMessage> extends MqttMessageEnc
     }
 
     @NotNull ByteBuf encode(
-            final @NotNull M message, final @NotNull MqttEncoderContext context, final int encodedLength,
+            final @NotNull M message,
+            final @NotNull MqttEncoderContext context,
+            final int encodedLength,
             final int remainingLength) {
 
         final ByteBuf out = context.getAllocator().ioBuffer(encodedLength, encodedLength);
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PublishEncoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PublishEncoder.java
index af6bf6634..1deec43a0 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PublishEncoder.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PublishEncoder.java
@@ -63,8 +63,10 @@ int remainingLength(final @NotNull MqttStatefulPublish message) {
 
     @Override
     @NotNull ByteBuf encode(
-            final @NotNull MqttStatefulPublish message, final @NotNull MqttEncoderContext context,
-            final int encodedLength, final int remainingLength) {
+            final @NotNull MqttStatefulPublish message,
+            final @NotNull MqttEncoderContext context,
+            final int encodedLength,
+            final int remainingLength) {
 
         final ByteBuffer payload = message.stateless().getRawPayload();
         if ((payload != null) && payload.isDirect()) {
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5AuthEncoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5AuthEncoder.java
index 6d1a05273..19c8c13e9 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5AuthEncoder.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5AuthEncoder.java
@@ -59,8 +59,11 @@ int propertyLength(final @NotNull MqttAuth message) {
 
     @Override
     void encode(
-            final @NotNull MqttAuth message, final @NotNull ByteBuf out, final int remainingLength,
-            final int propertyLength, final int omittedProperties) {
+            final @NotNull MqttAuth message,
+            final @NotNull ByteBuf out,
+            final int remainingLength,
+            final int propertyLength,
+            final int omittedProperties) {
 
         encodeFixedHeader(out, remainingLength);
         encodeVariableHeader(message, out, propertyLength, omittedProperties);
@@ -72,7 +75,9 @@ private void encodeFixedHeader(final @NotNull ByteBuf out, final int remainingLe
     }
 
     private void encodeVariableHeader(
-            final @NotNull MqttAuth message, final @NotNull ByteBuf out, final int propertyLength,
+            final @NotNull MqttAuth message,
+            final @NotNull ByteBuf out,
+            final int propertyLength,
             final int omittedProperties) {
 
         out.writeByte(message.getReasonCode().getCode());
@@ -80,7 +85,9 @@ private void encodeVariableHeader(
     }
 
     private void encodeProperties(
-            final @NotNull MqttAuth message, final @NotNull ByteBuf out, final int propertyLength,
+            final @NotNull MqttAuth message,
+            final @NotNull ByteBuf out,
+            final int propertyLength,
             final int omittedProperties) {
 
         MqttVariableByteInteger.encode(propertyLength, out);
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5ClientMessageEncoders.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5ClientMessageEncoders.java
index 5e1484b05..ef3cf01ad 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5ClientMessageEncoders.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5ClientMessageEncoders.java
@@ -34,12 +34,17 @@ public class Mqtt5ClientMessageEncoders extends MqttMessageEncoders {
 
     @Inject
     Mqtt5ClientMessageEncoders(
-            final @NotNull Mqtt5ConnectEncoder connectEncoder, final @NotNull Mqtt5PublishEncoder publishEncoder,
-            final @NotNull Mqtt5PubAckEncoder pubAckEncoder, final @NotNull Mqtt5PubRecEncoder pubRecEncoder,
-            final @NotNull Mqtt5PubRelEncoder pubRelEncoder, final @NotNull Mqtt5PubCompEncoder pubCompEncoder,
+            final @NotNull Mqtt5ConnectEncoder connectEncoder,
+            final @NotNull Mqtt5PublishEncoder publishEncoder,
+            final @NotNull Mqtt5PubAckEncoder pubAckEncoder,
+            final @NotNull Mqtt5PubRecEncoder pubRecEncoder,
+            final @NotNull Mqtt5PubRelEncoder pubRelEncoder,
+            final @NotNull Mqtt5PubCompEncoder pubCompEncoder,
             final @NotNull Mqtt5SubscribeEncoder subscribeEncoder,
-            final @NotNull Mqtt5UnsubscribeEncoder unsubscribeEncoder, final @NotNull MqttPingReqEncoder pingReqEncoder,
-            final @NotNull Mqtt5DisconnectEncoder disconnectEncoder, final @NotNull Mqtt5AuthEncoder authEncoder) {
+            final @NotNull Mqtt5UnsubscribeEncoder unsubscribeEncoder,
+            final @NotNull MqttPingReqEncoder pingReqEncoder,
+            final @NotNull Mqtt5DisconnectEncoder disconnectEncoder,
+            final @NotNull Mqtt5AuthEncoder authEncoder) {
 
         encoders[Mqtt5MessageType.CONNECT.getCode()] = connectEncoder;
         encoders[Mqtt5MessageType.PUBLISH.getCode()] = publishEncoder;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5ConnectEncoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5ConnectEncoder.java
index 6fbbbeb1f..d2917c25a 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5ConnectEncoder.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5ConnectEncoder.java
@@ -82,8 +82,12 @@ public class Mqtt5ConnectEncoder extends MqttMessageEncoder<MqttStatefulConnect>
     }
 
     private @NotNull ByteBuf encode(
-            final @NotNull MqttStatefulConnect message, final @NotNull MqttEncoderContext context,
-            final int encodedLength, final int remainingLength, final int propertyLength, final int willPropertyLength,
+            final @NotNull MqttStatefulConnect message,
+            final @NotNull MqttEncoderContext context,
+            final int encodedLength,
+            final int remainingLength,
+            final int propertyLength,
+            final int willPropertyLength,
             final int omittedProperties) {
 
         final ByteBuf out = context.getAllocator().ioBuffer(encodedLength, encodedLength);
@@ -185,8 +189,12 @@ private int willPropertyLength(final @NotNull MqttStatefulConnect message) {
     }
 
     private void encode(
-            final @NotNull MqttStatefulConnect message, final @NotNull ByteBuf out, final int remainingLength,
-            final int propertyLength, final int willPropertyLength, final int omittedProperties) {
+            final @NotNull MqttStatefulConnect message,
+            final @NotNull ByteBuf out,
+            final int remainingLength,
+            final int propertyLength,
+            final int willPropertyLength,
+            final int omittedProperties) {
 
         encodeFixedHeader(out, remainingLength);
         encodeVariableHeader(message, out, propertyLength, omittedProperties);
@@ -199,7 +207,9 @@ private void encodeFixedHeader(final @NotNull ByteBuf out, final int remainingLe
     }
 
     private void encodeVariableHeader(
-            final @NotNull MqttStatefulConnect message, final @NotNull ByteBuf out, final int propertyLength,
+            final @NotNull MqttStatefulConnect message,
+            final @NotNull ByteBuf out,
+            final int propertyLength,
             final int omittedProperties) {
 
         final MqttConnect stateless = message.stateless();
@@ -240,7 +250,9 @@ private void encodeVariableHeader(
     }
 
     private void encodeProperties(
-            final @NotNull MqttStatefulConnect message, final @NotNull ByteBuf out, final int propertyLength,
+            final @NotNull MqttStatefulConnect message,
+            final @NotNull ByteBuf out,
+            final int propertyLength,
             final int omittedProperties) {
 
         final MqttConnect stateless = message.stateless();
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5MessageEncoderUtil.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5MessageEncoderUtil.java
index 529409722..95f928939 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5MessageEncoderUtil.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5MessageEncoderUtil.java
@@ -94,7 +94,8 @@ static void encodeNullableProperty(
     }
 
     static void encodeNullableProperty(
-            final int propertyIdentifier, final @Nullable Mqtt5PayloadFormatIndicator payloadFormatIndicator,
+            final int propertyIdentifier,
+            final @Nullable Mqtt5PayloadFormatIndicator payloadFormatIndicator,
             final @NotNull ByteBuf out) {
 
         if (payloadFormatIndicator != null) {
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5MessageWithUserPropertiesEncoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5MessageWithUserPropertiesEncoder.java
index 0c5c012fd..565cf88a9 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5MessageWithUserPropertiesEncoder.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5MessageWithUserPropertiesEncoder.java
@@ -69,8 +69,12 @@ abstract class Mqtt5MessageWithUserPropertiesEncoder<M extends MqttMessage.WithU
      * @return the byte buffer the MQTT message is encoded to.
      */
     @NotNull ByteBuf encode(
-            final @NotNull M message, final @NotNull MqttEncoderContext context, final int encodedLength,
-            final int remainingLength, final int propertyLength, final int omittedProperties) {
+            final @NotNull M message,
+            final @NotNull MqttEncoderContext context,
+            final int encodedLength,
+            final int remainingLength,
+            final int propertyLength,
+            final int omittedProperties) {
 
         final ByteBuf out = context.getAllocator().ioBuffer(encodedLength, encodedLength);
         encode(message, out, remainingLength, propertyLength, omittedProperties);
@@ -87,7 +91,10 @@ abstract class Mqtt5MessageWithUserPropertiesEncoder<M extends MqttMessage.WithU
      * @param omittedProperties the count of omitted properties of the MQTT message.
      */
     abstract void encode(
-            final @NotNull M message, final @NotNull ByteBuf out, final int remainingLength, final int propertyLength,
+            final @NotNull M message,
+            final @NotNull ByteBuf out,
+            final int remainingLength,
+            final int propertyLength,
             final int omittedProperties);
 
     /**
@@ -249,8 +256,11 @@ int additionalPropertyLength(final @NotNull M message) {
 
             @Override
             protected void encode(
-                    final @NotNull M message, final @NotNull ByteBuf out, final int remainingLength,
-                    final int propertyLength, final int omittedProperties) {
+                    final @NotNull M message,
+                    final @NotNull ByteBuf out,
+                    final int remainingLength,
+                    final int propertyLength,
+                    final int omittedProperties) {
 
                 encodeFixedHeader(out, remainingLength);
                 encodeVariableHeader(message, out, propertyLength, omittedProperties);
@@ -262,7 +272,9 @@ private void encodeFixedHeader(final @NotNull ByteBuf out, final int remainingLe
             }
 
             private void encodeVariableHeader(
-                    final @NotNull M message, final @NotNull ByteBuf out, final int propertyLength,
+                    final @NotNull M message,
+                    final @NotNull ByteBuf out,
+                    final int propertyLength,
                     final int omittedProperties) {
 
                 encodeAdditionalVariableHeader(message, out);
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PublishEncoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PublishEncoder.java
index 49374b5fd..0ee94dcda 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PublishEncoder.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PublishEncoder.java
@@ -103,8 +103,12 @@ final int fixedPropertyLength(final @NotNull MqttPublish publish) {
 
     @Override
     @NotNull ByteBuf encode(
-            final @NotNull MqttStatefulPublish message, final @NotNull MqttEncoderContext context,
-            final int encodedLength, final int remainingLength, final int propertyLength, final int omittedProperties) {
+            final @NotNull MqttStatefulPublish message,
+            final @NotNull MqttEncoderContext context,
+            final int encodedLength,
+            final int remainingLength,
+            final int propertyLength,
+            final int omittedProperties) {
 
         final ByteBuffer payload = message.stateless().getRawPayload();
         if ((payload != null) && payload.isDirect()) {
@@ -121,8 +125,11 @@ final int fixedPropertyLength(final @NotNull MqttPublish publish) {
 
     @Override
     void encode(
-            final @NotNull MqttStatefulPublish message, final @NotNull ByteBuf out, final int remainingLength,
-            final int propertyLength, final int omittedProperties) {
+            final @NotNull MqttStatefulPublish message,
+            final @NotNull ByteBuf out,
+            final int remainingLength,
+            final int propertyLength,
+            final int omittedProperties) {
 
         encodeFixedHeader(message, out, remainingLength);
         encodeVariableHeader(message, out, propertyLength, omittedProperties);
@@ -149,7 +156,9 @@ private void encodeFixedHeader(
     }
 
     private void encodeVariableHeader(
-            final @NotNull MqttStatefulPublish message, final @NotNull ByteBuf out, final int propertyLength,
+            final @NotNull MqttStatefulPublish message,
+            final @NotNull ByteBuf out,
+            final int propertyLength,
             final int omittedProperties) {
 
         final MqttPublish stateless = message.stateless();
@@ -168,7 +177,9 @@ private void encodeVariableHeader(
     }
 
     private void encodeProperties(
-            final @NotNull MqttStatefulPublish message, final @NotNull ByteBuf out, final int propertyLength,
+            final @NotNull MqttStatefulPublish message,
+            final @NotNull ByteBuf out,
+            final int propertyLength,
             final int omittedProperties) {
 
         MqttVariableByteInteger.encode(propertyLength, out);
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5SubscribeEncoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5SubscribeEncoder.java
index e5d82a00a..5060fe17c 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5SubscribeEncoder.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5SubscribeEncoder.java
@@ -70,8 +70,11 @@ int propertyLength(final @NotNull MqttStatefulSubscribe message) {
 
     @Override
     void encode(
-            final @NotNull MqttStatefulSubscribe message, final @NotNull ByteBuf out, final int remainingLength,
-            final int propertyLength, final int omittedProperties) {
+            final @NotNull MqttStatefulSubscribe message,
+            final @NotNull ByteBuf out,
+            final int remainingLength,
+            final int propertyLength,
+            final int omittedProperties) {
 
         encodeFixedHeader(out, remainingLength);
         encodeVariableHeader(message, out, propertyLength, omittedProperties);
@@ -84,7 +87,9 @@ private void encodeFixedHeader(final @NotNull ByteBuf out, final int remainingLe
     }
 
     private void encodeVariableHeader(
-            final @NotNull MqttStatefulSubscribe message, final @NotNull ByteBuf out, final int propertyLength,
+            final @NotNull MqttStatefulSubscribe message,
+            final @NotNull ByteBuf out,
+            final int propertyLength,
             final int omittedProperties) {
 
         out.writeShort(message.getPacketIdentifier());
@@ -92,7 +97,9 @@ private void encodeVariableHeader(
     }
 
     private void encodeProperties(
-            final @NotNull MqttStatefulSubscribe message, final @NotNull ByteBuf out, final int propertyLength,
+            final @NotNull MqttStatefulSubscribe message,
+            final @NotNull ByteBuf out,
+            final int propertyLength,
             final int omittedProperties) {
 
         MqttVariableByteInteger.encode(propertyLength, out);
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5UnsubscribeEncoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5UnsubscribeEncoder.java
index e88d738c3..f5b1fd2cd 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5UnsubscribeEncoder.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5UnsubscribeEncoder.java
@@ -59,8 +59,11 @@ int propertyLength(final @NotNull MqttStatefulUnsubscribe message) {
 
     @Override
     void encode(
-            final @NotNull MqttStatefulUnsubscribe message, final @NotNull ByteBuf out, final int remainingLength,
-            final int propertyLength, final int omittedProperties) {
+            final @NotNull MqttStatefulUnsubscribe message,
+            final @NotNull ByteBuf out,
+            final int remainingLength,
+            final int propertyLength,
+            final int omittedProperties) {
 
         encodeFixedHeader(out, remainingLength);
         encodeVariableHeader(message, out, propertyLength, omittedProperties);
@@ -73,7 +76,9 @@ private void encodeFixedHeader(final @NotNull ByteBuf out, final int remainingLe
     }
 
     private void encodeVariableHeader(
-            final @NotNull MqttStatefulUnsubscribe message, final @NotNull ByteBuf out, final int propertyLength,
+            final @NotNull MqttStatefulUnsubscribe message,
+            final @NotNull ByteBuf out,
+            final int propertyLength,
             final int omittedProperties) {
 
         out.writeShort(message.getPacketIdentifier());
@@ -81,7 +86,9 @@ private void encodeVariableHeader(
     }
 
     private void encodeProperties(
-            final @NotNull MqttStatefulUnsubscribe message, final @NotNull ByteBuf out, final int propertyLength,
+            final @NotNull MqttStatefulUnsubscribe message,
+            final @NotNull ByteBuf out,
+            final int propertyLength,
             final int omittedProperties) {
 
         MqttVariableByteInteger.encode(propertyLength, out);
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicFilterImplBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicFilterImplBuilder.java
index 359923736..433a14c57 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicFilterImplBuilder.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicFilterImplBuilder.java
@@ -213,7 +213,8 @@ public static class SharedNested<P> extends SharedBase<SharedNested<P>>
         }
 
         SharedNested(
-                final @Nullable String shareName, final @NotNull String baseTopicFilter,
+                final @Nullable String shareName,
+                final @NotNull String baseTopicFilter,
                 final @NotNull Function<? super MqttSharedTopicFilterImpl, P> parentConsumer) {
 
             super(shareName, baseTopicFilter);
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/MqttChannelInitializer.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/MqttChannelInitializer.java
index e1df74171..5c1043795 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/handler/MqttChannelInitializer.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/MqttChannelInitializer.java
@@ -70,9 +70,12 @@ public class MqttChannelInitializer extends ChannelInboundHandlerAdapter {
 
     @Inject
     MqttChannelInitializer(
-            final @NotNull MqttClientConfig clientConfig, final @NotNull MqttConnect connect,
-            final @NotNull MqttConnAckFlow connAckFlow, final @NotNull MqttEncoder encoder,
-            final @NotNull MqttConnectHandler connectHandler, final @NotNull MqttDisconnectHandler disconnectHandler,
+            final @NotNull MqttClientConfig clientConfig,
+            final @NotNull MqttConnect connect,
+            final @NotNull MqttConnAckFlow connAckFlow,
+            final @NotNull MqttEncoder encoder,
+            final @NotNull MqttConnectHandler connectHandler,
+            final @NotNull MqttDisconnectHandler disconnectHandler,
             final @NotNull MqttAuthHandler authHandler,
             final @NotNull Lazy<MqttWebSocketInitializer> webSocketInitializer) {
 
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/MqttSession.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/MqttSession.java
index 3c2104bbf..b2319d966 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/handler/MqttSession.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/MqttSession.java
@@ -61,8 +61,10 @@ public class MqttSession {
 
     @CallByThread("Netty EventLoop")
     public void startOrResume(
-            final @NotNull MqttConnAck connAck, final @NotNull MqttClientConnectionConfig connectionConfig,
-            final @NotNull ChannelPipeline pipeline, final @NotNull EventLoop eventLoop) {
+            final @NotNull MqttConnAck connAck,
+            final @NotNull MqttClientConnectionConfig connectionConfig,
+            final @NotNull ChannelPipeline pipeline,
+            final @NotNull EventLoop eventLoop) {
 
         if (hasSession && !connAck.isSessionPresent()) {
             final String message = "Session expired as CONNACK did not contain the session present flag.";
@@ -85,7 +87,8 @@ public void startOrResume(
 
     @CallByThread("Netty EventLoop")
     public void expire(
-            final @NotNull Throwable cause, final @NotNull MqttClientConnectionConfig connectionConfig,
+            final @NotNull Throwable cause,
+            final @NotNull MqttClientConnectionConfig connectionConfig,
             final @NotNull EventLoop eventLoop) {
 
         final long expiryInterval = connectionConfig.getSessionExpiryInterval();
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttConnectAuthHandler.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttConnectAuthHandler.java
index fcf1f4b2a..c8ad5076b 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttConnectAuthHandler.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttConnectAuthHandler.java
@@ -61,7 +61,8 @@ public class MqttConnectAuthHandler extends AbstractMqttAuthHandler implements D
 
     @Override
     public void write(
-            final @NotNull ChannelHandlerContext ctx, final @NotNull Object msg,
+            final @NotNull ChannelHandlerContext ctx,
+            final @NotNull Object msg,
             final @NotNull ChannelPromise promise) {
 
         if (msg instanceof MqttConnect) {
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckSingle.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckSingle.java
index 34f2beaa3..31e8f13c0 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckSingle.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckSingle.java
@@ -69,8 +69,10 @@ protected void subscribeActual(final @NotNull SingleObserver<? super Mqtt5ConnAc
     }
 
     private static void connect(
-            final @NotNull MqttClientConfig clientConfig, final @NotNull MqttConnect connect,
-            final @NotNull MqttConnAckFlow flow, final @NotNull EventLoop eventLoop) {
+            final @NotNull MqttClientConfig clientConfig,
+            final @NotNull MqttConnect connect,
+            final @NotNull MqttConnAckFlow flow,
+            final @NotNull EventLoop eventLoop) {
 
         if (flow.getDisposable().isDisposed()) {
             clientConfig.releaseEventLoop();
@@ -104,8 +106,11 @@ private static void connect(
     }
 
     public static void reconnect(
-            final @NotNull MqttClientConfig clientConfig, final @NotNull MqttDisconnectSource source,
-            final @NotNull Throwable cause, final @NotNull MqttConnect connect, final @NotNull MqttConnAckFlow flow,
+            final @NotNull MqttClientConfig clientConfig,
+            final @NotNull MqttDisconnectSource source,
+            final @NotNull Throwable cause,
+            final @NotNull MqttConnect connect,
+            final @NotNull MqttConnAckFlow flow,
             final @NotNull EventLoop eventLoop) {
 
         if (flow.setDone()) {
@@ -114,16 +119,23 @@ public static void reconnect(
     }
 
     public static void reconnect(
-            final @NotNull MqttClientConfig clientConfig, final @NotNull MqttDisconnectSource source,
-            final @NotNull Throwable cause, final @NotNull MqttConnect connect, final @NotNull EventLoop eventLoop) {
+            final @NotNull MqttClientConfig clientConfig,
+            final @NotNull MqttDisconnectSource source,
+            final @NotNull Throwable cause,
+            final @NotNull MqttConnect connect,
+            final @NotNull EventLoop eventLoop) {
 
         reconnect(clientConfig, source, cause, connect, 0, null, eventLoop);
     }
 
     private static void reconnect(
-            final @NotNull MqttClientConfig clientConfig, final @NotNull MqttDisconnectSource source,
-            final @NotNull Throwable cause, final @NotNull MqttConnect connect, final int attempts,
-            final @Nullable MqttConnAckFlow flow, final @NotNull EventLoop eventLoop) {
+            final @NotNull MqttClientConfig clientConfig,
+            final @NotNull MqttDisconnectSource source,
+            final @NotNull Throwable cause,
+            final @NotNull MqttConnect connect,
+            final int attempts,
+            final @Nullable MqttConnAckFlow flow,
+            final @NotNull EventLoop eventLoop) {
 
         final MqttClientReconnector reconnector =
                 new MqttClientReconnector(eventLoop, attempts, connect, clientConfig.getCurrentTransportConfig());
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnectHandler.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnectHandler.java
index 24ad284ef..ff5d470a3 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnectHandler.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnectHandler.java
@@ -77,8 +77,10 @@ public class MqttConnectHandler extends MqttTimeoutInboundHandler {
 
     @Inject
     MqttConnectHandler(
-            final @NotNull MqttConnect connect, final @NotNull MqttConnAckFlow connAckFlow,
-            final @NotNull MqttClientConfig clientConfig, final @NotNull MqttSession session,
+            final @NotNull MqttConnect connect,
+            final @NotNull MqttConnAckFlow connAckFlow,
+            final @NotNull MqttClientConfig clientConfig,
+            final @NotNull MqttSession session,
             final @NotNull MqttDecoder decoder) {
 
         this.connect = connect;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectHandler.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectHandler.java
index 5e0b9f918..b51673890 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectHandler.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectHandler.java
@@ -223,7 +223,8 @@ private void disconnected(final @NotNull Channel channel, final @NotNull MqttDis
 
     private void reconnect(
             final @NotNull MqttDisconnectEvent disconnectEvent,
-            final @NotNull MqttClientConnectionConfig connectionConfig, final @NotNull EventLoop eventLoop) {
+            final @NotNull MqttClientConnectionConfig connectionConfig,
+            final @NotNull EventLoop eventLoop) {
 
         final MqttClientConfig.ConnectDefaults connectDefaults = clientConfig.getConnectDefaults();
         final Mqtt5EnhancedAuthMechanism enhancedAuthMechanism = connectionConfig.getRawEnhancedAuthMechanism();
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectUtil.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectUtil.java
index 9d75d4ea0..ebacaab11 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectUtil.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectUtil.java
@@ -61,7 +61,8 @@ public static void close(final @NotNull Channel channel, final @NotNull Throwabl
      * @param reasonString the reason string why the channel is closed.
      */
     public static void disconnect(
-            final @NotNull Channel channel, final @NotNull Mqtt5DisconnectReasonCode reasonCode,
+            final @NotNull Channel channel,
+            final @NotNull Mqtt5DisconnectReasonCode reasonCode,
             final @NotNull String reasonString) {
 
         final MqttDisconnect disconnect =
@@ -78,7 +79,8 @@ public static void disconnect(
      * @param cause      the cause why the channel is closed.
      */
     public static void disconnect(
-            final @NotNull Channel channel, final @NotNull Mqtt5DisconnectReasonCode reasonCode,
+            final @NotNull Channel channel,
+            final @NotNull Mqtt5DisconnectReasonCode reasonCode,
             final @NotNull Throwable cause) {
 
         final MqttDisconnect disconnect =
@@ -87,7 +89,8 @@ public static void disconnect(
     }
 
     public static void fireDisconnectEvent(
-            final @NotNull Channel channel, final @NotNull Throwable cause,
+            final @NotNull Channel channel,
+            final @NotNull Throwable cause,
             final @NotNull MqttDisconnectSource source) {
 
         fireDisconnectEvent(channel, new MqttDisconnectEvent(cause, source));
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/proxy/MqttProxyAdapterHandler.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/proxy/MqttProxyAdapterHandler.java
index 8b0a5a321..a5ac5db15 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/handler/proxy/MqttProxyAdapterHandler.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/proxy/MqttProxyAdapterHandler.java
@@ -47,8 +47,10 @@ class MqttProxyAdapterHandler extends ChannelOutboundHandlerAdapter {
     private final @NotNull BiConsumer<Channel, Throwable> onError;
 
     public MqttProxyAdapterHandler(
-            final @NotNull MqttProxyConfigImpl proxyConfig, final @NotNull InetSocketAddress serverAddress,
-            final @NotNull Consumer<Channel> onSuccess, final @NotNull BiConsumer<Channel, Throwable> onError) {
+            final @NotNull MqttProxyConfigImpl proxyConfig,
+            final @NotNull InetSocketAddress serverAddress,
+            final @NotNull Consumer<Channel> onSuccess,
+            final @NotNull BiConsumer<Channel, Throwable> onError) {
 
         this.proxyConfig = proxyConfig;
         this.serverAddress = serverAddress;
@@ -58,8 +60,10 @@ public MqttProxyAdapterHandler(
 
     @Override
     public void connect(
-            final @NotNull ChannelHandlerContext ctx, final @NotNull SocketAddress remoteAddress,
-            final @Nullable SocketAddress localAddress, final @NotNull ChannelPromise promise) {
+            final @NotNull ChannelHandlerContext ctx,
+            final @NotNull SocketAddress remoteAddress,
+            final @Nullable SocketAddress localAddress,
+            final @NotNull ChannelPromise promise) {
 
         final Channel channel = ctx.channel();
         final String username = proxyConfig.getRawUsername();
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/proxy/MqttProxyInitializer.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/proxy/MqttProxyInitializer.java
index 77e9a6846..83be60cfc 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/handler/proxy/MqttProxyInitializer.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/proxy/MqttProxyInitializer.java
@@ -30,8 +30,10 @@
 public final class MqttProxyInitializer {
 
     public static void initChannel(
-            final @NotNull Channel channel, final @NotNull MqttClientConfig clientConfig,
-            final @NotNull MqttProxyConfigImpl proxyConfig, final @NotNull Consumer<Channel> onSuccess,
+            final @NotNull Channel channel,
+            final @NotNull MqttClientConfig clientConfig,
+            final @NotNull MqttProxyConfigImpl proxyConfig,
+            final @NotNull Consumer<Channel> onSuccess,
             final @NotNull BiConsumer<Channel, Throwable> onError) {
 
         final MqttProxyAdapterHandler proxyAdapterHandler =
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttGlobalIncomingPublishFlow.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttGlobalIncomingPublishFlow.java
index dd75d97d0..a534b615e 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttGlobalIncomingPublishFlow.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttGlobalIncomingPublishFlow.java
@@ -33,8 +33,10 @@ public class MqttGlobalIncomingPublishFlow extends MqttIncomingPublishFlow {
     private @Nullable Handle<MqttGlobalIncomingPublishFlow> handle;
 
     MqttGlobalIncomingPublishFlow(
-            final @NotNull Subscriber<? super Mqtt5Publish> subscriber, final @NotNull MqttClientConfig clientConfig,
-            final @NotNull MqttIncomingQosHandler incomingQosHandler, final @NotNull MqttGlobalPublishFilter filter,
+            final @NotNull Subscriber<? super Mqtt5Publish> subscriber,
+            final @NotNull MqttClientConfig clientConfig,
+            final @NotNull MqttIncomingQosHandler incomingQosHandler,
+            final @NotNull MqttGlobalPublishFilter filter,
             final boolean manualAcknowledgement) {
 
         super(subscriber, clientConfig, incomingQosHandler, manualAcknowledgement);
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttGlobalIncomingPublishFlowable.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttGlobalIncomingPublishFlowable.java
index a51be4f77..05a71dc17 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttGlobalIncomingPublishFlowable.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttGlobalIncomingPublishFlowable.java
@@ -35,7 +35,8 @@ public class MqttGlobalIncomingPublishFlowable extends Flowable<Mqtt5Publish> {
     private final boolean manualAcknowledgement;
 
     public MqttGlobalIncomingPublishFlowable(
-            final @NotNull MqttGlobalPublishFilter filter, final @NotNull MqttClientConfig clientConfig,
+            final @NotNull MqttGlobalPublishFilter filter,
+            final @NotNull MqttClientConfig clientConfig,
             final boolean manualAcknowledgement) {
 
         this.filter = filter;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlow.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlow.java
index 52ce9b114..a1ed75d3a 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlow.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlow.java
@@ -58,8 +58,10 @@ abstract class MqttIncomingPublishFlow extends FlowWithEventLoop
     private boolean blocking;
 
     MqttIncomingPublishFlow(
-            final @NotNull Subscriber<? super Mqtt5Publish> subscriber, final @NotNull MqttClientConfig clientConfig,
-            final @NotNull MqttIncomingQosHandler incomingQosHandler, final boolean manualAcknowledgement) {
+            final @NotNull Subscriber<? super Mqtt5Publish> subscriber,
+            final @NotNull MqttClientConfig clientConfig,
+            final @NotNull MqttIncomingQosHandler incomingQosHandler,
+            final boolean manualAcknowledgement) {
 
         super(clientConfig);
         this.subscriber = subscriber;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlows.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlows.java
index 5ca960f23..083a0f644 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlows.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlows.java
@@ -55,7 +55,8 @@ public class MqttIncomingPublishFlows {
     }
 
     public void subscribe(
-            final @NotNull MqttSubscribe subscribe, final int subscriptionIdentifier,
+            final @NotNull MqttSubscribe subscribe,
+            final int subscriptionIdentifier,
             final @Nullable MqttSubscribedPublishFlow flow) {
 
         final ImmutableList<MqttSubscription> subscriptions = subscribe.getSubscriptions();
@@ -66,7 +67,8 @@ public void subscribe(
     }
 
     public void subAck(
-            final @NotNull MqttSubscribe subscribe, final int subscriptionIdentifier,
+            final @NotNull MqttSubscribe subscribe,
+            final int subscriptionIdentifier,
             final @NotNull ImmutableList<Mqtt5SubAckReasonCode> reasonCodes) {
 
         final ImmutableList<MqttSubscription> subscriptions = subscribe.getSubscriptions();
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlow.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlow.java
index a691a2643..6559528ac 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlow.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlow.java
@@ -35,8 +35,10 @@ public class MqttSubscribedPublishFlow extends MqttIncomingPublishFlow implement
     private final @NotNull HandleList<MqttTopicFilterImpl> topicFilters;
 
     MqttSubscribedPublishFlow(
-            final @NotNull Subscriber<? super Mqtt5Publish> subscriber, final @NotNull MqttClientConfig clientConfig,
-            final @NotNull MqttIncomingQosHandler incomingQosHandler, final boolean manualAcknowledgement) {
+            final @NotNull Subscriber<? super Mqtt5Publish> subscriber,
+            final @NotNull MqttClientConfig clientConfig,
+            final @NotNull MqttIncomingQosHandler incomingQosHandler,
+            final boolean manualAcknowledgement) {
 
         super(subscriber, clientConfig, incomingQosHandler, manualAcknowledgement);
         topicFilters = new HandleList<>();
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTree.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTree.java
index d101f6118..ed5c2730a 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTree.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTree.java
@@ -41,7 +41,8 @@ public class MqttSubscribedPublishFlowTree implements MqttSubscribedPublishFlows
 
     @Override
     public void subscribe(
-            final @NotNull MqttSubscription subscription, final int subscriptionIdentifier,
+            final @NotNull MqttSubscription subscription,
+            final int subscriptionIdentifier,
             final @Nullable MqttSubscribedPublishFlow flow) {
 
         final TopicTreeEntry entry = new TopicTreeEntry(subscription, subscriptionIdentifier, flow);
@@ -138,7 +139,8 @@ private static class TopicTreeEntry extends NodeList.Node<TopicTreeEntry> {
         boolean acknowledged;
 
         TopicTreeEntry(
-                final @NotNull MqttSubscription subscription, final int subscriptionIdentifier,
+                final @NotNull MqttSubscription subscription,
+                final int subscriptionIdentifier,
                 final @Nullable MqttSubscribedPublishFlow flow) {
 
             this.subscriptionIdentifier = subscriptionIdentifier;
@@ -226,7 +228,8 @@ private static class TopicTreeNode {
         }
 
         private static boolean suback(
-                final @Nullable NodeList<TopicTreeEntry> entries, final int subscriptionIdentifier,
+                final @Nullable NodeList<TopicTreeEntry> entries,
+                final int subscriptionIdentifier,
                 final boolean error) {
 
             if (entries != null) {
@@ -536,7 +539,8 @@ public void getSubscriptions(
         }
 
         private static void getSubscriptions(
-                final @NotNull NodeList<TopicTreeEntry> entries, final @NotNull MqttTopicLevel topicLevels,
+                final @NotNull NodeList<TopicTreeEntry> entries,
+                final @NotNull MqttTopicLevel topicLevels,
                 final boolean multiLevelWildcard,
                 final @NotNull Map<@NotNull Integer, @NotNull List<@NotNull MqttSubscription>> map) {
 
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowable.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowable.java
index a66efe6f4..8cc939d9e 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowable.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowable.java
@@ -37,7 +37,8 @@ public class MqttSubscribedPublishFlowable extends FlowableWithSingle<Mqtt5Publi
     private final boolean manualAcknowledgement;
 
     public MqttSubscribedPublishFlowable(
-            final @NotNull MqttSubscribe subscribe, final @NotNull MqttClientConfig clientConfig,
+            final @NotNull MqttSubscribe subscribe,
+            final @NotNull MqttClientConfig clientConfig,
             final boolean manualAcknowledgement) {
 
         this.subscribe = subscribe;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlows.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlows.java
index fc4dd6a2f..321a27a3e 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlows.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlows.java
@@ -33,7 +33,8 @@
 public interface MqttSubscribedPublishFlows {
 
     void subscribe(
-            @NotNull MqttSubscription subscription, int subscriptionIdentifier,
+            @NotNull MqttSubscription subscription,
+            int subscriptionIdentifier,
             @Nullable MqttSubscribedPublishFlow flow);
 
     void suback(@NotNull MqttTopicFilterImpl topicFilter, int subscriptionIdentifier, boolean error);
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckFlowableFlow.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckFlowableFlow.java
index fcfe22317..44d3ef4fe 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckFlowableFlow.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckFlowableFlow.java
@@ -58,7 +58,8 @@ class MqttAckFlowableFlow extends MqttAckFlow implements Subscription, Runnable
 
     MqttAckFlowableFlow(
             final @NotNull Subscriber<? super MqttPublishResult> subscriber,
-            final @NotNull MqttClientConfig clientConfig, final @NotNull MqttOutgoingQosHandler outgoingQosHandler) {
+            final @NotNull MqttClientConfig clientConfig,
+            final @NotNull MqttOutgoingQosHandler outgoingQosHandler) {
 
         super(clientConfig);
         this.subscriber = subscriber;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttOutgoingQosHandler.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttOutgoingQosHandler.java
index f54be3e8d..187527f98 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttOutgoingQosHandler.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttOutgoingQosHandler.java
@@ -298,7 +298,8 @@ private void writeQos1Or2Publish(
     }
 
     private void writeQos1Or2Publish(
-            final @NotNull ChannelHandlerContext ctx, final @NotNull MqttStatefulPublish publish,
+            final @NotNull ChannelHandlerContext ctx,
+            final @NotNull MqttStatefulPublish publish,
             final @NotNull MqttPublishWithFlow publishWithFlow) {
 
         currentPending = publishWithFlow;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPubRelWithFlow.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPubRelWithFlow.java
index bfc47552f..b3c8c6504 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPubRelWithFlow.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPubRelWithFlow.java
@@ -61,7 +61,9 @@ static class MqttQos2CompleteWithFlow extends MqttPubRelWithFlow {
         private final @NotNull MqttPubRec pubRec;
 
         MqttQos2CompleteWithFlow(
-                final @NotNull MqttPublish publish, final @NotNull MqttPubRec pubRec, final @NotNull MqttPubRel pubRel,
+                final @NotNull MqttPublish publish,
+                final @NotNull MqttPubRec pubRec,
+                final @NotNull MqttPubRel pubRel,
                 final @NotNull MqttAckFlow ackFlow) {
 
             super(pubRel, ackFlow);
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/ssl/MqttSslInitializer.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/ssl/MqttSslInitializer.java
index d84eee96a..37f2dc420 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/handler/ssl/MqttSslInitializer.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/ssl/MqttSslInitializer.java
@@ -43,8 +43,10 @@ public final class MqttSslInitializer {
     private static final @NotNull String SSL_HANDLER_NAME = "ssl";
 
     public static void initChannel(
-            final @NotNull Channel channel, final @NotNull MqttClientConfig clientConfig,
-            final @NotNull MqttClientSslConfigImpl sslConfig, final @NotNull Consumer<Channel> onSuccess,
+            final @NotNull Channel channel,
+            final @NotNull MqttClientConfig clientConfig,
+            final @NotNull MqttClientSslConfigImpl sslConfig,
+            final @NotNull Consumer<Channel> onSuccess,
             final @NotNull BiConsumer<Channel, Throwable> onError) {
 
         final InetSocketAddress serverAddress = clientConfig.getCurrentTransportConfig().getServerAddress();
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubscribeWithFlow.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubscribeWithFlow.java
index e3a7c5786..a2f388682 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubscribeWithFlow.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubscribeWithFlow.java
@@ -31,7 +31,8 @@ class MqttSubscribeWithFlow extends MqttSubOrUnsubWithFlow {
     private final @Nullable MqttSubscriptionFlow<MqttSubAck> flow;
 
     MqttSubscribeWithFlow(
-            final @NotNull MqttSubscribe subscribe, final int subscriptionIdentifier,
+            final @NotNull MqttSubscribe subscribe,
+            final int subscriptionIdentifier,
             final @Nullable MqttSubscriptionFlow<MqttSubAck> flow) {
 
         this.subscribe = subscribe;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebSocketCodec.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebSocketCodec.java
index 511f66139..ede95cc2b 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebSocketCodec.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebSocketCodec.java
@@ -64,7 +64,8 @@ public void channelRead(final @NotNull ChannelHandlerContext ctx, final @NotNull
 
     @Override
     public void write(
-            final @NotNull ChannelHandlerContext ctx, final @NotNull Object msg,
+            final @NotNull ChannelHandlerContext ctx,
+            final @NotNull Object msg,
             final @NotNull ChannelPromise promise) {
 
         if (msg instanceof ByteBuf) {
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebSocketInitializer.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebSocketInitializer.java
index 7ab78eee3..ed1c4c3f4 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebSocketInitializer.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebSocketInitializer.java
@@ -53,8 +53,10 @@ public class MqttWebSocketInitializer {
     }
 
     public void initChannel(
-            final @NotNull Channel channel, final @NotNull MqttClientConfig clientConfig,
-            final @NotNull MqttWebSocketConfigImpl webSocketConfig, final @NotNull Consumer<Channel> onSuccess,
+            final @NotNull Channel channel,
+            final @NotNull MqttClientConfig clientConfig,
+            final @NotNull MqttWebSocketConfigImpl webSocketConfig,
+            final @NotNull Consumer<Channel> onSuccess,
             final @NotNull BiConsumer<Channel, Throwable> onError) {
 
         final URI uri;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebsocketHandshakeHandler.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebsocketHandshakeHandler.java
index 8e88f5f84..dcde3a0ad 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebsocketHandshakeHandler.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebsocketHandshakeHandler.java
@@ -47,8 +47,10 @@ class MqttWebsocketHandshakeHandler extends ChannelInboundHandlerAdapter {
     private @Nullable ScheduledFuture<?> timeoutFuture;
 
     MqttWebsocketHandshakeHandler(
-            final @NotNull WebSocketClientHandshaker handshaker, final int handshakeTimeoutMs,
-            final @NotNull Consumer<Channel> onSuccess, final @NotNull BiConsumer<Channel, Throwable> onError) {
+            final @NotNull WebSocketClientHandshaker handshaker,
+            final int handshakeTimeoutMs,
+            final @NotNull Consumer<Channel> onSuccess,
+            final @NotNull BiConsumer<Channel, Throwable> onError) {
 
         this.handshaker = handshaker;
         this.handshakeTimeoutMs = handshakeTimeoutMs;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/ioc/ConnectionModule.java b/src/main/java/com/hivemq/client/internal/mqtt/ioc/ConnectionModule.java
index b52716ebf..34d516c4c 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/ioc/ConnectionModule.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/ioc/ConnectionModule.java
@@ -43,7 +43,8 @@ abstract class ConnectionModule {
     @Provides
     @ConnectionScope
     static @NotNull MqttAuthHandler provideAuthHandler(
-            final @NotNull MqttConnect connect, final @NotNull Lazy<MqttConnectAuthHandler> connectAuthHandlerLazy,
+            final @NotNull MqttConnect connect,
+            final @NotNull Lazy<MqttConnectAuthHandler> connectAuthHandlerLazy,
             final @NotNull Lazy<MqttDisconnectOnAuthHandler> disconnectOnAuthHandlerLazy) {
 
         return (connect.getRawEnhancedAuthMechanism() == null) ? disconnectOnAuthHandlerLazy.get() :
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientConnectedContextImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientConnectedContextImpl.java
index 7af8c2555..bd9ae8362 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientConnectedContextImpl.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientConnectedContextImpl.java
@@ -31,7 +31,8 @@
 public class MqttClientConnectedContextImpl implements Mqtt5ClientConnectedContext {
 
     public static @NotNull MqttClientConnectedContext of(
-            final @NotNull MqttClientConfig clientConfig, final @NotNull MqttConnect connect,
+            final @NotNull MqttClientConfig clientConfig,
+            final @NotNull MqttConnect connect,
             final @NotNull MqttConnAck connAck) {
 
         if (clientConfig.getMqttVersion() == MqttVersion.MQTT_3_1_1) {
@@ -45,7 +46,8 @@ public class MqttClientConnectedContextImpl implements Mqtt5ClientConnectedConte
     private final @NotNull MqttConnAck connAck;
 
     private MqttClientConnectedContextImpl(
-            final @NotNull MqttClientConfig clientConfig, final @NotNull MqttConnect connect,
+            final @NotNull MqttClientConfig clientConfig,
+            final @NotNull MqttConnect connect,
             final @NotNull MqttConnAck connAck) {
 
         this.clientConfig = clientConfig;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientDisconnectedContextImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientDisconnectedContextImpl.java
index 6c16be7aa..9296bea82 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientDisconnectedContextImpl.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientDisconnectedContextImpl.java
@@ -30,8 +30,10 @@
 public class MqttClientDisconnectedContextImpl implements Mqtt5ClientDisconnectedContext {
 
     public static @NotNull MqttClientDisconnectedContext of(
-            final @NotNull MqttClientConfig clientConfig, final @NotNull MqttDisconnectSource source,
-            final @NotNull Throwable cause, final @NotNull MqttClientReconnector reconnector) {
+            final @NotNull MqttClientConfig clientConfig,
+            final @NotNull MqttDisconnectSource source,
+            final @NotNull Throwable cause,
+            final @NotNull MqttClientReconnector reconnector) {
 
         if (clientConfig.getMqttVersion() == MqttVersion.MQTT_3_1_1) {
             return Mqtt3ClientDisconnectedContextView.of(clientConfig, source, cause, reconnector);
@@ -45,8 +47,10 @@ public class MqttClientDisconnectedContextImpl implements Mqtt5ClientDisconnecte
     private final @NotNull MqttClientReconnector reconnector;
 
     private MqttClientDisconnectedContextImpl(
-            final @NotNull MqttClientConfig clientConfig, final @NotNull MqttDisconnectSource source,
-            final @NotNull Throwable cause, final @NotNull MqttClientReconnector reconnector) {
+            final @NotNull MqttClientConfig clientConfig,
+            final @NotNull MqttDisconnectSource source,
+            final @NotNull Throwable cause,
+            final @NotNull MqttClientReconnector reconnector) {
 
         this.clientConfig = clientConfig;
         this.source = source;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientReconnector.java b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientReconnector.java
index 94b221dc0..0c0fc0fea 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientReconnector.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientReconnector.java
@@ -51,7 +51,9 @@ public class MqttClientReconnector implements Mqtt5ClientReconnector {
     private boolean afterOnDisconnected;
 
     public MqttClientReconnector(
-            final @NotNull EventLoop eventLoop, final int attempts, final @NotNull MqttConnect connect,
+            final @NotNull EventLoop eventLoop,
+            final int attempts,
+            final @NotNull MqttConnect connect,
             final @NotNull MqttClientTransportConfigImpl transportConfig) {
 
         this.eventLoop = eventLoop;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ClientConnectedContextView.java b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ClientConnectedContextView.java
index 1cc319042..aac46e0f5 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ClientConnectedContextView.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ClientConnectedContextView.java
@@ -32,7 +32,8 @@
 public class Mqtt3ClientConnectedContextView implements Mqtt3ClientConnectedContext {
 
     public static @NotNull MqttClientConnectedContext of(
-            final @NotNull MqttClientConfig clientConfig, final @NotNull MqttConnect connect,
+            final @NotNull MqttClientConfig clientConfig,
+            final @NotNull MqttConnect connect,
             final @NotNull MqttConnAck connAck) {
 
         return new Mqtt3ClientConnectedContextView(
@@ -44,7 +45,8 @@ public class Mqtt3ClientConnectedContextView implements Mqtt3ClientConnectedCont
     private final @NotNull Mqtt3ConnAckView connAck;
 
     private Mqtt3ClientConnectedContextView(
-            final @NotNull Mqtt3ClientConfigView clientConfig, final @NotNull Mqtt3ConnectView connect,
+            final @NotNull Mqtt3ClientConfigView clientConfig,
+            final @NotNull Mqtt3ConnectView connect,
             final @NotNull Mqtt3ConnAckView connAck) {
 
         this.clientConfig = clientConfig;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ClientDisconnectedContextView.java b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ClientDisconnectedContextView.java
index 6e22a2d47..bf65d8596 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ClientDisconnectedContextView.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ClientDisconnectedContextView.java
@@ -31,8 +31,10 @@
 public class Mqtt3ClientDisconnectedContextView implements Mqtt3ClientDisconnectedContext {
 
     public static @NotNull MqttClientDisconnectedContext of(
-            final @NotNull MqttClientConfig clientConfig, final @NotNull MqttDisconnectSource source,
-            final @NotNull Throwable cause, final @NotNull MqttClientReconnector reconnector) {
+            final @NotNull MqttClientConfig clientConfig,
+            final @NotNull MqttDisconnectSource source,
+            final @NotNull Throwable cause,
+            final @NotNull MqttClientReconnector reconnector) {
 
         return new Mqtt3ClientDisconnectedContextView(new Mqtt3ClientConfigView(clientConfig), source,
                 Mqtt3ExceptionFactory.map(cause), new Mqtt3ClientReconnectorView(reconnector));
@@ -44,8 +46,10 @@ public class Mqtt3ClientDisconnectedContextView implements Mqtt3ClientDisconnect
     private final @NotNull Mqtt3ClientReconnectorView reconnector;
 
     private Mqtt3ClientDisconnectedContextView(
-            final @NotNull Mqtt3ClientConfigView clientConfig, final @NotNull MqttDisconnectSource source,
-            final @NotNull Throwable cause, final @NotNull Mqtt3ClientReconnectorView reconnector) {
+            final @NotNull Mqtt3ClientConfigView clientConfig,
+            final @NotNull MqttDisconnectSource source,
+            final @NotNull Throwable cause,
+            final @NotNull Mqtt3ClientReconnectorView reconnector) {
 
         this.clientConfig = clientConfig;
         this.source = source;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/MqttMessageWithUserProperties.java b/src/main/java/com/hivemq/client/internal/mqtt/message/MqttMessageWithUserProperties.java
index a7096b682..897a88879 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/message/MqttMessageWithUserProperties.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/message/MqttMessageWithUserProperties.java
@@ -102,7 +102,8 @@ public abstract static class WithCode<R extends Mqtt5ReasonCode> extends WithRea
             private final @NotNull R reasonCode;
 
             protected WithCode(
-                    final @NotNull R reasonCode, final @Nullable MqttUtf8StringImpl reasonString,
+                    final @NotNull R reasonCode,
+                    final @Nullable MqttUtf8StringImpl reasonString,
                     final @NotNull MqttUserPropertiesImpl userProperties) {
 
                 super(reasonString, userProperties);
@@ -133,7 +134,8 @@ public abstract static class WithId<R extends Mqtt5ReasonCode> extends WithCode<
                 private final int packetIdentifier;
 
                 protected WithId(
-                        final int packetIdentifier, final @NotNull R reasonCode,
+                        final int packetIdentifier,
+                        final @NotNull R reasonCode,
                         final @Nullable MqttUtf8StringImpl reasonString,
                         final @NotNull MqttUserPropertiesImpl userProperties) {
 
@@ -166,7 +168,8 @@ public abstract static class WithCodesAndId<R extends Mqtt5ReasonCode> extends W
             private final @NotNull ImmutableList<@NotNull R> reasonCodes;
 
             protected WithCodesAndId(
-                    final int packetIdentifier, final @NotNull ImmutableList<@NotNull R> reasonCodes,
+                    final int packetIdentifier,
+                    final @NotNull ImmutableList<@NotNull R> reasonCodes,
                     final @Nullable MqttUtf8StringImpl reasonString,
                     final @NotNull MqttUserPropertiesImpl userProperties) {
 
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttAuth.java b/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttAuth.java
index 52fec9278..7d7a44cad 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttAuth.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttAuth.java
@@ -42,8 +42,10 @@ public class MqttAuth extends MqttMessageWithUserProperties.WithReason.WithCode<
     private final @Nullable ByteBuffer data;
 
     public MqttAuth(
-            final @NotNull Mqtt5AuthReasonCode reasonCode, final @NotNull MqttUtf8StringImpl method,
-            final @Nullable ByteBuffer data, final @Nullable MqttUtf8StringImpl reasonString,
+            final @NotNull Mqtt5AuthReasonCode reasonCode,
+            final @NotNull MqttUtf8StringImpl method,
+            final @Nullable ByteBuffer data,
+            final @Nullable MqttUtf8StringImpl reasonString,
             final @NotNull MqttUserPropertiesImpl userProperties) {
 
         super(reasonCode, reasonString, userProperties);
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnect.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnect.java
index ba1394fc2..44ccaa025 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnect.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnect.java
@@ -54,10 +54,14 @@ public class MqttConnect extends MqttMessageWithUserProperties implements Mqtt5C
     private final @Nullable MqttWillPublish willPublish;
 
     public MqttConnect(
-            final int keepAlive, final boolean cleanStart, final long sessionExpiryInterval,
-            final @NotNull MqttConnectRestrictions restrictions, final @Nullable MqttSimpleAuth simpleAuth,
+            final int keepAlive,
+            final boolean cleanStart,
+            final long sessionExpiryInterval,
+            final @NotNull MqttConnectRestrictions restrictions,
+            final @Nullable MqttSimpleAuth simpleAuth,
             final @Nullable Mqtt5EnhancedAuthMechanism enhancedAuthMechanism,
-            final @Nullable MqttWillPublish willPublish, final @NotNull MqttUserPropertiesImpl userProperties) {
+            final @Nullable MqttWillPublish willPublish,
+            final @NotNull MqttUserPropertiesImpl userProperties) {
 
         super(userProperties);
         this.keepAlive = keepAlive;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectRestrictions.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectRestrictions.java
index 653ac65ad..31f9000bd 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectRestrictions.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectRestrictions.java
@@ -42,9 +42,14 @@ public class MqttConnectRestrictions implements Mqtt5ConnectRestrictions {
     private final boolean requestResponseInformation;
 
     public MqttConnectRestrictions(
-            final int receiveMaximum, final int sendMaximum, final int maximumPacketSize,
-            final int sendMaximumPacketSize, final int topicAliasMaximum, final int sendTopicAliasMaximum,
-            final boolean requestProblemInformation, final boolean requestResponseInformation) {
+            final int receiveMaximum,
+            final int sendMaximum,
+            final int maximumPacketSize,
+            final int sendMaximumPacketSize,
+            final int topicAliasMaximum,
+            final int sendTopicAliasMaximum,
+            final boolean requestProblemInformation,
+            final boolean requestResponseInformation) {
 
         this.receiveMaximum = receiveMaximum;
         this.sendMaximum = sendMaximum;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttStatefulConnect.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttStatefulConnect.java
index 4275e6e9d..9dd27a79e 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttStatefulConnect.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttStatefulConnect.java
@@ -33,7 +33,8 @@ public class MqttStatefulConnect extends MqttStatefulMessage<MqttConnect> {
     private final @Nullable MqttEnhancedAuth enhancedAuth;
 
     MqttStatefulConnect(
-            final @NotNull MqttConnect connect, final @NotNull MqttClientIdentifierImpl clientIdentifier,
+            final @NotNull MqttConnect connect,
+            final @NotNull MqttClientIdentifierImpl clientIdentifier,
             final @Nullable MqttEnhancedAuth enhancedAuth) {
 
         super(connect);
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/connack/MqttConnAck.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/connack/MqttConnAck.java
index 4938143db..582e38938 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/connack/MqttConnAck.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/connack/MqttConnAck.java
@@ -55,12 +55,17 @@ public class MqttConnAck extends MqttMessageWithUserProperties.WithReason.WithCo
     private final @Nullable MqttUtf8StringImpl serverReference;
 
     public MqttConnAck(
-            final @NotNull Mqtt5ConnAckReasonCode reasonCode, final boolean sessionPresent,
-            final long sessionExpiryInterval, final int serverKeepAlive,
+            final @NotNull Mqtt5ConnAckReasonCode reasonCode,
+            final boolean sessionPresent,
+            final long sessionExpiryInterval,
+            final int serverKeepAlive,
             final @Nullable MqttClientIdentifierImpl assignedClientIdentifier,
-            final @Nullable Mqtt5EnhancedAuth enhancedAuth, final @NotNull MqttConnAckRestrictions restrictions,
-            final @Nullable MqttUtf8StringImpl responseInformation, final @Nullable MqttUtf8StringImpl serverReference,
-            final @Nullable MqttUtf8StringImpl reasonString, final @NotNull MqttUserPropertiesImpl userProperties) {
+            final @Nullable Mqtt5EnhancedAuth enhancedAuth,
+            final @NotNull MqttConnAckRestrictions restrictions,
+            final @Nullable MqttUtf8StringImpl responseInformation,
+            final @Nullable MqttUtf8StringImpl serverReference,
+            final @Nullable MqttUtf8StringImpl reasonString,
+            final @NotNull MqttUserPropertiesImpl userProperties) {
 
         super(reasonCode, reasonString, userProperties);
         this.sessionPresent = sessionPresent;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/connack/MqttConnAckRestrictions.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/connack/MqttConnAckRestrictions.java
index d4ccfd7d0..6489af4f9 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/connack/MqttConnAckRestrictions.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/connack/MqttConnAckRestrictions.java
@@ -44,9 +44,13 @@ public class MqttConnAckRestrictions implements Mqtt5ConnAckRestrictions {
     private final boolean subscriptionIdentifiersAvailable;
 
     public MqttConnAckRestrictions(
-            final int receiveMaximum, final int maximumPacketSize, final int topicAliasMaximum,
-            final @NotNull MqttQos maximumQos, final boolean retainAvailable,
-            final boolean wildcardSubscriptionAvailable, final boolean sharedSubscriptionAvailable,
+            final int receiveMaximum,
+            final int maximumPacketSize,
+            final int topicAliasMaximum,
+            final @NotNull MqttQos maximumQos,
+            final boolean retainAvailable,
+            final boolean wildcardSubscriptionAvailable,
+            final boolean sharedSubscriptionAvailable,
             final boolean subscriptionIdentifiersAvailable) {
 
         this.receiveMaximum = receiveMaximum;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectView.java
index ebde6d216..2056c6834 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectView.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectView.java
@@ -41,7 +41,9 @@ public class Mqtt3ConnectView implements Mqtt3Connect {
     public static final @NotNull Mqtt3ConnectView DEFAULT = of(DEFAULT_KEEP_ALIVE, DEFAULT_CLEAN_SESSION, null, null);
 
     private static @NotNull MqttConnect delegate(
-            final int keepAlive, final boolean cleanSession, final @Nullable MqttSimpleAuth simpleAuth,
+            final int keepAlive,
+            final boolean cleanSession,
+            final @Nullable MqttSimpleAuth simpleAuth,
             final @Nullable MqttWillPublish willPublish) {
 
         return new MqttConnect(keepAlive, cleanSession, cleanSession ? 0 : MqttConnect.NO_SESSION_EXPIRY,
@@ -50,7 +52,9 @@ public class Mqtt3ConnectView implements Mqtt3Connect {
     }
 
     static @NotNull Mqtt3ConnectView of(
-            final int keepAlive, final boolean cleanSession, final @Nullable MqttSimpleAuth simpleAuth,
+            final int keepAlive,
+            final boolean cleanSession,
+            final @Nullable MqttSimpleAuth simpleAuth,
             final @Nullable MqttWillPublish willPublish) {
 
         return new Mqtt3ConnectView(delegate(keepAlive, cleanSession, simpleAuth, willPublish));
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnect.java b/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnect.java
index 820c4d365..97dd47b90 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnect.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnect.java
@@ -47,8 +47,10 @@ public class MqttDisconnect extends MqttMessageWithUserProperties.WithReason.Wit
     private final @Nullable MqttUtf8StringImpl serverReference;
 
     public MqttDisconnect(
-            final @NotNull Mqtt5DisconnectReasonCode reasonCode, final long sessionExpiryInterval,
-            final @Nullable MqttUtf8StringImpl serverReference, final @Nullable MqttUtf8StringImpl reasonString,
+            final @NotNull Mqtt5DisconnectReasonCode reasonCode,
+            final long sessionExpiryInterval,
+            final @Nullable MqttUtf8StringImpl serverReference,
+            final @Nullable MqttUtf8StringImpl reasonString,
             final @NotNull MqttUserPropertiesImpl userProperties) {
 
         super(reasonCode, reasonString, userProperties);
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublish.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublish.java
index 416b2056e..f38aabca1 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublish.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublish.java
@@ -63,11 +63,16 @@ public class MqttPublish extends MqttMessageWithUserProperties implements Mqtt5P
     private final @Nullable Confirmable confirmable;
 
     public MqttPublish(
-            final @NotNull MqttTopicImpl topic, final @Nullable ByteBuffer payload, final @NotNull MqttQos qos,
-            final boolean retain, final long messageExpiryInterval,
+            final @NotNull MqttTopicImpl topic,
+            final @Nullable ByteBuffer payload,
+            final @NotNull MqttQos qos,
+            final boolean retain,
+            final long messageExpiryInterval,
             final @Nullable Mqtt5PayloadFormatIndicator payloadFormatIndicator,
-            final @Nullable MqttUtf8StringImpl contentType, final @Nullable MqttTopicImpl responseTopic,
-            final @Nullable ByteBuffer correlationData, final @NotNull MqttUserPropertiesImpl userProperties,
+            final @Nullable MqttUtf8StringImpl contentType,
+            final @Nullable MqttTopicImpl responseTopic,
+            final @Nullable ByteBuffer correlationData,
+            final @NotNull MqttUserPropertiesImpl userProperties,
             final @Nullable Confirmable confirmable) {
 
         super(userProperties);
@@ -181,7 +186,9 @@ public void acknowledge() {
     }
 
     public @NotNull MqttStatefulPublish createStateful(
-            final int packetIdentifier, final boolean dup, final int topicAlias,
+            final int packetIdentifier,
+            final boolean dup,
+            final int topicAlias,
             final @NotNull ImmutableIntList subscriptionIdentifiers) {
 
         return new MqttStatefulPublish(this, packetIdentifier, dup, topicAlias, subscriptionIdentifiers);
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishResult.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishResult.java
index 2883866b7..86b387deb 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishResult.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishResult.java
@@ -201,7 +201,8 @@ public static class MqttQos2IntermediateResult extends MqttQos2Result {
         private final @NotNull BooleanSupplier acknowledgedCallback;
 
         public MqttQos2IntermediateResult(
-                final @NotNull MqttPublish publish, final @NotNull MqttPubRec pubRec,
+                final @NotNull MqttPublish publish,
+                final @NotNull MqttPubRec pubRec,
                 final @NotNull BooleanSupplier acknowledgedCallback) {
 
             super(publish, null, pubRec);
@@ -220,7 +221,9 @@ public static class MqttQos2CompleteResult extends MqttQos2Result implements Mqt
         private final @NotNull MqttPubComp pubComp;
 
         public MqttQos2CompleteResult(
-                final @NotNull MqttPublish publish, final @NotNull MqttPubRec pubRec, final @NotNull MqttPubRel pubRel,
+                final @NotNull MqttPublish publish,
+                final @NotNull MqttPubRec pubRec,
+                final @NotNull MqttPubRel pubRel,
                 final @NotNull MqttPubComp pubComp) {
 
             super(publish, null, pubRec);
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttStatefulPublish.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttStatefulPublish.java
index dba0eb045..fb085cddb 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttStatefulPublish.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttStatefulPublish.java
@@ -40,7 +40,10 @@ public class MqttStatefulPublish extends MqttStatefulMessage.WithId<MqttPublish>
     private long id;
 
     MqttStatefulPublish(
-            final @NotNull MqttPublish publish, final int packetIdentifier, final boolean dup, final int topicAlias,
+            final @NotNull MqttPublish publish,
+            final int packetIdentifier,
+            final boolean dup,
+            final int topicAlias,
             final @NotNull ImmutableIntList subscriptionIdentifiers) {
 
         super(publish, packetIdentifier);
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttWillPublish.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttWillPublish.java
index e34897a55..7bb2e4505 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttWillPublish.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttWillPublish.java
@@ -37,11 +37,16 @@ public class MqttWillPublish extends MqttPublish implements Mqtt5WillPublish {
     private final long delayInterval;
 
     public MqttWillPublish(
-            final @NotNull MqttTopicImpl topic, final @Nullable ByteBuffer payload, final @NotNull MqttQos qos,
-            final boolean isRetain, final long messageExpiryInterval,
+            final @NotNull MqttTopicImpl topic,
+            final @Nullable ByteBuffer payload,
+            final @NotNull MqttQos qos,
+            final boolean isRetain,
+            final long messageExpiryInterval,
             final @Nullable Mqtt5PayloadFormatIndicator payloadFormatIndicator,
-            final @Nullable MqttUtf8StringImpl contentType, final @Nullable MqttTopicImpl responseTopic,
-            final @Nullable ByteBuffer correlationData, final @NotNull MqttUserPropertiesImpl userProperties,
+            final @Nullable MqttUtf8StringImpl contentType,
+            final @Nullable MqttTopicImpl responseTopic,
+            final @Nullable ByteBuffer correlationData,
+            final @NotNull MqttUserPropertiesImpl userProperties,
             final long delayInterval) {
 
         super(topic, payload, qos, isRetain, messageExpiryInterval, payloadFormatIndicator, contentType, responseTopic,
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishView.java
index f99322507..5ab066e9f 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishView.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishView.java
@@ -45,7 +45,9 @@ public class Mqtt3PublishView implements Mqtt3Publish {
             Mqtt3PublishView::of;
 
     public static @NotNull MqttPublish delegate(
-            final @NotNull MqttTopicImpl topic, final @Nullable ByteBuffer payload, final @NotNull MqttQos qos,
+            final @NotNull MqttTopicImpl topic,
+            final @Nullable ByteBuffer payload,
+            final @NotNull MqttQos qos,
             final boolean retain) {
 
         return new MqttPublish(topic, payload, qos, retain, MqttPublish.NO_MESSAGE_EXPIRY, null, null, null, null,
@@ -60,14 +62,18 @@ public class Mqtt3PublishView implements Mqtt3Publish {
     }
 
     static @NotNull Mqtt3PublishView of(
-            final @NotNull MqttTopicImpl topic, final @Nullable ByteBuffer payload, final @NotNull MqttQos qos,
+            final @NotNull MqttTopicImpl topic,
+            final @Nullable ByteBuffer payload,
+            final @NotNull MqttQos qos,
             final boolean retain) {
 
         return new Mqtt3PublishView(delegate(topic, payload, qos, retain));
     }
 
     static @NotNull Mqtt3PublishView willOf(
-            final @NotNull MqttTopicImpl topic, final @Nullable ByteBuffer payload, final @NotNull MqttQos qos,
+            final @NotNull MqttTopicImpl topic,
+            final @Nullable ByteBuffer payload,
+            final @NotNull MqttQos qos,
             final boolean retain) {
 
         return new Mqtt3PublishView(
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/puback/MqttPubAck.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/puback/MqttPubAck.java
index 53d87d081..3c1e04c03 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/puback/MqttPubAck.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/puback/MqttPubAck.java
@@ -35,8 +35,10 @@ public class MqttPubAck extends MqttMessageWithUserProperties.WithReason.WithCod
     public static final @NotNull Mqtt5PubAckReasonCode DEFAULT_REASON_CODE = Mqtt5PubAckReasonCode.SUCCESS;
 
     public MqttPubAck(
-            final int packetIdentifier, final @NotNull Mqtt5PubAckReasonCode reasonCode,
-            final @Nullable MqttUtf8StringImpl reasonString, final @NotNull MqttUserPropertiesImpl userProperties) {
+            final int packetIdentifier,
+            final @NotNull Mqtt5PubAckReasonCode reasonCode,
+            final @Nullable MqttUtf8StringImpl reasonString,
+            final @NotNull MqttUserPropertiesImpl userProperties) {
 
         super(packetIdentifier, reasonCode, reasonString, userProperties);
     }
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubcomp/MqttPubComp.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubcomp/MqttPubComp.java
index 9cdc254d8..6caae0dd5 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubcomp/MqttPubComp.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubcomp/MqttPubComp.java
@@ -35,8 +35,10 @@ public class MqttPubComp extends MqttMessageWithUserProperties.WithReason.WithCo
     public static final @NotNull Mqtt5PubCompReasonCode DEFAULT_REASON_CODE = Mqtt5PubCompReasonCode.SUCCESS;
 
     public MqttPubComp(
-            final int packetIdentifier, final @NotNull Mqtt5PubCompReasonCode reasonCode,
-            final @Nullable MqttUtf8StringImpl reasonString, final @NotNull MqttUserPropertiesImpl userProperties) {
+            final int packetIdentifier,
+            final @NotNull Mqtt5PubCompReasonCode reasonCode,
+            final @Nullable MqttUtf8StringImpl reasonString,
+            final @NotNull MqttUserPropertiesImpl userProperties) {
 
         super(packetIdentifier, reasonCode, reasonString, userProperties);
     }
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrec/MqttPubRec.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrec/MqttPubRec.java
index 65abaee60..5bf73fa3f 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrec/MqttPubRec.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrec/MqttPubRec.java
@@ -35,8 +35,10 @@ public class MqttPubRec extends MqttMessageWithUserProperties.WithReason.WithCod
     public static final @NotNull Mqtt5PubRecReasonCode DEFAULT_REASON_CODE = Mqtt5PubRecReasonCode.SUCCESS;
 
     public MqttPubRec(
-            final int packetIdentifier, final @NotNull Mqtt5PubRecReasonCode reasonCode,
-            final @Nullable MqttUtf8StringImpl reasonString, final @NotNull MqttUserPropertiesImpl userProperties) {
+            final int packetIdentifier,
+            final @NotNull Mqtt5PubRecReasonCode reasonCode,
+            final @Nullable MqttUtf8StringImpl reasonString,
+            final @NotNull MqttUserPropertiesImpl userProperties) {
 
         super(packetIdentifier, reasonCode, reasonString, userProperties);
     }
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrel/MqttPubRel.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrel/MqttPubRel.java
index 372e4db7a..ba10053b4 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrel/MqttPubRel.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrel/MqttPubRel.java
@@ -35,8 +35,10 @@ public class MqttPubRel extends MqttMessageWithUserProperties.WithReason.WithCod
     public static final @NotNull Mqtt5PubRelReasonCode DEFAULT_REASON_CODE = Mqtt5PubRelReasonCode.SUCCESS;
 
     public MqttPubRel(
-            final int packetIdentifier, final @NotNull Mqtt5PubRelReasonCode reasonCode,
-            final @Nullable MqttUtf8StringImpl reasonString, final @NotNull MqttUserPropertiesImpl userProperties) {
+            final int packetIdentifier,
+            final @NotNull Mqtt5PubRelReasonCode reasonCode,
+            final @Nullable MqttUtf8StringImpl reasonString,
+            final @NotNull MqttUserPropertiesImpl userProperties) {
 
         super(packetIdentifier, reasonCode, reasonString, userProperties);
     }
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscription.java b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscription.java
index a6a446f51..7feba7ed6 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscription.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscription.java
@@ -37,8 +37,11 @@ public class MqttSubscription implements Mqtt5Subscription {
     private final boolean retainAsPublished;
 
     public MqttSubscription(
-            final @NotNull MqttTopicFilterImpl topicFilter, final @NotNull MqttQos qos, final boolean noLocal,
-            final @NotNull Mqtt5RetainHandling retainHandling, final boolean retainAsPublished) {
+            final @NotNull MqttTopicFilterImpl topicFilter,
+            final @NotNull MqttQos qos,
+            final boolean noLocal,
+            final @NotNull Mqtt5RetainHandling retainHandling,
+            final boolean retainAsPublished) {
 
         this.topicFilter = topicFilter;
         this.qos = qos;
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/suback/MqttSubAck.java b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/suback/MqttSubAck.java
index d0e4e7b75..0b6623d37 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/suback/MqttSubAck.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/suback/MqttSubAck.java
@@ -35,8 +35,10 @@ public class MqttSubAck extends MqttMessageWithUserProperties.WithReason.WithCod
         implements Mqtt5SubAck {
 
     public MqttSubAck(
-            final int packetIdentifier, final @NotNull ImmutableList<Mqtt5SubAckReasonCode> reasonCodes,
-            final @Nullable MqttUtf8StringImpl reasonString, final @NotNull MqttUserPropertiesImpl userProperties) {
+            final int packetIdentifier,
+            final @NotNull ImmutableList<Mqtt5SubAckReasonCode> reasonCodes,
+            final @Nullable MqttUtf8StringImpl reasonString,
+            final @NotNull MqttUserPropertiesImpl userProperties) {
 
         super(packetIdentifier, reasonCodes, reasonString, userProperties);
     }
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/unsuback/MqttUnsubAck.java b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/unsuback/MqttUnsubAck.java
index 7addcf9e3..519b6bff4 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/unsuback/MqttUnsubAck.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/unsuback/MqttUnsubAck.java
@@ -35,8 +35,10 @@ public class MqttUnsubAck extends MqttMessageWithUserProperties.WithReason.WithC
         implements Mqtt5UnsubAck {
 
     public MqttUnsubAck(
-            final int packetIdentifier, final @NotNull ImmutableList<Mqtt5UnsubAckReasonCode> reasonCodes,
-            final @Nullable MqttUtf8StringImpl reasonString, final @NotNull MqttUserPropertiesImpl userProperties) {
+            final int packetIdentifier,
+            final @NotNull ImmutableList<Mqtt5UnsubAckReasonCode> reasonCodes,
+            final @Nullable MqttUtf8StringImpl reasonString,
+            final @NotNull MqttUserPropertiesImpl userProperties) {
 
         super(packetIdentifier, reasonCodes, reasonString, userProperties);
     }
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java
index be7bf491f..352e0224e 100644
--- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java
+++ b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java
@@ -125,7 +125,8 @@ public class Mqtt3AsyncClientView implements Mqtt3AsyncClient {
 
     @Override
     public @NotNull CompletableFuture<@NotNull Mqtt3SubAck> subscribe(
-            final @Nullable Mqtt3Subscribe subscribe, final @Nullable Consumer<@NotNull Mqtt3Publish> callback,
+            final @Nullable Mqtt3Subscribe subscribe,
+            final @Nullable Consumer<@NotNull Mqtt3Publish> callback,
             final @Nullable Executor executor) {
 
         return subscribe(subscribe, callback, executor, false);
@@ -133,7 +134,8 @@ public class Mqtt3AsyncClientView implements Mqtt3AsyncClient {
 
     @Override
     public @NotNull CompletableFuture<@NotNull Mqtt3SubAck> subscribe(
-            final @Nullable Mqtt3Subscribe subscribe, final @Nullable Consumer<@NotNull Mqtt3Publish> callback,
+            final @Nullable Mqtt3Subscribe subscribe,
+            final @Nullable Consumer<@NotNull Mqtt3Publish> callback,
             final boolean manualAcknowledgement) {
 
         final MqttSubscribe mqttSubscribe = MqttChecks.subscribe(subscribe);
@@ -144,8 +146,10 @@ public class Mqtt3AsyncClientView implements Mqtt3AsyncClient {
 
     @Override
     public @NotNull CompletableFuture<@NotNull Mqtt3SubAck> subscribe(
-            final @Nullable Mqtt3Subscribe subscribe, final @Nullable Consumer<@NotNull Mqtt3Publish> callback,
-            final @Nullable Executor executor, final boolean manualAcknowledgement) {
+            final @Nullable Mqtt3Subscribe subscribe,
+            final @Nullable Consumer<@NotNull Mqtt3Publish> callback,
+            final @Nullable Executor executor,
+            final boolean manualAcknowledgement) {
 
         final MqttSubscribe mqttSubscribe = MqttChecks.subscribe(subscribe);
         Checks.notNull(callback, "Callback");
@@ -168,7 +172,8 @@ public void publishes(
 
     @Override
     public void publishes(
-            final @Nullable MqttGlobalPublishFilter filter, final @Nullable Consumer<@NotNull Mqtt3Publish> callback,
+            final @Nullable MqttGlobalPublishFilter filter,
+            final @Nullable Consumer<@NotNull Mqtt3Publish> callback,
             final @Nullable Executor executor) {
 
         publishes(filter, callback, executor, false);
@@ -176,7 +181,8 @@ public void publishes(
 
     @Override
     public void publishes(
-            final @Nullable MqttGlobalPublishFilter filter, final @Nullable Consumer<@NotNull Mqtt3Publish> callback,
+            final @Nullable MqttGlobalPublishFilter filter,
+            final @Nullable Consumer<@NotNull Mqtt3Publish> callback,
             final boolean manualAcknowledgement) {
 
         Checks.notNull(filter, "Global publish filter");
@@ -187,8 +193,10 @@ public void publishes(
 
     @Override
     public void publishes(
-            final @Nullable MqttGlobalPublishFilter filter, final @Nullable Consumer<@NotNull Mqtt3Publish> callback,
-            final @Nullable Executor executor, final boolean manualAcknowledgement) {
+            final @Nullable MqttGlobalPublishFilter filter,
+            final @Nullable Consumer<@NotNull Mqtt3Publish> callback,
+            final @Nullable Executor executor,
+            final boolean manualAcknowledgement) {
 
         Checks.notNull(filter, "Global publish filter");
         Checks.notNull(callback, "Callback");
diff --git a/src/main/java/com/hivemq/client/internal/netty/DefaultChannelOutboundHandler.java b/src/main/java/com/hivemq/client/internal/netty/DefaultChannelOutboundHandler.java
index 670123f4d..159fb6e63 100644
--- a/src/main/java/com/hivemq/client/internal/netty/DefaultChannelOutboundHandler.java
+++ b/src/main/java/com/hivemq/client/internal/netty/DefaultChannelOutboundHandler.java
@@ -34,7 +34,8 @@ public interface DefaultChannelOutboundHandler extends ChannelOutboundHandler {
 
     @Override
     default void bind(
-            final @NotNull ChannelHandlerContext ctx, final @NotNull SocketAddress localAddress,
+            final @NotNull ChannelHandlerContext ctx,
+            final @NotNull SocketAddress localAddress,
             final @NotNull ChannelPromise promise) {
 
         ctx.bind(localAddress, promise);
@@ -42,8 +43,10 @@ default void bind(
 
     @Override
     default void connect(
-            final @NotNull ChannelHandlerContext ctx, final @NotNull SocketAddress remoteAddress,
-            final @Nullable SocketAddress localAddress, final @NotNull ChannelPromise promise) {
+            final @NotNull ChannelHandlerContext ctx,
+            final @NotNull SocketAddress remoteAddress,
+            final @Nullable SocketAddress localAddress,
+            final @NotNull ChannelPromise promise) {
 
         ctx.connect(remoteAddress, localAddress, promise);
     }
@@ -70,7 +73,8 @@ default void read(final @NotNull ChannelHandlerContext ctx) {
 
     @Override
     default void write(
-            final @NotNull ChannelHandlerContext ctx, final @NotNull Object msg,
+            final @NotNull ChannelHandlerContext ctx,
+            final @NotNull Object msg,
             final @NotNull ChannelPromise promise) {
 
         ctx.write(msg, promise);
diff --git a/src/main/java/com/hivemq/client/internal/rx/RxFutureConverter.java b/src/main/java/com/hivemq/client/internal/rx/RxFutureConverter.java
index 66b5477bc..fa15aff6d 100644
--- a/src/main/java/com/hivemq/client/internal/rx/RxFutureConverter.java
+++ b/src/main/java/com/hivemq/client/internal/rx/RxFutureConverter.java
@@ -260,7 +260,8 @@ public void accept(final @Nullable Optional<T> t, final @Nullable Throwable thro
         }
 
         private static <T> void complete(
-                final @NotNull MaybeObserver<? super T> observer, final @Nullable T t,
+                final @NotNull MaybeObserver<? super T> observer,
+                final @Nullable T t,
                 final @Nullable Throwable throwable) {
 
             if (throwable != null) {
@@ -317,7 +318,8 @@ public void accept(final @Nullable T t, final @Nullable Throwable throwable) {
         }
 
         private static <T> void complete(
-                final @NotNull SingleObserver<? super T> observer, final @Nullable T t,
+                final @NotNull SingleObserver<? super T> observer,
+                final @Nullable T t,
                 final @Nullable Throwable throwable) {
 
             if (t != null) {
diff --git a/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleMap.java b/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleMap.java
index dd40c0ac2..1c26f0646 100644
--- a/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleMap.java
+++ b/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleMap.java
@@ -94,7 +94,8 @@ private static class MapSubscriber<F, S, FM, SM, T extends Subscriber<? super FM
         private @Nullable Subscription subscription;
 
         MapSubscriber(
-                final @NotNull T subscriber, final @Nullable Function<? super F, ? extends FM> flowableMapper,
+                final @NotNull T subscriber,
+                final @Nullable Function<? super F, ? extends FM> flowableMapper,
                 final @NotNull Function<? super S, ? extends SM> singleMapper) {
 
             this.subscriber = subscriber;
@@ -172,7 +173,8 @@ private static class Conditional<F, S, FM, SM, T extends ConditionalSubscriber<?
                 extends MapSubscriber<F, S, FM, SM, T> implements WithSingleConditionalSubscriber<F, S> {
 
             Conditional(
-                    final @NotNull T subscriber, final @Nullable Function<? super F, ? extends FM> flowableMapper,
+                    final @NotNull T subscriber,
+                    final @Nullable Function<? super F, ? extends FM> flowableMapper,
                     final @NotNull Function<? super S, ? extends SM> singleMapper) {
 
                 super(subscriber, flowableMapper, singleMapper);
diff --git a/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleObserveOn.java b/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleObserveOn.java
index 71f0445f6..0394f62da 100644
--- a/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleObserveOn.java
+++ b/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleObserveOn.java
@@ -32,8 +32,10 @@ public class FlowableWithSingleObserveOn<F, S> extends FlowableWithSingleOperato
     private final int bufferSize;
 
     public FlowableWithSingleObserveOn(
-            final @NotNull FlowableWithSingle<F, S> source, final @NotNull Scheduler scheduler,
-            final boolean delayError, final int bufferSize) {
+            final @NotNull FlowableWithSingle<F, S> source,
+            final @NotNull Scheduler scheduler,
+            final boolean delayError,
+            final int bufferSize) {
 
         super(source);
         this.scheduler = scheduler;
diff --git a/src/main/java/com/hivemq/client/internal/util/ByteArrayUtil.java b/src/main/java/com/hivemq/client/internal/util/ByteArrayUtil.java
index 7b093dba1..f70f44c33 100644
--- a/src/main/java/com/hivemq/client/internal/util/ByteArrayUtil.java
+++ b/src/main/java/com/hivemq/client/internal/util/ByteArrayUtil.java
@@ -24,8 +24,12 @@
 public final class ByteArrayUtil {
 
     public static boolean equals(
-            final byte @NotNull [] array1, final int start1, final int end1, final byte @NotNull [] array2,
-            final int start2, final int end2) {
+            final byte @NotNull [] array1,
+            final int start1,
+            final int end1,
+            final byte @NotNull [] array2,
+            final int start2,
+            final int end2) {
 
         final int length1 = end1 - start1;
         final int length2 = end2 - start2;
diff --git a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableArray.java b/src/main/java/com/hivemq/client/internal/util/collections/ImmutableArray.java
index 3a112344b..32963e36f 100644
--- a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableArray.java
+++ b/src/main/java/com/hivemq/client/internal/util/collections/ImmutableArray.java
@@ -159,7 +159,9 @@ public boolean equals(final @Nullable Object o) {
     }
 
     private static boolean equals(
-            final @NotNull Object @NotNull [] array, final int fromIndex, final int toIndex,
+            final @NotNull Object @NotNull [] array,
+            final int fromIndex,
+            final int toIndex,
             final @NotNull List<?> that) {
 
         if ((toIndex - fromIndex) != that.size()) {
diff --git a/src/main/java/com/hivemq/client/internal/util/collections/Index.java b/src/main/java/com/hivemq/client/internal/util/collections/Index.java
index a01d89ad3..269150a3e 100644
--- a/src/main/java/com/hivemq/client/internal/util/collections/Index.java
+++ b/src/main/java/com/hivemq/client/internal/util/collections/Index.java
@@ -56,7 +56,8 @@ public Spec(final @NotNull Function<? super E, ? extends K> keyFunction, final f
         }
 
         public Spec(
-                final @NotNull Function<? super E, ? extends K> keyFunction, final int minCapacity,
+                final @NotNull Function<? super E, ? extends K> keyFunction,
+                final int minCapacity,
                 final float nodeThresholdFactor) {
 
             this.keyFunction = keyFunction;
diff --git a/src/main/java/com/hivemq/client/internal/util/collections/IntIndex.java b/src/main/java/com/hivemq/client/internal/util/collections/IntIndex.java
index 3af0d1556..50d5de0f3 100644
--- a/src/main/java/com/hivemq/client/internal/util/collections/IntIndex.java
+++ b/src/main/java/com/hivemq/client/internal/util/collections/IntIndex.java
@@ -55,7 +55,8 @@ public Spec(final @NotNull ToIntFunction<? super E> keyFunction, final float nod
         }
 
         public Spec(
-                final @NotNull ToIntFunction<? super E> keyFunction, final int minCapacity,
+                final @NotNull ToIntFunction<? super E> keyFunction,
+                final int minCapacity,
                 final float nodeThresholdFactor) {
 
             this.keyFunction = keyFunction;
diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java
index 3941f6fcf..c11be2910 100644
--- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java
+++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java
@@ -132,7 +132,8 @@ public interface Mqtt3AsyncClient extends Mqtt3Client {
      * @see #subscribe(Mqtt3Subscribe, Consumer, Executor, boolean)
      */
     @NotNull CompletableFuture<@NotNull Mqtt3SubAck> subscribe(
-            @NotNull Mqtt3Subscribe subscribe, @NotNull Consumer<@NotNull Mqtt3Publish> callback,
+            @NotNull Mqtt3Subscribe subscribe,
+            @NotNull Consumer<@NotNull Mqtt3Publish> callback,
             @NotNull Executor executor);
 
     /**
@@ -150,7 +151,8 @@ public interface Mqtt3AsyncClient extends Mqtt3Client {
      * @since 1.2
      */
     @NotNull CompletableFuture<@NotNull Mqtt3SubAck> subscribe(
-            @NotNull Mqtt3Subscribe subscribe, @NotNull Consumer<@NotNull Mqtt3Publish> callback,
+            @NotNull Mqtt3Subscribe subscribe,
+            @NotNull Consumer<@NotNull Mqtt3Publish> callback,
             boolean manualAcknowledgement);
 
     /**
@@ -171,8 +173,10 @@ public interface Mqtt3AsyncClient extends Mqtt3Client {
      * @since 1.2
      */
     @NotNull CompletableFuture<@NotNull Mqtt3SubAck> subscribe(
-            @NotNull Mqtt3Subscribe subscribe, @NotNull Consumer<@NotNull Mqtt3Publish> callback,
-            @NotNull Executor executor, boolean manualAcknowledgement);
+            @NotNull Mqtt3Subscribe subscribe,
+            @NotNull Consumer<@NotNull Mqtt3Publish> callback,
+            @NotNull Executor executor,
+            boolean manualAcknowledgement);
 
     /**
      * Fluent counterpart of {@link #subscribe(Mqtt3Subscribe)}, {@link #subscribe(Mqtt3Subscribe, Consumer, boolean)}
@@ -217,7 +221,8 @@ public interface Mqtt3AsyncClient extends Mqtt3Client {
      * @see #publishes(MqttGlobalPublishFilter, Consumer, Executor, boolean)
      */
     void publishes(
-            @NotNull MqttGlobalPublishFilter filter, @NotNull Consumer<@NotNull Mqtt3Publish> callback,
+            @NotNull MqttGlobalPublishFilter filter,
+            @NotNull Consumer<@NotNull Mqtt3Publish> callback,
             @NotNull Executor executor);
 
     /**
@@ -232,7 +237,8 @@ void publishes(
      * @since 1.2
      */
     void publishes(
-            @NotNull MqttGlobalPublishFilter filter, @NotNull Consumer<@NotNull Mqtt3Publish> callback,
+            @NotNull MqttGlobalPublishFilter filter,
+            @NotNull Consumer<@NotNull Mqtt3Publish> callback,
             boolean manualAcknowledgement);
 
     /**
@@ -248,8 +254,10 @@ void publishes(
      * @since 1.2
      */
     void publishes(
-            @NotNull MqttGlobalPublishFilter filter, @NotNull Consumer<@NotNull Mqtt3Publish> callback,
-            @NotNull Executor executor, boolean manualAcknowledgement);
+            @NotNull MqttGlobalPublishFilter filter,
+            @NotNull Consumer<@NotNull Mqtt3Publish> callback,
+            @NotNull Executor executor,
+            boolean manualAcknowledgement);
 
     /**
      * Unsubscribes this client with the given Unsubscribe message.
diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5AsyncClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5AsyncClient.java
index c3cd67e14..7e0342c44 100644
--- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5AsyncClient.java
+++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5AsyncClient.java
@@ -136,7 +136,8 @@ public interface Mqtt5AsyncClient extends Mqtt5Client {
      * @see #subscribe(Mqtt5Subscribe, Consumer, Executor, boolean)
      */
     @NotNull CompletableFuture<@NotNull Mqtt5SubAck> subscribe(
-            @NotNull Mqtt5Subscribe subscribe, @NotNull Consumer<@NotNull Mqtt5Publish> callback,
+            @NotNull Mqtt5Subscribe subscribe,
+            @NotNull Consumer<@NotNull Mqtt5Publish> callback,
             @NotNull Executor executor);
 
     /**
@@ -154,7 +155,8 @@ public interface Mqtt5AsyncClient extends Mqtt5Client {
      * @since 1.2
      */
     @NotNull CompletableFuture<@NotNull Mqtt5SubAck> subscribe(
-            @NotNull Mqtt5Subscribe subscribe, @NotNull Consumer<@NotNull Mqtt5Publish> callback,
+            @NotNull Mqtt5Subscribe subscribe,
+            @NotNull Consumer<@NotNull Mqtt5Publish> callback,
             boolean manualAcknowledgement);
 
     /**
@@ -175,8 +177,10 @@ public interface Mqtt5AsyncClient extends Mqtt5Client {
      * @since 1.2
      */
     @NotNull CompletableFuture<@NotNull Mqtt5SubAck> subscribe(
-            @NotNull Mqtt5Subscribe subscribe, @NotNull Consumer<@NotNull Mqtt5Publish> callback,
-            @NotNull Executor executor, final boolean manualAcknowledgement);
+            @NotNull Mqtt5Subscribe subscribe,
+            @NotNull Consumer<@NotNull Mqtt5Publish> callback,
+            @NotNull Executor executor,
+            final boolean manualAcknowledgement);
 
     /**
      * Fluent counterpart of {@link #subscribe(Mqtt5Subscribe)}, {@link #subscribe(Mqtt5Subscribe, Consumer, boolean)}
@@ -221,7 +225,8 @@ public interface Mqtt5AsyncClient extends Mqtt5Client {
      * @see #publishes(MqttGlobalPublishFilter, Consumer, Executor, boolean)
      */
     void publishes(
-            @NotNull MqttGlobalPublishFilter filter, @NotNull Consumer<@NotNull Mqtt5Publish> callback,
+            @NotNull MqttGlobalPublishFilter filter,
+            @NotNull Consumer<@NotNull Mqtt5Publish> callback,
             @NotNull Executor executor);
 
     /**
@@ -236,7 +241,8 @@ void publishes(
      * @since 1.2
      */
     void publishes(
-            @NotNull MqttGlobalPublishFilter filter, @NotNull Consumer<@NotNull Mqtt5Publish> callback,
+            @NotNull MqttGlobalPublishFilter filter,
+            @NotNull Consumer<@NotNull Mqtt5Publish> callback,
             boolean manualAcknowledgement);
 
     /**
@@ -252,8 +258,10 @@ void publishes(
      * @since 1.2
      */
     void publishes(
-            @NotNull MqttGlobalPublishFilter filter, @NotNull Consumer<@NotNull Mqtt5Publish> callback,
-            @NotNull Executor executor, boolean manualAcknowledgement);
+            @NotNull MqttGlobalPublishFilter filter,
+            @NotNull Consumer<@NotNull Mqtt5Publish> callback,
+            @NotNull Executor executor,
+            boolean manualAcknowledgement);
 
     /**
      * Unsubscribes this client with the given Unsubscribe message.
diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5IncomingQos1Interceptor.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5IncomingQos1Interceptor.java
index 310cce8af..f1f1451b0 100644
--- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5IncomingQos1Interceptor.java
+++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5IncomingQos1Interceptor.java
@@ -39,6 +39,7 @@ public interface Mqtt5IncomingQos1Interceptor {
      * @param pubAckBuilder the builder for the outgoing PubAck message.
      */
     void onPublish(
-            @NotNull Mqtt5ClientConfig clientConfig, @NotNull Mqtt5Publish publish,
+            @NotNull Mqtt5ClientConfig clientConfig,
+            @NotNull Mqtt5Publish publish,
             @NotNull Mqtt5PubAckBuilder pubAckBuilder);
 }
diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5IncomingQos2Interceptor.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5IncomingQos2Interceptor.java
index 5d896e057..f7a7e5ade 100644
--- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5IncomingQos2Interceptor.java
+++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5IncomingQos2Interceptor.java
@@ -41,7 +41,8 @@ public interface Mqtt5IncomingQos2Interceptor {
      * @param pubRecBuilder the builder for the outgoing PubRec message.
      */
     void onPublish(
-            @NotNull Mqtt5ClientConfig clientConfig, @NotNull Mqtt5Publish publish,
+            @NotNull Mqtt5ClientConfig clientConfig,
+            @NotNull Mqtt5Publish publish,
             @NotNull Mqtt5PubRecBuilder pubRecBuilder);
 
     /**
@@ -54,6 +55,7 @@ void onPublish(
      * @param pubCompBuilder the builder for the outgoing PubComp message.
      */
     void onPubRel(
-            @NotNull Mqtt5ClientConfig clientConfig, @NotNull Mqtt5PubRel pubRel,
+            @NotNull Mqtt5ClientConfig clientConfig,
+            @NotNull Mqtt5PubRel pubRel,
             @NotNull Mqtt5PubCompBuilder pubCompBuilder);
 }
diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5OutgoingQos2Interceptor.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5OutgoingQos2Interceptor.java
index 7112caba6..c240563be 100644
--- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5OutgoingQos2Interceptor.java
+++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5OutgoingQos2Interceptor.java
@@ -43,7 +43,9 @@ public interface Mqtt5OutgoingQos2Interceptor {
      * @param pubRelBuilder the builder for the outgoing PubRel message.
      */
     void onPubRec(
-            @NotNull Mqtt5ClientConfig clientConfig, @NotNull Mqtt5Publish publish, @NotNull Mqtt5PubRec pubRec,
+            @NotNull Mqtt5ClientConfig clientConfig,
+            @NotNull Mqtt5Publish publish,
+            @NotNull Mqtt5PubRec pubRec,
             @NotNull Mqtt5PubRelBuilder pubRelBuilder);
 
     /**
diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/auth/Mqtt5EnhancedAuthMechanism.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/auth/Mqtt5EnhancedAuthMechanism.java
index 92bdfac21..dd47e877f 100644
--- a/src/main/java/com/hivemq/client/mqtt/mqtt5/auth/Mqtt5EnhancedAuthMechanism.java
+++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/auth/Mqtt5EnhancedAuthMechanism.java
@@ -77,7 +77,8 @@ public interface Mqtt5EnhancedAuthMechanism {
      * @return a {@link CompletableFuture} succeeding when the required data for auth is added to the builder.
      */
     @NotNull CompletableFuture<Void> onAuth(
-            @NotNull Mqtt5ClientConfig clientConfig, @NotNull Mqtt5Connect connect,
+            @NotNull Mqtt5ClientConfig clientConfig,
+            @NotNull Mqtt5Connect connect,
             @NotNull Mqtt5EnhancedAuthBuilder authBuilder);
 
     /**
@@ -104,7 +105,8 @@ public interface Mqtt5EnhancedAuthMechanism {
      *         and when the required data for auth is added to the builder.
      */
     default @NotNull CompletableFuture<Boolean> onServerReAuth(
-            final @NotNull Mqtt5ClientConfig clientConfig, final @NotNull Mqtt5Auth auth,
+            final @NotNull Mqtt5ClientConfig clientConfig,
+            final @NotNull Mqtt5Auth auth,
             final @NotNull Mqtt5AuthBuilder authBuilder) {
 
         return onReAuth(clientConfig, authBuilder).thenApply(aVoid -> true);
diff --git a/src/main/java/com/hivemq/client/rx/FlowableWithSingle.java b/src/main/java/com/hivemq/client/rx/FlowableWithSingle.java
index 2186c9ecc..5eb5de2be 100644
--- a/src/main/java/com/hivemq/client/rx/FlowableWithSingle.java
+++ b/src/main/java/com/hivemq/client/rx/FlowableWithSingle.java
@@ -314,7 +314,8 @@ public final void subscribeBoth(final @NotNull FlowableWithSingleSubscriber<? su
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final @NotNull CompletableFuture<S> subscribeSingleFuture(
-            final @NotNull Consumer<? super F> onNext, final @NotNull Consumer<? super Throwable> onError,
+            final @NotNull Consumer<? super F> onNext,
+            final @NotNull Consumer<? super Throwable> onError,
             final @NotNull Action onComplete) {
 
         final SingleFutureSubscriber<F, S> singleFutureSubscriber = new SingleFutureSubscriber<>(this);
diff --git a/src/main/java/com/hivemq/client/util/KeyStoreUtil.java b/src/main/java/com/hivemq/client/util/KeyStoreUtil.java
index c159c9adf..2fbb8d5a1 100644
--- a/src/main/java/com/hivemq/client/util/KeyStoreUtil.java
+++ b/src/main/java/com/hivemq/client/util/KeyStoreUtil.java
@@ -63,7 +63,8 @@ public class KeyStoreUtil {
     }
 
     public static @NotNull KeyManagerFactory keyManagerFromKeystore(
-            final @NotNull File keyStoreFile, final @NotNull String keyStorePassword,
+            final @NotNull File keyStoreFile,
+            final @NotNull String keyStorePassword,
             final @NotNull String privateKeyPassword) throws SSLException {
 
         Checks.notNull(keyStoreFile, "Keystore file");
diff --git a/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java b/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java
index 9828754a0..1517ab22d 100644
--- a/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java
+++ b/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java
@@ -61,9 +61,12 @@ class Mqtt3ClientExample {
 
     // create a client with a random UUID and connect to server
     Mqtt3ClientExample(
-            @NotNull final String server, final int port, final boolean usesSsl,
+            @NotNull final String server,
+            final int port,
+            final boolean usesSsl,
             @Nullable final TrustManagerFactory trustManagerFactory,
-            @Nullable final KeyManagerFactory keyManagerFactory, @Nullable final String serverPath) {
+            @Nullable final KeyManagerFactory keyManagerFactory,
+            @Nullable final String serverPath) {
         this.server = server;
         this.port = port;
         this.usesSsl = usesSsl;
diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/AbstractMqttDecoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/AbstractMqttDecoderTest.java
index 18a44220a..311c9fd65 100644
--- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/AbstractMqttDecoderTest.java
+++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/AbstractMqttDecoderTest.java
@@ -82,7 +82,8 @@ public boolean isSharable() {
     protected EmbeddedChannel channel;
 
     protected AbstractMqttDecoderTest(
-            final @NotNull MqttMessageDecoders decoders, final @NotNull MqttVersion mqttVersion,
+            final @NotNull MqttMessageDecoders decoders,
+            final @NotNull MqttVersion mqttVersion,
             final @NotNull MqttConnect connect) {
 
         this.decoders = decoders;
diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PublishDecoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PublishDecoderTest.java
index b04243019..1d0ddd9c7 100644
--- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PublishDecoderTest.java
+++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PublishDecoderTest.java
@@ -40,7 +40,11 @@ class Mqtt3PublishDecoderTest extends AbstractMqtt3DecoderTest {
     }
 
     private @NotNull ByteBuf createWellformedPublish(
-            final boolean dup, final int qos, final boolean retained, final int packetId, final byte[] topic,
+            final boolean dup,
+            final int qos,
+            final boolean retained,
+            final int packetId,
+            final byte[] topic,
             final @NotNull byte[] payload) throws Exception {
 
         final ByteBuf byteBuf = channel.alloc().buffer();
diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3ConnectEncoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3ConnectEncoderTest.java
index e9d1b459e..a22542143 100644
--- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3ConnectEncoderTest.java
+++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3ConnectEncoderTest.java
@@ -51,10 +51,15 @@ class Mqtt3ConnectEncoderTest extends AbstractMqtt3EncoderTest {
     })
     @ParameterizedTest(name = "Connect(\"{0}\", {1}, {2}, \"{3}\", \"{4}\", \"{5}\", \"{6}\")")
     void matchesPaho(
-            final @NotNull String clientId, final boolean cleanSession, final int keepAliveInterval,
-            final @Nullable String userName, final @Nullable String password, final @Nullable String willMessage,
-            final @Nullable String willTopic, final @Nullable Integer willQos, final @Nullable Boolean willRetained)
-            throws MqttException {
+            final @NotNull String clientId,
+            final boolean cleanSession,
+            final int keepAliveInterval,
+            final @Nullable String userName,
+            final @Nullable String password,
+            final @Nullable String willMessage,
+            final @Nullable String willTopic,
+            final @Nullable Integer willQos,
+            final @Nullable Boolean willRetained) throws MqttException {
 
         final boolean hasAuth = isNotBlank(userName) && isNotBlank(password);
         final boolean hasWill =
diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5AuthEncoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5AuthEncoderTest.java
index 1505bb8f2..8c5c054f2 100644
--- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5AuthEncoderTest.java
+++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5AuthEncoderTest.java
@@ -240,7 +240,8 @@ private void encode(final @NotNull byte[] expected, final @NotNull MqttAuth auth
     }
 
     private void encodeNok(
-            final @NotNull MqttAuth auth, final @NotNull Class<? extends Exception> expectedException,
+            final @NotNull MqttAuth auth,
+            final @NotNull Class<? extends Exception> expectedException,
             final @NotNull String reason) {
 
         final Throwable exception = assertThrows(expectedException, () -> channel.writeOutbound(auth));
diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5ConnectEncoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5ConnectEncoderTest.java
index 5054d5fce..bb0b0089e 100644
--- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5ConnectEncoderTest.java
+++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5ConnectEncoderTest.java
@@ -520,7 +520,8 @@ private void encode(final @NotNull byte[] expected, final @NotNull MqttStatefulC
 
     private void encodeNok(
             final @NotNull MqttStatefulConnect connectWrapper,
-            final @NotNull Class<? extends Exception> expectedException, final @NotNull String reason) {
+            final @NotNull Class<? extends Exception> expectedException,
+            final @NotNull String reason) {
 
         final Throwable exception = assertThrows(expectedException, () -> channel.writeOutbound(connectWrapper));
         assertTrue(exception.getMessage().contains(reason), () -> "found: " + exception.getMessage());
@@ -612,7 +613,8 @@ public int getTimeout() {
         @NotNull
         @Override
         public CompletableFuture<Void> onAuth(
-                @NotNull final Mqtt5ClientConfig clientConfig, @NotNull final Mqtt5Connect connect,
+                @NotNull final Mqtt5ClientConfig clientConfig,
+                @NotNull final Mqtt5Connect connect,
                 @NotNull final Mqtt5EnhancedAuthBuilder authBuilder) {
             throw new UnsupportedOperationException();
         }
@@ -627,7 +629,8 @@ public CompletableFuture<Void> onReAuth(
         @NotNull
         @Override
         public CompletableFuture<Boolean> onServerReAuth(
-                @NotNull final Mqtt5ClientConfig clientConfig, @NotNull final Mqtt5Auth auth,
+                @NotNull final Mqtt5ClientConfig clientConfig,
+                @NotNull final Mqtt5Auth auth,
                 @NotNull final Mqtt5AuthBuilder authBuilder) {
             throw new UnsupportedOperationException();
         }
@@ -635,7 +638,8 @@ public CompletableFuture<Boolean> onServerReAuth(
         @NotNull
         @Override
         public CompletableFuture<Boolean> onContinue(
-                @NotNull final Mqtt5ClientConfig clientConfig, @NotNull final Mqtt5Auth auth,
+                @NotNull final Mqtt5ClientConfig clientConfig,
+                @NotNull final Mqtt5Auth auth,
                 @NotNull final Mqtt5AuthBuilder authBuilder) {
             throw new UnsupportedOperationException();
         }
diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PublishEncoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PublishEncoderTest.java
index 848aa1017..64158e4ac 100644
--- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PublishEncoderTest.java
+++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PublishEncoderTest.java
@@ -693,8 +693,11 @@ void encode_propertyLengthExceeded_omitUserProperties() {
     }
 
     private void encode(
-            final @NotNull byte[] expected, final @NotNull MqttPublish publish, final int packetIdentifier,
-            final boolean isDup, final @NotNull ImmutableIntList subscriptionIdentifiers) {
+            final @NotNull byte[] expected,
+            final @NotNull MqttPublish publish,
+            final int packetIdentifier,
+            final boolean isDup,
+            final @NotNull ImmutableIntList subscriptionIdentifiers) {
 
         final MqttStatefulPublish publishInternal =
                 publish.createStateful(packetIdentifier, isDup, DEFAULT_NO_TOPIC_ALIAS, subscriptionIdentifiers);
@@ -702,8 +705,12 @@ private void encode(
     }
 
     private void encode(
-            final @NotNull byte[] expected, final @NotNull MqttPublish publish, final int packetIdentifier,
-            final boolean isDup, int topicAlias, final boolean isNewTopicAlias,
+            final @NotNull byte[] expected,
+            final @NotNull MqttPublish publish,
+            final int packetIdentifier,
+            final boolean isDup,
+            int topicAlias,
+            final boolean isNewTopicAlias,
             final @NotNull ImmutableIntList subscriptionIdentifiers) {
 
         if (isNewTopicAlias) {
diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5UnsubscribeEncoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5UnsubscribeEncoderTest.java
index 6c9752064..3c6b72faf 100644
--- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5UnsubscribeEncoderTest.java
+++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5UnsubscribeEncoderTest.java
@@ -167,7 +167,8 @@ void encode_propertyLengthExceeded_omitUserProperties() {
     }
 
     private void encodeUnsubscribe(
-            final @NotNull byte[] expected, final @NotNull MqttUserPropertiesImpl userProperties,
+            final @NotNull byte[] expected,
+            final @NotNull MqttUserPropertiesImpl userProperties,
             final @NotNull ImmutableList<MqttTopicFilterImpl> topicFilters) {
         final MqttUnsubscribe unsubscribe = new MqttUnsubscribe(topicFilters, userProperties);
         final int packetIdentifier = 0x01;
diff --git a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttSharedTopicFilterImplTest.java b/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttSharedTopicFilterImplTest.java
index 9fdef09f7..bb7b18629 100644
--- a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttSharedTopicFilterImplTest.java
+++ b/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttSharedTopicFilterImplTest.java
@@ -47,7 +47,8 @@ enum SharedTopicFilterSource {
     }
 
     private @Nullable MqttTopicFilterImpl from(
-            final @NotNull SharedTopicFilterSource source, final @NotNull String shareName,
+            final @NotNull SharedTopicFilterSource source,
+            final @NotNull String shareName,
             final @NotNull String topicFilter) {
 
         if (source == SharedTopicFilterSource.SHARE_NAME_AND_TOPIC_FILTER) {
@@ -170,8 +171,10 @@ void from_invalidSharedSubscriptionString_throws(
     @ParameterizedTest
     @MethodSource("invalidShareNameOrTopicFilterFromByteBuf")
     void from_invalidShareNameOrTopicFilterByteBuf_returnsNull(
-            final @NotNull SharedTopicFilterSource source, final @NotNull String shareName,
-            final @NotNull String topicFilter, @SuppressWarnings("unused") final @NotNull String message) {
+            final @NotNull SharedTopicFilterSource source,
+            final @NotNull String shareName,
+            final @NotNull String topicFilter,
+            @SuppressWarnings("unused") final @NotNull String message) {
 
         final MqttTopicFilterImpl mqtt5TopicFilter = from(source, shareName, topicFilter);
         assertNull(mqtt5TopicFilter);
@@ -180,8 +183,10 @@ void from_invalidShareNameOrTopicFilterByteBuf_returnsNull(
     @ParameterizedTest
     @MethodSource("invalidShareNameOrTopicFilterFromStringAndFromShareNameAndTopicFilter")
     void from_invalidShareNameOrTopicFilterString_throws(
-            final @NotNull SharedTopicFilterSource source, final @NotNull String shareName,
-            final @NotNull String topicFilter, final @NotNull String message) {
+            final @NotNull SharedTopicFilterSource source,
+            final @NotNull String shareName,
+            final @NotNull String topicFilter,
+            final @NotNull String message) {
 
         final IllegalArgumentException exception =
                 Assertions.assertThrows(IllegalArgumentException.class, () -> from(source, shareName, topicFilter));
@@ -241,7 +246,8 @@ void test_shared_topic_filter_must_be_case_sensitive() {
     @MethodSource("validShareNameAndTopicFilter")
     void from_validShareNameAndTopicFilter(
             final @NotNull SharedTopicFilterSource source,
-            @SuppressWarnings("unused") final @NotNull String testDescription, final @NotNull String shareName,
+            @SuppressWarnings("unused") final @NotNull String testDescription,
+            final @NotNull String shareName,
             final @NotNull String topicFilter) {
 
         final MqttTopicFilterImpl mqtt5TopicFilter = from(source, shareName, topicFilter);
diff --git a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicFilterImplTest.java b/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicFilterImplTest.java
index f5917532d..41b3ea98e 100644
--- a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicFilterImplTest.java
+++ b/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicFilterImplTest.java
@@ -192,8 +192,10 @@ void getLevels_emptyLevels(final @NotNull Function<String, MqttTopicFilterImpl>
     @MethodSource("wildcardTopicFilterProvider")
     void containsWildcards(
             final @NotNull Function<String, MqttTopicFilterImpl> topicFilterFactoryMethod,
-            @SuppressWarnings("unused") final @NotNull String testDescription, final @NotNull String topicFilterString,
-            final boolean containsWildcards, final boolean containsMultiLevelWildcard,
+            @SuppressWarnings("unused") final @NotNull String testDescription,
+            final @NotNull String topicFilterString,
+            final boolean containsWildcards,
+            final boolean containsMultiLevelWildcard,
             final boolean containsSingleLevelWildcard) {
         final MqttTopicFilterImpl mqtt5TopicFilter = topicFilterFactoryMethod.apply(topicFilterString);
         assertNotNull(mqtt5TopicFilter);
diff --git a/src/test/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTreeTest.java b/src/test/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTreeTest.java
index a0fdee7c6..60f7021c2 100644
--- a/src/test/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTreeTest.java
+++ b/src/test/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTreeTest.java
@@ -95,8 +95,12 @@ class MqttSubscribedPublishFlowTreeTest extends MqttSubscribedPublishFlowsTest {
             "remove, test/topic/filter, test/topic//filter, test/topic///filter, test/topic///filter, test/topic//filter, test/topic/filter",
     })
     void branching_compaction(
-            final @NotNull String compactOperation, final @NotNull String filter1, final @NotNull String filter2,
-            final @NotNull String filter3, final @NotNull String topic1, final @NotNull String topic2,
+            final @NotNull String compactOperation,
+            final @NotNull String filter1,
+            final @NotNull String filter2,
+            final @NotNull String filter3,
+            final @NotNull String topic1,
+            final @NotNull String topic2,
             final @NotNull String topic3) {
 
         final MqttSubscription subscription1 = new MqttSubscriptionBuilder.Default().topicFilter(filter1).build();
diff --git a/src/test/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowsTest.java b/src/test/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowsTest.java
index f47f0326b..de84ec77a 100644
--- a/src/test/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowsTest.java
+++ b/src/test/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowsTest.java
@@ -73,7 +73,8 @@ void setUp() {
             "/,    /; +/+; +/; /+; +/#; /#; #,                             false"
     })
     void subscribe_matchingTopicFilters_doMatch(
-            final @NotNull String topic, @ConvertWith(CsvToArray.class) final @NotNull String[] matchingTopicFilters,
+            final @NotNull String topic,
+            @ConvertWith(CsvToArray.class) final @NotNull String[] matchingTopicFilters,
             final boolean acknowledge) {
 
         final MqttSubscribedPublishFlow[] matchingFlows = new MqttSubscribedPublishFlow[matchingTopicFilters.length];
@@ -107,7 +108,8 @@ void subscribe_matchingTopicFilters_doMatch(
             "/,    /; +/+; +/; /+; +/#; /#; #,                             false"
     })
     void subscribe_matchingTopicFilters_doMatch_noFlow(
-            final @NotNull String topic, @ConvertWith(CsvToArray.class) final @NotNull String[] matchingTopicFilters,
+            final @NotNull String topic,
+            @ConvertWith(CsvToArray.class) final @NotNull String[] matchingTopicFilters,
             final boolean acknowledge) {
 
         for (int i = 0; i < matchingTopicFilters.length; i++) {
@@ -267,7 +269,8 @@ void unsubscribe_matchingTopicFilters_notAcknowledged_doStillMatch_noFlow(
     @ParameterizedTest
     @CsvSource({"a, a, b", "a, a, a/b", "a/b, a/b, a/c"})
     void unsubscribe_nonMatchingTopicFilters_othersStillMatch(
-            final @NotNull String topic, final @NotNull String matchingTopicFilter,
+            final @NotNull String topic,
+            final @NotNull String matchingTopicFilter,
             final @NotNull String notMatchingTopicFilter) {
 
         final MqttSubscribedPublishFlow flow1 = mockSubscriptionFlow(matchingTopicFilter);
@@ -295,7 +298,8 @@ void unsubscribe_nonMatchingTopicFilters_othersStillMatch(
     @ParameterizedTest
     @CsvSource({"a, a, b", "a, a, a/b", "a/b, a/b, a/c"})
     void unsubscribe_nonMatchingTopicFilters_othersStillMatch_noFlow(
-            final @NotNull String topic, final @NotNull String matchingTopicFilter,
+            final @NotNull String topic,
+            final @NotNull String matchingTopicFilter,
             final @NotNull String notMatchingTopicFilter) {
 
         final MqttSubscription subscription1 =
@@ -386,7 +390,9 @@ void cancel_partiallyUnsubscribedFlow() {
             "1/a/b, 1/+/#, 2/a/b, 2/+/#", "1/a/b, 1/#, 2/a/b, 2/#"
     })
     void suback_error(
-            final @NotNull String topic, final @NotNull String matchingTopicFilter, final @NotNull String topic2,
+            final @NotNull String topic,
+            final @NotNull String matchingTopicFilter,
+            final @NotNull String topic2,
             final @NotNull String matchingTopicFilter2) {
 
         final MqttSubscribedPublishFlow flow = mockSubscriptionFlow(matchingTopicFilter);
@@ -422,7 +428,9 @@ void suback_error(
             "1/a/b, 1/+/#, 2/a/b, 2/+/#", "1/a/b, 1/#, 2/a/b, 2/#"
     })
     void suback_error_noFlow(
-            final @NotNull String topic, final @NotNull String matchingTopicFilter, final @NotNull String topic2,
+            final @NotNull String topic,
+            final @NotNull String matchingTopicFilter,
+            final @NotNull String topic2,
             final @NotNull String matchingTopicFilter2) {
 
         final MqttSubscription subscription1 =
@@ -489,7 +497,9 @@ void suback_error_doesNotUnsubscribe_noFlow(
     @ParameterizedTest
     @CsvSource({"a/b, a/b/c, +/b/c, +/+/+", "a/b/c/d, a/b/c/d/e, +/b//d/ec, +/+/+/+/+"})
     void findMatching_matchingMultipleButNotAllLevels(
-            final @NotNull String topic, final @NotNull String filter1, final @NotNull String filter2,
+            final @NotNull String topic,
+            final @NotNull String filter1,
+            final @NotNull String filter2,
             final @NotNull String filter3) {
 
         final MqttSubscription subscription1 = new MqttSubscriptionBuilder.Default().topicFilter(filter1).build();
diff --git a/src/test/java/com/hivemq/client/rx/FlowableWithSingleItem.java b/src/test/java/com/hivemq/client/rx/FlowableWithSingleItem.java
index 1abeaeef0..2018e9d7e 100644
--- a/src/test/java/com/hivemq/client/rx/FlowableWithSingleItem.java
+++ b/src/test/java/com/hivemq/client/rx/FlowableWithSingleItem.java
@@ -58,7 +58,8 @@ private static class SingleItemSubscriber<F, S> implements FlowableSubscriber<F>
         private @Nullable Subscription subscription;
 
         SingleItemSubscriber(
-                final @NotNull WithSingleSubscriber<? super F, ? super S> subscriber, final @NotNull S single,
+                final @NotNull WithSingleSubscriber<? super F, ? super S> subscriber,
+                final @NotNull S single,
                 final int index) {
 
             this.subscriber = subscriber;
diff --git a/src/test/java/com/hivemq/client/rx/FlowableWithSingleSplit.java b/src/test/java/com/hivemq/client/rx/FlowableWithSingleSplit.java
index 9c87cbc5a..f13683c92 100644
--- a/src/test/java/com/hivemq/client/rx/FlowableWithSingleSplit.java
+++ b/src/test/java/com/hivemq/client/rx/FlowableWithSingleSplit.java
@@ -33,7 +33,8 @@ public class FlowableWithSingleSplit<U, F, S> extends FlowableWithSingle<F, S> {
     private final @NotNull Class<S> singleClass;
 
     public FlowableWithSingleSplit(
-            final @NotNull Flowable<U> source, final @NotNull Class<F> flowableClass,
+            final @NotNull Flowable<U> source,
+            final @NotNull Class<F> flowableClass,
             final @NotNull Class<S> singleClass) {
 
         this.source = source;
@@ -59,7 +60,8 @@ private static class SplitSubscriber<U, F, S> implements Subscriber<U>, Subscrip
         private @Nullable Subscription subscription;
 
         SplitSubscriber(
-                final @NotNull Subscriber<? super F> subscriber, final @NotNull Class<F> flowableClass,
+                final @NotNull Subscriber<? super F> subscriber,
+                final @NotNull Class<F> flowableClass,
                 final @NotNull Class<S> singleClass) {
 
             this.subscriber = subscriber;
diff --git a/src/test/java/com/hivemq/client/rx/FlowableWithSingleTest.java b/src/test/java/com/hivemq/client/rx/FlowableWithSingleTest.java
index 300657f26..1ea70e94d 100644
--- a/src/test/java/com/hivemq/client/rx/FlowableWithSingleTest.java
+++ b/src/test/java/com/hivemq/client/rx/FlowableWithSingleTest.java
@@ -865,9 +865,12 @@ public void onError(final @NotNull Throwable t) {}
     }
 
     private @NotNull CompletableFuture<StringBuilder> subscribeSingleFuture(
-            final int args, final @NotNull FlowableWithSingle<String, StringBuilder> flowableWithSingle,
-            final @NotNull AtomicInteger onNextCounter, final @NotNull AtomicInteger onErrorCounter,
-            final @NotNull AtomicInteger onCompleteCounter, final @NotNull CountDownLatch latch) {
+            final int args,
+            final @NotNull FlowableWithSingle<String, StringBuilder> flowableWithSingle,
+            final @NotNull AtomicInteger onNextCounter,
+            final @NotNull AtomicInteger onErrorCounter,
+            final @NotNull AtomicInteger onCompleteCounter,
+            final @NotNull CountDownLatch latch) {
 
         switch (args) {
             case 0:
@@ -929,8 +932,10 @@ public void onError(final @NotNull Throwable t) {
     }
 
     private @NotNull CompletableFuture<StringBuilder> subscribeSingleFuture(
-            final int args, final @NotNull FlowableWithSingle<String, StringBuilder> flowableWithSingle,
-            final @NotNull AtomicInteger onNextCounter, final @NotNull AtomicInteger onErrorCounter,
+            final int args,
+            final @NotNull FlowableWithSingle<String, StringBuilder> flowableWithSingle,
+            final @NotNull AtomicInteger onNextCounter,
+            final @NotNull AtomicInteger onErrorCounter,
             final @NotNull AtomicInteger onCompleteCounter) {
 
         return subscribeSingleFuture(
diff --git a/src/test/java/com/hivemq/client/util/TestKeyStoreGenerator.java b/src/test/java/com/hivemq/client/util/TestKeyStoreGenerator.java
index e87556cb1..2f8474508 100644
--- a/src/test/java/com/hivemq/client/util/TestKeyStoreGenerator.java
+++ b/src/test/java/com/hivemq/client/util/TestKeyStoreGenerator.java
@@ -51,7 +51,9 @@ public TestKeyStoreGenerator() {
     }
 
     public File generateKeyStore(
-            final String name, final String keystoreType, final String keyStorePassword,
+            final String name,
+            final String keystoreType,
+            final String keyStorePassword,
             final String privateKeyPassword) throws Exception {
 
         final KeyStore ks = KeyStore.getInstance(keystoreType);