Added encode/decode for Unsubscribe message

netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MQTTDecoder.java

@@ -24,6 +24,7 @@ public class MQTTDecoder extends ByteToMessageDecoder {
        m_decoderMap.put(AbstractMessage.PUBACK, new PubAckDecoder());
        m_decoderMap.put(AbstractMessage.SUBSCRIBE, new SubscribeDecoder());
        m_decoderMap.put(AbstractMessage.SUBACK, new SubAckDecoder());
+       m_decoderMap.put(AbstractMessage.UNSUBSCRIBE, new UnsubscribeDecoder());
     }
 
     @Override

netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MQTTEncoder.java

@@ -23,6 +23,7 @@ public class MQTTEncoder extends MessageToByteEncoder<AbstractMessage> {
        m_encoderMap.put(AbstractMessage.PUBACK, new PubAckEncoder());
        m_encoderMap.put(AbstractMessage.SUBSCRIBE, new SubscribeEncoder());
        m_encoderMap.put(AbstractMessage.SUBACK, new SubAckEncoder());
+       m_encoderMap.put(AbstractMessage.UNSUBSCRIBE, new UnsubscribeEncoder());
     }
     
     @Override

netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeDecoder.java

@@ -0,0 +1,43 @@
+package org.dna.mqtt.moquette.parser.netty;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.CorruptedFrameException;
+import java.util.List;
+import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
+import org.dna.mqtt.moquette.proto.messages.UnsubscribeMessage;
+
+/**
+ *
+ * @author andrea
+ */
+class UnsubscribeDecoder extends DemuxDecoder {
+
+    @Override
+    void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
+        //Common decoding part
+        in.resetReaderIndex();
+        UnsubscribeMessage message = new UnsubscribeMessage();
+        if (!decodeCommonHeader(message, in)) {
+            in.resetReaderIndex();
+            return;
+        }
+        
+        //check qos level
+        if (message.getQos() != AbstractMessage.QOSType.LEAST_ONE) {
+            throw new CorruptedFrameException("Found an Usubscribe message with qos other than LEAST_ONE, was: " + message.getQos());
+        }
+            
+        int start = in.readerIndex();
+        //read  messageIDs
+        message.setMessageID(in.readUnsignedShort());
+        int readed = in.readerIndex()- start;
+        while (readed < message.getRemainingLength()) {
+            message.addTopic(Utils.decodeString(in));
+            readed = in.readerIndex()- start;
+        }
+        
+        out.add(message);
+    }
+    
+}

netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeEncoder.java

@@ -0,0 +1,42 @@
+package org.dna.mqtt.moquette.parser.netty;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
+import org.dna.mqtt.moquette.proto.messages.UnsubscribeMessage;
+
+
+/**
+ *
+ * @author andrea
+ */
+class UnsubscribeEncoder extends DemuxEncoder<UnsubscribeMessage> {
+
+    @Override
+    protected void encode(ChannelHandlerContext chc, UnsubscribeMessage message, ByteBuf out) {
+        if (message.topics().isEmpty()) {
+            throw new IllegalArgumentException("Found an unsubscribe message with empty topics");
+        }
+
+        if (message.getQos() != AbstractMessage.QOSType.LEAST_ONE) {
+            throw new IllegalArgumentException("Expected a message with QOS 1, found " + message.getQos());
+        }
+        
+        ByteBuf variableHeaderBuff = chc.alloc().buffer(4);
+        variableHeaderBuff.writeShort(message.getMessageID());
+        for (String topic : message.topics()) {
+            variableHeaderBuff.writeBytes(Utils.encodeString(topic));
+        }
+        
+        int variableHeaderSize = variableHeaderBuff.readableBytes();
+        byte flags = Utils.encodeFlags(message);
+        ByteBuf buff = chc.alloc().buffer(2 + variableHeaderSize);
+
+        buff.writeByte(AbstractMessage.UNSUBSCRIBE << 4 | flags);
+        buff.writeBytes(Utils.encodeRemainingLength(variableHeaderSize));
+        buff.writeBytes(variableHeaderBuff);
+
+        out.writeBytes(buff);
+    }
+    
+}