X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fmessagebus-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fyang%2Fmessagebus%2Fapp%2Fimpl%2FMessageBusAppImplModule.java;h=b870e1453025e3a99b62ec4b7c334964b42984a6;hp=9f9d737a64180a29b60e22062826afc84c0d68dd;hb=99f994b3e45963f6ef46bc2b71ab4dd8eea8b9ac;hpb=202de5f104dc8149accab4ebf04c3ec8857edff2

diff --git a/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/config/yang/messagebus/app/impl/MessageBusAppImplModule.java b/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/config/yang/messagebus/app/impl/MessageBusAppImplModule.java
index 9f9d737a64..b870e14530 100644
--- a/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/config/yang/messagebus/app/impl/MessageBusAppImplModule.java
+++ b/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/config/yang/messagebus/app/impl/MessageBusAppImplModule.java
@@ -9,16 +9,16 @@ package org.opendaylight.controller.config.yang.messagebus.app.impl;
 
 import org.opendaylight.controller.config.api.DependencyResolver;
 import org.opendaylight.controller.config.api.ModuleIdentifier;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.messagebus.app.impl.EventSourceTopology;
-import org.opendaylight.controller.messagebus.app.util.Providers;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
-import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
+import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker;
+import org.opendaylight.controller.messagebus.spi.EventSource;
+import org.opendaylight.controller.messagebus.spi.EventSourceRegistration;
+import org.opendaylight.controller.messagebus.spi.EventSourceRegistry;
 import org.osgi.framework.BundleContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class MessageBusAppImplModule extends org.opendaylight.controller.config.yang.messagebus.app.impl.AbstractMessageBusAppImplModule {
+@Deprecated
+public class MessageBusAppImplModule extends AbstractMessageBusAppImplModule {
     private static final Logger LOG = LoggerFactory.getLogger(MessageBusAppImplModule.class);
 
     private BundleContext bundleContext;
@@ -40,18 +40,24 @@ public class MessageBusAppImplModule extends org.opendaylight.controller.config.
         super(identifier, dependencyResolver, oldModule, oldInstance);
     }
 
-    @Override
-    protected void customValidation() {
-    }
-
     @Override
     public java.lang.AutoCloseable createInstance() {
-        final ProviderContext bindingCtx = getBindingBrokerDependency().registerProvider(new Providers.BindingAware());
-        final DataBroker dataBroker = bindingCtx.getSALService(DataBroker.class);
-        final RpcProviderRegistry rpcRegistry = bindingCtx.getSALService(RpcProviderRegistry.class);
-        final EventSourceTopology eventSourceTopology = new EventSourceTopology(dataBroker, rpcRegistry);
-        LOG.info("Messagebus initialized");
-        return eventSourceTopology;
+        final WaitingServiceTracker<EventSourceRegistry> tracker =
+                WaitingServiceTracker.create(EventSourceRegistry.class, bundleContext);
+        final EventSourceRegistry service = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES);
+
+        return new EventSourceRegistry() {
+            @Override
+            public void close() {
+                // We need to close the WaitingServiceTracker however we don't want to close the actual
+                // service instance because its life-cycle is controlled via blueprint.
+                tracker.close();
+            }
+
+            @Override
+            public <T extends EventSource> EventSourceRegistration<T> registerEventSource(T eventSource) {
+                return service.registerEventSource(eventSource);
+            }
+        };
     }
-
 }