Skip to content

Commit 4232241

Browse files
authored
Fix missing reasonCode in MqttMessages (#591)
* Bump version * Put reasonCode on first place of toString
1 parent 338f338 commit 4232241

File tree

6 files changed

+11
-7
lines changed

6 files changed

+11
-7
lines changed

gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
version=1.3.1
2-
prevVersion=1.3.0
1+
version=1.3.2
2+
prevVersion=1.3.1
33
#
44
# main dependencies
55
#

src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttAuth.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public MqttAuth(
6969

7070
@Override
7171
protected @NotNull String toAttributeString() {
72-
return "reasonCode= " + getReasonCode() + ", method=" + method +
72+
return "reasonCode=" + getReasonCode() + ", method=" + method +
7373
((data == null) ? "" : ", data=" + data.remaining() + "byte") +
7474
StringUtil.prepend(", ", super.toAttributeString());
7575
}

src/main/java/com/hivemq/client/internal/mqtt/message/publish/puback/MqttPubAck.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl;
2121
import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl;
2222
import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties;
23+
import com.hivemq.client.internal.util.StringUtil;
2324
import com.hivemq.client.mqtt.mqtt5.message.publish.puback.Mqtt5PubAck;
2425
import com.hivemq.client.mqtt.mqtt5.message.publish.puback.Mqtt5PubAckReasonCode;
2526
import org.jetbrains.annotations.NotNull;
@@ -45,7 +46,7 @@ public MqttPubAck(
4546

4647
@Override
4748
public @NotNull String toString() {
48-
return "MqttPubAck{" + toAttributeString() + "}";
49+
return "MqttPubAck{reasonCode=" + getReasonCode() + StringUtil.prepend(", ", super.toAttributeString()) + "}";
4950
}
5051

5152
@Override

src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubcomp/MqttPubComp.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl;
2121
import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl;
2222
import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties;
23+
import com.hivemq.client.internal.util.StringUtil;
2324
import com.hivemq.client.mqtt.mqtt5.message.publish.pubcomp.Mqtt5PubComp;
2425
import com.hivemq.client.mqtt.mqtt5.message.publish.pubcomp.Mqtt5PubCompReasonCode;
2526
import org.jetbrains.annotations.NotNull;
@@ -45,7 +46,7 @@ public MqttPubComp(
4546

4647
@Override
4748
public @NotNull String toString() {
48-
return "MqttPubComp{" + toAttributeString() + "}";
49+
return "MqttPubComp{reasonCode=" + getReasonCode() + StringUtil.prepend(", ", super.toAttributeString()) + "}";
4950
}
5051

5152
@Override

src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrec/MqttPubRec.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl;
2121
import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl;
2222
import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties;
23+
import com.hivemq.client.internal.util.StringUtil;
2324
import com.hivemq.client.mqtt.mqtt5.message.publish.pubrec.Mqtt5PubRec;
2425
import com.hivemq.client.mqtt.mqtt5.message.publish.pubrec.Mqtt5PubRecReasonCode;
2526
import org.jetbrains.annotations.NotNull;
@@ -45,7 +46,7 @@ public MqttPubRec(
4546

4647
@Override
4748
public @NotNull String toString() {
48-
return "MqttPubRec{" + toAttributeString() + "}";
49+
return "MqttPubRec{reasonCode=" + getReasonCode() + StringUtil.prepend(", ", super.toAttributeString()) + "}";
4950
}
5051

5152
@Override

src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrel/MqttPubRel.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl;
2121
import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl;
2222
import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties;
23+
import com.hivemq.client.internal.util.StringUtil;
2324
import com.hivemq.client.mqtt.mqtt5.message.publish.pubrel.Mqtt5PubRel;
2425
import com.hivemq.client.mqtt.mqtt5.message.publish.pubrel.Mqtt5PubRelReasonCode;
2526
import org.jetbrains.annotations.NotNull;
@@ -45,7 +46,7 @@ public MqttPubRel(
4546

4647
@Override
4748
public @NotNull String toString() {
48-
return "MqttPubRel{" + toAttributeString() + "}";
49+
return "MqttPubRel{reasonCode=" + getReasonCode() + StringUtil.prepend(", ", super.toAttributeString()) + "}";
4950
}
5051

5152
@Override

0 commit comments

Comments
 (0)