anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed unusefull SubscriptionsStore.clearAllSubscriptions used only in tests

Browse Source
This commit is contained in:
andsel
2015-10-17 21:08:06 +02:00
parent 1d25839f53
commit 165a0aebd5
2 changed files with 2 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/SubscriptionsStore.java
-28
View File
@@ -90,21 +90,6 @@ public class SubscriptionsStore {
}
}
private class SubscriptionTreeCollector implements IVisitor<List<Subscription>> {
private List<Subscription> m_allSubscriptions = new ArrayList<>();
@Override
public void visit(TreeNode node, int deep) {
m_allSubscriptions.addAll(node.subscriptions());
}
@Override
public List<Subscription> getResult() {
return m_allSubscriptions;
}
}
private AtomicReference<TreeNode> 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<Subscription> 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).
broker/src/test/java/org/eclipse/moquette/spi/impl/ProtocolProcessorTest.java
+2 -4
View File
@@ -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