From 165a0aebd596f5486b0d8557209bb96731baf0de Mon Sep 17 00:00:00 2001 From: andsel Date: Sat, 17 Oct 2015 21:08:06 +0200 Subject: [PATCH] Removed unusefull SubscriptionsStore.clearAllSubscriptions used only in tests --- .../subscriptions/SubscriptionsStore.java | 28 ------------------- .../spi/impl/ProtocolProcessorTest.java | 6 ++-- 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/SubscriptionsStore.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/SubscriptionsStore.java index f8cef25b..2648b271 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/SubscriptionsStore.java +++ b/broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/SubscriptionsStore.java @@ -90,21 +90,6 @@ public class SubscriptionsStore { } } - private class SubscriptionTreeCollector implements IVisitor> { - - private List m_allSubscriptions = new ArrayList<>(); - - @Override - public void visit(TreeNode node, int deep) { - m_allSubscriptions.addAll(node.subscriptions()); - } - - @Override - public List getResult() { - return m_allSubscriptions; - } - } - private AtomicReference subscriptions = new AtomicReference<>(new TreeNode(null)); private ISessionsStore m_sessionsStore; private static final Logger LOG = LoggerFactory.getLogger(SubscriptionsStore.class); @@ -209,19 +194,6 @@ public class SubscriptionsStore { m_sessionsStore.removeSubscription(topic, clientID); } - /** - * It's public because needed in tests :-( bleah - */ - public void clearAllSubscriptions() { - SubscriptionTreeCollector subsCollector = new SubscriptionTreeCollector(); - bfsVisit(subscriptions.get(), subsCollector, 0); - - List allSubscriptions = subsCollector.getResult(); - for (Subscription subscription : allSubscriptions) { - removeSubscription(subscription.getTopicFilter(), subscription.getClientId()); - } - } - /** * Visit the topics tree to remove matching subscriptions with clientID. * It's a mutating structure operation so create a new subscription tree (partial or total). diff --git a/broker/src/test/java/org/eclipse/moquette/spi/impl/ProtocolProcessorTest.java b/broker/src/test/java/org/eclipse/moquette/spi/impl/ProtocolProcessorTest.java index a249045e..cde49965 100644 --- a/broker/src/test/java/org/eclipse/moquette/spi/impl/ProtocolProcessorTest.java +++ b/broker/src/test/java/org/eclipse/moquette/spi/impl/ProtocolProcessorTest.java @@ -216,13 +216,12 @@ public class ProtocolProcessorTest { msg.addSubscription(new SubscribeMessage.Couple(AbstractMessage.QOSType.MOST_ONE.byteValue(), FAKE_TOPIC)); m_session.setAttribute(NettyChannel.ATTR_KEY_CLIENTID, FAKE_CLIENT_ID); m_session.setAttribute(NettyChannel.ATTR_KEY_CLEANSESSION, false); - subscriptions.clearAllSubscriptions(); assertEquals(0, subscriptions.size()); - m_processor.processSubscribe(m_session, msg/*, FAKE_CLIENT_ID, false*/); + m_processor.processSubscribe(m_session, msg); //Exercise - m_processor.processSubscribe(m_session, msg/*, FAKE_CLIENT_ID, false*/); + m_processor.processSubscribe(m_session, msg); //Verify assertEquals(1, subscriptions.size()); @@ -237,7 +236,6 @@ public class ProtocolProcessorTest { msg.addSubscription(new SubscribeMessage.Couple(AbstractMessage.QOSType.MOST_ONE.byteValue(), BAD_FORMATTED_TOPIC)); m_session.setAttribute(NettyChannel.ATTR_KEY_CLIENTID, FAKE_CLIENT_ID); m_session.setAttribute(NettyChannel.ATTR_KEY_CLEANSESSION, false); - subscriptions.clearAllSubscriptions(); assertEquals(0, subscriptions.size()); //Exercise