refactoring

Author: JavaSaBr

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

@@ -12,7 +12,7 @@ public enum ConnectAckReasonCode {
     /**
      * The Connection is accepted.
      */
-    SUCCESSFUL((byte) 0x00, (byte) 0x00),
+    SUCCESS((byte) 0x00, (byte) 0x00),
 
     // WITH REASONS BELOW SERVER MUST CLOSE CONNECTION
 
@@ -141,7 +141,7 @@ public enum ConnectAckReasonCode {
     public static @NotNull ConnectAckReasonCode ofMqtt311(int reasonCode) {
         switch (reasonCode) {
             case 0x00:
-                return SUCCESSFUL;
+                return SUCCESS;
             case 0x01:
                 return UNSUPPORTED_PROTOCOL_VERSION;
             case 0x02:

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

@@ -13,7 +13,7 @@ public enum PublishAckReasonCode {
      * The message is accepted. Publication of the QoS 1
      * message proceeds.
      */
-    SUCCESSFUL((byte) 0x00),
+    SUCCESS((byte) 0x00),
     /**
      * The message is accepted but there are no
      * subscribers. This is sent only by the Server. If the

src/main/java/com/ss/mqtt/broker/network/MqttClient.java

@@ -13,8 +13,6 @@
 import lombok.extern.log4j.Log4j2;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Objects;
-
 @Log4j2
 @Getter
 @EqualsAndHashCode(of = "clientId")
@@ -65,7 +63,7 @@ private void onConnected(@NotNull ConnectInPacket connect) {
 
         connection.send(getPacketOutFactory().newConnectAck(
             this,
-            ConnectAckReasonCode.SUCCESSFUL,
+            ConnectAckReasonCode.SUCCESS,
             false,
             clientId,
             sessionExpiryInterval,

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

@@ -55,6 +55,7 @@ public class AuthenticationInPacket extends MqttReadablePacket {
 
     private @NotNull AuthenticateReasonCode reasonCode;
 
+    // properties
     private @NotNull String reason;
     private @NotNull String authenticationMethod;
 

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

@@ -267,7 +267,7 @@ public class ConnectAckInPacket extends MqttReadablePacket {
     public ConnectAckInPacket(byte info) {
         super(info);
         this.userProperties = Array.empty();
-        this.reasonCode = ConnectAckReasonCode.SUCCESSFUL;
+        this.reasonCode = ConnectAckReasonCode.SUCCESS;
         this.maximumQos = QoS.EXACTLY_ONCE_DELIVERY;
         this.sessionExpiryInterval = MqttPropertyConstants.SESSION_EXPIRY_INTERVAL_DEFAULT;
         this.receiveMax = MqttPropertyConstants.RECEIVE_MAXIMUM_DEFAULT;

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

@@ -57,6 +57,7 @@ public class DisconnectInPacket extends MqttReadablePacket {
 
     private @NotNull DisconnectReasonCode reasonCode;
 
+    // properties
     private @NotNull String reason;
     private @NotNull String serverReference;
 

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

@@ -51,7 +51,7 @@ public class PublishAckInPacket extends MqttReadablePacket {
 
     public PublishAckInPacket(byte info) {
         super(info);
-        this.reasonCode = PublishAckReasonCode.SUCCESSFUL;
+        this.reasonCode = PublishAckReasonCode.SUCCESS;
         this.reason = StringUtils.EMPTY;
     }
 

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

@@ -44,10 +44,11 @@ public class PublishCompleteInPacket extends MqttReadablePacket {
     );
 
     private @NotNull PublishCompletedReasonCode reasonCode;
-    private @NotNull String reason;
-
     private int packetId;
 
+    // properties
+    private @NotNull String reason;
+
     public PublishCompleteInPacket(byte info) {
         super(info);
         this.reasonCode = PublishCompletedReasonCode.SUCCESS;

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

@@ -230,11 +230,6 @@ public class PublishInPacket extends MqttReadablePacket {
      */
     private final boolean retained;
 
-    /**
-     * The list of subscription ids.
-     */
-    private @NotNull IntegerArray subscriptionIds;
-
     /**
      * The Topic Name identifies the information channel to which Payload data is published.
      * <p>
@@ -255,34 +250,23 @@ public class PublishInPacket extends MqttReadablePacket {
     private @NotNull String topicName;
 
     /**
-     * The response topic.
+     * The Packet Identifier field is only present in PUBLISH packets where the QoS level is 1 or 2. Section
+     * 2.2.1 provides more information about Packet Identifiers.
      */
-    private @NotNull String responseTopic;
+    private int packetId;
 
-    /**
-     * The content type.
-     */
-    private @NotNull String contentType;
+    private @NotNull byte[] payload;
 
-    /**
-     * The correlation data.
-     */
-    private @NotNull byte[] correlationData;
+    // properties
+    private @NotNull String responseTopic;
+    private @NotNull String contentType;
 
-    /**
-     * The payload data.
-     */
-    private @NotNull byte[] payload;
+    private @NotNull IntegerArray subscriptionIds;
 
-    /**
-     * The Packet Identifier field is only present in PUBLISH packets where the QoS level is 1 or 2. Section
-     * 2.2.1 provides more information about Packet Identifiers.
-     */
-    private int packetId;
+    private @NotNull byte[] correlationData;
 
     private long messageExpiryInterval = MqttPropertyConstants.MESSAGE_EXPIRY_INTERVAL_DEFAULT;
     private int topicAlias = MqttPropertyConstants.TOPIC_ALIAS_DEFAULT;
-
     private boolean payloadFormatIndicator = MqttPropertyConstants.PAYLOAD_FORMAT_INDICATOR_DEFAULT;
 
     public PublishInPacket(byte info) {

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

@@ -44,10 +44,11 @@ public class PublishReceivedInPacket extends MqttReadablePacket {
     );
 
     private @NotNull PublishReceivedReasonCode reasonCode;
-    private @NotNull String reason;
-
     private int packetId;
 
+    // properties
+    private @NotNull String reason;
+
     public PublishReceivedInPacket(byte info) {
         super(info);
         this.reasonCode = PublishReceivedReasonCode.SUCCESS;