[broker-25] improve logging

Author: JavaSaBr

build.gradle

@@ -43,6 +43,7 @@ allprojects {
         projectReactorVersion = "3.3.0.RELEASE"
         byteBuddyVersion = "1.10.2"
         objenesisVersion = "3.1"
+        gsonVersion = "2.8.6"
     }
 
     dependencies {
@@ -52,6 +53,7 @@ allprojects {
         implementation "org.springframework.boot:spring-boot-starter:$springbootVersion"
         implementation "org.springframework.boot:spring-boot-starter-log4j2:$springbootVersion"
         implementation "io.projectreactor:reactor-core:$projectReactorVersion"
+        implementation "com.google.code.gson:gson:$gsonVersion"
 
         compileOnly "org.jetbrains:annotations:$annotationVersion"
         compileOnly "org.projectlombok:lombok:$lombokVersion"

src/main/java/com/ss/mqtt/broker/handler/packet/in/DisconnetInPacketHandler.java

@@ -1,5 +1,6 @@
 package com.ss.mqtt.broker.handler.packet.in;
 
+import com.ss.mqtt.broker.model.reason.code.DisconnectReasonCode;
 import com.ss.mqtt.broker.network.client.MqttClient.UnsafeMqttClient;
 import com.ss.mqtt.broker.network.packet.in.DisconnectInPacket;
 import lombok.extern.log4j.Log4j2;
@@ -10,7 +11,15 @@ public class DisconnetInPacketHandler extends AbstractPacketHandler<UnsafeMqttCl
 
     @Override
     protected void handleImpl(@NotNull UnsafeMqttClient client, @NotNull DisconnectInPacket packet) {
-        log.info("Disconnect client {} with packet {}", client, packet);
+
+        var reasonCode = packet.getReasonCode();
+
+        if (reasonCode == DisconnectReasonCode.NORMAL_DISCONNECTION) {
+            log.info("Disconnect client {}", client);
+        } else {
+            log.error("Disconnect client {} by error reason {}", client, reasonCode);
+        }
+
         client.release().subscribe();
     }
 }

src/main/java/com/ss/mqtt/broker/handler/publish/out/Qos0PublishOutHandler.java

@@ -11,7 +11,7 @@ public class Qos0PublishOutHandler extends AbstractPublishOutHandler {
 
     @Override
     protected @NotNull QoS getQoS() {
-        return QoS.AT_MOST_ONCE_DELIVERY;
+        return QoS.AT_MOST_ONCE;
     }
 
     @Override

src/main/java/com/ss/mqtt/broker/handler/publish/out/Qos1PublishOutHandler.java

@@ -12,7 +12,7 @@ public class Qos1PublishOutHandler extends PersistentPublishOutHandler {
 
     @Override
     protected @NotNull QoS getQoS() {
-        return QoS.AT_LEAST_ONCE_DELIVERY;
+        return QoS.AT_LEAST_ONCE;
     }
 
     @Override

src/main/java/com/ss/mqtt/broker/handler/publish/out/Qos2PublishOutHandler.java

@@ -14,7 +14,7 @@ public final class Qos2PublishOutHandler extends PersistentPublishOutHandler {
 
     @Override
     protected @NotNull QoS getQoS() {
-        return QoS.EXACTLY_ONCE_DELIVERY;
+        return QoS.EXACTLY_ONCE;
     }
 
     @Override

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

@@ -2,7 +2,7 @@
 
 public interface MqttPropertyConstants {
 
-    QoS MAXIMUM_QOS_DEFAULT = QoS.EXACTLY_ONCE_DELIVERY;
+    QoS MAXIMUM_QOS_DEFAULT = QoS.EXACTLY_ONCE;
 
     int MAXIMUM_PROTOCOL_PACKET_SIZE = 256 * 1024 * 1024;
     int MAXIMUM_PACKET_ID = 0xFFFF;

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

@@ -8,15 +8,15 @@
 @Getter
 @RequiredArgsConstructor
 public enum QoS {
-    AT_MOST_ONCE_DELIVERY(SubscribeAckReasonCode.GRANTED_QOS_0),
-    AT_LEAST_ONCE_DELIVERY(SubscribeAckReasonCode.GRANTED_QOS_1),
-    EXACTLY_ONCE_DELIVERY(SubscribeAckReasonCode.GRANTED_QOS_2),
+    AT_MOST_ONCE(SubscribeAckReasonCode.GRANTED_QOS_0),
+    AT_LEAST_ONCE(SubscribeAckReasonCode.GRANTED_QOS_1),
+    EXACTLY_ONCE(SubscribeAckReasonCode.GRANTED_QOS_2),
     INVALID(SubscribeAckReasonCode.IMPLEMENTATION_SPECIFIC_ERROR);
 
     private static final QoS[] VALUES = values();
 
     public static @NotNull QoS of(int level) {
-        if (level < 0 || level > EXACTLY_ONCE_DELIVERY.ordinal()) {
+        if (level < 0 || level > EXACTLY_ONCE.ordinal()) {
             return INVALID;
         } else {
             return VALUES[level];

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

@@ -4,11 +4,9 @@
 import com.ss.mqtt.broker.model.topic.TopicFilter;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import lombok.ToString;
 import org.jetbrains.annotations.NotNull;
 
 @Getter
-@ToString
 @EqualsAndHashCode
 @RequiredArgsConstructor
 public class SubscribeTopicFilter {
@@ -51,4 +49,10 @@ public SubscribeTopicFilter(@NotNull String topicFilter, @NotNull QoS qos) {
     public SubscribeTopicFilter(@NotNull TopicFilter topicFilter, @NotNull QoS qos) {
         this(topicFilter, qos, SubscribeRetainHandling.SEND, true, true);
     }
+
+    @Override
+    public String toString() {
+        return "SubscribeTopicFilter(" + "topicFilter=" + topicFilter.getRawTopic() + ", qos=" + qos + ", retainHandling=" +
+            retainHandling + ", noLocal=" + noLocal + ", retainAsPublished=" + retainAsPublished + ')';
+    }
 }

src/main/java/com/ss/mqtt/broker/model/topic/AbstractTopic.java

@@ -4,11 +4,9 @@
 import com.ss.rlib.common.util.StringUtils;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import lombok.ToString;
 import org.jetbrains.annotations.NotNull;
 
 @Getter
-@ToString(of = "rawTopic")
 @EqualsAndHashCode(of = "rawTopic")
 public abstract class AbstractTopic {
 
@@ -48,4 +46,9 @@ static void checkTopic(@NotNull String topic) {
     int levelsCount() {
         return segments.length;
     }
+
+    @Override
+    public String toString() {
+        return rawTopic;
+    }
 }

src/main/java/com/ss/mqtt/broker/network/client/AbstractMqttClient.java

@@ -58,7 +58,7 @@ public AbstractMqttClient(@NotNull MqttConnection connection, @NotNull MqttClien
 
     @Override
     public void handle(@NotNull MqttReadablePacket packet) {
-        log.info("Handle received packet: {}", packet);
+        log.info("Handle received packet: {} : {}", packet.getName(), packet);
 
         var packetHandler = connection.getPacketHandlers()[packet.getPacketType()];