X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-binding-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fbinding%2Fimpl%2FNotificationBrokerImpl.xtend;h=9a431fec74f4a3cf7c3f4d694f6c2000df3de718;hp=52aa8d029066b3093a90300f6bb078886b2b3d7b;hb=1862f90478212a06a9534ed0674f27212972177f;hpb=ce2938e5616a170ca2fb2f5b478b3b2ceff832a1

diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationBrokerImpl.xtend b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationBrokerImpl.xtend
index 52aa8d0290..9a431fec74 100644
--- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationBrokerImpl.xtend
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationBrokerImpl.xtend
@@ -21,14 +21,23 @@ import org.opendaylight.yangtools.concepts.ListenerRegistration
 import org.opendaylight.yangtools.concepts.Registration
 import org.opendaylight.yangtools.yang.binding.Notification
 import org.slf4j.LoggerFactory
-import org.opendaylight.controller.sal.binding.codegen.impl.SingletonHolder
import com.google.common.collect.Multimaps
-
-class NotificationBrokerImpl implements NotificationProviderService, AutoCloseable {
+import org.opendaylight.controller.sal.binding.codegen.impl.SingletonHolder
import com.google.common.collect.Multimaps
+import org.opendaylight.yangtools.concepts.util.ListenerRegistry
+import org.opendaylight.controller.sal.binding.api.NotificationProviderService.NotificationInterestListener
import java.util.Set
+import java.util.Set
+import com.google.common.collect.ImmutableSet
+import java.util.concurrent.Future
 
+class NotificationBrokerImpl implements NotificationProviderService, AutoCloseable {
+    
+    val ListenerRegistry<NotificationInterestListener> interestListeners = ListenerRegistry.create;
+    
     val Multimap<Class<? extends Notification>, NotificationListener<?>> listeners;
 
     @Property
     var ExecutorService executor;
+    
+    val logger = LoggerFactory.getLogger(NotificationBrokerImpl)
 
     new() {
         listeners = Multimaps.synchronizedSetMultimap(HashMultimap.create())
@@ -94,21 +103,41 @@ class NotificationBrokerImpl implements NotificationProviderService, AutoCloseab
             listenerToNotify = listenerToNotify + listeners.get(type as Class<? extends Notification>)
         }
         val tasks = listenerToNotify.map[new NotifyTask(it, notification)].toSet;
-        executor.invokeAll(tasks);
+        submitAll(executor,tasks);
     }
-
+    
+    def submitAll(ExecutorService service, Set<NotifyTask> tasks) {
+        val ret = ImmutableSet.<Future<Object>>builder();
+        for(task : tasks) {
+            ret.add(service.submit(task));
+        }
+        return ret.build();
+    }
+    
     override <T extends Notification> registerNotificationListener(Class<T> notificationType,
         NotificationListener<T> listener) {
         val reg = new GenericNotificationRegistration<T>(notificationType, listener, this);
         listeners.put(notificationType, listener);
+        announceNotificationSubscription(notificationType);
         return reg;
     }
+    
+    def announceNotificationSubscription(Class<? extends Notification> notification) {
+        for (listener : interestListeners) {
+            try {
+                listener.instance.onNotificationSubscribtion(notification);
+            } catch (Exception e) {
+                logger.error("", e.message)
+            }
+        }
+    }
 
     override registerNotificationListener(
         org.opendaylight.yangtools.yang.binding.NotificationListener listener) {
         val invoker = SingletonHolder.INVOKER_FACTORY.invokerFor(listener);
         for (notifyType : invoker.supportedNotifications) {
             listeners.put(notifyType, invoker.invocationProxy)
+            announceNotificationSubscription(notifyType)
         }
         val registration = new GeneratedListenerRegistration(listener, invoker,this);
         return registration as Registration<org.opendaylight.yangtools.yang.binding.NotificationListener>;
@@ -128,6 +157,14 @@ class NotificationBrokerImpl implements NotificationProviderService, AutoCloseab
         //FIXME: implement properly.
     }
     
+    override registerInterestListener(NotificationInterestListener interestListener) {
+        val registration = interestListeners.register(interestListener);
+        
+        for(notification : listeners.keySet) {
+            interestListener.onNotificationSubscribtion(notification);
+        }
+        return registration
+    }
 }
 
 class GenericNotificationRegistration<T extends Notification> extends AbstractObjectRegistration<NotificationListener<T>> implements ListenerRegistration<NotificationListener<T>> {