From 57d9eeef64697e11a24c7f5c6e2a997fe11364a9 Mon Sep 17 00:00:00 2001 From: andsel Date: Tue, 13 Dec 2016 00:50:25 +0100 Subject: [PATCH] Just renames --- .../impl/{MetaPublisher.java => MessagesPublisher.java} | 8 ++++---- .../main/java/io/moquette/spi/impl/ProtocolProcessor.java | 8 ++++---- .../java/io/moquette/spi/impl/Qos0PublishHandler.java | 4 ++-- .../java/io/moquette/spi/impl/Qos1PublishHandler.java | 4 ++-- .../java/io/moquette/spi/impl/Qos2PublishHandler.java | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) rename broker/src/main/java/io/moquette/spi/impl/{MetaPublisher.java => MessagesPublisher.java} (93%) diff --git a/broker/src/main/java/io/moquette/spi/impl/MetaPublisher.java b/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java similarity index 93% rename from broker/src/main/java/io/moquette/spi/impl/MetaPublisher.java rename to broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java index 38d09d0e..faec8218 100644 --- a/broker/src/main/java/io/moquette/spi/impl/MetaPublisher.java +++ b/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java @@ -16,17 +16,17 @@ import java.util.concurrent.ConcurrentMap; import static io.moquette.spi.impl.ProtocolProcessor.lowerQosToTheSubscriptionDesired; -class MetaPublisher { +class MessagesPublisher { - private static final Logger LOG = LoggerFactory.getLogger(MetaPublisher.class); + private static final Logger LOG = LoggerFactory.getLogger(MessagesPublisher.class); private final ConcurrentMap connectionDescriptors; private final ISessionsStore m_sessionsStore; private final IMessagesStore m_messagesStore; private final BestEffortMessageSender bestEffortSender; private final PersistentQueueMessageSender persistentSender; - public MetaPublisher(ConcurrentMap connectionDescriptors, ISessionsStore sessionsStore, - IMessagesStore messagesStore) { + public MessagesPublisher(ConcurrentMap connectionDescriptors, ISessionsStore sessionsStore, + IMessagesStore messagesStore) { this.connectionDescriptors = connectionDescriptors; this.m_sessionsStore = sessionsStore; this.m_messagesStore = messagesStore; diff --git a/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java b/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java index 4db2395c..55665195 100644 --- a/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java +++ b/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java @@ -136,7 +136,7 @@ public class ProtocolProcessor { private Qos0PublishHandler qos0PublishHandler; private Qos1PublishHandler qos1PublishHandler; private Qos2PublishHandler qos2PublishHandler; - private MetaPublisher metaPublisher; + private MessagesPublisher messagesPublisher; private InternalRepublisher internalRepublisher; //maps clientID to Will testament, if specified on CONNECT @@ -194,7 +194,7 @@ public class ProtocolProcessor { this.qos1PublishHandler = new Qos1PublishHandler(m_authorizator, subscriptions, m_messagesStore, m_interceptor, this.connectionDescriptors, m_sessionsStore, m_server_port); - this.metaPublisher = new MetaPublisher(connectionDescriptors, sessionsStore, m_messagesStore); + this.messagesPublisher = new MessagesPublisher(connectionDescriptors, sessionsStore, m_messagesStore); this.qos2PublishHandler = new Qos2PublishHandler(m_authorizator, subscriptions, m_messagesStore, m_interceptor, this.connectionDescriptors, m_sessionsStore, m_server_port/*, this.qos2Publisher*/); @@ -488,7 +488,7 @@ public class ProtocolProcessor { guid = m_messagesStore.storePublishForFuture(toStoreMsg); } List topicMatchingSubscriptions = subscriptions.matches(topic); - this.metaPublisher.publish2Subscribers(toStoreMsg, topicMatchingSubscriptions); + this.messagesPublisher.publish2Subscribers(toStoreMsg, topicMatchingSubscriptions); if (!msg.isRetainFlag()) { return; @@ -522,7 +522,7 @@ public class ProtocolProcessor { String topic = tobeStored.getTopic(); List topicMatchingSubscriptions = subscriptions.matches(topic); - this.metaPublisher.publish2Subscribers(tobeStored, topicMatchingSubscriptions); + this.messagesPublisher.publish2Subscribers(tobeStored, topicMatchingSubscriptions); } static QOSType lowerQosToTheSubscriptionDesired(Subscription sub, QOSType qos) { diff --git a/broker/src/main/java/io/moquette/spi/impl/Qos0PublishHandler.java b/broker/src/main/java/io/moquette/spi/impl/Qos0PublishHandler.java index f8586f1c..559f0a0b 100644 --- a/broker/src/main/java/io/moquette/spi/impl/Qos0PublishHandler.java +++ b/broker/src/main/java/io/moquette/spi/impl/Qos0PublishHandler.java @@ -25,7 +25,7 @@ class Qos0PublishHandler { private final SubscriptionsStore subscriptions; private final IMessagesStore m_messagesStore; private final BrokerInterceptor m_interceptor; - private final MetaPublisher metaPublisher; + private final MessagesPublisher metaPublisher; public Qos0PublishHandler(IAuthorizator authorizator, SubscriptionsStore subscriptions, IMessagesStore messagesStore, BrokerInterceptor interceptor, ConcurrentMap connectionDescriptors; private final String brokerPort; - private final MetaPublisher metaPublisher; + private final MessagesPublisher metaPublisher; public Qos1PublishHandler(IAuthorizator authorizator, SubscriptionsStore subscriptions, IMessagesStore messagesStore, BrokerInterceptor interceptor, ConcurrentMap connectionDescriptors; private final ISessionsStore m_sessionsStore; private final String brokerPort; - private final MetaPublisher metaPublisher; + private final MessagesPublisher metaPublisher; public Qos2PublishHandler(IAuthorizator authorizator, SubscriptionsStore subscriptions, IMessagesStore messagesStore, BrokerInterceptor interceptor, ConcurrentMap