addressed PR change requests

Author: yannick

build.gradle.kts

@@ -148,6 +148,12 @@ dependencies {
     integrationTestImplementation("org.awaitility:awaitility:${property("awaitility.version")}")
 }
 
+tasks.named<JavaCompile>("compileIntegrationTestJava") {
+    javaCompiler.set(javaToolchains.compilerFor {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    })
+}
+
 val integrationTest by tasks.registering(Test::class) {
     group = "verification"
     description = "Runs integration tests."
@@ -162,11 +168,6 @@ val integrationTest by tasks.registering(Test::class) {
 
 tasks.check { dependsOn(integrationTest) }
 
-tasks.named<JavaCompile>("compileIntegrationTestJava").configure {
-    javaCompiler.set(javaToolchains.compilerFor {
-        languageVersion.set(JavaLanguageVersion.of(11))
-    })
-}
 /* ******************** jars ******************** */
 
 allprojects {

src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectView.java

@@ -22,15 +22,12 @@
 import com.hivemq.client.internal.mqtt.message.auth.mqtt3.Mqtt3SimpleAuthView;
 import com.hivemq.client.internal.mqtt.message.connect.MqttConnect;
 import com.hivemq.client.internal.mqtt.message.connect.MqttConnectRestrictions;
-import com.hivemq.client.internal.mqtt.message.connect.MqttConnectRestrictionsBuilder;
 import com.hivemq.client.internal.mqtt.message.publish.MqttWillPublish;
 import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishView;
-import com.hivemq.client.internal.util.Checks;
 import com.hivemq.client.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth;
 import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect;
 import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnectRestrictions;
 import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish;
-import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictions;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -42,28 +39,28 @@
 @Immutable
 public class Mqtt3ConnectView implements Mqtt3Connect {
 
-    public static final @NotNull Mqtt3ConnectView DEFAULT = of(DEFAULT_KEEP_ALIVE, DEFAULT_CLEAN_SESSION, null, null, MqttConnectRestrictions.DEFAULT);
+    public static final @NotNull Mqtt3ConnectView DEFAULT =
+            of(DEFAULT_KEEP_ALIVE, DEFAULT_CLEAN_SESSION, MqttConnectRestrictions.DEFAULT, null, null);
 
     private static @NotNull MqttConnect delegate(
             final int keepAlive,
             final boolean cleanSession,
+            final @NotNull MqttConnectRestrictions restrictions,
             final @Nullable MqttSimpleAuth simpleAuth,
-            final @Nullable MqttWillPublish willPublish,
-            final @NotNull MqttConnectRestrictions restrictions) {
+            final @Nullable MqttWillPublish willPublish) {
 
-        return new MqttConnect(keepAlive, cleanSession, cleanSession ? 0 : MqttConnect.NO_SESSION_EXPIRY,
-                restrictions, simpleAuth, null, willPublish,
-                MqttUserPropertiesImpl.NO_USER_PROPERTIES);
+        return new MqttConnect(keepAlive, cleanSession, cleanSession ? 0 : MqttConnect.NO_SESSION_EXPIRY, restrictions,
+                simpleAuth, null, willPublish, MqttUserPropertiesImpl.NO_USER_PROPERTIES);
     }
 
     static @NotNull Mqtt3ConnectView of(
             final int keepAlive,
             final boolean cleanSession,
+            final @NotNull MqttConnectRestrictions restrictions,
             final @Nullable MqttSimpleAuth simpleAuth,
-            final @Nullable MqttWillPublish willPublish,
-            final @NotNull MqttConnectRestrictions mqttConnectRestrictions) {
+            final @Nullable MqttWillPublish willPublish) {
 
-        return new Mqtt3ConnectView(delegate(keepAlive, cleanSession, simpleAuth, willPublish, mqttConnectRestrictions));
+        return new Mqtt3ConnectView(delegate(keepAlive, cleanSession, restrictions, simpleAuth, willPublish));
     }
 
     public static @NotNull Mqtt3ConnectView of(final @NotNull MqttConnect delegate) {
@@ -123,7 +120,8 @@ public boolean isCleanSession() {
     private @NotNull String toAttributeString() {
         final Mqtt3SimpleAuth simpleAuth = getRawSimpleAuth();
         final Mqtt3Publish willPublish = getRawWillPublish();
-        return "keepAlive=" + getKeepAlive() + ", cleanSession=" + isCleanSession() +
+        final Mqtt3ConnectRestrictions restrictions = getRestrictions();
+        return "keepAlive=" + getKeepAlive() + ", cleanSession=" + isCleanSession() + ", restrictions=" + restrictions +
                 ((simpleAuth == null) ? "" : ", simpleAuth=" + simpleAuth) +
                 ((willPublish == null) ? "" : ", willPublish=" + willPublish);
     }

src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectViewBuilder.java

@@ -29,9 +29,7 @@
 import com.hivemq.client.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth;
 import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnectBuilder;
 import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnectRestrictions;
-import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnectRestrictionsBuilder;
 import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish;
-import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictions;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -44,19 +42,19 @@ public abstract class Mqtt3ConnectViewBuilder<B extends Mqtt3ConnectViewBuilder<
 
     private int keepAliveSeconds = Mqtt3ConnectView.DEFAULT_KEEP_ALIVE;
     private boolean cleanSession = Mqtt3ConnectView.DEFAULT_CLEAN_SESSION;
+    private @NotNull MqttConnectRestrictions restrictions = MqttConnectRestrictions.DEFAULT;
     private @Nullable MqttSimpleAuth simpleAuth;
     private @Nullable MqttWillPublish willPublish;
-    private @NotNull MqttConnectRestrictions restrictions = MqttConnectRestrictions.DEFAULT;
 
     Mqtt3ConnectViewBuilder() {}
 
     Mqtt3ConnectViewBuilder(final @NotNull Mqtt3ConnectView connect) {
         final MqttConnect delegate = connect.getDelegate();
         keepAliveSeconds = delegate.getKeepAlive();
         cleanSession = delegate.isCleanStart();
+        restrictions = delegate.getRestrictions();
         simpleAuth = delegate.getRawSimpleAuth();
         willPublish = delegate.getRawWillPublish();
-        restrictions = delegate.getRestrictions();
     }
 
     abstract @NotNull B self();
@@ -106,7 +104,7 @@ public abstract class Mqtt3ConnectViewBuilder<B extends Mqtt3ConnectViewBuilder<
     }
 
     public @NotNull Mqtt3ConnectView build() {
-        return Mqtt3ConnectView.of(keepAliveSeconds, cleanSession, simpleAuth, willPublish, restrictions);
+        return Mqtt3ConnectView.of(keepAliveSeconds, cleanSession, restrictions, simpleAuth, willPublish);
     }
 
     public static class Default extends Mqtt3ConnectViewBuilder<Default> implements Mqtt3ConnectBuilder {

src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilderBase.java

@@ -22,9 +22,6 @@
 import com.hivemq.client.mqtt.mqtt3.message.auth.Mqtt3SimpleAuthBuilder;
 import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish;
 import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3WillPublishBuilder;
-import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect;
-import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictions;
-import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictionsBuilder;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -71,6 +68,7 @@ public interface Mqtt3ConnectBuilderBase<B extends Mqtt3ConnectBuilderBase<B>> {
      *
      * @param restrictions the restrictions from the client.
      * @return the builder.
+     * @since 1.3
      */
     @CheckReturnValue
     @NotNull B restrictions(@NotNull Mqtt3ConnectRestrictions restrictions);
@@ -83,6 +81,7 @@ public interface Mqtt3ConnectBuilderBase<B extends Mqtt3ConnectBuilderBase<B>> {
      *
      * @return the fluent builder for the restrictions.
      * @see #restrictions(Mqtt3ConnectRestrictions)
+     * @since 1.3
      */
     @CheckReturnValue
     Mqtt3ConnectRestrictionsBuilder.@NotNull Nested<? extends B> restrictions();

src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnectRestrictionsBuilderBase.java

@@ -37,7 +37,6 @@ public interface Mqtt3ConnectRestrictionsBuilderBase<B extends Mqtt3ConnectRestr
      *
      * @param receiveMaximum the send maximum.
      * @return the builder.
-     * @since 1.3
      */
     @CheckReturnValue
     @NotNull B sendMaximum(int receiveMaximum);
@@ -49,7 +48,6 @@ public interface Mqtt3ConnectRestrictionsBuilderBase<B extends Mqtt3ConnectRestr
      *
      * @param maximumPacketSize the maximum packet size for sending.
      * @return the builder.
-     * @since 1.3
      */
     @CheckReturnValue
     @NotNull B sendMaximumPacketSize(int maximumPacketSize);