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;
 
 /**