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;