Merge remote-tracking branch 'github/feature-broker-26' into feature-broker-33

# Conflicts:
#	src/test/groovy/com/ss/mqtt/broker/test/integration/ConnectSubscribePublishTest.groovy

Author: JavaSaBr

src/main/java/com/ss/mqtt/broker/model/SubscribeTopicFilter.java

@@ -51,7 +51,7 @@ public SubscribeTopicFilter(@NotNull TopicFilter topicFilter, @NotNull QoS qos)
     }
 
     @Override
-    public String toString() {
+    public @NotNull String toString() {
         return "SubscribeTopicFilter(" + "topicFilter=" + topicFilter.getRawTopic() + ", qos=" + qos + ", retainHandling=" +
             retainHandling + ", noLocal=" + noLocal + ", retainAsPublished=" + retainAsPublished + ')';
     }

src/main/java/com/ss/mqtt/broker/network/packet/in/ConnectInPacket.java

@@ -282,12 +282,9 @@ protected void readVariableHeader(@NotNull MqttConnection connection, @NotNull B
         hasUserName = NumberUtils.isSetBit(flags, 7);
         hasPassword = NumberUtils.isSetBit(flags, 6);
 
-        if (mqttVersion.ordinal() < MqttVersion.MQTT_5.ordinal()) {
-
-            // for mqtt < 5 we cannot have password without user
-            if (!hasUserName && hasPassword) {
-                throw new ConnectionRejectException(ConnectAckReasonCode.BAD_USER_NAME_OR_PASSWORD);
-            }
+        // for mqtt < 5 we cannot have password without user
+        if (mqttVersion.ordinal() < MqttVersion.MQTT_5.ordinal() && !hasUserName && hasPassword) {
+            throw new ConnectionRejectException(ConnectAckReasonCode.BAD_USER_NAME_OR_PASSWORD);
         }
 
         willFlag = NumberUtils.isSetBit(flags, 2);

src/test/groovy/com/ss/mqtt/broker/test/integration/ConnectSubscribePublishTest.groovy

@@ -44,8 +44,8 @@ class ConnectSubscribePublishTest extends IntegrationSpecification {
             received.get().qos == MqttQos.AT_MOST_ONCE
             received.get().type == Mqtt3MessageType.PUBLISH
         cleanup:
-            subscriber.disconnect()
-            publisher.disconnect()
+            subscriber.disconnect().join()
+            publisher.disconnect().join()
     }
 
     def "publisher should publish message QoS 0 using mqtt 5"() {
@@ -77,8 +77,8 @@ class ConnectSubscribePublishTest extends IntegrationSpecification {
             received.get().qos == MqttQos.AT_MOST_ONCE
             received.get().type == Mqtt5MessageType.PUBLISH
         cleanup:
-            subscriber.disconnect()
-            publisher.disconnect()
+            subscriber.disconnect().join()
+            publisher.disconnect().join()
     }
 
     def "publisher should publish message QoS 1 using mqtt 3.1.1"() {
@@ -110,8 +110,8 @@ class ConnectSubscribePublishTest extends IntegrationSpecification {
             received.get().qos == MqttQos.AT_LEAST_ONCE
             received.get().type == Mqtt3MessageType.PUBLISH
         cleanup:
-            subscriber.disconnect()
-            publisher.disconnect()
+            subscriber.disconnect().join()
+            publisher.disconnect().join()
     }
 
     def "publisher should publish message QoS 1 using mqtt 5"() {
@@ -177,8 +177,8 @@ class ConnectSubscribePublishTest extends IntegrationSpecification {
             received.get().qos == MqttQos.EXACTLY_ONCE
             received.get().type == Mqtt3MessageType.PUBLISH
         cleanup:
-            subscriber.disconnect()
-            publisher.disconnect()
+            subscriber.disconnect().join()
+            publisher.disconnect().join()
     }
 
     def "publisher should publish message QoS 2 using mqtt 5"() {
@@ -211,8 +211,8 @@ class ConnectSubscribePublishTest extends IntegrationSpecification {
             received.get().qos == MqttQos.EXACTLY_ONCE
             received.get().type == Mqtt5MessageType.PUBLISH
         cleanup:
-            subscriber.disconnect()
-            publisher.disconnect()
+            subscriber.disconnect().join()
+            publisher.disconnect().join()
     }
 
     def publish(Mqtt5AsyncClient publisher, String subscriberId, MqttQos qos) {