Bug 8568: Removed deprecated HydrogenNotificationBrokerImpl

[controller.git] / opendaylight / md-sal / sal-binding-config / src / main / java / org / opendaylight / controller / config / yang / md / sal / binding / impl / NotificationBrokerImplModule.java

diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModule.java
index 46cb7ceee026c69ebb3e8ff40ba36a7e53516347..1416cda5d8bda557e5061a1e89ba0a46c3096709 100644 (file)
--- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModule.java
+++ b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/NotificationBrokerImplModule.java
@@ -11,12 +11,10 @@ import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService
 import org.opendaylight.controller.md.sal.binding.api.NotificationService;
 import org.opendaylight.controller.md.sal.binding.compat.HeliumNotificationProviderServiceAdapter;
 import org.opendaylight.controller.md.sal.binding.compat.HeliumNotificationProviderServiceWithInterestListeners;
-import org.opendaylight.controller.md.sal.binding.compat.HydrogenNotificationBrokerImpl;
 import org.opendaylight.controller.md.sal.binding.impl.BindingDOMNotificationPublishServiceAdapter;
 import org.opendaylight.controller.md.sal.binding.impl.BindingDOMNotificationServiceAdapter;
 import org.opendaylight.controller.md.sal.dom.api.DOMNotificationPublishService;
 import org.opendaylight.controller.md.sal.dom.spi.DOMNotificationSubscriptionListenerRegistry;
-import org.opendaylight.controller.sal.binding.codegen.impl.SingletonHolder;
 
 /**
  * @deprecated Replaced by blueprint wiring
@@ -44,21 +42,7 @@ public final class NotificationBrokerImplModule extends
 
     @Override
     public java.lang.AutoCloseable createInstance() {
-
-        final NotificationPublishService notificationPublishService = getNotificationPublishAdapterDependency();
-        final NotificationService notificationService = getNotificationAdapterDependency();
-
-        if(notificationPublishService != null & notificationService != null) {
-            return createHeliumAdapter(notificationPublishService,notificationService);
-        }
-
-        /*
-         *  FIXME: Switch to new broker (which has different threading model)
-         *  once this change is communicated with downstream users or
-         *  we will have adapter implementation which will honor Helium
-         *  threading model for notifications.
-         */
-        return new HydrogenNotificationBrokerImpl(SingletonHolder.getDefaultNotificationExecutor());
+        return createHeliumAdapter(getNotificationPublishAdapterDependency(), getNotificationAdapterDependency());
     }
 
     private static AutoCloseable createHeliumAdapter(final NotificationPublishService publishService,