Moved project package from org.eclipse.moquette to io.moquette

netty_parser/src/main/java/io/moquette/parser/netty/ConnAckDecoder.java

@@ -1,9 +1,9 @@
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import org.eclipse.moquette.proto.messages.ConnAckMessage;
+import io.moquette.proto.messages.ConnAckMessage;
 
 /**
  *

netty_parser/src/main/java/io/moquette/parser/netty/ConnAckEncoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
-import org.eclipse.moquette.proto.messages.ConnAckMessage;
+import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.proto.messages.ConnAckMessage;
 
 /**
  *

netty_parser/src/main/java/io/moquette/parser/netty/ConnectDecoder.java

@@ -13,8 +13,9 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
+import io.moquette.proto.messages.ConnectMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.handler.codec.CorruptedFrameException;
 import io.netty.util.Attribute;
@@ -22,10 +23,8 @@ import io.netty.util.AttributeKey;
 import io.netty.util.AttributeMap;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
-import static org.eclipse.moquette.parser.netty.Utils.VERSION_3_1;
-import static org.eclipse.moquette.parser.netty.Utils.VERSION_3_1_1;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
-import org.eclipse.moquette.proto.messages.ConnectMessage;
+
+import io.moquette.proto.messages.AbstractMessage;
 
 /**
  *
@@ -69,7 +68,7 @@ public class ConnectDecoder extends DemuxDecoder {
                 }
                 message.setProtocolName(protoName);
                 
-                versionAttr.set((int) VERSION_3_1);
+                versionAttr.set((int) Utils.VERSION_3_1);
                 break;
             case 4:
                 //MQTT version 3.1.1 "MQTT"
@@ -86,7 +85,7 @@ public class ConnectDecoder extends DemuxDecoder {
                     throw new CorruptedFrameException("Invalid protoName: " + protoName);
                 }
                 message.setProtocolName(protoName);
-                versionAttr.set((int) VERSION_3_1_1);
+                versionAttr.set((int) Utils.VERSION_3_1_1);
                 break;
             default:
                 //protocol broken
@@ -95,7 +94,7 @@ public class ConnectDecoder extends DemuxDecoder {
         
         //ProtocolVersion 1 byte (value 0x03 for 3.1, 0x04 for 3.1.1)
         message.setProtocolVersion(in.readByte());
-        if (message.getProtocolVersion() == VERSION_3_1_1) {
+        if (message.getProtocolVersion() == Utils.VERSION_3_1_1) {
             //if 3.1.1, check the flags (dup, retain and qos == 0)
             if (message.isDupFlag() || message.isRetainFlag() || message.getQos() != AbstractMessage.QOSType.MOST_ONE) {
                 throw new CorruptedFrameException("Received a CONNECT with fixed header flags != 0");
@@ -114,7 +113,7 @@ public class ConnectDecoder extends DemuxDecoder {
 
         //Connection flag
         byte connFlags = in.readByte();
-        if (message.getProtocolVersion() == VERSION_3_1_1) {
+        if (message.getProtocolVersion() == Utils.VERSION_3_1_1) {
             if ((connFlags & 0x01) != 0) { //bit(0) of connection flags is != 0
                 throw new CorruptedFrameException("Received a CONNECT with connectionFlags[0(bit)] != 0");
             }
@@ -147,8 +146,8 @@ public class ConnectDecoder extends DemuxDecoder {
         int keepAlive = in.readUnsignedShort();
         message.setKeepAlive(keepAlive);
 
-        if ((remainingLength == 12 && message.getProtocolVersion() == VERSION_3_1) ||
-            (remainingLength == 10 && message.getProtocolVersion() == VERSION_3_1_1)) {
+        if ((remainingLength == 12 && message.getProtocolVersion() == Utils.VERSION_3_1) ||
+            (remainingLength == 10 && message.getProtocolVersion() == Utils.VERSION_3_1_1)) {
             out.add(message);
             return;
         }

netty_parser/src/main/java/io/moquette/parser/netty/ConnectEncoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
+import io.moquette.proto.messages.ConnectMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
-import org.eclipse.moquette.proto.messages.ConnectMessage;
+import io.moquette.proto.messages.AbstractMessage;
 
 /**
  *

netty_parser/src/main/java/io/moquette/parser/netty/DemuxDecoder.java

@@ -13,13 +13,13 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.handler.codec.CorruptedFrameException;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
+import io.moquette.proto.messages.AbstractMessage;
 
 /**
  *

netty_parser/src/main/java/io/moquette/parser/netty/DemuxEncoder.java

@@ -13,11 +13,11 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
+import io.moquette.proto.messages.AbstractMessage;
 
 /**
  *

netty_parser/src/main/java/io/moquette/parser/netty/DisconnectDecoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import org.eclipse.moquette.proto.messages.DisconnectMessage;
+import io.moquette.proto.messages.DisconnectMessage;
 
 /**
  *

netty_parser/src/main/java/io/moquette/parser/netty/DisconnectEncoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
-import org.eclipse.moquette.proto.messages.DisconnectMessage;
+import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.proto.messages.DisconnectMessage;
 
 /**
  *

netty_parser/src/main/java/io/moquette/parser/netty/MQTTDecoder.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
@@ -23,7 +23,7 @@ import io.netty.util.AttributeKey;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
+import io.moquette.proto.messages.AbstractMessage;
 
 /**
  *

netty_parser/src/main/java/io/moquette/parser/netty/MQTTEncoder.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
@@ -21,7 +21,7 @@ import io.netty.handler.codec.CorruptedFrameException;
 import io.netty.handler.codec.MessageToByteEncoder;
 import java.util.HashMap;
 import java.util.Map;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
+import io.moquette.proto.messages.AbstractMessage;
 
 /**
  *

netty_parser/src/main/java/io/moquette/parser/netty/MessageIDDecoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
+import io.moquette.proto.messages.MessageIDMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import org.eclipse.moquette.proto.messages.MessageIDMessage;
 
 /**
  *

netty_parser/src/main/java/io/moquette/parser/netty/PingReqDecoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
+import io.moquette.proto.messages.PingReqMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import org.eclipse.moquette.proto.messages.PingReqMessage;
 
 /**
  *

netty_parser/src/main/java/io/moquette/parser/netty/PingReqEncoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
-import org.eclipse.moquette.proto.messages.PingReqMessage;
+import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.proto.messages.PingReqMessage;
 
 /**
  *

netty_parser/src/main/java/io/moquette/parser/netty/PingRespDecoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import org.eclipse.moquette.proto.messages.PingRespMessage;
+import io.moquette.proto.messages.PingRespMessage;
 
 /**
  *

netty_parser/src/main/java/io/moquette/parser/netty/PingRespEncoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
-import org.eclipse.moquette.proto.messages.PingRespMessage;
+import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.proto.messages.PingRespMessage;
 
 /**
  *

netty_parser/src/main/java/io/moquette/parser/netty/PubAckDecoder.java

@@ -13,10 +13,10 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
-import org.eclipse.moquette.proto.messages.MessageIDMessage;
-import org.eclipse.moquette.proto.messages.PubAckMessage;
+import io.moquette.proto.messages.MessageIDMessage;
+import io.moquette.proto.messages.PubAckMessage;
 
 /**
  *

netty_parser/src/main/java/io/moquette/parser/netty/PubAckEncoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
-import org.eclipse.moquette.proto.messages.PubAckMessage;
+import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.proto.messages.PubAckMessage;
 
 /**
  *

netty_parser/src/main/java/io/moquette/parser/netty/PubCompDecoder.java

@@ -13,10 +13,10 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
-import org.eclipse.moquette.proto.messages.MessageIDMessage;
-import org.eclipse.moquette.proto.messages.PubCompMessage;
+import io.moquette.proto.messages.MessageIDMessage;
+import io.moquette.proto.messages.PubCompMessage;
 
 
 /**

netty_parser/src/main/java/io/moquette/parser/netty/PubCompEncoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
+import io.moquette.proto.messages.PubCompMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.eclipse.moquette.proto.messages.PubCompMessage;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
+import io.moquette.proto.messages.AbstractMessage;
 
 /**
  *

netty_parser/src/main/java/io/moquette/parser/netty/PubRecDecoder.java

@@ -13,10 +13,10 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
-import org.eclipse.moquette.proto.messages.MessageIDMessage;
-import org.eclipse.moquette.proto.messages.PubRecMessage;
+import io.moquette.proto.messages.MessageIDMessage;
+import io.moquette.proto.messages.PubRecMessage;
 
 /**
  *

netty_parser/src/main/java/io/moquette/parser/netty/PubRecEncoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
+import io.moquette.proto.messages.PubRecMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
-import org.eclipse.moquette.proto.messages.PubRecMessage;
+import io.moquette.proto.messages.AbstractMessage;
 
 /**
  *

netty_parser/src/main/java/io/moquette/parser/netty/PubRelDecoder.java

@@ -13,14 +13,14 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
+import io.moquette.proto.messages.MessageIDMessage;
+import io.moquette.proto.messages.PubRelMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.util.AttributeMap;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
-import org.eclipse.moquette.proto.messages.MessageIDMessage;
-import org.eclipse.moquette.proto.messages.PubRelMessage;
 
 /**
  *

netty_parser/src/main/java/io/moquette/parser/netty/PubRelEncoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
+import io.moquette.proto.messages.PubRelMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
-import org.eclipse.moquette.proto.messages.PubRelMessage;
+import io.moquette.proto.messages.AbstractMessage;
 
 /**
  *

netty_parser/src/main/java/io/moquette/parser/netty/PublishDecoder.java

@@ -13,15 +13,15 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.CorruptedFrameException;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
-import org.eclipse.moquette.proto.messages.PublishMessage;
+import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.proto.messages.PublishMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

netty_parser/src/main/java/io/moquette/parser/netty/PublishEncoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
-import org.eclipse.moquette.proto.messages.PublishMessage;
+import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.proto.messages.PublishMessage;
 
 /**
  *

netty_parser/src/main/java/io/moquette/parser/netty/SubAckDecoder.java

@@ -13,13 +13,13 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
-import org.eclipse.moquette.proto.messages.SubAckMessage;
+import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.proto.messages.SubAckMessage;
 
 /**
  *

netty_parser/src/main/java/io/moquette/parser/netty/SubAckEncoder.java

@@ -13,13 +13,13 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
-import org.eclipse.moquette.proto.messages.AbstractMessage.QOSType;
-import org.eclipse.moquette.proto.messages.SubAckMessage;
+import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.proto.messages.AbstractMessage.QOSType;
+import io.moquette.proto.messages.SubAckMessage;
 
 /**
  *

netty_parser/src/main/java/io/moquette/parser/netty/SubscribeDecoder.java

@@ -13,15 +13,15 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.handler.codec.CorruptedFrameException;
 import io.netty.util.AttributeMap;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
-import org.eclipse.moquette.proto.messages.AbstractMessage.QOSType;
-import org.eclipse.moquette.proto.messages.SubscribeMessage;
+import io.moquette.proto.messages.AbstractMessage.QOSType;
+import io.moquette.proto.messages.SubscribeMessage;
 
 /**
  *

netty_parser/src/main/java/io/moquette/parser/netty/SubscribeEncoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
-import org.eclipse.moquette.proto.messages.SubscribeMessage;
+import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.proto.messages.SubscribeMessage;
 
 /**
  *

netty_parser/src/main/java/io/moquette/parser/netty/UnsubAckDecoder.java

@@ -13,10 +13,10 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
-import org.eclipse.moquette.proto.messages.MessageIDMessage;
-import org.eclipse.moquette.proto.messages.UnsubAckMessage;
+import io.moquette.proto.messages.MessageIDMessage;
+import io.moquette.proto.messages.UnsubAckMessage;
 
 /**
  *

netty_parser/src/main/java/io/moquette/parser/netty/UnsubAckEncoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
+import io.moquette.proto.messages.UnsubAckMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
-import org.eclipse.moquette.proto.messages.UnsubAckMessage;
+import io.moquette.proto.messages.AbstractMessage;
 
 /**
  *

netty_parser/src/main/java/io/moquette/parser/netty/UnsubscribeDecoder.java

@@ -13,14 +13,14 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
+import io.moquette.proto.messages.UnsubscribeMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.handler.codec.CorruptedFrameException;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
-import org.eclipse.moquette.proto.messages.UnsubscribeMessage;
+import io.moquette.proto.messages.AbstractMessage;
 
 /**
  *

netty_parser/src/main/java/io/moquette/parser/netty/UnsubscribeEncoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
+import io.moquette.proto.messages.UnsubscribeMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
-import org.eclipse.moquette.proto.messages.UnsubscribeMessage;
+import io.moquette.proto.messages.AbstractMessage;
 
 
 /**

netty_parser/src/main/java/io/moquette/parser/netty/Utils.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -21,7 +21,7 @@ import io.netty.handler.codec.CorruptedFrameException;
 import io.netty.util.Attribute;
 import io.netty.util.AttributeMap;
 import java.io.UnsupportedEncodingException;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
+import io.moquette.proto.messages.AbstractMessage;
 import org.slf4j.LoggerFactory;
 
 /**

netty_parser/src/test/java/io/moquette/parser/netty/ConnAckDecoderTest.java

@@ -13,14 +13,14 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import java.util.ArrayList;
 import java.util.List;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
-import org.eclipse.moquette.proto.messages.ConnAckMessage;
+import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.proto.messages.ConnAckMessage;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;

netty_parser/src/test/java/io/moquette/parser/netty/ConnAckEncoderTest.java

@@ -13,14 +13,14 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.buffer.Unpooled;
 import io.netty.buffer.UnpooledByteBufAllocator;
 import io.netty.channel.ChannelHandlerContext;
-import org.eclipse.moquette.proto.messages.ConnAckMessage;
+import io.moquette.proto.messages.ConnAckMessage;
 import org.junit.Before;
 import org.junit.Test;
 import static org.junit.Assert.*;

netty_parser/src/test/java/io/moquette/parser/netty/ConnectDecoderTest.java

@@ -13,8 +13,9 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
+import io.moquette.proto.messages.ConnectMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.CorruptedFrameException;
@@ -24,10 +25,10 @@ import io.netty.util.DefaultAttributeMap;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.List;
-import static org.eclipse.moquette.parser.netty.Utils.VERSION_3_1;
-import static org.eclipse.moquette.parser.netty.Utils.VERSION_3_1_1;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
-import org.eclipse.moquette.proto.messages.ConnectMessage;
+import static io.moquette.parser.netty.Utils.VERSION_3_1;
+import static io.moquette.parser.netty.Utils.VERSION_3_1_1;
+import io.moquette.proto.messages.AbstractMessage;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;

netty_parser/src/test/java/io/moquette/parser/netty/ConnectEncoderTest.java

@@ -13,16 +13,15 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
+import io.moquette.proto.messages.ConnectMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
-import org.eclipse.moquette.proto.messages.ConnectMessage;
 import org.junit.Test;
 import org.junit.Before;
 import static org.junit.Assert.*;
-import static org.eclipse.moquette.parser.netty.TestUtils.*;
 
 
 /**
@@ -36,7 +35,7 @@ public class ConnectEncoderTest {
     @Before
     public void setUp() {
         //mock the ChannelHandlerContext to return an UnpooledAllocator
-        m_mockedContext = mockChannelHandler();
+        m_mockedContext = TestUtils.mockChannelHandler();
     }
     
     @Test
@@ -55,7 +54,7 @@ public class ConnectEncoderTest {
         //Verify
         assertEquals(0x10, out.readByte()); //1 byte
         assertEquals(12, out.readByte()); //remaining length
-        verifyString("MQIsdp", out);
+        TestUtils.verifyString("MQIsdp", out);
         assertEquals(0x03, out.readByte()); //protocol version
         assertEquals(0x32, out.readByte()); //flags
         assertEquals(2, out.readByte()); //keepAliveTimer msb
@@ -85,16 +84,16 @@ public class ConnectEncoderTest {
         //Verify
         assertEquals(0x10, out.readByte()); //1 byte
         assertEquals(36, out.readByte()); //remaining length
-        verifyString("MQIsdp", out);
+        TestUtils.verifyString("MQIsdp", out);
         assertEquals(0x03, out.readByte()); //protocol version
         assertEquals(0x36, out.readByte()); //flags
         assertEquals(2, out.readByte()); //keepAliveTimer msb
         assertEquals(0, out.readByte()); //keepAliveTimer lsb
         
         //Variable part
-        verifyString("ABCDEF", out);
-        verifyString("Topic", out);
-        verifyString("Message", out);
+        TestUtils.verifyString("ABCDEF", out);
+        TestUtils.verifyString("Topic", out);
+        TestUtils.verifyString("Message", out);
     }
     
     @Test
@@ -123,17 +122,17 @@ public class ConnectEncoderTest {
         //Verify
         assertEquals(0x10, out.readByte()); //1 byte
         assertEquals(48, out.readByte()); //remaining length
-        verifyString("MQIsdp", out);
+        TestUtils.verifyString("MQIsdp", out);
         assertEquals(0x03, out.readByte()); //protocol version
         assertEquals((byte)0xF6, (byte)out.readByte()); //flags
         assertEquals(2, out.readByte()); //keepAliveTimer msb
         assertEquals(0, out.readByte()); //keepAliveTimer lsb
         
         //Variable part
-        verifyString("ABCDEF", out);
-        verifyString("Topic", out);
-        verifyString("Message", out);
-        verifyString("Pablo", out);//username
-        verifyString("PBL", out);//password
+        TestUtils.verifyString("ABCDEF", out);
+        TestUtils.verifyString("Topic", out);
+        TestUtils.verifyString("Message", out);
+        TestUtils.verifyString("Pablo", out);//username
+        TestUtils.verifyString("PBL", out);//password
     }
 }

netty_parser/src/test/java/io/moquette/parser/netty/PubAckDecoderTest.java

@@ -13,14 +13,15 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
+import io.moquette.proto.messages.PubAckMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import java.util.ArrayList;
 import java.util.List;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
-import org.eclipse.moquette.proto.messages.PubAckMessage;
+import io.moquette.proto.messages.AbstractMessage;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -51,7 +52,7 @@ public class PubAckDecoderTest {
         m_msgdec.decode(null, m_buff, results);
         
         assertFalse(results.isEmpty());
-        PubAckMessage message = (PubAckMessage)results.get(0); 
+        PubAckMessage message = (PubAckMessage)results.get(0);
         assertNotNull(message);
         assertEquals(messageId, message.getMessageID().intValue());
         assertEquals(AbstractMessage.PUBACK, message.getMessageType());

netty_parser/src/test/java/io/moquette/parser/netty/PubAckEncoderTest.java

@@ -13,16 +13,15 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
+import io.moquette.proto.messages.PubAckMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import org.junit.Test;
 import org.junit.Before;
 import static org.junit.Assert.*;
-import static org.eclipse.moquette.parser.netty.TestUtils.*;
-import org.eclipse.moquette.proto.messages.PubAckMessage;
 
 /**
  *
@@ -34,7 +33,7 @@ public class PubAckEncoderTest {
     @Before
     public void setUp() {
         //mock the ChannelHandlerContext to return an UnpooledAllocator
-        m_mockedContext = mockChannelHandler();
+        m_mockedContext = TestUtils.mockChannelHandler();
     }
     
     @Test

netty_parser/src/test/java/io/moquette/parser/netty/PubRelDecoderTest.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -22,7 +22,7 @@ import io.netty.util.AttributeMap;
 import io.netty.util.DefaultAttributeMap;
 import java.util.ArrayList;
 import java.util.List;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
+import io.moquette.proto.messages.AbstractMessage;
 import org.junit.Test;
 import static org.junit.Assert.*;
 import org.junit.Before;

netty_parser/src/test/java/io/moquette/parser/netty/PubRelEncoderTest.java

@@ -13,16 +13,15 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
+import io.moquette.proto.messages.PubRelMessage;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
-import org.eclipse.moquette.proto.messages.PubRelMessage;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.eclipse.moquette.parser.netty.TestUtils.mockChannelHandler;
 import static org.junit.Assert.assertEquals;
 
 /**
@@ -35,7 +34,7 @@ public class PubRelEncoderTest {
     @Before
     public void setUp() {
         //mock the ChannelHandlerContext to return an UnpooledAllocator
-        m_mockedContext = mockChannelHandler();
+        m_mockedContext = TestUtils.mockChannelHandler();
     }
     
     @Test

netty_parser/src/test/java/io/moquette/parser/netty/PublishDecoderTest.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -24,8 +24,8 @@ import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
-import org.eclipse.moquette.proto.messages.PublishMessage;
+import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.proto.messages.PublishMessage;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;

netty_parser/src/test/java/io/moquette/parser/netty/PublishEncoderTest.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -22,9 +22,9 @@ import java.nio.ByteBuffer;
 import org.junit.Before;
 import org.junit.Test;
 import static org.junit.Assert.*;
-import static org.eclipse.moquette.parser.netty.TestUtils.*;
-import org.eclipse.moquette.proto.messages.AbstractMessage.QOSType;
-import org.eclipse.moquette.proto.messages.PublishMessage;
+
+import io.moquette.proto.messages.AbstractMessage.QOSType;
+import io.moquette.proto.messages.PublishMessage;
 
 /**
  *
@@ -38,7 +38,7 @@ public class PublishEncoderTest {
     @Before
     public void setUp() {
         //mock the ChannelHandlerContext to return an UnpooledAllocator
-        m_mockedContext = mockChannelHandler();
+        m_mockedContext = TestUtils.mockChannelHandler();
         m_out = Unpooled.buffer();
     }
     
@@ -64,9 +64,9 @@ public class PublishEncoderTest {
         assertEquals(12, m_out.readByte()); //remaining length
 
         //Variable part
-        verifyString(topic, m_out);
+        TestUtils.verifyString(topic, m_out);
         payload.rewind();
-        verifyBuff(bpayload.length, payload, m_out);
+        TestUtils.verifyBuff(bpayload.length, payload, m_out);
     }
     
     
@@ -92,11 +92,11 @@ public class PublishEncoderTest {
         assertEquals(14, m_out.readByte()); //remaining length
 
         //Variable part
-        verifyString(topic, m_out);
+        TestUtils.verifyString(topic, m_out);
         assertEquals(0, m_out.readByte()); //MessageID MSB
         assertEquals(1, m_out.readByte()); //MessageID LSB
         payload.rewind();
-        verifyBuff(bpayload.length, payload, m_out);
+        TestUtils.verifyBuff(bpayload.length, payload, m_out);
     }
     
     @Test(expected = IllegalArgumentException.class)

netty_parser/src/test/java/io/moquette/parser/netty/SubAckDecoderTest.java

@@ -13,14 +13,14 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import java.util.ArrayList;
 import java.util.List;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
-import org.eclipse.moquette.proto.messages.SubAckMessage;
+import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.proto.messages.SubAckMessage;
 import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;

netty_parser/src/test/java/io/moquette/parser/netty/SubAckEncoderTest.java

@@ -13,14 +13,13 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
-import static org.eclipse.moquette.parser.netty.TestUtils.mockChannelHandler;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
-import org.eclipse.moquette.proto.messages.SubAckMessage;
+import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.proto.messages.SubAckMessage;
 import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Test;
@@ -37,7 +36,7 @@ public class SubAckEncoderTest {
     @Before
     public void setUp() {
         //mock the ChannelHandlerContext to return an UnpooledAllocator
-        m_mockedContext = mockChannelHandler();
+        m_mockedContext = TestUtils.mockChannelHandler();
         m_out = Unpooled.buffer();
     }
     

netty_parser/src/test/java/io/moquette/parser/netty/SubscribeDecoderTest.java

@@ -13,15 +13,15 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.CorruptedFrameException;
 import java.util.ArrayList;
 import java.util.List;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
-import org.eclipse.moquette.proto.messages.SubscribeMessage;
+import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.proto.messages.SubscribeMessage;
 import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;

netty_parser/src/test/java/io/moquette/parser/netty/SubscribeEncoderTest.java

@@ -13,17 +13,16 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
-import org.eclipse.moquette.proto.messages.SubscribeMessage;
+import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.proto.messages.SubscribeMessage;
 import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Test;
-import static org.eclipse.moquette.parser.netty.TestUtils.*;
 
 /**
  *
@@ -37,7 +36,7 @@ public class SubscribeEncoderTest {
     @Before
     public void setUp() {
         //mock the ChannelHandlerContext to return an UnpooledAllocator
-        m_mockedContext = mockChannelHandler();
+        m_mockedContext = TestUtils.mockChannelHandler();
         m_out = Unpooled.buffer();
     }
     
@@ -65,9 +64,9 @@ public class SubscribeEncoderTest {
         assertEquals((byte)0xBB, m_out.readByte());
         
         //Variable part
-        verifyString(c1.getTopicFilter(), m_out);
+        TestUtils.verifyString(c1.getTopicFilter(), m_out);
         assertEquals(c1.getQos(), m_out.readByte());
-        verifyString(c2.getTopicFilter(), m_out);
+        TestUtils.verifyString(c2.getTopicFilter(), m_out);
         assertEquals(c2.getQos(), m_out.readByte());
     }
     

netty_parser/src/test/java/io/moquette/parser/netty/TestUtils.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;

netty_parser/src/test/java/io/moquette/parser/netty/UnsubscribeDecoderTest.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -21,8 +21,8 @@ import io.netty.handler.codec.CorruptedFrameException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
-import org.eclipse.moquette.proto.messages.UnsubscribeMessage;
+import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.proto.messages.UnsubscribeMessage;
 import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;

netty_parser/src/test/java/io/moquette/parser/netty/UnsubscribeEncoderTest.java

@@ -13,17 +13,16 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
-import org.eclipse.moquette.proto.messages.UnsubscribeMessage;
+import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.proto.messages.UnsubscribeMessage;
 import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Test;
-import static org.eclipse.moquette.parser.netty.TestUtils.*;
 
 /**
  *
@@ -38,7 +37,7 @@ public class UnsubscribeEncoderTest {
     @Before
     public void setUp() {
         //mock the ChannelHandlerContext to return an UnpooledAllocator
-        m_mockedContext = mockChannelHandler();
+        m_mockedContext = TestUtils.mockChannelHandler();
         m_out = Unpooled.buffer();
         m_msg = new UnsubscribeMessage();
         m_msg.setMessageID(0xAABB);
@@ -65,7 +64,7 @@ public class UnsubscribeEncoderTest {
         assertEquals((byte)0xBB, m_out.readByte());
         
         //Variable part
-        verifyString(topic1, m_out);
+        TestUtils.verifyString(topic1, m_out);
     }
     
 
@@ -91,8 +90,8 @@ public class UnsubscribeEncoderTest {
         assertEquals((byte)0xBB, m_out.readByte());
         
         //Variable part
-        verifyString(topic1, m_out);
-        verifyString(topic2, m_out);
+        TestUtils.verifyString(topic1, m_out);
+        TestUtils.verifyString(topic2, m_out);
     }
     
     @Test(expected = IllegalArgumentException.class)

netty_parser/src/test/java/io/moquette/parser/netty/UtilsTest.java

@@ -13,17 +13,19 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.eclipse.moquette.parser.netty;
+package io.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.CorruptedFrameException;
 import org.junit.Before;
 import org.junit.Test;
+
+import static io.moquette.parser.netty.TestUtils.verifyBuff;
 import static org.junit.Assert.*;
-import static org.eclipse.moquette.parser.netty.TestUtils.*;
-import org.eclipse.moquette.proto.messages.AbstractMessage;
-import org.eclipse.moquette.proto.messages.UnsubscribeMessage;
+
+import io.moquette.proto.messages.AbstractMessage;
+import io.moquette.proto.messages.UnsubscribeMessage;
 
 /**
  *

netty_parser/src/test/java/io/moquette/parser/netty/performance/LoopHandler.java

@@ -1,17 +1,16 @@
-package org.eclipse.moquette.parser.netty.performance;
+package io.moquette.parser.netty.performance;
 
+import io.moquette.proto.messages.*;
+import static io.moquette.proto.messages.AbstractMessage.*;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
-import org.eclipse.moquette.proto.Utils;
-import org.eclipse.moquette.proto.messages.*;
+import io.moquette.proto.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.nio.ByteBuffer;
 
-import static org.eclipse.moquette.proto.messages.AbstractMessage.*;
-
 /**
  * Created by andrea on 6/2/15.
  */

netty_parser/src/test/java/io/moquette/parser/netty/performance/ProtocolDecodingServer.java

@@ -1,5 +1,8 @@
-package org.eclipse.moquette.parser.netty.performance;
+package io.moquette.parser.netty.performance;
 
+import io.moquette.commons.Constants;
+import io.moquette.parser.netty.MQTTDecoder;
+import io.moquette.parser.netty.MQTTEncoder;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.*;
 import io.netty.channel.nio.NioEventLoopGroup;
@@ -8,9 +11,6 @@ import io.netty.channel.socket.nio.NioServerSocketChannel;
 import io.netty.handler.timeout.IdleState;
 import io.netty.handler.timeout.IdleStateEvent;
 import io.netty.handler.timeout.IdleStateHandler;
-import org.eclipse.moquette.commons.Constants;
-import org.eclipse.moquette.parser.netty.MQTTDecoder;
-import org.eclipse.moquette.parser.netty.MQTTEncoder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;