Merge pull request #2 from cinterloper/de-ja-vu

re-remove
cinterloper · Mar 24, 2016 · 46e56cb · 46e56cb
2 parents 83b5f4f + fb80a1d
commit 46e56cb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/src/main/groovy/net/iowntheinter/saltReactor/impl/SimplePipeSubscriptionManager.groovy b/src/main/groovy/net/iowntheinter/saltReactor/impl/SimplePipeSubscriptionManager.groovy
@@ -6,21 +6,18 @@ import io.vertx.core.json.JsonObject
 import io.vertx.core.logging.Logger
 import io.vertx.core.logging.LoggerFactory
 import io.vertx.groovy.core.eventbus.EventBus
-import io.vertx.groovy.core.shareddata.SharedData
 import net.iowntheinter.saltReactor.SVXSubscriptionManager
 
 /**
  * Created by grant on 11/5/15.
  */
 class SimplePipeSubscriptionManager implements SVXSubscriptionManager {
-    private SharedData sd
     private EventBus eb
     private Logger log
     private subscriptionChannel
     private SaltClient saltClient
 
-    SimplePipeSubscriptionManager(SharedData s, EventBus e, SaltClient c) {
-        sd = s
+    SimplePipeSubscriptionManager(EventBus e, SaltClient c) {
         eb = e
         log = LoggerFactory.getLogger("saltReactor:subscriptionManager")
         saltClient = c

diff --git a/src/main/groovy/net/iowntheinter/saltReactor/impl/saltReactor.groovy b/src/main/groovy/net/iowntheinter/saltReactor/impl/saltReactor.groovy
@@ -9,7 +9,6 @@ import com.suse.salt.netapi.event.EventListener
 import io.vertx.core.logging.Logger
 import io.vertx.core.logging.LoggerFactory
 import io.vertx.groovy.core.eventbus.EventBus
-import io.vertx.groovy.core.shareddata.SharedData
 import com.suse.salt.netapi.datatypes.Event;
 import io.vertx.groovy.core.Vertx;
 import io.vertx.core.json.JsonObject
@@ -18,7 +17,6 @@ import javax.websocket.CloseReason;
 
 class saltReactor implements EventListener {
     private Vertx vx
-    private SharedData sd
     private EventBus eb
     private JsonObject config
     private Logger log
@@ -28,11 +26,10 @@ class saltReactor implements EventListener {
     saltReactor(Vertx v, JsonObject c, SaltClient s) {
         vx = v;
         sc = s
-        sd = v.sharedData()
         config = c
         eb = v.eventBus()
         log = LoggerFactory.getLogger("saltReactor")
-        mgr = new SimplePipeSubscriptionManager(sd, eb, sc)
+        mgr = new SimplePipeSubscriptionManager( eb, sc)
     }
     CloseReason closeReason;