From 0e0afe7c9b49baa8fa94dc1b5d2010331ef99de8 Mon Sep 17 00:00:00 2001 From: andsel Date: Tue, 13 Dec 2016 00:46:19 +0100 Subject: [PATCH] Renames --- ...s0Publisher.java => BestEffortMessageSender.java} | 6 +++--- .../java/io/moquette/spi/impl/MetaPublisher.java | 12 ++++++------ ...lisher.java => PersistentQueueMessageSender.java} | 6 +++--- .../io/moquette/spi/impl/Qos2PublishHandler.java | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) rename broker/src/main/java/io/moquette/spi/impl/{Qos0Publisher.java => BestEffortMessageSender.java} (90%) rename broker/src/main/java/io/moquette/spi/impl/{Qos2Publisher.java => PersistentQueueMessageSender.java} (92%) diff --git a/broker/src/main/java/io/moquette/spi/impl/Qos0Publisher.java b/broker/src/main/java/io/moquette/spi/impl/BestEffortMessageSender.java similarity index 90% rename from broker/src/main/java/io/moquette/spi/impl/Qos0Publisher.java rename to broker/src/main/java/io/moquette/spi/impl/BestEffortMessageSender.java index a59f07ce..ecb863a0 100644 --- a/broker/src/main/java/io/moquette/spi/impl/Qos0Publisher.java +++ b/broker/src/main/java/io/moquette/spi/impl/BestEffortMessageSender.java @@ -11,12 +11,12 @@ import org.slf4j.LoggerFactory; import java.nio.ByteBuffer; import java.util.concurrent.ConcurrentMap; -class Qos0Publisher { +class BestEffortMessageSender { - private static final Logger LOG = LoggerFactory.getLogger(Qos0Publisher.class); + private static final Logger LOG = LoggerFactory.getLogger(BestEffortMessageSender.class); private final ConcurrentMap connectionDescriptors; - public Qos0Publisher(ConcurrentMap connectionDescriptors) { + public BestEffortMessageSender(ConcurrentMap connectionDescriptors) { this.connectionDescriptors = connectionDescriptors; } diff --git a/broker/src/main/java/io/moquette/spi/impl/MetaPublisher.java b/broker/src/main/java/io/moquette/spi/impl/MetaPublisher.java index 43f837ac..b1e27643 100644 --- a/broker/src/main/java/io/moquette/spi/impl/MetaPublisher.java +++ b/broker/src/main/java/io/moquette/spi/impl/MetaPublisher.java @@ -22,16 +22,16 @@ class MetaPublisher { private final ConcurrentMap connectionDescriptors; private final ISessionsStore m_sessionsStore; private final IMessagesStore m_messagesStore; - private final Qos0Publisher qos0Publisher; - private final Qos2Publisher qos2Publisher; + private final BestEffortMessageSender bestEffortSender; + private final PersistentQueueMessageSender persistentSender; public MetaPublisher(ConcurrentMap connectionDescriptors, ISessionsStore sessionsStore, IMessagesStore messagesStore) { this.connectionDescriptors = connectionDescriptors; this.m_sessionsStore = sessionsStore; this.m_messagesStore = messagesStore; - this.qos0Publisher = new Qos0Publisher(connectionDescriptors); - this.qos2Publisher = new Qos2Publisher(connectionDescriptors); + this.bestEffortSender = new BestEffortMessageSender(connectionDescriptors); + this.persistentSender = new PersistentQueueMessageSender(connectionDescriptors); } void publish2Subscribers(IMessagesStore.StoredMessage pubMsg, List topicMatchingSubscriptions) { @@ -58,12 +58,12 @@ class MetaPublisher { if (targetIsActive) { //QoS 0 if (qos == AbstractMessage.QOSType.MOST_ONE) { - this.qos0Publisher.publishQos0(targetSession, topic, message); + this.bestEffortSender.publishQos0(targetSession, topic, message); } else { //QoS 1 or 2 int messageId = targetSession.nextPacketId(); targetSession.inFlightAckWaiting(guid, messageId); - this.qos2Publisher.publishQos2(targetSession, topic, qos, message, false, messageId); + this.persistentSender.publishQos2(targetSession, topic, qos, message, false, messageId); } } else { if (!targetSession.isCleanSession()) { diff --git a/broker/src/main/java/io/moquette/spi/impl/Qos2Publisher.java b/broker/src/main/java/io/moquette/spi/impl/PersistentQueueMessageSender.java similarity index 92% rename from broker/src/main/java/io/moquette/spi/impl/Qos2Publisher.java rename to broker/src/main/java/io/moquette/spi/impl/PersistentQueueMessageSender.java index c6acb5d5..129f3d20 100644 --- a/broker/src/main/java/io/moquette/spi/impl/Qos2Publisher.java +++ b/broker/src/main/java/io/moquette/spi/impl/PersistentQueueMessageSender.java @@ -11,12 +11,12 @@ import org.slf4j.LoggerFactory; import java.nio.ByteBuffer; import java.util.concurrent.ConcurrentMap; -class Qos2Publisher { +class PersistentQueueMessageSender { - private static final Logger LOG = LoggerFactory.getLogger(Qos2Publisher.class); + private static final Logger LOG = LoggerFactory.getLogger(PersistentQueueMessageSender.class); private final ConcurrentMap connectionDescriptors; - public Qos2Publisher(ConcurrentMap connectionDescriptors) { + public PersistentQueueMessageSender(ConcurrentMap connectionDescriptors) { this.connectionDescriptors = connectionDescriptors; } diff --git a/broker/src/main/java/io/moquette/spi/impl/Qos2PublishHandler.java b/broker/src/main/java/io/moquette/spi/impl/Qos2PublishHandler.java index 075411aa..1d9a5581 100644 --- a/broker/src/main/java/io/moquette/spi/impl/Qos2PublishHandler.java +++ b/broker/src/main/java/io/moquette/spi/impl/Qos2PublishHandler.java @@ -35,7 +35,7 @@ class Qos2PublishHandler { public Qos2PublishHandler(IAuthorizator authorizator, SubscriptionsStore subscriptions, IMessagesStore messagesStore, BrokerInterceptor interceptor, ConcurrentMap connectionDescriptors, ISessionsStore sessionsStore, String brokerPort/*, - Qos2Publisher qos2Publisher*/) { + PersistentQueueMessageSender qos2Publisher*/) { this.m_authorizator = authorizator; this.subscriptions = subscriptions; this.m_messagesStore = messagesStore;