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

Minor, modified access to fields of SubscribeMessage.Couple

Browse Source
This commit is contained in:
andsel
2016-01-30 17:35:28 +01:00
parent a19af18a61
commit d36de24349
7 changed files with 25 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
netty_parser/src/main/java/io/moquette/parser/netty/SubscribeEncoder.java
+2 -2
View File
@@ -41,8 +41,8 @@ class SubscribeEncoder extends DemuxEncoder<SubscribeMessage> {
try {
variableHeaderBuff.writeShort(message.getMessageID());
for (SubscribeMessage.Couple c : message.subscriptions()) {
variableHeaderBuff.writeBytes(Utils.encodeString(c.getTopicFilter()));
variableHeaderBuff.writeByte(c.getQos());
variableHeaderBuff.writeBytes(Utils.encodeString(c.topicFilter));
variableHeaderBuff.writeByte(c.qos);
}
int variableHeaderSize = variableHeaderBuff.readableBytes();
netty_parser/src/test/java/io/moquette/parser/netty/SubscribeDecoderTest.java
+4 -4
View File
@@ -119,8 +119,8 @@ public class SubscribeDecoderTest {
ByteBuf topicBuffer = Unpooled.buffer(4);
topicBuffer.writeShort(messageID);
for (SubscribeMessage.Couple couple : topics) {
topicBuffer.writeBytes(Utils.encodeString(couple.getTopicFilter()));
topicBuffer.writeByte(couple.getQos());
topicBuffer.writeBytes(Utils.encodeString(couple.topicFilter));
topicBuffer.writeByte(couple.qos);
}
buff.clear().writeByte(AbstractMessage.SUBSCRIBE << 4 | (byte)0x02)
@@ -131,8 +131,8 @@ public class SubscribeDecoderTest {
private void initPollutedTopic(ByteBuf buff, int messageID, SubscribeMessage.Couple topic) throws IllegalAccessException {
ByteBuf topicBuffer = Unpooled.buffer(4);
topicBuffer.writeShort(messageID);
topicBuffer.writeBytes(Utils.encodeString(topic.getTopicFilter()));
topicBuffer.writeByte(0xF0 | topic.getQos());
topicBuffer.writeBytes(Utils.encodeString(topic.topicFilter));
topicBuffer.writeByte(0xF0 | topic.qos);
buff.clear().writeByte(AbstractMessage.SUBSCRIBE << 4 | (byte)0x02)
.writeBytes(Utils.encodeRemainingLength(topicBuffer.readableBytes()));
netty_parser/src/test/java/io/moquette/parser/netty/SubscribeEncoderTest.java
+4 -4
View File
@@ -64,10 +64,10 @@ public class SubscribeEncoderTest {
assertEquals((byte)0xBB, m_out.readByte());
//Variable part
TestUtils.verifyString(c1.getTopicFilter(), m_out);
assertEquals(c1.getQos(), m_out.readByte());
TestUtils.verifyString(c2.getTopicFilter(), m_out);
assertEquals(c2.getQos(), m_out.readByte());
TestUtils.verifyString(c1.topicFilter, m_out);
assertEquals(c1.qos, m_out.readByte());
TestUtils.verifyString(c2.topicFilter, m_out);
assertEquals(c2.qos, m_out.readByte());
}
@Test(expected = IllegalArgumentException.class)