Updated publish message parto to conform to 3.1.1 specification

broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/IMessagesStore.java

@@ -68,4 +68,6 @@ public interface IMessagesStore {
     void removeQoS2Message(String publishKey);
 
     PublishEvent retrieveQoS2Message(String publishKey);
+
+    void cleanRetained(String topic);
 }

broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/HawtDBPersistentStore.java

@@ -150,6 +150,11 @@ public class HawtDBPersistentStore implements IMessagesStore, ISessionsStore {
         m_qos2Store = (SortedIndex<String, StoredPublishEvent>) m_multiIndexFactory.openOrCreate("qos2Store", indexFactory);
     }
 
+    @Override
+    public void cleanRetained(String topic) {
+        m_retainedStore.remove(topic);
+    }
+    
     @Override
     public void storeRetained(String topic, ByteBuffer message, AbstractMessage.QOSType qos) {
         if (!message.hasRemaining()) {

broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/MemoryStorageService.java

@@ -47,9 +47,14 @@ public class MemoryStorageService implements IMessagesStore, ISessionsStore {
     private static final Logger LOG = LoggerFactory.getLogger(MemoryStorageService.class);
     
     public void initStore() {
-        //To change body of implemented methods use File | Settings | File Templates.
     }
-
+    
+    @Override
+    public void cleanRetained(String topic) {
+        m_retainedStore.remove(topic);
+    }
+    
+    @Override
     public void storeRetained(String topic, ByteBuffer message, AbstractMessage.QOSType qos) {
         if (!message.hasRemaining()) {
             //clean the message from topic
@@ -62,6 +67,7 @@ public class MemoryStorageService implements IMessagesStore, ISessionsStore {
         }
     }
 
+    @Override
     public Collection<HawtDBPersistentStore.StoredMessage> searchMatching(IMatchingCondition condition) {
         LOG.debug("searchMatching scanning all retained messages, presents are {}", m_retainedStore.size());
 
@@ -77,6 +83,7 @@ public class MemoryStorageService implements IMessagesStore, ISessionsStore {
         return results;
     }
 
+    @Override
     public void storePublishForFuture(PublishEvent evt) {
         LOG.debug("storePublishForFuture store evt {}", evt);
         List<PublishEvent> storedEvents;
@@ -95,6 +102,7 @@ public class MemoryStorageService implements IMessagesStore, ISessionsStore {
         return m_persistentMessageStore.get(clientID);
     }
     
+    @Override
     public void cleanPersistedPublishMessage(String clientID, int messageID) {
         List<PublishEvent> events = m_persistentMessageStore.get(clientID);
         PublishEvent toRemoveEvt = null;
@@ -107,18 +115,22 @@ public class MemoryStorageService implements IMessagesStore, ISessionsStore {
         m_persistentMessageStore.put(clientID, events);
     }
 
+    @Override
     public void cleanPersistedPublishes(String clientID) {
         m_persistentMessageStore.remove(clientID);
     }
 
+    @Override
     public void cleanInFlight(String msgID) {
         m_inflightStore.remove(msgID);
     }
 
+    @Override
     public void addInFlight(PublishEvent evt, String publishKey) {
         m_inflightStore.put(publishKey, evt);
     }
 
+    @Override
     public void addNewSubscription(Subscription newSubscription, String clientID) {
         if (!m_persistentSubscriptions.containsKey(clientID)) {
             m_persistentSubscriptions.put(clientID, new HashSet<Subscription>());
@@ -131,6 +143,7 @@ public class MemoryStorageService implements IMessagesStore, ISessionsStore {
         }
     }
 
+    @Override
     public void wipeSubscriptions(String clientID) {
         m_persistentSubscriptions.remove(clientID);
     }
@@ -140,6 +153,7 @@ public class MemoryStorageService implements IMessagesStore, ISessionsStore {
         return m_persistentSubscriptions.containsKey(clientID);
     }
 
+    @Override
     public List<Subscription> listAllSubscriptions() {
         List<Subscription> allSubscriptions = new ArrayList<Subscription>();
         for (Map.Entry<String, Set<Subscription>> entry : m_persistentSubscriptions.entrySet()) {
@@ -148,19 +162,23 @@ public class MemoryStorageService implements IMessagesStore, ISessionsStore {
         return allSubscriptions;
     }
 
+    @Override
     public void close() {
         //To change body of implemented methods use File | Settings | File Templates.
     }
 
+    @Override
     public void persistQoS2Message(String publishKey, PublishEvent evt) {
         LOG.debug("persistQoS2Message store pubKey {}, evt {}", publishKey, evt);
         m_qos2Store.put(publishKey, evt);
     }
 
+    @Override
     public void removeQoS2Message(String publishKey) {
         m_qos2Store.remove(publishKey);
     }
 
+    @Override
     public PublishEvent retrieveQoS2Message(String publishKey) {
         return m_qos2Store.get(publishKey);
     }

broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessor.java

@@ -303,7 +303,12 @@ class ProtocolProcessor implements EventHandler<ValueEvent> {
         }
 
         if (retain) {
-            m_messagesStore.storeRetained(topic, message, qos);
+            if (qos == AbstractMessage.QOSType.MOST_ONE) {
+                //QoS == 0 && retain => clean old retained 
+                m_messagesStore.cleanRetained(topic);
+            } else {
+                m_messagesStore.storeRetained(topic, message, qos);
+            }
         }
     }
     
@@ -408,7 +413,7 @@ class ProtocolProcessor implements EventHandler<ValueEvent> {
             }
             LOG.debug("clientIDs are {}", m_clientIDs);
             if (m_clientIDs.get(clientId) == null) {
-                throw new RuntimeException(String.format("Can't find a ConnectionDEwcriptor for client %s in cache %s", clientId, m_clientIDs));
+                throw new RuntimeException(String.format("Can't find a ConnectionDescriptor for client %s in cache %s", clientId, m_clientIDs));
             }
 //            LOG.debug("Session for clientId " + clientId + " is " + m_clientIDs.get(clientId).getSession());
 //            m_clientIDs.get(clientId).getSession().write(pubAckMessage);