Minor change, redefined signature of DemuxDecoder.decode to use the more gneric AttributeMap instead of ChannelHandlerContext
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
package org.dna.mqtt.moquette.parser.netty;
|
package org.dna.mqtt.moquette.parser.netty;
|
||||||
|
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import io.netty.channel.ChannelHandlerContext;
|
import io.netty.util.AttributeMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import org.dna.mqtt.moquette.proto.messages.ConnAckMessage;
|
import org.dna.mqtt.moquette.proto.messages.ConnAckMessage;
|
||||||
|
|
||||||
@@ -12,7 +12,7 @@ import org.dna.mqtt.moquette.proto.messages.ConnAckMessage;
|
|||||||
class ConnAckDecoder extends DemuxDecoder {
|
class ConnAckDecoder extends DemuxDecoder {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
|
void decode(AttributeMap ctx, ByteBuf in, List<Object> out) throws Exception {
|
||||||
in.resetReaderIndex();
|
in.resetReaderIndex();
|
||||||
//Common decoding part
|
//Common decoding part
|
||||||
ConnAckMessage message = new ConnAckMessage();
|
ConnAckMessage message = new ConnAckMessage();
|
||||||
|
|||||||
@@ -37,11 +37,6 @@ public class ConnectDecoder extends DemuxDecoder {
|
|||||||
static final AttributeKey<Boolean> CONNECT_STATUS = new AttributeKey<Boolean>("connected");
|
static final AttributeKey<Boolean> CONNECT_STATUS = new AttributeKey<Boolean>("connected");
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws UnsupportedEncodingException {
|
|
||||||
decode((AttributeMap)ctx, in, out);
|
|
||||||
}
|
|
||||||
|
|
||||||
// @Override
|
|
||||||
void decode(AttributeMap ctx, ByteBuf in, List<Object> out) throws UnsupportedEncodingException {
|
void decode(AttributeMap ctx, ByteBuf in, List<Object> out) throws UnsupportedEncodingException {
|
||||||
in.resetReaderIndex();
|
in.resetReaderIndex();
|
||||||
//Common decoding part
|
//Common decoding part
|
||||||
|
|||||||
@@ -16,8 +16,8 @@
|
|||||||
package org.dna.mqtt.moquette.parser.netty;
|
package org.dna.mqtt.moquette.parser.netty;
|
||||||
|
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import io.netty.channel.ChannelHandlerContext;
|
|
||||||
import io.netty.handler.codec.CorruptedFrameException;
|
import io.netty.handler.codec.CorruptedFrameException;
|
||||||
|
import io.netty.util.AttributeMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
|
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
|
||||||
|
|
||||||
@@ -26,7 +26,7 @@ import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
|
|||||||
* @author andrea
|
* @author andrea
|
||||||
*/
|
*/
|
||||||
abstract class DemuxDecoder {
|
abstract class DemuxDecoder {
|
||||||
abstract void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception;
|
abstract void decode(AttributeMap ctx, ByteBuf in, List<Object> out) throws Exception;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Decodes the first 2 bytes of the MQTT packet.
|
* Decodes the first 2 bytes of the MQTT packet.
|
||||||
|
|||||||
+2
-2
@@ -16,7 +16,7 @@
|
|||||||
package org.dna.mqtt.moquette.parser.netty;
|
package org.dna.mqtt.moquette.parser.netty;
|
||||||
|
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import io.netty.channel.ChannelHandlerContext;
|
import io.netty.util.AttributeMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import org.dna.mqtt.moquette.proto.messages.DisconnectMessage;
|
import org.dna.mqtt.moquette.proto.messages.DisconnectMessage;
|
||||||
|
|
||||||
@@ -27,7 +27,7 @@ import org.dna.mqtt.moquette.proto.messages.DisconnectMessage;
|
|||||||
class DisconnectDecoder extends DemuxDecoder {
|
class DisconnectDecoder extends DemuxDecoder {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
|
void decode(AttributeMap ctx, ByteBuf in, List<Object> out) throws Exception {
|
||||||
//Common decoding part
|
//Common decoding part
|
||||||
in.resetReaderIndex();
|
in.resetReaderIndex();
|
||||||
DisconnectMessage message = new DisconnectMessage();
|
DisconnectMessage message = new DisconnectMessage();
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
package org.dna.mqtt.moquette.parser.netty;
|
package org.dna.mqtt.moquette.parser.netty;
|
||||||
|
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import io.netty.channel.ChannelHandlerContext;
|
import io.netty.util.AttributeMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import org.dna.mqtt.moquette.proto.messages.MessageIDMessage;
|
import org.dna.mqtt.moquette.proto.messages.MessageIDMessage;
|
||||||
|
|
||||||
@@ -29,7 +29,7 @@ abstract class MessageIDDecoder extends DemuxDecoder {
|
|||||||
protected abstract MessageIDMessage createMessage();
|
protected abstract MessageIDMessage createMessage();
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
|
void decode(AttributeMap ctx, ByteBuf in, List<Object> out) throws Exception {
|
||||||
in.resetReaderIndex();
|
in.resetReaderIndex();
|
||||||
//Common decoding part
|
//Common decoding part
|
||||||
MessageIDMessage message = createMessage();
|
MessageIDMessage message = createMessage();
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
package org.dna.mqtt.moquette.parser.netty;
|
package org.dna.mqtt.moquette.parser.netty;
|
||||||
|
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import io.netty.channel.ChannelHandlerContext;
|
import io.netty.util.AttributeMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import org.dna.mqtt.moquette.proto.messages.PingReqMessage;
|
import org.dna.mqtt.moquette.proto.messages.PingReqMessage;
|
||||||
|
|
||||||
@@ -27,7 +27,7 @@ import org.dna.mqtt.moquette.proto.messages.PingReqMessage;
|
|||||||
class PingReqDecoder extends DemuxDecoder {
|
class PingReqDecoder extends DemuxDecoder {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
|
void decode(AttributeMap ctx, ByteBuf in, List<Object> out) throws Exception {
|
||||||
//Common decoding part
|
//Common decoding part
|
||||||
in.resetReaderIndex();
|
in.resetReaderIndex();
|
||||||
PingReqMessage message = new PingReqMessage();
|
PingReqMessage message = new PingReqMessage();
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
package org.dna.mqtt.moquette.parser.netty;
|
package org.dna.mqtt.moquette.parser.netty;
|
||||||
|
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import io.netty.channel.ChannelHandlerContext;
|
import io.netty.util.AttributeMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import org.dna.mqtt.moquette.proto.messages.PingRespMessage;
|
import org.dna.mqtt.moquette.proto.messages.PingRespMessage;
|
||||||
|
|
||||||
@@ -27,7 +27,7 @@ import org.dna.mqtt.moquette.proto.messages.PingRespMessage;
|
|||||||
class PingRespDecoder extends DemuxDecoder {
|
class PingRespDecoder extends DemuxDecoder {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
|
void decode(AttributeMap ctx, ByteBuf in, List<Object> out) throws Exception {
|
||||||
//Common decoding part
|
//Common decoding part
|
||||||
in.resetReaderIndex();
|
in.resetReaderIndex();
|
||||||
PingRespMessage message = new PingRespMessage();
|
PingRespMessage message = new PingRespMessage();
|
||||||
|
|||||||
@@ -16,7 +16,6 @@
|
|||||||
package org.dna.mqtt.moquette.parser.netty;
|
package org.dna.mqtt.moquette.parser.netty;
|
||||||
|
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import io.netty.channel.ChannelHandlerContext;
|
|
||||||
import io.netty.util.AttributeMap;
|
import io.netty.util.AttributeMap;
|
||||||
import java.io.UnsupportedEncodingException;
|
import java.io.UnsupportedEncodingException;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -30,11 +29,6 @@ import org.dna.mqtt.moquette.proto.messages.PubRelMessage;
|
|||||||
class PubRelDecoder extends DemuxDecoder {
|
class PubRelDecoder extends DemuxDecoder {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws UnsupportedEncodingException {
|
|
||||||
decode((AttributeMap)ctx, in, out);
|
|
||||||
}
|
|
||||||
|
|
||||||
// @Override
|
|
||||||
void decode(AttributeMap ctx, ByteBuf in, List<Object> out) throws UnsupportedEncodingException {
|
void decode(AttributeMap ctx, ByteBuf in, List<Object> out) throws UnsupportedEncodingException {
|
||||||
in.resetReaderIndex();
|
in.resetReaderIndex();
|
||||||
//Common decoding part
|
//Common decoding part
|
||||||
|
|||||||
@@ -35,11 +35,6 @@ class PublishDecoder extends DemuxDecoder {
|
|||||||
private static Logger LOG = LoggerFactory.getLogger(PublishDecoder.class);
|
private static Logger LOG = LoggerFactory.getLogger(PublishDecoder.class);
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
|
|
||||||
decode((AttributeMap)ctx, in, out);
|
|
||||||
}
|
|
||||||
|
|
||||||
// @Override
|
|
||||||
void decode(AttributeMap ctx, ByteBuf in, List<Object> out) throws Exception {
|
void decode(AttributeMap ctx, ByteBuf in, List<Object> out) throws Exception {
|
||||||
LOG.info("decode invoked with buffer {}", in);
|
LOG.info("decode invoked with buffer {}", in);
|
||||||
in.resetReaderIndex();
|
in.resetReaderIndex();
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
package org.dna.mqtt.moquette.parser.netty;
|
package org.dna.mqtt.moquette.parser.netty;
|
||||||
|
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import io.netty.channel.ChannelHandlerContext;
|
import io.netty.util.AttributeMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
|
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
|
||||||
import org.dna.mqtt.moquette.proto.messages.SubAckMessage;
|
import org.dna.mqtt.moquette.proto.messages.SubAckMessage;
|
||||||
@@ -28,7 +28,7 @@ import org.dna.mqtt.moquette.proto.messages.SubAckMessage;
|
|||||||
class SubAckDecoder extends DemuxDecoder {
|
class SubAckDecoder extends DemuxDecoder {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
|
void decode(AttributeMap ctx, ByteBuf in, List<Object> out) throws Exception {
|
||||||
//Common decoding part
|
//Common decoding part
|
||||||
in.resetReaderIndex();
|
in.resetReaderIndex();
|
||||||
SubAckMessage message = new SubAckMessage();
|
SubAckMessage message = new SubAckMessage();
|
||||||
|
|||||||
@@ -16,8 +16,8 @@
|
|||||||
package org.dna.mqtt.moquette.parser.netty;
|
package org.dna.mqtt.moquette.parser.netty;
|
||||||
|
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import io.netty.channel.ChannelHandlerContext;
|
|
||||||
import io.netty.handler.codec.CorruptedFrameException;
|
import io.netty.handler.codec.CorruptedFrameException;
|
||||||
|
import io.netty.util.AttributeMap;
|
||||||
import java.io.UnsupportedEncodingException;
|
import java.io.UnsupportedEncodingException;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType;
|
import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType;
|
||||||
@@ -30,7 +30,7 @@ import org.dna.mqtt.moquette.proto.messages.SubscribeMessage;
|
|||||||
class SubscribeDecoder extends DemuxDecoder {
|
class SubscribeDecoder extends DemuxDecoder {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
|
void decode(AttributeMap ctx, ByteBuf in, List<Object> out) throws Exception {
|
||||||
//Common decoding part
|
//Common decoding part
|
||||||
SubscribeMessage message = new SubscribeMessage();
|
SubscribeMessage message = new SubscribeMessage();
|
||||||
in.resetReaderIndex();
|
in.resetReaderIndex();
|
||||||
|
|||||||
+2
-2
@@ -16,8 +16,8 @@
|
|||||||
package org.dna.mqtt.moquette.parser.netty;
|
package org.dna.mqtt.moquette.parser.netty;
|
||||||
|
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import io.netty.channel.ChannelHandlerContext;
|
|
||||||
import io.netty.handler.codec.CorruptedFrameException;
|
import io.netty.handler.codec.CorruptedFrameException;
|
||||||
|
import io.netty.util.AttributeMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
|
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
|
||||||
import org.dna.mqtt.moquette.proto.messages.UnsubscribeMessage;
|
import org.dna.mqtt.moquette.proto.messages.UnsubscribeMessage;
|
||||||
@@ -29,7 +29,7 @@ import org.dna.mqtt.moquette.proto.messages.UnsubscribeMessage;
|
|||||||
class UnsubscribeDecoder extends DemuxDecoder {
|
class UnsubscribeDecoder extends DemuxDecoder {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
|
void decode(AttributeMap ctx, ByteBuf in, List<Object> out) throws Exception {
|
||||||
//Common decoding part
|
//Common decoding part
|
||||||
in.resetReaderIndex();
|
in.resetReaderIndex();
|
||||||
UnsubscribeMessage message = new UnsubscribeMessage();
|
UnsubscribeMessage message = new UnsubscribeMessage();
|
||||||
|
|||||||
Reference in New Issue
Block a user