From c76db85ae76d33d7ca5aace509613be7e3e41d58 Mon Sep 17 00:00:00 2001 From: andsel Date: Tue, 13 Dec 2016 00:43:22 +0100 Subject: [PATCH] Removed unused params --- .../main/java/io/moquette/spi/impl/MetaPublisher.java | 6 ++---- .../main/java/io/moquette/spi/impl/Qos0Publisher.java | 8 +------- .../main/java/io/moquette/spi/impl/Qos2Publisher.java | 9 +-------- 3 files changed, 4 insertions(+), 19 deletions(-) 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 26397ae7..43f837ac 100644 --- a/broker/src/main/java/io/moquette/spi/impl/MetaPublisher.java +++ b/broker/src/main/java/io/moquette/spi/impl/MetaPublisher.java @@ -1,14 +1,12 @@ package io.moquette.spi.impl; import io.moquette.parser.proto.messages.AbstractMessage; -import io.moquette.parser.proto.messages.PublishMessage; import io.moquette.server.ConnectionDescriptor; import io.moquette.spi.ClientSession; import io.moquette.spi.IMessagesStore; import io.moquette.spi.ISessionsStore; import io.moquette.spi.MessageGUID; import io.moquette.spi.impl.subscriptions.Subscription; -import io.netty.channel.Channel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,8 +30,8 @@ class MetaPublisher { this.connectionDescriptors = connectionDescriptors; this.m_sessionsStore = sessionsStore; this.m_messagesStore = messagesStore; - this.qos0Publisher = new Qos0Publisher(connectionDescriptors, sessionsStore); - this.qos2Publisher = new Qos2Publisher(connectionDescriptors, sessionsStore, m_messagesStore); + this.qos0Publisher = new Qos0Publisher(connectionDescriptors); + this.qos2Publisher = new Qos2Publisher(connectionDescriptors); } void publish2Subscribers(IMessagesStore.StoredMessage pubMsg, List topicMatchingSubscriptions) { diff --git a/broker/src/main/java/io/moquette/spi/impl/Qos0Publisher.java b/broker/src/main/java/io/moquette/spi/impl/Qos0Publisher.java index 7c320d4b..a59f07ce 100644 --- a/broker/src/main/java/io/moquette/spi/impl/Qos0Publisher.java +++ b/broker/src/main/java/io/moquette/spi/impl/Qos0Publisher.java @@ -4,26 +4,20 @@ import io.moquette.parser.proto.messages.AbstractMessage; import io.moquette.parser.proto.messages.PublishMessage; import io.moquette.server.ConnectionDescriptor; import io.moquette.spi.ClientSession; -import io.moquette.spi.IMessagesStore; -import io.moquette.spi.ISessionsStore; -import io.moquette.spi.impl.subscriptions.Subscription; import io.netty.channel.Channel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.nio.ByteBuffer; -import java.util.List; import java.util.concurrent.ConcurrentMap; class Qos0Publisher { private static final Logger LOG = LoggerFactory.getLogger(Qos0Publisher.class); private final ConcurrentMap connectionDescriptors; - private final ISessionsStore m_sessionsStore; - public Qos0Publisher(ConcurrentMap connectionDescriptors, ISessionsStore sessionsStore) { + public Qos0Publisher(ConcurrentMap connectionDescriptors) { this.connectionDescriptors = connectionDescriptors; - this.m_sessionsStore = sessionsStore; } void publishQos0(ClientSession clientsession, String topic, ByteBuffer message) { diff --git a/broker/src/main/java/io/moquette/spi/impl/Qos2Publisher.java b/broker/src/main/java/io/moquette/spi/impl/Qos2Publisher.java index 0bc2a188..c6acb5d5 100644 --- a/broker/src/main/java/io/moquette/spi/impl/Qos2Publisher.java +++ b/broker/src/main/java/io/moquette/spi/impl/Qos2Publisher.java @@ -4,8 +4,6 @@ import io.moquette.parser.proto.messages.AbstractMessage; import io.moquette.parser.proto.messages.PublishMessage; import io.moquette.server.ConnectionDescriptor; import io.moquette.spi.ClientSession; -import io.moquette.spi.IMessagesStore; -import io.moquette.spi.ISessionsStore; import io.netty.channel.Channel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -17,14 +15,9 @@ class Qos2Publisher { private static final Logger LOG = LoggerFactory.getLogger(Qos2Publisher.class); private final ConcurrentMap connectionDescriptors; - private final ISessionsStore m_sessionsStore; - private final IMessagesStore m_messagesStore; - public Qos2Publisher(ConcurrentMap connectionDescriptors, ISessionsStore sessionsStore, - IMessagesStore messagesStore) { + public Qos2Publisher(ConcurrentMap connectionDescriptors) { this.connectionDescriptors = connectionDescriptors; - this.m_sessionsStore = sessionsStore; - m_messagesStore = messagesStore; } void publishQos2(ClientSession clientsession, String topic, AbstractMessage.QOSType qos,