/*
 * Copyright (c) 2012-2017 The original author or authors
 * ------------------------------------------------------
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * and Apache License v2.0 which accompanies this distribution.
 *
 * The Eclipse Public License is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * The Apache License v2.0 is available at
 * http://www.opensource.org/licenses/apache2.0.php
 *
 * You may elect to redistribute this code under either of these licenses.
 */

package io.moquette.spi.impl;

import io.moquette.server.ConnectionDescriptorStore;
import io.moquette.spi.ClientSession;
import io.netty.handler.codec.mqtt.MqttPublishMessage;
import io.netty.handler.codec.mqtt.MqttQoS;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static io.moquette.spi.impl.ProtocolProcessor.asStoredMessage;
import static io.netty.handler.codec.mqtt.MqttQoS.AT_MOST_ONCE;

class PersistentQueueMessageSender {

    private static final Logger LOG = LoggerFactory.getLogger(PersistentQueueMessageSender.class);
    private final ConnectionDescriptorStore connectionDescriptorStore;

    PersistentQueueMessageSender(ConnectionDescriptorStore connectionDescriptorStore) {
        this.connectionDescriptorStore = connectionDescriptorStore;
    }

    void sendPublish(ClientSession clientsession, MqttPublishMessage pubMessage) {
        String clientId = clientsession.clientID;
        final int messageId = pubMessage.variableHeader().messageId();
        final String topicName = pubMessage.variableHeader().topicName();
        if (LOG.isDebugEnabled()) {
            LOG.debug("Sending PUBLISH message. MessageId={}, CId={}, topic={}, qos={}, payload={}", messageId,
                clientId, topicName, DebugUtils.payload2Str(pubMessage.payload()));
        } else {
            LOG.info("Sending PUBLISH message. MessageId={}, CId={}, topic={}", messageId, clientId, topicName);
        }

        boolean messageDelivered = connectionDescriptorStore.sendMessage(pubMessage, messageId, clientId);

        MqttQoS qos = pubMessage.fixedHeader().qosLevel();
        if (!messageDelivered && qos != AT_MOST_ONCE && !clientsession.isCleanSession()) {
            LOG.warn("PUBLISH message could not be delivered. It will be stored. MessageId={}, CId={}, topic={}, "
                    + "qos={}, cleanSession={}", messageId, clientId, topicName, qos, false);
            clientsession.enqueue(asStoredMessage(pubMessage));
        } else {
            LOG.warn("PUBLISH message could not be delivered. It will be discarded. MessageId={}, CId={}, topic={}, " +
                "qos={}, cleanSession={}", messageId, clientId, topicName, qos, true);
        }
    }
}

@@ -2205,17 +2205,16 @@
       if
- 
 (!messag
@@ -2223,20 +2223,36 @@
 elivered
- && 
+) %7B%0A            if (
 qos != A
@@ -2297,24 +2297,28 @@
 ession()) %7B%0A
+    
             
@@ -2522,24 +2522,28 @@
             
+   
+ 
 clientsessio
@@ -2582,32 +2582,36 @@
 sage));%0A        
+    
 %7D else %7B%0A       
@@ -2607,32 +2607,36 @@
 e %7B%0A            
+  
+  
 LOG.warn(%22PUBLIS
@@ -2743,16 +2743,20 @@
         
+    
 %22qos=%7B%7D,
@@ -2814,24 +2814,38 @@
 qos, true);%0A
+            %7D%0A
         %7D%0A  

change to logging that makes sense