Move AbstractDOMDataBroker to mdsal-dom-spi

[mdsal.git] / dom / mdsal-dom-broker / src / main / java / org / opendaylight / mdsal / dom / broker / DOMNotificationRouter.java

diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMNotificationRouter.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMNotificationRouter.java
index 1fe8bc6437907a67fd98d180060e3f12d631b733..4b3190a1da014eaf5bee51433f2021707d9ff5d5 100644 (file)
--- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMNotificationRouter.java
+++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMNotificationRouter.java
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.mdsal.dom.broker;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMultimap;
@@ -35,11 +37,9 @@ import org.opendaylight.mdsal.dom.api.DOMNotificationPublishDemandExtension;
 import org.opendaylight.mdsal.dom.api.DOMNotificationPublishDemandExtension.DemandListener;
 import org.opendaylight.mdsal.dom.api.DOMNotificationPublishService;
 import org.opendaylight.mdsal.dom.api.DOMNotificationService;
-import org.opendaylight.yangtools.concepts.AbstractListenerRegistration;
 import org.opendaylight.yangtools.concepts.AbstractRegistration;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.concepts.Registration;
-import org.opendaylight.yangtools.util.ListenerRegistry;
+import org.opendaylight.yangtools.util.ObjectRegistry;
 import org.opendaylight.yangtools.util.concurrent.EqualityQueuedNotificationManager;
 import org.opendaylight.yangtools.util.concurrent.QueuedNotificationManager;
 import org.opendaylight.yangtools.yang.common.Empty;
@@ -73,14 +73,16 @@ public class DOMNotificationRouter implements AutoCloseable {
     }
 
     @VisibleForTesting
