From de2937d4dde464a6375f760f099115fd4c5a6512 Mon Sep 17 00:00:00 2001
From: "selva.andre" <selva.andre@gmail.com>
Date: Wed, 5 Sep 2012 21:35:20 +0200
Subject: [PATCH] Renamed methods in SubscriptionStore, connect-> activate
 disconnect ->deactivate

---
 .../moquette/messaging/spi/impl/SimpleMessaging.java  |  5 ++---
 .../spi/impl/subscriptions/SubscriptionsStore.java    | 11 +++++------
 .../messaging/spi/impl/subscriptions/TreeNode.java    |  8 ++++----
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java b/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java
index 916829e6..0f474329 100644
--- a/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java
+++ b/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java
@@ -5,7 +5,6 @@ import com.lmax.disruptor.EventHandler;
 import com.lmax.disruptor.RingBuffer;
 import com.lmax.disruptor.SequenceBarrier;
 
-import java.text.ParseException;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -261,7 +260,7 @@ public class SimpleMessaging implements IMessaging, EventHandler<ValueEvent> {
             }
         }
 
-        subscriptions.connect(msg.getClientID());
+        subscriptions.activate(msg.getClientID());
 
         //handle clean session flag
         if (msg.isCleanSession()) {
@@ -394,7 +393,7 @@ public class SimpleMessaging implements IMessaging, EventHandler<ValueEvent> {
 
         //de-activate the subscriptions for this ClientID
 //        String clientID = (String) evt.getSession().getAttribute(Constants.ATTR_CLIENTID);
-        subscriptions.disconnect(clientID);
+        subscriptions.deactivate(clientID);
     }
     
     private void processStop() {
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStore.java b/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStore.java
index 42ef38f4..6afaab18 100644
--- a/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStore.java
+++ b/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStore.java
@@ -5,7 +5,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.LinkedBlockingQueue;
 
 import org.dna.mqtt.moquette.messaging.spi.IStorageService;
 import org.slf4j.Logger;
@@ -111,13 +110,13 @@ public class SubscriptionsStore {
         m_storageService.removeAllSubscriptions(clientID);
     }
 
-    public void disconnect(String clientID) {
-        subscriptions.disconnect(clientID);
+    public void deactivate(String clientID) {
+        subscriptions.deactivate(clientID);
     }
 
-    public void connect(String clientID) {
-        LOG.debug("connect re-activating subscriptions for clientID " + clientID);
-        subscriptions.connect(clientID);
+    public void activate(String clientID) {
+        LOG.debug("activate re-activating subscriptions for clientID " + clientID);
+        subscriptions.activate(clientID);
     }
 
     public List<Subscription> matches(String topic) {
diff --git a/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/TreeNode.java b/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/TreeNode.java
index cdb4572d..aeb6bd91 100644
--- a/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/TreeNode.java
+++ b/parser/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/TreeNode.java
@@ -122,7 +122,7 @@ class TreeNode {
     /**
      * Deactivate all topic subscriptions for the given clientID.
      * */
-    void disconnect(String clientID) {
+    void deactivate(String clientID) {
         for (Subscription s : m_subscriptions) {
             if (s.clientId.equals(clientID)) {
                 s.setActive(false);
@@ -131,14 +131,14 @@ class TreeNode {
 
         //go deep
         for (TreeNode child : m_children) {
-            child.disconnect(clientID);
+            child.deactivate(clientID);
         }
     }
 
     /**
      * Activate all topic subscriptions for the given clientID.
      * */
-    public void connect(String clientID) {
+    public void activate(String clientID) {
         for (Subscription s : m_subscriptions) {
             if (s.clientId.equals(clientID)) {
                 s.setActive(true);
@@ -147,7 +147,7 @@ class TreeNode {
 
         //go deep
         for (TreeNode child : m_children) {
-            child.disconnect(clientID);
+            child.deactivate(clientID);
         }
 
     }