Cleanup DOMNotificationRouter

Use a dedicated subclass for internal registrations. This cuts a bit
of verbosity and makes things a bit more clear.

Change-Id: Ibd22dda7346e0152213d021d536e93714d1f881a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

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 3e156cc772e074d933cd9d836dda7ff024cb02cc..35db4b41f59a97f5e302abfcff184fead356549a 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
@@ -10,7 +10,6 @@ package org.opendaylight.mdsal.dom.broker;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.ImmutableMultimap.Builder;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
 import com.google.common.util.concurrent.Futures;
@@ -28,6 +27,7 @@ import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.dom.api.DOMNotification;
 import org.opendaylight.mdsal.dom.api.DOMNotificationListener;
 import org.opendaylight.mdsal.dom.api.DOMNotificationPublishService;
@@ -72,6 +72,18 @@ public class DOMNotificationRouter implements AutoCloseable, DOMNotificationPubl
         int queueDepth() default 65536;
     }
 
+    @VisibleForTesting
+    final class Reg<T extends DOMNotificationListener> extends AbstractListenerRegistration<T> {
+        private Reg(final @NonNull T listener) {
+            super(listener);
+        }
+
+        @Override
+        protected void removeRegistration() {
+            DOMNotificationRouter.this.removeRegistration(this);
+        }
+    }
+
     private static final Logger LOG = LoggerFactory.getLogger(DOMNotificationRouter.class);
     private static final ListenableFuture<Void> NO_LISTENERS = FluentFutures.immediateNullFluentFuture();
 
@@ -82,8 +94,7 @@ public class DOMNotificationRouter implements AutoCloseable, DOMNotificationPubl
     private final ScheduledThreadPoolExecutor observer;
     private final ExecutorService executor;
 
-    private volatile Multimap<Absolute, AbstractListenerRegistration<? extends DOMNotificationListener>> listeners =
-            ImmutableMultimap.of();
+    private volatile Multimap<Absolute, Reg<?>> listeners = ImmutableMultimap.of();
 
     @Inject
     public DOMNotificationRouter(final int maxQueueCapacity) {
@@ -113,19 +124,10 @@ public class DOMNotificationRouter implements AutoCloseable, DOMNotificationPubl
     @Override
     public synchronized <T extends DOMNotificationListener> ListenerRegistration<T> registerNotificationListener(
             final T listener, final Collection<Absolute> types) {
-        final AbstractListenerRegistration<T> reg = new AbstractListenerRegistration<>(listener) {
-            @Override
-            protected void removeRegistration() {
-                synchronized (DOMNotificationRouter.this) {
-                    replaceListeners(ImmutableMultimap.copyOf(Multimaps.filterValues(listeners,
-                        input -> input != this)));
-                }
-            }
-        };
+        final var reg = new Reg<>(listener);
 
         if (!types.isEmpty()) {
-            final Builder<Absolute, AbstractListenerRegistration<? extends DOMNotificationListener>> b =
-                    ImmutableMultimap.builder();
+            final var b = ImmutableMultimap.<Absolute, Reg<?>>builder();
             b.putAll(listeners);
 
             for (final Absolute t : types) {
@@ -138,13 +140,16 @@ public class DOMNotificationRouter implements AutoCloseable, DOMNotificationPubl
         return reg;
     }
 
+    private synchronized void removeRegistration(final Reg<?> reg) {
+        replaceListeners(ImmutableMultimap.copyOf(Multimaps.filterValues(listeners, input -> input != reg)));
+    }
+
     /**
      * Swaps registered listeners and triggers notification update.
      *
      * @param newListeners is used to notify listenerTypes changed
      */
-    private void replaceListeners(
-            final Multimap<Absolute, AbstractListenerRegistration<? extends DOMNotificationListener>> newListeners) {
+    private void replaceListeners(final Multimap<Absolute, Reg<?>> newListeners) {
         listeners = newListeners;
         notifyListenerTypesChanged(newListeners.keySet());
     }
@@ -172,10 +177,9 @@ public class DOMNotificationRouter implements AutoCloseable, DOMNotificationPubl
         return subscriptionListeners.register(listener);
     }
 
-
     @VisibleForTesting
     ListenableFuture<? extends Object> publish(final DOMNotification notification,
-            final Collection<AbstractListenerRegistration<? extends DOMNotificationListener>> subscribers) {
+            final Collection<Reg<?>> subscribers) {
         final List<ListenableFuture<Void>> futures = new ArrayList<>(subscribers.size());
         subscribers.forEach(subscriber -> {
             final DOMNotificationRouterEvent event = new DOMNotificationRouterEvent(notification);
@@ -189,8 +193,7 @@ public class DOMNotificationRouter implements AutoCloseable, DOMNotificationPubl
     @Override
     public ListenableFuture<? extends Object> putNotification(final DOMNotification notification)
             throws InterruptedException {
-        final Collection<AbstractListenerRegistration<? extends DOMNotificationListener>> subscribers =
-                listeners.get(notification.getType());
+        final var subscribers = listeners.get(notification.getType());
         if (subscribers.isEmpty()) {
             return NO_LISTENERS;
         }
@@ -200,8 +203,7 @@ public class DOMNotificationRouter implements AutoCloseable, DOMNotificationPubl
 
     @Override
     public ListenableFuture<? extends Object> offerNotification(final DOMNotification notification) {
-        final Collection<AbstractListenerRegistration<? extends DOMNotificationListener>> subscribers =
-                listeners.get(notification.getType());
+        final var subscribers = listeners.get(notification.getType());
         if (subscribers.isEmpty()) {
             return NO_LISTENERS;
         }
@@ -212,8 +214,7 @@ public class DOMNotificationRouter implements AutoCloseable, DOMNotificationPubl
     @Override
     public ListenableFuture<? extends Object> offerNotification(final DOMNotification notification, final long timeout,
             final TimeUnit unit) throws InterruptedException {
-        final Collection<AbstractListenerRegistration<? extends DOMNotificationListener>> subscribers =
-                listeners.get(notification.getType());
+        final var subscribers = listeners.get(notification.getType());
         if (subscribers.isEmpty()) {
             return NO_LISTENERS;
         }

diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMNotificationRouterTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMNotificationRouterTest.java
index be0345eb54e92ad2bb05e22311a4f78eedded77a..fa07396c06c42ae20e9ef96d1d4058242de5e4f5 100644 (file)
--- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMNotificationRouterTest.java
+++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMNotificationRouterTest.java
@@ -32,7 +32,6 @@ import org.opendaylight.mdsal.dom.api.DOMNotification;
 import org.opendaylight.mdsal.dom.api.DOMNotificationListener;
 import org.opendaylight.mdsal.dom.api.DOMNotificationPublishService;
 import org.opendaylight.mdsal.dom.spi.DOMNotificationSubscriptionListener;
-import org.opendaylight.yangtools.concepts.AbstractListenerRegistration;
 import org.opendaylight.yangtools.util.ListenerRegistry;
 import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute;
 
@@ -171,7 +170,7 @@ public class DOMNotificationRouterTest {
 
         @Override
         ListenableFuture<? extends Object> publish(final DOMNotification notification,
-                final Collection<AbstractListenerRegistration<? extends DOMNotificationListener>> subscribers) {
+                final Collection<Reg<?>> subscribers) {
             if (triggerRejected) {
                 return REJECTED;
             }