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

Minor refact, moved commons Channel attributes constants from NettyChannel to NettyUtils

Browse Source
This commit is contained in:
andsel
2016-01-24 19:21:24 +01:00
parent aa94d47148
commit 43371d3068
6 changed files with 58 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/test/java/io/moquette/spi/impl/ProtocolProcessorTest.java
+16 -16
View File
@@ -19,7 +19,7 @@ import io.moquette.proto.messages.*;
import io.moquette.interception.InterceptHandler;
import io.moquette.proto.messages.AbstractMessage.QOSType;
import io.moquette.server.ConnectionDescriptor;
import io.moquette.server.netty.NettyChannel;
import io.moquette.server.netty.NettyUtils;
import io.moquette.spi.ClientSession;
import io.moquette.spi.IMatchingCondition;
import io.moquette.spi.IMessagesStore;
@@ -130,7 +130,7 @@ public class ProtocolProcessorTest {
msg.setQos(QOSType.MOST_ONE);
msg.setPayload(buffer);
msg.setRetainFlag(false);
m_session.attr(NettyChannel.ATTR_KEY_USERNAME).set("FakeCLI");
m_session.attr(NettyUtils.ATTR_KEY_USERNAME).set("FakeCLI");
m_processor.processPublish(m_session, msg);
//Verify
@@ -189,7 +189,7 @@ public class ProtocolProcessorTest {
msg.setQos(QOSType.MOST_ONE);
msg.setPayload(buffer);
msg.setRetainFlag(false);
m_session.attr(NettyChannel.ATTR_KEY_USERNAME).set("FakeCLI");
m_session.attr(NettyUtils.ATTR_KEY_USERNAME).set("FakeCLI");
m_processor.processPublish(m_session, msg);
@@ -210,8 +210,8 @@ public class ProtocolProcessorTest {
//Exercise
SubscribeMessage msg = new SubscribeMessage();
msg.addSubscription(new SubscribeMessage.Couple(AbstractMessage.QOSType.MOST_ONE.byteValue(), FAKE_TOPIC));
m_session.attr(NettyChannel.ATTR_KEY_CLIENTID).set(FAKE_CLIENT_ID);
m_session.attr(NettyChannel.ATTR_KEY_CLEANSESSION).set(false);
m_session.attr(NettyUtils.ATTR_KEY_CLIENTID).set(FAKE_CLIENT_ID);
m_session.attr(NettyUtils.ATTR_KEY_CLEANSESSION).set(false);
m_sessionStore.createNewSession(FAKE_CLIENT_ID, false);
m_processor.processSubscribe(m_session, msg);
@@ -225,8 +225,8 @@ public class ProtocolProcessorTest {
public void testDoubleSubscribe() {
SubscribeMessage msg = new SubscribeMessage();
msg.addSubscription(new SubscribeMessage.Couple(AbstractMessage.QOSType.MOST_ONE.byteValue(), FAKE_TOPIC));
m_session.attr(NettyChannel.ATTR_KEY_CLIENTID).set(FAKE_CLIENT_ID);
m_session.attr(NettyChannel.ATTR_KEY_CLEANSESSION).set(false);
m_session.attr(NettyUtils.ATTR_KEY_CLIENTID).set(FAKE_CLIENT_ID);
m_session.attr(NettyUtils.ATTR_KEY_CLEANSESSION).set(false);
m_sessionStore.createNewSession(FAKE_CLIENT_ID, false);
assertEquals(0, subscriptions.size());
@@ -246,8 +246,8 @@ public class ProtocolProcessorTest {
public void testSubscribeWithBadFormattedTopic() {
SubscribeMessage msg = new SubscribeMessage();
msg.addSubscription(new SubscribeMessage.Couple(AbstractMessage.QOSType.MOST_ONE.byteValue(), BAD_FORMATTED_TOPIC));
m_session.attr(NettyChannel.ATTR_KEY_CLIENTID).set(FAKE_CLIENT_ID);
m_session.attr(NettyChannel.ATTR_KEY_CLEANSESSION).set(false);
m_session.attr(NettyUtils.ATTR_KEY_CLIENTID).set(FAKE_CLIENT_ID);
m_session.attr(NettyUtils.ATTR_KEY_CLEANSESSION).set(false);
m_sessionStore.createNewSession(FAKE_CLIENT_ID, false);
assertEquals(0, subscriptions.size());
@@ -271,8 +271,8 @@ public class ProtocolProcessorTest {
UnsubscribeMessage msg = new UnsubscribeMessage();
msg.setMessageID(1);
msg.addTopicFilter(BAD_FORMATTED_TOPIC);
m_session.attr(NettyChannel.ATTR_KEY_CLIENTID).set(FAKE_CLIENT_ID);
m_session.attr(NettyChannel.ATTR_KEY_CLEANSESSION).set(false);
m_session.attr(NettyUtils.ATTR_KEY_CLIENTID).set(FAKE_CLIENT_ID);
m_session.attr(NettyUtils.ATTR_KEY_CLEANSESSION).set(false);
//Exercise
m_processor.processUnsubscribe(m_session, msg);
@@ -317,9 +317,9 @@ public class ProtocolProcessorTest {
pubmsg.setQos(QOSType.MOST_ONE);
pubmsg.setPayload(buffer);
pubmsg.setRetainFlag(true);
m_session.attr(NettyChannel.ATTR_KEY_CLIENTID).set(FAKE_PUBLISHER_ID);
m_session.attr(NettyUtils.ATTR_KEY_CLIENTID).set(FAKE_PUBLISHER_ID);
m_processor.processPublish(m_session, pubmsg);
m_session.attr(NettyChannel.ATTR_KEY_CLEANSESSION).set(false);
m_session.attr(NettyUtils.ATTR_KEY_CLEANSESSION).set(false);
//Exercise
SubscribeMessage msg = new SubscribeMessage();
@@ -377,7 +377,7 @@ public class ProtocolProcessorTest {
msg.setQos(QOSType.MOST_ONE);
msg.setPayload(buffer);
msg.setRetainFlag(true);
m_session.attr(NettyChannel.ATTR_KEY_CLIENTID).set("Publisher");
m_session.attr(NettyUtils.ATTR_KEY_CLIENTID).set("Publisher");
m_processor.processPublish(m_session, msg);
//Verify no message is received
@@ -404,7 +404,7 @@ public class ProtocolProcessorTest {
msg.setQos(QOSType.MOST_ONE);
msg.setPayload(buffer);
msg.setRetainFlag(true);
m_session.attr(NettyChannel.ATTR_KEY_CLIENTID).set("Publisher");
m_session.attr(NettyUtils.ATTR_KEY_CLIENTID).set("Publisher");
m_processor.processPublish(m_session, msg);
//Verify no message is received
@@ -422,7 +422,7 @@ public class ProtocolProcessorTest {
connMsg.setClientID("Publisher");
m_processor.processConnect(m_session, connMsg);
//prepare and existing retained store
m_session.attr(NettyChannel.ATTR_KEY_CLIENTID).set("Publisher");
m_session.attr(NettyUtils.ATTR_KEY_CLIENTID).set("Publisher");
ByteBuffer payload = ByteBuffer.allocate(5).put("Hello".getBytes());
PublishMessage msg = new PublishMessage();
msg.setTopicName(FAKE_TOPIC);
broker/src/test/java/io/moquette/spi/impl/ProtocolProcessor_CONNECT_Test.java
+13 -9
View File
@@ -18,10 +18,10 @@ 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.server.netty.NettyUtils;
import io.moquette.spi.IMessagesStore;
import io.moquette.spi.ISessionsStore;
import io.moquette.spi.impl.subscriptions.SubscriptionsStore;
import io.moquette.server.netty.NettyChannel;
import io.moquette.spi.impl.security.PermitAllAuthorizator;
import io.moquette.spi.impl.subscriptions.Subscription;
import io.netty.channel.embedded.EmbeddedChannel;
@@ -169,7 +169,8 @@ public class ProtocolProcessor_CONNECT_Test {
@Test
public void prohibitAnonymousClient() {
connMsg.setClientID("123");
m_processor.init(subscriptions, m_messagesStore, m_sessionStore, m_mockAuthenticator, false, new PermitAllAuthorizator(), ProtocolProcessorTest.NO_OBSERVERS_INTERCEPTOR);
m_processor.init(subscriptions, m_messagesStore, m_sessionStore, m_mockAuthenticator, false,
new PermitAllAuthorizator(), ProtocolProcessorTest.NO_OBSERVERS_INTERCEPTOR);
//Exercise
m_processor.processConnect(m_session, connMsg);
@@ -183,7 +184,8 @@ public class ProtocolProcessor_CONNECT_Test {
connMsg.setClientID("123");
connMsg.setUserFlag(true);
connMsg.setUsername(ProtocolProcessorTest.TEST_USER + "_fake");
m_processor.init(subscriptions, m_messagesStore, m_sessionStore, m_mockAuthenticator, false, new PermitAllAuthorizator(), ProtocolProcessorTest.NO_OBSERVERS_INTERCEPTOR);
m_processor.init(subscriptions, m_messagesStore, m_sessionStore, m_mockAuthenticator, false,
new PermitAllAuthorizator(), ProtocolProcessorTest.NO_OBSERVERS_INTERCEPTOR);
//Exercise
m_processor.processConnect(m_session, connMsg);
@@ -195,7 +197,8 @@ public class ProtocolProcessor_CONNECT_Test {
@Test
public void acceptAnonymousClient() {
connMsg.setClientID("123");
m_processor.init(subscriptions, m_messagesStore, m_sessionStore, m_mockAuthenticator, true, new PermitAllAuthorizator(), ProtocolProcessorTest.NO_OBSERVERS_INTERCEPTOR);
m_processor.init(subscriptions, m_messagesStore, m_sessionStore, m_mockAuthenticator, true,
new PermitAllAuthorizator(), ProtocolProcessorTest.NO_OBSERVERS_INTERCEPTOR);
//Exercise
m_processor.processConnect(m_session, connMsg);
@@ -243,8 +246,8 @@ public class ProtocolProcessor_CONNECT_Test {
connMsg.setProtocolVersion(VERSION_3_1_1);
connMsg.setClientID("CliID");
connMsg.setCleanSession(false);
m_session.attr(NettyChannel.ATTR_KEY_CLIENTID).set("CliID");
m_session.attr(NettyChannel.ATTR_KEY_CLIENTID).set(false);
m_session.attr(NettyUtils.ATTR_KEY_CLIENTID).set("CliID");
m_session.attr(NettyUtils.ATTR_KEY_CLIENTID).set(false);
//Connect a first time
m_processor.processConnect(m_session, connMsg);
@@ -272,9 +275,10 @@ public class ProtocolProcessor_CONNECT_Test {
//subscribe
SubscribeMessage subscribeMsg = new SubscribeMessage();
subscribeMsg.addSubscription(new SubscribeMessage.Couple((byte) AbstractMessage.QOSType.MOST_ONE.ordinal(), ProtocolProcessorTest.FAKE_TOPIC));
m_session.attr(NettyChannel.ATTR_KEY_CLIENTID).set("CliID");
m_session.attr(NettyChannel.ATTR_KEY_CLEANSESSION).set(false);
subscribeMsg.addSubscription(new SubscribeMessage.Couple((byte) AbstractMessage.QOSType.MOST_ONE.ordinal(),
ProtocolProcessorTest.FAKE_TOPIC));
m_session.attr(NettyUtils.ATTR_KEY_CLIENTID).set("CliID");
m_session.attr(NettyUtils.ATTR_KEY_CLEANSESSION).set(false);
m_processor.processSubscribe(m_session, subscribeMsg);
Subscription expectedSubscription = new Subscription("CliID", ProtocolProcessorTest.FAKE_TOPIC,
AbstractMessage.QOSType.MOST_ONE);