Introduced handling of sessionPresent flag in ConnAck msg, now on every conenction is created an empty subscription in ISessionStore

This commit is contained in:
selva.andre
2014-07-27 12:20:53 +02:00
parent bd3c4cb40c
commit 482ffe0c65
8 changed files with 70 additions and 5 deletions
@@ -36,4 +36,9 @@ public interface ISessionsStore {
void wipeSubscriptions(String sessionID); void wipeSubscriptions(String sessionID);
List<Subscription> listAllSubscriptions(); List<Subscription> listAllSubscriptions();
/**
* @return true iff there are subscriptions persisted with clientID
*/
boolean contains(String clientID);
} }
@@ -274,6 +274,11 @@ public class HawtDBPersistentStore implements IMessagesStore, ISessionsStore {
return allSubscriptions; return allSubscriptions;
} }
@Override
public boolean contains(String clientID) {
return m_persistentSubscriptions.containsKey(clientID);
}
public void close() { public void close() {
LOG.debug("closing disk storage"); LOG.debug("closing disk storage");
try { try {
@@ -135,6 +135,11 @@ public class MemoryStorageService implements IMessagesStore, ISessionsStore {
m_persistentSubscriptions.remove(clientID); m_persistentSubscriptions.remove(clientID);
} }
@Override
public boolean contains(String clientID) {
return m_persistentSubscriptions.containsKey(clientID);
}
public List<Subscription> listAllSubscriptions() { public List<Subscription> listAllSubscriptions() {
List<Subscription> allSubscriptions = new ArrayList<Subscription>(); List<Subscription> allSubscriptions = new ArrayList<Subscription>();
for (Map.Entry<String, Set<Subscription>> entry : m_persistentSubscriptions.entrySet()) { for (Map.Entry<String, Set<Subscription>> entry : m_persistentSubscriptions.entrySet()) {
@@ -220,10 +220,16 @@ class ProtocolProcessor implements EventHandler<ValueEvent> {
ConnAckMessage okResp = new ConnAckMessage(); ConnAckMessage okResp = new ConnAckMessage();
okResp.setReturnCode(ConnAckMessage.CONNECTION_ACCEPTED); okResp.setReturnCode(ConnAckMessage.CONNECTION_ACCEPTED);
if (!msg.isCleanSession() && m_sessionsStore.contains(msg.getClientID())) {
okResp.setSessionPresent(true);
}
LOG.debug("processConnect sent OK ConnAck"); LOG.debug("processConnect sent OK ConnAck");
session.write(okResp); session.write(okResp);
LOG.info("Connected client ID <{}> with clean session {}", msg.getClientID(), msg.isCleanSession()); LOG.info("Connected client ID <{}> with clean session {}", msg.getClientID(), msg.isCleanSession());
LOG.info("Create persistent session for clientID {}", msg.getClientID());
m_sessionsStore.addNewSubscription(Subscription.createEmptySubscription(msg.getClientID(), true), msg.getClientID()); //null means EmptySubscription
if (!msg.isCleanSession()) { if (!msg.isCleanSession()) {
//force the republish of stored QoS1 and QoS2 //force the republish of stored QoS1 and QoS2
republishStored(msg.getClientID()); republishStored(msg.getClientID());
@@ -40,6 +40,13 @@ public class Subscription implements Serializable {
this.cleanSession = cleanSession; this.cleanSession = cleanSession;
} }
/**
* Factory method for empty subscriptions
*/
public static final Subscription createEmptySubscription(String clientId, boolean cleanSession) {
return new Subscription(clientId, "", QOSType.MOST_ONE, cleanSession);
}
public String getClientId() { public String getClientId() {
return clientId; return clientId;
} }
@@ -23,23 +23,25 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.dna.mqtt.moquette.messaging.spi.ISessionsStore;
import org.dna.mqtt.moquette.messaging.spi.IMessagesStore; import org.dna.mqtt.moquette.messaging.spi.IMessagesStore;
import org.dna.mqtt.moquette.messaging.spi.ISessionsStore;
import org.dna.mqtt.moquette.messaging.spi.impl.events.PublishEvent; import org.dna.mqtt.moquette.messaging.spi.impl.events.PublishEvent;
import org.dna.mqtt.moquette.messaging.spi.impl.subscriptions.Subscription; import org.dna.mqtt.moquette.messaging.spi.impl.subscriptions.Subscription;
import org.dna.mqtt.moquette.messaging.spi.impl.subscriptions.SubscriptionsStore; import org.dna.mqtt.moquette.messaging.spi.impl.subscriptions.SubscriptionsStore;
import static org.dna.mqtt.moquette.parser.netty.Utils.VERSION_3_1_1;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage; import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType; import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType;
import org.dna.mqtt.moquette.proto.messages.ConnAckMessage; import org.dna.mqtt.moquette.proto.messages.ConnAckMessage;
import org.dna.mqtt.moquette.proto.messages.ConnectMessage; import org.dna.mqtt.moquette.proto.messages.ConnectMessage;
import org.dna.mqtt.moquette.proto.messages.DisconnectMessage;
import org.dna.mqtt.moquette.proto.messages.PublishMessage; import org.dna.mqtt.moquette.proto.messages.PublishMessage;
import org.dna.mqtt.moquette.proto.messages.SubAckMessage; import org.dna.mqtt.moquette.proto.messages.SubAckMessage;
import org.dna.mqtt.moquette.proto.messages.SubscribeMessage; import org.dna.mqtt.moquette.proto.messages.SubscribeMessage;
import org.dna.mqtt.moquette.server.ServerChannel; import org.dna.mqtt.moquette.server.ServerChannel;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import static org.mockito.Mockito.*;
/** /**
* *
@@ -97,7 +99,9 @@ public class ProtocolProcessorTest {
} }
} }
/**
* This a synchronous channel that avoid output ring buffer from Processor
*/
class MockReceiverChannel implements ServerChannel { class MockReceiverChannel implements ServerChannel {
// byte m_returnCode; // byte m_returnCode;
AbstractMessage m_receivedMessage; AbstractMessage m_receivedMessage;
@@ -247,6 +251,31 @@ public class ProtocolProcessorTest {
} }
@Test
public void testConnAckContainsSessionPresentFlag() throws InterruptedException {
connMsg = new ConnectMessage();
connMsg.setProcotolVersion(VERSION_3_1_1);
connMsg.setClientID("CliID");
connMsg.setCleanSession(false);
//Connect a first time
m_processor.processConnect(m_session, connMsg);
//disconnect
m_processor.processDisconnect(m_session, "CliID", false);
//Exercise, reconnect
MockReceiverChannel firstReceiverSession = new MockReceiverChannel();
m_processor.processConnect(firstReceiverSession, connMsg);
//Verify
AbstractMessage recvMsg = firstReceiverSession.getMessage();
assertTrue(recvMsg instanceof ConnAckMessage);
ConnAckMessage connAckMsg = (ConnAckMessage) recvMsg;
assertTrue(connAckMsg.isSessionPresent());
assertEquals(ConnAckMessage.CONNECTION_ACCEPTED, connAckMsg.getReturnCode());
}
@Test @Test
public void testPublish() throws InterruptedException { public void testPublish() throws InterruptedException {
final Subscription subscription = new Subscription(FAKE_CLIENT_ID, final Subscription subscription = new Subscription(FAKE_CLIENT_ID,
@@ -30,7 +30,7 @@ class ConnAckEncoder extends DemuxEncoder<ConnAckMessage>{
protected void encode(ChannelHandlerContext chc, ConnAckMessage message, ByteBuf out) { protected void encode(ChannelHandlerContext chc, ConnAckMessage message, ByteBuf out) {
out.writeByte(AbstractMessage.CONNACK << 4); out.writeByte(AbstractMessage.CONNACK << 4);
out.writeBytes(Utils.encodeRemainingLength(2)); out.writeBytes(Utils.encodeRemainingLength(2));
out.writeByte(0); out.writeByte(message.isSessionPresent() ? 0x01 : 0x00);
out.writeByte(message.getReturnCode()); out.writeByte(message.getReturnCode());
} }
@@ -29,6 +29,7 @@ public class ConnAckMessage extends AbstractMessage {
public static final byte NOT_AUTHORIZED = 0x05; public static final byte NOT_AUTHORIZED = 0x05;
private byte m_returnCode; private byte m_returnCode;
private boolean sessionPresent;
public ConnAckMessage() { public ConnAckMessage() {
m_messageType = AbstractMessage.CONNACK; m_messageType = AbstractMessage.CONNACK;
@@ -42,4 +43,11 @@ public class ConnAckMessage extends AbstractMessage {
this.m_returnCode = returnCode; this.m_returnCode = returnCode;
} }
public boolean isSessionPresent() {
return this.sessionPresent;
}
public void setSessionPresent(boolean present) {
this.sessionPresent = present;
}
} }