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

Minor change, removed redundant parameter in method addNewSubscription of session storage

Browse Source
This commit is contained in:
andrea
2015-06-21 16:37:44 +02:00
parent 932d2fb4cb
commit 78b3f1faf8
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/org/eclipse/moquette/spi/ISessionsStore.java
+1 -1
View File
@@ -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
broker/src/main/java/org/eclipse/moquette/spi/impl/MemoryStorageService.java
+2 -1
View File
@@ -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<Subscription>());
}
broker/src/main/java/org/eclipse/moquette/spi/impl/ProtocolProcessor.java
+2 -3
View File
@@ -238,7 +238,7 @@ class ProtocolProcessor implements EventHandler<ValueEvent> {
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<ValueEvent> {
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
broker/src/main/java/org/eclipse/moquette/spi/persistence/MapDBPersistentStore.java
+3 -2
View File
@@ -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<Subscription>());
broker/src/test/java/org/eclipse/moquette/spi/impl/MapDBPersistentStoreTest.java
+2 -2
View File
@@ -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<Subscription> subscriptions = m_storageService.listAllSubscriptions();