Fix missing reasonCode in MqttMessages (#591)

* Bump version * Put reasonCode on first place of toString
hivemq · Aug 28, 2023 · 4232241 · 4232241
1 parent 338f338
commit 4232241
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
-version=1.3.1
-prevVersion=1.3.0
+version=1.3.2
+prevVersion=1.3.1
 #
 # main dependencies
 #

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
@@ -69,7 +69,7 @@ public MqttAuth(
 
     @Override
     protected @NotNull String toAttributeString() {
-        return "reasonCode= " + getReasonCode() + ", method=" + method +
+        return "reasonCode=" + getReasonCode() + ", method=" + method +
                 ((data == null) ? "" : ", data=" + data.remaining() + "byte") +
                 StringUtil.prepend(", ", super.toAttributeString());
     }

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
@@ -20,6 +20,7 @@
 import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl;
 import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl;
 import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties;
+import com.hivemq.client.internal.util.StringUtil;
 import com.hivemq.client.mqtt.mqtt5.message.publish.puback.Mqtt5PubAck;
 import com.hivemq.client.mqtt.mqtt5.message.publish.puback.Mqtt5PubAckReasonCode;
 import org.jetbrains.annotations.NotNull;
@@ -45,7 +46,7 @@ public MqttPubAck(
 
     @Override
     public @NotNull String toString() {
-        return "MqttPubAck{" + toAttributeString() + "}";
+        return "MqttPubAck{reasonCode=" + getReasonCode() + StringUtil.prepend(", ", super.toAttributeString()) + "}";
     }
 
     @Override

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
@@ -20,6 +20,7 @@
 import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl;
 import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl;
 import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties;
+import com.hivemq.client.internal.util.StringUtil;
 import com.hivemq.client.mqtt.mqtt5.message.publish.pubcomp.Mqtt5PubComp;
 import com.hivemq.client.mqtt.mqtt5.message.publish.pubcomp.Mqtt5PubCompReasonCode;
 import org.jetbrains.annotations.NotNull;
@@ -45,7 +46,7 @@ public MqttPubComp(
 
     @Override
     public @NotNull String toString() {
-        return "MqttPubComp{" + toAttributeString() + "}";
+        return "MqttPubComp{reasonCode=" + getReasonCode() + StringUtil.prepend(", ", super.toAttributeString()) + "}";
     }
 
     @Override

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
@@ -20,6 +20,7 @@
 import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl;
 import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl;
 import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties;
+import com.hivemq.client.internal.util.StringUtil;
 import com.hivemq.client.mqtt.mqtt5.message.publish.pubrec.Mqtt5PubRec;
 import com.hivemq.client.mqtt.mqtt5.message.publish.pubrec.Mqtt5PubRecReasonCode;
 import org.jetbrains.annotations.NotNull;
@@ -45,7 +46,7 @@ public MqttPubRec(
 
     @Override
     public @NotNull String toString() {
-        return "MqttPubRec{" + toAttributeString() + "}";
+        return "MqttPubRec{reasonCode=" + getReasonCode() + StringUtil.prepend(", ", super.toAttributeString()) + "}";
     }
 
     @Override

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
@@ -20,6 +20,7 @@
 import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl;
 import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl;
 import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties;
+import com.hivemq.client.internal.util.StringUtil;
 import com.hivemq.client.mqtt.mqtt5.message.publish.pubrel.Mqtt5PubRel;
 import com.hivemq.client.mqtt.mqtt5.message.publish.pubrel.Mqtt5PubRelReasonCode;
 import org.jetbrains.annotations.NotNull;
@@ -45,7 +46,7 @@ public MqttPubRel(
 
     @Override
     public @NotNull String toString() {
-        return "MqttPubRel{" + toAttributeString() + "}";
+        return "MqttPubRel{reasonCode=" + getReasonCode() + StringUtil.prepend(", ", super.toAttributeString()) + "}";
     }
 
     @Override