anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged parser_commons into netty_parser

Browse Source
This commit is contained in:
andsel
2016-02-03 23:20:15 +01:00
parent 5c7e2b357f
commit 5487303095
102 changed files with 172 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/io/moquette/interception/InterceptHandler.java
+1 -1
View File
@@ -15,7 +15,7 @@
*/
package io.moquette.interception;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.spi.impl.subscriptions.Subscription;
import io.moquette.interception.messages.InterceptConnectMessage;
import io.moquette.interception.messages.InterceptDisconnectMessage;
broker/src/main/java/io/moquette/interception/Interceptor.java
+2 -2
View File
@@ -15,8 +15,8 @@
*/
package io.moquette.interception;
import io.moquette.proto.messages.ConnectMessage;
import io.moquette.proto.messages.PublishMessage;
import io.moquette.parser.proto.messages.ConnectMessage;
import io.moquette.parser.proto.messages.PublishMessage;
import io.moquette.spi.impl.subscriptions.Subscription;
/**
broker/src/main/java/io/moquette/interception/messages/InterceptAbstractMessage.java
+1 -1
View File
@@ -15,7 +15,7 @@
*/
package io.moquette.interception.messages;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
/**
* @author Wagner Macedo
broker/src/main/java/io/moquette/interception/messages/InterceptConnectMessage.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.moquette.interception.messages;
import io.moquette.proto.messages.ConnectMessage;
import io.moquette.parser.proto.messages.ConnectMessage;
/**
* @author Wagner Macedo
broker/src/main/java/io/moquette/interception/messages/InterceptPublishMessage.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.moquette.interception.messages;
import io.moquette.proto.messages.PublishMessage;
import io.moquette.parser.proto.messages.PublishMessage;
import java.nio.ByteBuffer;
broker/src/main/java/io/moquette/interception/messages/InterceptSubscribeMessage.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.moquette.interception.messages;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.spi.impl.subscriptions.Subscription;
/**
broker/src/main/java/io/moquette/server/Server.java
+1 -1
View File
@@ -17,7 +17,7 @@ package io.moquette.server;
import io.moquette.BrokerConstants;
import io.moquette.interception.InterceptHandler;
import io.moquette.proto.messages.PublishMessage;
import io.moquette.parser.proto.messages.PublishMessage;
import io.moquette.server.config.MemoryConfig;
import io.moquette.spi.impl.SimpleMessaging;
import io.moquette.server.config.FilesystemConfig;
broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java
+1 -1
View File
@@ -16,7 +16,7 @@
package io.moquette.server.netty;
import io.moquette.BrokerConstants;
import io.moquette.commons.Constants;
import io.moquette.parser.commons.Constants;
import io.moquette.parser.netty.MQTTDecoder;
import io.moquette.parser.netty.MQTTEncoder;
import io.moquette.spi.security.ISslContextCreator;
broker/src/main/java/io/moquette/server/netty/NettyMQTTHandler.java
+3 -3
View File
@@ -15,10 +15,10 @@
*/
package io.moquette.server.netty;
import io.moquette.proto.Utils;
import io.moquette.proto.messages.*;
import io.moquette.parser.proto.Utils;
import io.moquette.parser.proto.messages.*;
import io.moquette.spi.impl.ProtocolProcessor;
import static io.moquette.proto.messages.AbstractMessage.*;
import static io.moquette.parser.proto.messages.AbstractMessage.*;
import io.netty.channel.ChannelHandler.Sharable;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
broker/src/main/java/io/moquette/spi/ClientSession.java
+1 -1
View File
@@ -15,7 +15,7 @@
*/
package io.moquette.spi;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.spi.impl.subscriptions.Subscription;
import io.moquette.spi.impl.subscriptions.SubscriptionsStore;
import io.moquette.spi.ISessionsStore.ClientTopicCouple;
broker/src/main/java/io/moquette/spi/IMessagesStore.java
+1 -1
View File
@@ -17,7 +17,7 @@ package io.moquette.spi;
import java.io.Serializable;
import java.nio.ByteBuffer;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import java.util.Collection;
import java.util.List;
broker/src/main/java/io/moquette/spi/impl/BrokerInterceptor.java
+2 -2
View File
@@ -18,9 +18,9 @@ package io.moquette.spi.impl;
import io.moquette.interception.InterceptHandler;
import io.moquette.interception.Interceptor;
import io.moquette.interception.messages.*;
import io.moquette.proto.messages.ConnectMessage;
import io.moquette.parser.proto.messages.ConnectMessage;
import io.moquette.spi.impl.subscriptions.Subscription;
import io.moquette.proto.messages.PublishMessage;
import io.moquette.parser.proto.messages.PublishMessage;
import java.util.List;
import java.util.concurrent.ExecutorService;
broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java
+13 -13
View File
@@ -33,19 +33,19 @@ import io.moquette.spi.impl.subscriptions.Subscription;
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 io.moquette.proto.messages.AbstractMessage.QOSType;
import io.moquette.proto.messages.ConnAckMessage;
import io.moquette.proto.messages.ConnectMessage;
import io.moquette.proto.messages.PubAckMessage;
import io.moquette.proto.messages.PubCompMessage;
import io.moquette.proto.messages.PubRecMessage;
import io.moquette.proto.messages.PubRelMessage;
import io.moquette.proto.messages.PublishMessage;
import io.moquette.proto.messages.SubAckMessage;
import io.moquette.proto.messages.SubscribeMessage;
import io.moquette.proto.messages.UnsubAckMessage;
import io.moquette.proto.messages.UnsubscribeMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.AbstractMessage.QOSType;
import io.moquette.parser.proto.messages.ConnAckMessage;
import io.moquette.parser.proto.messages.ConnectMessage;
import io.moquette.parser.proto.messages.PubAckMessage;
import io.moquette.parser.proto.messages.PubCompMessage;
import io.moquette.parser.proto.messages.PubRecMessage;
import io.moquette.parser.proto.messages.PubRelMessage;
import io.moquette.parser.proto.messages.PublishMessage;
import io.moquette.parser.proto.messages.SubAckMessage;
import io.moquette.parser.proto.messages.SubscribeMessage;
import io.moquette.parser.proto.messages.UnsubAckMessage;
import io.moquette.parser.proto.messages.UnsubscribeMessage;
import io.netty.channel.Channel;
import io.netty.channel.ChannelPipeline;
import io.netty.handler.timeout.IdleStateHandler;
broker/src/main/java/io/moquette/spi/impl/subscriptions/Subscription.java
+1 -1
View File
@@ -16,7 +16,7 @@
package io.moquette.spi.impl.subscriptions;
import java.io.Serializable;
import io.moquette.proto.messages.AbstractMessage.QOSType;
import io.moquette.parser.proto.messages.AbstractMessage.QOSType;
import io.moquette.spi.ISessionsStore.ClientTopicCouple;
/**
broker/src/main/java/io/moquette/spi/persistence/MapDBPersistentStore.java
+1 -1
View File
@@ -19,7 +19,7 @@ package io.moquette.spi.persistence;
import io.moquette.server.config.IConfig;
import io.moquette.spi.IMessagesStore;
import io.moquette.spi.ISessionsStore;
import io.moquette.proto.MQTTException;
import io.moquette.parser.proto.MQTTException;
import org.mapdb.DB;
import org.mapdb.DBMaker;
import org.slf4j.Logger;
broker/src/test/java/io/moquette/server/ServerIntegrationEmbeddedPublishTest.java
+2 -2
View File
@@ -15,8 +15,8 @@
*/
package io.moquette.server;
import io.moquette.proto.messages.AbstractMessage.QOSType;
import io.moquette.proto.messages.PublishMessage;
import io.moquette.parser.proto.messages.AbstractMessage.QOSType;
import io.moquette.parser.proto.messages.PublishMessage;
import io.moquette.server.config.IConfig;
import io.moquette.server.config.MemoryConfig;
import org.fusesource.mqtt.client.*;
broker/src/test/java/io/moquette/server/ServerLowlevelMessagesIntegrationTests.java
+4 -4
View File
@@ -15,10 +15,10 @@
*/
package io.moquette.server;
import io.moquette.proto.messages.ConnectMessage;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.proto.messages.AbstractMessage.QOSType;
import io.moquette.proto.messages.ConnAckMessage;
import io.moquette.parser.proto.messages.ConnectMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.AbstractMessage.QOSType;
import io.moquette.parser.proto.messages.ConnAckMessage;
import io.moquette.server.config.IConfig;
import io.moquette.server.config.MemoryConfig;
import io.moquette.testclient.Client;
broker/src/test/java/io/moquette/spi/impl/BrokerInterceptorTest.java
+3 -3
View File
@@ -16,10 +16,10 @@
package io.moquette.spi.impl;
import io.moquette.interception.messages.*;
import io.moquette.proto.messages.ConnectMessage;
import io.moquette.parser.proto.messages.ConnectMessage;
import io.moquette.interception.InterceptHandler;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.proto.messages.PublishMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.PublishMessage;
import io.moquette.spi.impl.subscriptions.Subscription;
import org.junit.AfterClass;
import org.junit.BeforeClass;
broker/src/test/java/io/moquette/spi/impl/MockReceiverChannel.java
+1 -1
View File
@@ -15,7 +15,7 @@
*/package io.moquette.spi.impl;
import io.netty.util.AttributeKey;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import java.util.HashMap;
import java.util.Map;
broker/src/test/java/io/moquette/spi/impl/NettyChannelAssertions.java
+3 -4
View File
@@ -15,12 +15,11 @@
*/
package io.moquette.spi.impl;
import io.moquette.proto.messages.ConnAckMessage;
import io.moquette.proto.messages.SubAckMessage;
import io.netty.channel.Channel;
import io.moquette.parser.proto.messages.ConnAckMessage;
import io.moquette.parser.proto.messages.SubAckMessage;
import io.netty.channel.embedded.EmbeddedChannel;
import static io.moquette.proto.messages.ConnAckMessage.CONNECTION_ACCEPTED;
import static io.moquette.parser.proto.messages.ConnAckMessage.CONNECTION_ACCEPTED;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
broker/src/test/java/io/moquette/spi/impl/ProtocolProcessorTest.java
+2 -2
View File
@@ -15,9 +15,9 @@
*/
package io.moquette.spi.impl;
import io.moquette.proto.messages.*;
import io.moquette.parser.proto.messages.*;
import io.moquette.interception.InterceptHandler;
import io.moquette.proto.messages.AbstractMessage.QOSType;
import io.moquette.parser.proto.messages.AbstractMessage.QOSType;
import io.moquette.server.ConnectionDescriptor;
import io.moquette.server.netty.NettyUtils;
import io.moquette.spi.ClientSession;
broker/src/test/java/io/moquette/spi/impl/ProtocolProcessor_CONNECT_Test.java
+6 -6
View File
@@ -15,9 +15,9 @@
*/
package io.moquette.spi.impl;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.proto.messages.ConnectMessage;
import io.moquette.proto.messages.SubscribeMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.ConnectMessage;
import io.moquette.parser.proto.messages.SubscribeMessage;
import io.moquette.server.netty.NettyUtils;
import io.moquette.spi.ClientSession;
import io.moquette.spi.IMessagesStore;
@@ -33,9 +33,9 @@ import java.util.HashMap;
import java.util.Map;
import static io.moquette.parser.netty.Utils.VERSION_3_1_1;
import static io.moquette.proto.messages.ConnAckMessage.BAD_USERNAME_OR_PASSWORD;
import static io.moquette.proto.messages.ConnAckMessage.CONNECTION_ACCEPTED;
import static io.moquette.proto.messages.ConnAckMessage.UNNACEPTABLE_PROTOCOL_VERSION;
import static io.moquette.parser.proto.messages.ConnAckMessage.BAD_USERNAME_OR_PASSWORD;
import static io.moquette.parser.proto.messages.ConnAckMessage.CONNECTION_ACCEPTED;
import static io.moquette.parser.proto.messages.ConnAckMessage.UNNACEPTABLE_PROTOCOL_VERSION;
import static io.moquette.spi.impl.NettyChannelAssertions.assertEqualsConnAck;
import static io.moquette.spi.impl.NettyChannelAssertions.assertEqualsSubAck;
import static org.junit.Assert.assertFalse;
broker/src/test/java/io/moquette/spi/impl/subscriptions/SubscriptionsStoreTest.java
+1 -1
View File
@@ -24,7 +24,7 @@ import io.moquette.spi.ClientSession;
import io.moquette.spi.ISessionsStore;
import io.moquette.spi.ISessionsStore.ClientTopicCouple;
import io.moquette.spi.impl.MemoryStorageService;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import static org.junit.Assert.*;
import org.junit.Before;
broker/src/test/java/io/moquette/spi/persistence/MapDBPersistentStoreTest.java
+1 -1
View File
@@ -23,7 +23,7 @@ import io.moquette.spi.ClientSession;
import io.moquette.spi.IMessagesStore;
import io.moquette.spi.ISessionsStore;
import io.moquette.spi.ISessionsStore.ClientTopicCouple;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.spi.impl.subscriptions.Subscription;
import org.junit.After;
import org.junit.Before;
broker/src/test/java/io/moquette/testclient/Client.java
+1 -1
View File
@@ -27,7 +27,7 @@ import io.netty.channel.EventLoopGroup;
import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioSocketChannel;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
broker/src/test/java/io/moquette/testclient/ClientNettyMQTTHandler.java
+2 -2
View File
@@ -15,11 +15,11 @@
*/
package io.moquette.testclient;
import io.moquette.proto.Utils;
import io.moquette.parser.proto.Utils;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.server.netty.NettyMQTTHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
embedding_moquette/src/main/java/io/moquette/testembedded/EmbeddedLauncher.java
+2 -2
View File
@@ -18,8 +18,8 @@ package io.moquette.testembedded;
import io.moquette.interception.AbstractInterceptHandler;
import io.moquette.interception.InterceptHandler;
import io.moquette.interception.messages.*;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.proto.messages.PublishMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.PublishMessage;
import io.moquette.server.Server;
import io.moquette.server.config.IConfig;
import io.moquette.server.config.ClasspathConfig;
parser_commons/src/main/java/io/moquette/commons/Constants.java → netty_parser/src/main/java/io/moquette/parser/commons/Constants.java
+1 -1
View File
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package io.moquette.commons;
package io.moquette.parser.commons;
import java.io.File;
netty_parser/src/main/java/io/moquette/parser/netty/ConnAckDecoder.java
+1 -1
View File
@@ -3,7 +3,7 @@ package io.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.util.AttributeMap;
import java.util.List;
import io.moquette.proto.messages.ConnAckMessage;
import io.moquette.parser.proto.messages.ConnAckMessage;
/**
*
netty_parser/src/main/java/io/moquette/parser/netty/ConnAckEncoder.java
+2 -2
View File
@@ -17,8 +17,8 @@ package io.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.proto.messages.ConnAckMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.ConnAckMessage;
/**
*
netty_parser/src/main/java/io/moquette/parser/netty/ConnectDecoder.java
+2 -2
View File
@@ -15,7 +15,7 @@
*/
package io.moquette.parser.netty;
import io.moquette.proto.messages.ConnectMessage;
import io.moquette.parser.proto.messages.ConnectMessage;
import io.netty.buffer.ByteBuf;
import io.netty.handler.codec.CorruptedFrameException;
import io.netty.util.Attribute;
@@ -24,7 +24,7 @@ import io.netty.util.AttributeMap;
import java.io.UnsupportedEncodingException;
import java.util.List;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
/**
*
netty_parser/src/main/java/io/moquette/parser/netty/ConnectEncoder.java
+2 -2
View File
@@ -15,10 +15,10 @@
*/
package io.moquette.parser.netty;
import io.moquette.proto.messages.ConnectMessage;
import io.moquette.parser.proto.messages.ConnectMessage;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
/**
*
netty_parser/src/main/java/io/moquette/parser/netty/DemuxDecoder.java
+1 -1
View File
@@ -19,7 +19,7 @@ import io.netty.buffer.ByteBuf;
import io.netty.handler.codec.CorruptedFrameException;
import io.netty.util.AttributeMap;
import java.util.List;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
/**
*
netty_parser/src/main/java/io/moquette/parser/netty/DemuxEncoder.java
+1 -1
View File
@@ -17,7 +17,7 @@ package io.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
/**
*
netty_parser/src/main/java/io/moquette/parser/netty/DisconnectDecoder.java
+1 -1
View File
@@ -18,7 +18,7 @@ package io.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.util.AttributeMap;
import java.util.List;
import io.moquette.proto.messages.DisconnectMessage;
import io.moquette.parser.proto.messages.DisconnectMessage;
/**
*
netty_parser/src/main/java/io/moquette/parser/netty/DisconnectEncoder.java
+2 -2
View File
@@ -17,8 +17,8 @@ package io.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.proto.messages.DisconnectMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.DisconnectMessage;
/**
*
netty_parser/src/main/java/io/moquette/parser/netty/MQTTDecoder.java
+1 -1
View File
@@ -23,7 +23,7 @@ import io.netty.util.AttributeKey;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
/**
*
netty_parser/src/main/java/io/moquette/parser/netty/MQTTEncoder.java
+1 -1
View File
@@ -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 io.moquette.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
/**
*
netty_parser/src/main/java/io/moquette/parser/netty/MessageIDDecoder.java
+1 -1
View File
@@ -15,7 +15,7 @@
*/
package io.moquette.parser.netty;
import io.moquette.proto.messages.MessageIDMessage;
import io.moquette.parser.proto.messages.MessageIDMessage;
import io.netty.buffer.ByteBuf;
import io.netty.util.AttributeMap;
import java.util.List;
netty_parser/src/main/java/io/moquette/parser/netty/PingReqDecoder.java
+1 -1
View File
@@ -15,7 +15,7 @@
*/
package io.moquette.parser.netty;
import io.moquette.proto.messages.PingReqMessage;
import io.moquette.parser.proto.messages.PingReqMessage;
import io.netty.buffer.ByteBuf;
import io.netty.util.AttributeMap;
import java.util.List;
netty_parser/src/main/java/io/moquette/parser/netty/PingReqEncoder.java
+2 -2
View File
@@ -17,8 +17,8 @@ package io.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.proto.messages.PingReqMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.PingReqMessage;
/**
*
netty_parser/src/main/java/io/moquette/parser/netty/PingRespDecoder.java
+1 -1
View File
@@ -18,7 +18,7 @@ package io.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.util.AttributeMap;
import java.util.List;
import io.moquette.proto.messages.PingRespMessage;
import io.moquette.parser.proto.messages.PingRespMessage;
/**
*
netty_parser/src/main/java/io/moquette/parser/netty/PingRespEncoder.java
+2 -2
View File
@@ -17,8 +17,8 @@ package io.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.proto.messages.PingRespMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.PingRespMessage;
/**
*
netty_parser/src/main/java/io/moquette/parser/netty/PubAckDecoder.java
+2 -2
View File
@@ -15,8 +15,8 @@
*/
package io.moquette.parser.netty;
import io.moquette.proto.messages.MessageIDMessage;
import io.moquette.proto.messages.PubAckMessage;
import io.moquette.parser.proto.messages.MessageIDMessage;
import io.moquette.parser.proto.messages.PubAckMessage;
/**
*
netty_parser/src/main/java/io/moquette/parser/netty/PubAckEncoder.java
+2 -2
View File
@@ -17,8 +17,8 @@ package io.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.proto.messages.PubAckMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.PubAckMessage;
/**
*
netty_parser/src/main/java/io/moquette/parser/netty/PubCompDecoder.java
+2 -2
View File
@@ -15,8 +15,8 @@
*/
package io.moquette.parser.netty;
import io.moquette.proto.messages.MessageIDMessage;
import io.moquette.proto.messages.PubCompMessage;
import io.moquette.parser.proto.messages.MessageIDMessage;
import io.moquette.parser.proto.messages.PubCompMessage;
/**
netty_parser/src/main/java/io/moquette/parser/netty/PubCompEncoder.java
+2 -2
View File
@@ -15,10 +15,10 @@
*/
package io.moquette.parser.netty;
import io.moquette.proto.messages.PubCompMessage;
import io.moquette.parser.proto.messages.PubCompMessage;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
/**
*
netty_parser/src/main/java/io/moquette/parser/netty/PubRecDecoder.java
+2 -2
View File
@@ -15,8 +15,8 @@
*/
package io.moquette.parser.netty;
import io.moquette.proto.messages.MessageIDMessage;
import io.moquette.proto.messages.PubRecMessage;
import io.moquette.parser.proto.messages.MessageIDMessage;
import io.moquette.parser.proto.messages.PubRecMessage;
/**
*
netty_parser/src/main/java/io/moquette/parser/netty/PubRecEncoder.java
+2 -2
View File
@@ -15,10 +15,10 @@
*/
package io.moquette.parser.netty;
import io.moquette.proto.messages.PubRecMessage;
import io.moquette.parser.proto.messages.PubRecMessage;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
/**
*
netty_parser/src/main/java/io/moquette/parser/netty/PubRelDecoder.java
+2 -2
View File
@@ -15,8 +15,8 @@
*/
package io.moquette.parser.netty;
import io.moquette.proto.messages.MessageIDMessage;
import io.moquette.proto.messages.PubRelMessage;
import io.moquette.parser.proto.messages.MessageIDMessage;
import io.moquette.parser.proto.messages.PubRelMessage;
import io.netty.buffer.ByteBuf;
import io.netty.util.AttributeMap;
import java.io.UnsupportedEncodingException;
netty_parser/src/main/java/io/moquette/parser/netty/PubRelEncoder.java
+2 -2
View File
@@ -15,10 +15,10 @@
*/
package io.moquette.parser.netty;
import io.moquette.proto.messages.PubRelMessage;
import io.moquette.parser.proto.messages.PubRelMessage;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
/**
*
netty_parser/src/main/java/io/moquette/parser/netty/PublishDecoder.java
+2 -2
View File
@@ -20,8 +20,8 @@ import io.netty.buffer.Unpooled;
import io.netty.handler.codec.CorruptedFrameException;
import io.netty.util.AttributeMap;
import java.util.List;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.proto.messages.PublishMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.PublishMessage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
netty_parser/src/main/java/io/moquette/parser/netty/PublishEncoder.java
+2 -2
View File
@@ -17,8 +17,8 @@ package io.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.proto.messages.PublishMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.PublishMessage;
/**
*
netty_parser/src/main/java/io/moquette/parser/netty/SubAckDecoder.java
+2 -2
View File
@@ -18,8 +18,8 @@ package io.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.util.AttributeMap;
import java.util.List;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.proto.messages.SubAckMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.SubAckMessage;
/**
*
netty_parser/src/main/java/io/moquette/parser/netty/SubAckEncoder.java
+3 -3
View File
@@ -17,9 +17,9 @@ package io.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.proto.messages.AbstractMessage.QOSType;
import io.moquette.proto.messages.SubAckMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.AbstractMessage.QOSType;
import io.moquette.parser.proto.messages.SubAckMessage;
/**
*
netty_parser/src/main/java/io/moquette/parser/netty/SubscribeDecoder.java
+2 -2
View File
@@ -20,8 +20,8 @@ import io.netty.handler.codec.CorruptedFrameException;
import io.netty.util.AttributeMap;
import java.io.UnsupportedEncodingException;
import java.util.List;
import io.moquette.proto.messages.AbstractMessage.QOSType;
import io.moquette.proto.messages.SubscribeMessage;
import io.moquette.parser.proto.messages.AbstractMessage.QOSType;
import io.moquette.parser.proto.messages.SubscribeMessage;
/**
*
netty_parser/src/main/java/io/moquette/parser/netty/SubscribeEncoder.java
+2 -2
View File
@@ -17,8 +17,8 @@ package io.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.proto.messages.SubscribeMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.SubscribeMessage;
/**
*
netty_parser/src/main/java/io/moquette/parser/netty/UnsubAckDecoder.java
+2 -2
View File
@@ -15,8 +15,8 @@
*/
package io.moquette.parser.netty;
import io.moquette.proto.messages.MessageIDMessage;
import io.moquette.proto.messages.UnsubAckMessage;
import io.moquette.parser.proto.messages.MessageIDMessage;
import io.moquette.parser.proto.messages.UnsubAckMessage;
/**
*
netty_parser/src/main/java/io/moquette/parser/netty/UnsubAckEncoder.java
+2 -2
View File
@@ -15,10 +15,10 @@
*/
package io.moquette.parser.netty;
import io.moquette.proto.messages.UnsubAckMessage;
import io.moquette.parser.proto.messages.UnsubAckMessage;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
/**
*
netty_parser/src/main/java/io/moquette/parser/netty/UnsubscribeDecoder.java
+2 -2
View File
@@ -15,12 +15,12 @@
*/
package io.moquette.parser.netty;
import io.moquette.proto.messages.UnsubscribeMessage;
import io.moquette.parser.proto.messages.UnsubscribeMessage;
import io.netty.buffer.ByteBuf;
import io.netty.handler.codec.CorruptedFrameException;
import io.netty.util.AttributeMap;
import java.util.List;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
/**
*
netty_parser/src/main/java/io/moquette/parser/netty/UnsubscribeEncoder.java
+2 -2
View File
@@ -15,10 +15,10 @@
*/
package io.moquette.parser.netty;
import io.moquette.proto.messages.UnsubscribeMessage;
import io.moquette.parser.proto.messages.UnsubscribeMessage;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
/**
netty_parser/src/main/java/io/moquette/parser/netty/Utils.java
+1 -1
View File
@@ -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 io.moquette.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import org.slf4j.LoggerFactory;
/**
parser_commons/src/main/java/io/moquette/proto/MQTTException.java → netty_parser/src/main/java/io/moquette/parser/proto/MQTTException.java
+1 -1
View File
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package io.moquette.proto;
package io.moquette.parser.proto;
/**
*
parser_commons/src/main/java/io/moquette/proto/Utils.java → netty_parser/src/main/java/io/moquette/parser/proto/Utils.java
+2 -2
View File
@@ -13,9 +13,9 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package io.moquette.proto;
package io.moquette.parser.proto;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
/**
* Common utils methodd used in codecs.
parser_commons/src/main/java/io/moquette/proto/messages/AbstractMessage.java → netty_parser/src/main/java/io/moquette/parser/proto/messages/AbstractMessage.java
+1 -1
View File
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package io.moquette.proto.messages;
package io.moquette.parser.proto.messages;
/**
* Basic abstract message for all MQTT protocol messages.
parser_commons/src/main/java/io/moquette/proto/messages/ConnAckMessage.java → netty_parser/src/main/java/io/moquette/parser/proto/messages/ConnAckMessage.java
+1 -1
View File
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package io.moquette.proto.messages;
package io.moquette.parser.proto.messages;
/**
* The attributes Qos, Dup and Retain aren't used.
parser_commons/src/main/java/io/moquette/proto/messages/ConnectMessage.java → netty_parser/src/main/java/io/moquette/parser/proto/messages/ConnectMessage.java
+1 -1
View File
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package io.moquette.proto.messages;
package io.moquette.parser.proto.messages;
/**
* The attributes Qos, Dup and Retain aren't used for Connect message
parser_commons/src/main/java/io/moquette/proto/messages/DisconnectMessage.java → netty_parser/src/main/java/io/moquette/parser/proto/messages/DisconnectMessage.java
+1 -1
View File
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package io.moquette.proto.messages;
package io.moquette.parser.proto.messages;
/**
* Doesn't care DUP, QOS and RETAIN flags.
parser_commons/src/main/java/io/moquette/proto/messages/MessageIDMessage.java → netty_parser/src/main/java/io/moquette/parser/proto/messages/MessageIDMessage.java
+1 -1
View File
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package io.moquette.proto.messages;
package io.moquette.parser.proto.messages;
/**
* Base class for alla the messages that carries only MessageID. (PUBACK, PUBREC,
parser_commons/src/main/java/io/moquette/proto/messages/PingReqMessage.java → netty_parser/src/main/java/io/moquette/parser/proto/messages/PingReqMessage.java
+1 -1
View File
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package io.moquette.proto.messages;
package io.moquette.parser.proto.messages;
/**
* Doesn't care DUP, QOS and RETAIN flags.
parser_commons/src/main/java/io/moquette/proto/messages/PingRespMessage.java → netty_parser/src/main/java/io/moquette/parser/proto/messages/PingRespMessage.java
+1 -1
View File
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package io.moquette.proto.messages;
package io.moquette.parser.proto.messages;
/**
* Doesn't care DUP, QOS and RETAIN flags.
parser_commons/src/main/java/io/moquette/proto/messages/PubAckMessage.java → netty_parser/src/main/java/io/moquette/parser/proto/messages/PubAckMessage.java
+1 -1
View File
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package io.moquette.proto.messages;
package io.moquette.parser.proto.messages;
/**
* Placeholder for PUBACK message.
parser_commons/src/main/java/io/moquette/proto/messages/PubCompMessage.java → netty_parser/src/main/java/io/moquette/parser/proto/messages/PubCompMessage.java
+1 -1
View File
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package io.moquette.proto.messages;
package io.moquette.parser.proto.messages;
/**
*
parser_commons/src/main/java/io/moquette/proto/messages/PubRecMessage.java → netty_parser/src/main/java/io/moquette/parser/proto/messages/PubRecMessage.java
+1 -1
View File
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package io.moquette.proto.messages;
package io.moquette.parser.proto.messages;
/**
* Placeholder for PUBREC message.
parser_commons/src/main/java/io/moquette/proto/messages/PubRelMessage.java → netty_parser/src/main/java/io/moquette/parser/proto/messages/PubRelMessage.java
+1 -1
View File
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package io.moquette.proto.messages;
package io.moquette.parser.proto.messages;
/**
*
parser_commons/src/main/java/io/moquette/proto/messages/PublishMessage.java → netty_parser/src/main/java/io/moquette/parser/proto/messages/PublishMessage.java
+1 -1
View File
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package io.moquette.proto.messages;
package io.moquette.parser.proto.messages;
import java.nio.ByteBuffer;
parser_commons/src/main/java/io/moquette/proto/messages/SubAckMessage.java → netty_parser/src/main/java/io/moquette/parser/proto/messages/SubAckMessage.java
+1 -1
View File
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package io.moquette.proto.messages;
package io.moquette.parser.proto.messages;
import java.util.ArrayList;
import java.util.List;
parser_commons/src/main/java/io/moquette/proto/messages/SubscribeMessage.java → netty_parser/src/main/java/io/moquette/parser/proto/messages/SubscribeMessage.java
+1 -1
View File
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package io.moquette.proto.messages;
package io.moquette.parser.proto.messages;
import java.util.ArrayList;
import java.util.List;
parser_commons/src/main/java/io/moquette/proto/messages/UnsubAckMessage.java → netty_parser/src/main/java/io/moquette/parser/proto/messages/UnsubAckMessage.java
+1 -1
View File
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package io.moquette.proto.messages;
package io.moquette.parser.proto.messages;
/**
*
parser_commons/src/main/java/io/moquette/proto/messages/UnsubscribeMessage.java → netty_parser/src/main/java/io/moquette/parser/proto/messages/UnsubscribeMessage.java
+1 -1
View File
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package io.moquette.proto.messages;
package io.moquette.parser.proto.messages;
import java.util.ArrayList;
import java.util.List;
parser_commons/src/main/java/io/moquette/proto/messages/ZeroLengthMessage.java → netty_parser/src/main/java/io/moquette/parser/proto/messages/ZeroLengthMessage.java
+1 -1
View File
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package io.moquette.proto.messages;
package io.moquette.parser.proto.messages;
/**
*
netty_parser/src/test/java/io/moquette/parser/netty/ConnAckDecoderTest.java
+2 -2
View File
@@ -19,8 +19,8 @@ import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.util.ArrayList;
import java.util.List;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.proto.messages.ConnAckMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.parser.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
+1 -1
View File
@@ -20,7 +20,7 @@ import io.netty.buffer.ByteBufAllocator;
import io.netty.buffer.Unpooled;
import io.netty.buffer.UnpooledByteBufAllocator;
import io.netty.channel.ChannelHandlerContext;
import io.moquette.proto.messages.ConnAckMessage;
import io.moquette.parser.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
+2 -2
View File
@@ -15,7 +15,7 @@
*/
package io.moquette.parser.netty;
import io.moquette.proto.messages.ConnectMessage;
import io.moquette.parser.proto.messages.ConnectMessage;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.handler.codec.CorruptedFrameException;
@@ -27,7 +27,7 @@ import java.util.ArrayList;
import java.util.List;
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 io.moquette.parser.proto.messages.AbstractMessage;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
netty_parser/src/test/java/io/moquette/parser/netty/ConnectEncoderTest.java
+1 -1
View File
@@ -15,7 +15,7 @@
*/
package io.moquette.parser.netty;
import io.moquette.proto.messages.ConnectMessage;
import io.moquette.parser.proto.messages.ConnectMessage;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandlerContext;
netty_parser/src/test/java/io/moquette/parser/netty/PubAckDecoderTest.java
+2 -2
View File
@@ -15,12 +15,12 @@
*/
package io.moquette.parser.netty;
import io.moquette.proto.messages.PubAckMessage;
import io.moquette.parser.proto.messages.PubAckMessage;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.util.ArrayList;
import java.util.List;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
netty_parser/src/test/java/io/moquette/parser/netty/PubAckEncoderTest.java
+1 -1
View File
@@ -15,7 +15,7 @@
*/
package io.moquette.parser.netty;
import io.moquette.proto.messages.PubAckMessage;
import io.moquette.parser.proto.messages.PubAckMessage;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandlerContext;
netty_parser/src/test/java/io/moquette/parser/netty/PubRelDecoderTest.java
+1 -1
View File
@@ -22,7 +22,7 @@ import io.netty.util.AttributeMap;
import io.netty.util.DefaultAttributeMap;
import java.util.ArrayList;
import java.util.List;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.parser.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
+1 -1
View File
@@ -15,7 +15,7 @@
*/
package io.moquette.parser.netty;
import io.moquette.proto.messages.PubRelMessage;
import io.moquette.parser.proto.messages.PubRelMessage;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandlerContext;
netty_parser/src/test/java/io/moquette/parser/netty/PublishDecoderTest.java
+2 -2
View File
@@ -24,8 +24,8 @@ import java.nio.Buffer;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.proto.messages.PublishMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.parser.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
+2 -2
View File
@@ -23,8 +23,8 @@ import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.*;
import io.moquette.proto.messages.AbstractMessage.QOSType;
import io.moquette.proto.messages.PublishMessage;
import io.moquette.parser.proto.messages.AbstractMessage.QOSType;
import io.moquette.parser.proto.messages.PublishMessage;
/**
*
netty_parser/src/test/java/io/moquette/parser/netty/SubAckDecoderTest.java
+2 -2
View File
@@ -19,8 +19,8 @@ import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.util.ArrayList;
import java.util.List;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.proto.messages.SubAckMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.parser.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
+2 -2
View File
@@ -18,8 +18,8 @@ package io.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandlerContext;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.proto.messages.SubAckMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.SubAckMessage;
import static org.junit.Assert.assertEquals;
import org.junit.Before;
import org.junit.Test;
netty_parser/src/test/java/io/moquette/parser/netty/SubscribeDecoderTest.java
+2 -2
View File
@@ -20,8 +20,8 @@ import io.netty.buffer.Unpooled;
import io.netty.handler.codec.CorruptedFrameException;
import java.util.ArrayList;
import java.util.List;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.proto.messages.SubscribeMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.parser.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
+2 -2
View File
@@ -18,8 +18,8 @@ package io.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandlerContext;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.proto.messages.SubscribeMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.SubscribeMessage;
import static org.junit.Assert.assertEquals;
import org.junit.Before;
import org.junit.Test;
netty_parser/src/test/java/io/moquette/parser/netty/UnsubscribeDecoderTest.java
+2 -2
View File
@@ -21,8 +21,8 @@ import io.netty.handler.codec.CorruptedFrameException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.proto.messages.UnsubscribeMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.parser.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
+2 -2
View File
@@ -18,8 +18,8 @@ package io.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandlerContext;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.proto.messages.UnsubscribeMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.UnsubscribeMessage;
import static org.junit.Assert.assertEquals;
import org.junit.Before;
import org.junit.Test;
netty_parser/src/test/java/io/moquette/parser/netty/UtilsTest.java
+2 -2
View File
@@ -24,8 +24,8 @@ import org.junit.Test;
import static io.moquette.parser.netty.TestUtils.verifyBuff;
import static org.junit.Assert.*;
import io.moquette.proto.messages.AbstractMessage;
import io.moquette.proto.messages.UnsubscribeMessage;
import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.parser.proto.messages.UnsubscribeMessage;
/**
*
netty_parser/src/test/java/io/moquette/parser/netty/performance/LoopHandler.java
+3 -3
View File
@@ -1,11 +1,11 @@
package io.moquette.parser.netty.performance;
import io.moquette.proto.messages.*;
import static io.moquette.proto.messages.AbstractMessage.*;
import io.moquette.parser.proto.messages.*;
import static io.moquette.parser.proto.messages.AbstractMessage.*;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
import io.moquette.proto.Utils;
import io.moquette.parser.proto.Utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
netty_parser/src/test/java/io/moquette/parser/netty/performance/ProtocolDecodingServer.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.moquette.parser.netty.performance;
import io.moquette.commons.Constants;
import io.moquette.parser.commons.Constants;
import io.moquette.parser.netty.MQTTDecoder;
import io.moquette.parser.netty.MQTTEncoder;
import io.netty.bootstrap.ServerBootstrap;

Some files were not shown because too many files have changed in this diff Show More