From 78b3f1faf8f65f8dbe18c87fb075be00be45e131 Mon Sep 17 00:00:00 2001 From: andrea Date: Sun, 21 Jun 2015 16:36:47 +0200 Subject: [PATCH] Minor change, removed redundant parameter in method addNewSubscription of session storage --- .../main/java/org/eclipse/moquette/spi/ISessionsStore.java | 2 +- .../org/eclipse/moquette/spi/impl/MemoryStorageService.java | 3 ++- .../org/eclipse/moquette/spi/impl/ProtocolProcessor.java | 5 ++--- .../moquette/spi/persistence/MapDBPersistentStore.java | 5 +++-- .../eclipse/moquette/spi/impl/MapDBPersistentStoreTest.java | 4 ++-- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/broker/src/main/java/org/eclipse/moquette/spi/ISessionsStore.java b/broker/src/main/java/org/eclipse/moquette/spi/ISessionsStore.java index 002f77bc..770cd524 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/ISessionsStore.java +++ b/broker/src/main/java/org/eclipse/moquette/spi/ISessionsStore.java @@ -30,7 +30,7 @@ public interface ISessionsStore { /** * Add a new subscription to the session */ - void addNewSubscription(Subscription newSubscription, String clientID); + void addNewSubscription(Subscription newSubscription); /** * Remove all the subscriptions of the session diff --git a/broker/src/main/java/org/eclipse/moquette/spi/impl/MemoryStorageService.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/MemoryStorageService.java index 400488c1..7e836d5d 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/impl/MemoryStorageService.java +++ b/broker/src/main/java/org/eclipse/moquette/spi/impl/MemoryStorageService.java @@ -159,7 +159,8 @@ public class MemoryStorageService implements IMessagesStore, ISessionsStore { } @Override - public void addNewSubscription(Subscription newSubscription, String clientID) { + public void addNewSubscription(Subscription newSubscription) { + final String clientID = newSubscription.getClientId(); if (!m_persistentSubscriptions.containsKey(clientID)) { m_persistentSubscriptions.put(clientID, new HashSet()); } diff --git a/broker/src/main/java/org/eclipse/moquette/spi/impl/ProtocolProcessor.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/ProtocolProcessor.java index d41738dc..2364051c 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/impl/ProtocolProcessor.java +++ b/broker/src/main/java/org/eclipse/moquette/spi/impl/ProtocolProcessor.java @@ -238,7 +238,7 @@ class ProtocolProcessor implements EventHandler { session.write(okResp); LOG.info("Create persistent session for clientID <{}>", msg.getClientID()); - m_sessionsStore.addNewSubscription(Subscription.createEmptySubscription(msg.getClientID(), true), msg.getClientID()); //null means EmptySubscription + m_sessionsStore.addNewSubscription(Subscription.createEmptySubscription(msg.getClientID(), true)); //null means EmptySubscription LOG.info("Connected client ID <{}> with clean session {}", msg.getClientID(), msg.isCleanSession()); if (!msg.isCleanSession()) { //force the republish of stored QoS1 and QoS2 @@ -621,13 +621,12 @@ class ProtocolProcessor implements EventHandler { LOG.info("<{}> subscribed to topic <{}> with QoS {}", newSubscription.getClientId(), topic, AbstractMessage.QOSType.formatQoS(newSubscription.getRequestedQos())); - String clientID = newSubscription.getClientId(); boolean validTopic = SubscriptionsStore.validate(newSubscription); if (!validTopic) { //send SUBACK with 0x80 for this topic filter return false; } - m_sessionsStore.addNewSubscription(newSubscription, clientID); + m_sessionsStore.addNewSubscription(newSubscription); subscriptions.add(newSubscription); //scans retained messages to be published to the new subscription diff --git a/broker/src/main/java/org/eclipse/moquette/spi/persistence/MapDBPersistentStore.java b/broker/src/main/java/org/eclipse/moquette/spi/persistence/MapDBPersistentStore.java index 6af9fb9c..09627a65 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/persistence/MapDBPersistentStore.java +++ b/broker/src/main/java/org/eclipse/moquette/spi/persistence/MapDBPersistentStore.java @@ -221,8 +221,9 @@ public class MapDBPersistentStore implements IMessagesStore, ISessionsStore { return nextPacketId; } - public void addNewSubscription(Subscription newSubscription, String clientID) { - LOG.debug("addNewSubscription invoked with subscription {} for client {}", newSubscription, clientID); + public void addNewSubscription(Subscription newSubscription) { + LOG.debug("addNewSubscription invoked with subscription {}", newSubscription); + final String clientID = newSubscription.getClientId(); if (!m_persistentSubscriptions.containsKey(clientID)) { LOG.debug("clientID {} is a newcome, creating it's subscriptions set", clientID); m_persistentSubscriptions.put(clientID, new HashSet()); diff --git a/broker/src/test/java/org/eclipse/moquette/spi/impl/MapDBPersistentStoreTest.java b/broker/src/test/java/org/eclipse/moquette/spi/impl/MapDBPersistentStoreTest.java index 78aaf9db..56e4ac87 100644 --- a/broker/src/test/java/org/eclipse/moquette/spi/impl/MapDBPersistentStoreTest.java +++ b/broker/src/test/java/org/eclipse/moquette/spi/impl/MapDBPersistentStoreTest.java @@ -61,9 +61,9 @@ public class MapDBPersistentStoreTest { @Test public void overridingSubscriptions() { Subscription oldSubscription = new Subscription("FAKE_CLI_ID_1", "/topic", AbstractMessage.QOSType.MOST_ONE, false); - m_storageService.addNewSubscription(oldSubscription, oldSubscription.getClientId()); + m_storageService.addNewSubscription(oldSubscription); Subscription overrindingSubscription = new Subscription("FAKE_CLI_ID_1", "/topic", AbstractMessage.QOSType.EXACTLY_ONCE, false); - m_storageService.addNewSubscription(overrindingSubscription, overrindingSubscription.getClientId()); + m_storageService.addNewSubscription(overrindingSubscription); //Verify List subscriptions = m_storageService.listAllSubscriptions();