Switched from Moquette's MQTT codec to Netty's MQTT codec ones

broker/src/main/java/io/moquette/interception/messages/InterceptAbstractMessage.java

@@ -15,27 +15,28 @@
  */
 package io.moquette.interception.messages;
 
-import io.moquette.parser.proto.messages.AbstractMessage;
+import io.netty.handler.codec.mqtt.MqttMessage;
+import io.netty.handler.codec.mqtt.MqttQoS;
 
 /**
  * @author Wagner Macedo
  */
 public abstract class InterceptAbstractMessage implements InterceptMessage {
-    private final AbstractMessage msg;
+    private final MqttMessage msg;
 
-    InterceptAbstractMessage(AbstractMessage msg) {
+    InterceptAbstractMessage(MqttMessage msg) {
         this.msg = msg;
     }
 
     public boolean isRetainFlag() {
-        return msg.isRetainFlag();
+        return msg.fixedHeader().isRetain();
     }
 
     public boolean isDupFlag() {
-        return msg.isDupFlag();
+        return msg.fixedHeader().isDup();
     }
 
-    public AbstractMessage.QOSType getQos() {
-        return msg.getQos();
+    public MqttQoS getQos() {
+        return msg.fixedHeader().qosLevel();
     }
 }

broker/src/main/java/io/moquette/interception/messages/InterceptConnectMessage.java

@@ -1,71 +1,71 @@
 package io.moquette.interception.messages;
 
-import io.moquette.parser.proto.messages.ConnectMessage;
+import io.netty.handler.codec.mqtt.MqttConnectMessage;
 
 /**
  * @author Wagner Macedo
  */
 public class InterceptConnectMessage extends InterceptAbstractMessage {
-    private final ConnectMessage msg;
+    private final MqttConnectMessage msg;
 
-    public InterceptConnectMessage(ConnectMessage msg) {
+    public InterceptConnectMessage(MqttConnectMessage msg) {
         super(msg);
         this.msg = msg;
     }
 
     public String getClientID() {
-        return msg.getClientID();
+        return msg.payload().clientIdentifier();
     }
 
     public boolean isCleanSession() {
-        return msg.isCleanSession();
+        return msg.variableHeader().isCleanSession();
     }
 
     public int getKeepAlive() {
-        return msg.getKeepAlive();
+        return msg.variableHeader().keepAliveTimeSeconds();
     }
 
     public boolean isPasswordFlag() {
-        return msg.isPasswordFlag();
+        return msg.variableHeader().hasPassword();
     }
 
     public byte getProtocolVersion() {
-        return msg.getProtocolVersion();
+        return (byte) msg.variableHeader().version();
     }
 
     public String getProtocolName() {
-        return msg.getProtocolName();
+        return msg.variableHeader().name();
     }
 
     public boolean isUserFlag() {
-        return msg.isUserFlag();
+        return msg.variableHeader().hasUserName();
     }
 
     public boolean isWillFlag() {
-        return msg.isWillFlag();
+        return msg.variableHeader().isWillFlag();
     }
 
     public byte getWillQos() {
-        return msg.getWillQos();
+        return (byte) msg.variableHeader().willQos();
     }
 
     public boolean isWillRetain() {
-        return msg.isWillRetain();
+        return msg.variableHeader().isWillRetain();
     }
 
     public String getUsername() {
-        return msg.getUsername();
+        return msg.payload().userName();
     }
 
     public byte[] getPassword() {
-        return msg.getPassword();
+        return msg.payload().password().getBytes();
     }
 
     public String getWillTopic() {
-        return msg.getWillTopic();
+        return msg.payload().willTopic();
     }
 
     public byte[] getWillMessage() {
-        return msg.getWillMessage();
+        return msg.payload().willMessage().getBytes();
     }
 }

broker/src/main/java/io/moquette/interception/messages/InterceptPublishMessage.java

@@ -1,18 +1,17 @@
 package io.moquette.interception.messages;
 
-import io.moquette.parser.proto.messages.PublishMessage;
-
-import java.nio.ByteBuffer;
+import io.netty.buffer.ByteBuf;
+import io.netty.handler.codec.mqtt.MqttPublishMessage;
 
 /**
  * @author Wagner Macedo
  */
 public class InterceptPublishMessage extends InterceptAbstractMessage {
-    private final PublishMessage msg;
+    private final MqttPublishMessage msg;
     private final String clientID;
     private final String username;
     
-    public InterceptPublishMessage(PublishMessage msg, String clientID, String username) {
+    public InterceptPublishMessage(MqttPublishMessage msg, String clientID, String username) {
         super(msg);
         this.msg = msg;
         this.clientID = clientID;
@@ -20,11 +19,11 @@ public class InterceptPublishMessage extends InterceptAbstractMessage {
     }
 
     public String getTopicName() {
-        return msg.getTopicName();
+        return msg.variableHeader().topicName();
     }
 
-    public ByteBuffer getPayload() {
-        return msg.getPayload();
+    public ByteBuf getPayload() {
+        return msg.payload();
     }
 
     public String getClientID() {

broker/src/main/java/io/moquette/interception/messages/InterceptSubscribeMessage.java

@@ -1,7 +1,7 @@
 package io.moquette.interception.messages;
 
-import io.moquette.parser.proto.messages.AbstractMessage;
 import io.moquette.spi.impl.subscriptions.Subscription;
+import io.netty.handler.codec.mqtt.MqttQoS;
 
 /**
  * @author Wagner Macedo
@@ -19,7 +19,7 @@ public class InterceptSubscribeMessage implements InterceptMessage {
         return subscription.getClientId();
     }
 
-    public AbstractMessage.QOSType getRequestedQos() {
+    public MqttQoS getRequestedQos() {
         return subscription.getRequestedQos();
     }