-    abstract static sealed class Reg<T extends DOMNotificationListener> extends AbstractListenerRegistration<T> {
-        Reg(final @NonNull T listener) {
-            super(listener);
+    abstract static sealed class Reg extends AbstractRegistration {
+        private final @NonNull DOMNotificationListener listener;
+
+        Reg(final @NonNull DOMNotificationListener listener) {
+            this.listener = requireNonNull(listener);
         }
     }
 
-    private final class SingleReg<T extends DOMNotificationListener> extends Reg<T> {
-        SingleReg(final @NonNull T listener) {
+    private final class SingleReg extends Reg {
+        SingleReg(final @NonNull DOMNotificationListener listener) {
             super(listener);
         }
 
@@ -90,7 +92,7 @@ public class DOMNotificationRouter implements AutoCloseable {
         }
     }
 
-    private static final class ComponentReg extends Reg<DOMNotificationListener> {
+    private static final class ComponentReg extends Reg {
         ComponentReg(final @NonNull DOMNotificationListener listener) {
             super(listener);
         }
@@ -156,13 +158,13 @@ public class DOMNotificationRouter implements AutoCloseable {
 
     private final class SubscribeFacade implements DOMNotificationService {
         @Override
-        public <T extends DOMNotificationListener> ListenerRegistration<T> registerNotificationListener(
-                final T listener, final Collection<Absolute> types) {
+        public Registration registerNotificationListener(final DOMNotificationListener listener,
+                final Collection<Absolute> types) {
             synchronized (DOMNotificationRouter.this) {
-                final var reg = new SingleReg<>(listener);
+                final var reg = new SingleReg(listener);
 
                 if (!types.isEmpty()) {
-                    final var b = ImmutableMultimap.<Absolute, Reg<?>>builder();
+                    final var b = ImmutableMultimap.<Absolute, Reg>builder();
                     b.putAll(listeners);
 
                     for (var t : types) {
@@ -180,7 +182,7 @@ public class DOMNotificationRouter implements AutoCloseable {
         public synchronized Registration registerNotificationListeners(
                 final Map<Absolute, DOMNotificationListener> typeToListener) {
             synchronized (DOMNotificationRouter.this) {
-                final var b = ImmutableMultimap.<Absolute, Reg<?>>builder();
+                final var b = ImmutableMultimap.<Absolute, Reg>builder();
                 b.putAll(listeners);
 
                 final var tmp = new HashMap<DOMNotificationListener, ComponentReg>();
@@ -204,15 +206,15 @@ public class DOMNotificationRouter implements AutoCloseable {
     private static final Logger LOG = LoggerFactory.getLogger(DOMNotificationRouter.class);
     private static final @NonNull ListenableFuture<?> NO_LISTENERS = Futures.immediateFuture(Empty.value());
 
-    private final ListenerRegistry<DemandListener> demandListeners = ListenerRegistry.create();
-    private final EqualityQueuedNotificationManager<AbstractListenerRegistration<? extends DOMNotificationListener>,
-                DOMNotificationRouterEvent> queueNotificationManager;
+    private final EqualityQueuedNotificationManager<Reg, DOMNotificationRouterEvent> queueNotificationManager;
     private final @NonNull DOMNotificationPublishService notificationPublishService = new PublishFacade();
     private final @NonNull DOMNotificationService notificationService = new SubscribeFacade();
+    private final ObjectRegistry<DemandListener> demandListeners =
+        ObjectRegistry.createConcurrent("notification demand listeners");
     private final ScheduledThreadPoolExecutor observer;
     private final ExecutorService executor;
 
-    private volatile ImmutableMultimap<Absolute, Reg<?>> listeners = ImmutableMultimap.of();
+    private volatile ImmutableMultimap<Absolute, Reg> listeners = ImmutableMultimap.of();
 
     @Inject
     public DOMNotificationRouter(final int maxQueueCapacity) {
@@ -242,7 +244,7 @@ public class DOMNotificationRouter implements AutoCloseable {
         return notificationPublishService;
     }
 
-    private synchronized void removeRegistration(final SingleReg<?> reg) {
+    private synchronized void removeRegistration(final SingleReg reg) {
         replaceListeners(ImmutableMultimap.copyOf(Multimaps.filterValues(listeners, input -> input != reg)));
     }
 
@@ -255,14 +257,14 @@ public class DOMNotificationRouter implements AutoCloseable {
      *
      * @param newListeners is used to notify listenerTypes changed
      */
-    private void replaceListeners(final ImmutableMultimap<Absolute, Reg<?>> newListeners) {
+    private void replaceListeners(final ImmutableMultimap<Absolute, Reg> newListeners) {
         listeners = newListeners;
         notifyListenerTypesChanged(newListeners.keySet());
     }
 
     @SuppressWarnings("checkstyle:IllegalCatch")
     private void notifyListenerTypesChanged(final @NonNull ImmutableSet<Absolute> typesAfter) {
-        final var listenersAfter = demandListeners.streamListeners().collect(ImmutableList.toImmutableList());
+        final var listenersAfter = demandListeners.streamObjects().collect(ImmutableList.toImmutableList());
         executor.execute(() -> {
             for (var listener : listenersAfter) {
                 try {
@@ -282,7 +284,7 @@ public class DOMNotificationRouter implements AutoCloseable {
     }
 
     @VisibleForTesting
-    @NonNull ListenableFuture<?> publish(final DOMNotification notification, final Collection<Reg<?>> subscribers) {
+    @NonNull ListenableFuture<?> publish(final DOMNotification notification, final Collection<Reg> subscribers) {
         final var futures = new ArrayList<ListenableFuture<?>>(subscribers.size());
         subscribers.forEach(subscriber -> {
             final var event = new DOMNotificationRouterEvent(notification);
@@ -318,14 +320,13 @@ public class DOMNotificationRouter implements AutoCloseable {
     }
 
     @VisibleForTesting
-    ListenerRegistry<DemandListener> demandListeners() {
+    ObjectRegistry<DemandListener> demandListeners() {
         return demandListeners;
     }
 
-    private static void deliverEvents(final AbstractListenerRegistration<? extends DOMNotificationListener> reg,
-            final ImmutableList<DOMNotificationRouterEvent> events) {
+    private static void deliverEvents(final Reg reg, final ImmutableList<DOMNotificationRouterEvent> events) {
         if (reg.notClosed()) {
-            final var listener = reg.getInstance();
+            final var listener = reg.listener;
             for (var event : events) {
                 event.deliverTo(listener);
             }