Moved subscription logic inside the event loop

This commit is contained in:
selva.andre
2012-09-04 16:20:53 +02:00
parent 70ad0c0475
commit 0e1a3cef6c
5 changed files with 46 additions and 89 deletions
@@ -14,11 +14,6 @@ import org.dna.mqtt.moquette.proto.messages.ConnectMessage;
*/ */
public interface IMessaging { public interface IMessaging {
/**
* Subscribe a client to a specified topic with a defined level
*/
void subscribe(String clientId, String topic, QOSType qos, boolean cleanSession, int messageID);
void stop(); void stop();
void disconnect(IoSession session); void disconnect(IoSession session);
@@ -14,7 +14,6 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import org.apache.mina.core.session.IdleStatus; import org.apache.mina.core.session.IdleStatus;
import org.apache.mina.core.session.IoSession; import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.util.SessionAttributeInitializingFilter;
import org.dna.mqtt.moquette.messaging.spi.IMatchingCondition; import org.dna.mqtt.moquette.messaging.spi.IMatchingCondition;
import org.dna.mqtt.moquette.messaging.spi.IMessaging; import org.dna.mqtt.moquette.messaging.spi.IMessaging;
import org.dna.mqtt.moquette.messaging.spi.IStorageService; import org.dna.mqtt.moquette.messaging.spi.IStorageService;
@@ -115,13 +114,6 @@ public class SimpleMessaging implements IMessaging, EventHandler<ValueEvent> {
} }
public void subscribe(String clientId, String topic, QOSType qos, boolean cleanSession, int messageID) {
Subscription newSubscription = new Subscription(clientId, topic, qos, cleanSession);
LOG.debug("subscribe invoked for topic: " + topic);
disruptorPublish(new SubscribeEvent(newSubscription, messageID));
}
public void disconnect(IoSession session) { public void disconnect(IoSession session) {
disruptorPublish(new DisconnectEvent(session)); disruptorPublish(new DisconnectEvent(session));
} }
@@ -178,9 +170,6 @@ public class SimpleMessaging implements IMessaging, EventHandler<ValueEvent> {
return subscriptions; return subscriptions;
} }
/* public void removeSubscriptions(String clientID) {
disruptorPublish(new RemoveAllSubscriptionsEvent(clientID));
}*/
public void stop() { public void stop() {
disruptorPublish(new StopEvent()); disruptorPublish(new StopEvent());
@@ -191,8 +180,6 @@ public class SimpleMessaging implements IMessaging, EventHandler<ValueEvent> {
MessagingEvent evt = t.getEvent(); MessagingEvent evt = t.getEvent();
if (evt instanceof PublishEvent) { if (evt instanceof PublishEvent) {
processPublish((PublishEvent) evt); processPublish((PublishEvent) evt);
} else if (evt instanceof SubscribeEvent) {
processSubscribe((SubscribeEvent) evt);
} else if (evt instanceof StopEvent) { } else if (evt instanceof StopEvent) {
processStop(); processStop();
} else if (evt instanceof DisconnectEvent) { } else if (evt instanceof DisconnectEvent) {
@@ -237,7 +224,10 @@ public class SimpleMessaging implements IMessaging, EventHandler<ValueEvent> {
UnsubscribeMessage unsubMsg = (UnsubscribeMessage) message; UnsubscribeMessage unsubMsg = (UnsubscribeMessage) message;
String clientID = (String) session.getAttribute(Constants.ATTR_CLIENTID); String clientID = (String) session.getAttribute(Constants.ATTR_CLIENTID);
processUnsubscribe(session, clientID, unsubMsg.topics(), unsubMsg.getMessageID()); processUnsubscribe(session, clientID, unsubMsg.topics(), unsubMsg.getMessageID());
} else if (message instanceof SubscribeMessage) {
String clientID = (String) session.getAttribute(Constants.ATTR_CLIENTID);
boolean cleanSession = (Boolean) session.getAttribute(Constants.CLEAN_SESSION);
processSubscribe(session, (SubscribeMessage) message, clientID, cleanSession);
} else { } else {
throw new RuntimeException("Illegal message received " + message); throw new RuntimeException("Illegal message received " + message);
} }
@@ -373,11 +363,7 @@ public class SimpleMessaging implements IMessaging, EventHandler<ValueEvent> {
} }
protected void processSubscribe(SubscribeEvent evt) { private void subscribeSingleTopic(Subscription newSubscription, final String topic) {
LOG.debug("processSubscribe invoked");
Subscription newSubscription = evt.getSubscription();
final String topic = newSubscription.getTopic();
subscriptions.add(newSubscription); subscriptions.add(newSubscription);
//scans retained messages to be published to the new subscription //scans retained messages to be published to the new subscription
@@ -390,22 +376,30 @@ public class SimpleMessaging implements IMessaging, EventHandler<ValueEvent> {
for (StoredMessage storedMsg : messages) { for (StoredMessage storedMsg : messages) {
//fire the as retained the message //fire the as retained the message
LOG.debug("Inserting NotifyEvent into outbound for topic " + topic); LOG.debug("Inserting NotifyEvent into outbound for topic " + topic);
notify(new NotifyEvent(newSubscription.clientId, topic, storedMsg.getQos(), notify(new NotifyEvent(newSubscription.clientId, topic, storedMsg.getQos(), storedMsg.getPayload(), true));
storedMsg.getPayload(), true)); }
}
protected void processSubscribe(IoSession session, SubscribeMessage msg, String clientID, boolean cleanSession) {
LOG.debug("processSubscribe invoked");
for (SubscribeMessage.Couple req : msg.subscriptions()) {
QOSType qos = AbstractMessage.QOSType.values()[req.getQos()];
Subscription newSubscription = new Subscription(clientID, req.getTopic(), qos, cleanSession);
subscribeSingleTopic(newSubscription, req.getTopic());
} }
// //ack the client //ack the client
// SubAckMessage ackMessage = new SubAckMessage(); SubAckMessage ackMessage = new SubAckMessage();
// ackMessage.setMessageID(evt.getMessageID()); ackMessage.setMessageID(msg.getMessageID());
//
// //TODO by now it handles only QoS 0 messages //TODO by now it handles only QoS 0 messages
// /*for (int i = 0; i < evt.subscriptions().size(); i++) { for (int i = 0; i < msg.subscriptions().size(); i++) {
// ackMessage.addType(QOSType.MOST_ONE); ackMessage.addType(QOSType.MOST_ONE);
// } */ }
// LOG.info("replying with SubAct to MSG ID {0}", evt.getMessageID()); LOG.info("replying with SubAct to MSG ID {0}", msg.getMessageID());
// //session.write(ackMessage); session.write(ackMessage);
// IoSession session = m_clientIDs.get(evt.getSubscription().clientId).getSession();
// session.write(ackMessage).awaitUninterruptibly();
} }
/** /**
@@ -1,25 +0,0 @@
package org.dna.mqtt.moquette.messaging.spi.impl.events;
import org.apache.mina.core.session.IoSession;
import org.dna.mqtt.moquette.proto.messages.ConnectMessage;
/**
*/
public class ConnectEvent extends MessagingEvent {
IoSession m_session;
ConnectMessage message;
public ConnectEvent(IoSession session, ConnectMessage message) {
this.m_session = session;
this.message = message;
}
public IoSession getSession() {
return m_session;
}
public ConnectMessage getMessage() {
return message;
}
}
@@ -66,23 +66,7 @@ public class MQTTHandler extends IoHandlerAdapter {
protected void handleSubscribe(IoSession session, SubscribeMessage msg) { protected void handleSubscribe(IoSession session, SubscribeMessage msg) {
LOG.debug("handleSubscribe, registering the subscriptions"); LOG.debug("handleSubscribe, registering the subscriptions");
for (SubscribeMessage.Couple req : msg.subscriptions()) { m_messaging.handleProtocolMessage(session, msg);
String clientID = (String) session.getAttribute(Constants.ATTR_CLIENTID);
boolean cleanSession = (Boolean) session.getAttribute(Constants.CLEAN_SESSION);
m_messaging.subscribe(clientID, req.getTopic(), AbstractMessage.QOSType.values()[req.getQos()],
cleanSession, msg.getMessageID());
}
//ack the client
SubAckMessage ackMessage = new SubAckMessage();
ackMessage.setMessageID(msg.getMessageID());
//TODO by now it handles only QoS 0 messages
for (int i = 0; i < msg.subscriptions().size(); i++) {
ackMessage.addType(QOSType.MOST_ONE);
}
LOG.info("replying with SubAct to MSG ID {0}", msg.getMessageID());
session.write(ackMessage);
} }
private void handleUnsubscribe(IoSession session, UnsubscribeMessage msg) { private void handleUnsubscribe(IoSession session, UnsubscribeMessage msg) {
@@ -76,8 +76,9 @@ public class SimpleMessagingTest {
@Test @Test
public void testSubscribe() { public void testSubscribe() {
//Exercise //Exercise
SubscribeEvent evt = new SubscribeEvent(new Subscription(FAKE_CLIENT_ID, FAKE_TOPIC, QOSType.MOST_ONE, false), 0); SubscribeMessage msg = new SubscribeMessage();
messaging.processSubscribe(evt); msg.addSubscription(new SubscribeMessage.Couple((byte)QOSType.MOST_ONE.ordinal(), FAKE_TOPIC));
messaging.processSubscribe(m_session, msg, FAKE_CLIENT_ID, false);
//Verify //Verify
Subscription expectedSubscription = new Subscription(FAKE_CLIENT_ID, FAKE_TOPIC, QOSType.MOST_ONE, false); Subscription expectedSubscription = new Subscription(FAKE_CLIENT_ID, FAKE_TOPIC, QOSType.MOST_ONE, false);
@@ -86,11 +87,14 @@ public class SimpleMessagingTest {
@Test @Test
public void testDoubleSubscribe() { public void testDoubleSubscribe() {
SubscribeEvent evt = new SubscribeEvent(new Subscription(FAKE_CLIENT_ID, FAKE_TOPIC, QOSType.MOST_ONE, false), 0); // SubscribeEvent evt = new SubscribeEvent(new Subscription(FAKE_CLIENT_ID, FAKE_TOPIC, QOSType.MOST_ONE, false), 0);
messaging.processSubscribe(evt); SubscribeMessage msg = new SubscribeMessage();
msg.addSubscription(new SubscribeMessage.Couple((byte)QOSType.MOST_ONE.ordinal(), FAKE_TOPIC));
messaging.processSubscribe(m_session, msg, FAKE_CLIENT_ID, false);
//Exercise //Exercise
messaging.processSubscribe(evt); messaging.processSubscribe(m_session, msg, FAKE_CLIENT_ID, false);
//Verify //Verify
Subscription subscription = new Subscription(FAKE_CLIENT_ID, FAKE_TOPIC, QOSType.MOST_ONE, false); Subscription subscription = new Subscription(FAKE_CLIENT_ID, FAKE_TOPIC, QOSType.MOST_ONE, false);
@@ -103,8 +107,11 @@ public class SimpleMessagingTest {
ConnectionDescriptor connDescr = new ConnectionDescriptor(FAKE_CLIENT_ID, m_session, true); ConnectionDescriptor connDescr = new ConnectionDescriptor(FAKE_CLIENT_ID, m_session, true);
messaging.m_clientIDs.put(FAKE_CLIENT_ID, connDescr); messaging.m_clientIDs.put(FAKE_CLIENT_ID, connDescr);
SubscribeEvent evt = new SubscribeEvent(new Subscription(FAKE_CLIENT_ID, FAKE_TOPIC, QOSType.MOST_ONE, false), 0); // SubscribeEvent evt = new SubscribeEvent(new Subscription(FAKE_CLIENT_ID, FAKE_TOPIC, QOSType.MOST_ONE, false), 0);
messaging.processSubscribe(evt); SubscribeMessage msg = new SubscribeMessage();
msg.addSubscription(new SubscribeMessage.Couple((byte)QOSType.MOST_ONE.ordinal(), FAKE_TOPIC));
messaging.processSubscribe(m_session, msg, FAKE_CLIENT_ID, false);
//Exercise //Exercise
PublishEvent pubEvt = new PublishEvent(FAKE_TOPIC, QOSType.MOST_ONE, "Hello".getBytes(), false, "FakeCLI", null); PublishEvent pubEvt = new PublishEvent(FAKE_TOPIC, QOSType.MOST_ONE, "Hello".getBytes(), false, "FakeCLI", null);
@@ -198,8 +205,10 @@ public class SimpleMessagingTest {
//Exercise //Exercise
//m_handler.setMessaging(mockedMessaging); //m_handler.setMessaging(mockedMessaging);
SubscribeEvent pubEvt = new SubscribeEvent(subscription, 0); // SubscribeEvent pubEvt = new SubscribeEvent(subscription, 0);
messaging.processSubscribe(pubEvt); SubscribeMessage msg = new SubscribeMessage();
msg.addSubscription(new SubscribeMessage.Couple((byte)QOSType.EXACTLY_ONCE.ordinal(), "/news"));
messaging.processSubscribe(m_session, msg, "fakeID", false);
//Verify //Verify
/*ArgumentCaptor<AbstractMessage.QOSType> argument = ArgumentCaptor.forClass(AbstractMessage.QOSType.class); /*ArgumentCaptor<AbstractMessage.QOSType> argument = ArgumentCaptor.forClass(AbstractMessage.QOSType.class);