Clean up DOMRpcRouter registrations

Use a plain AbstractObjectRegistration specialized to
(DOMRpc)AvailabilityListener instead of over-verbose
ListenerRegistrations.

JIRA: MDSAL-843
Change-Id: I1640eed53c2daae8674d42e7b00bbba85b583d36
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMRpcRouter.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMRpcRouter.java
index ce2d1a081bc8f0992eac498cdb3ca7a51cc208d0..28ed420567228f8f8d43ea6a25a1e194b79ce6b2 100644 (file)
--- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMRpcRouter.java
+++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMRpcRouter.java
@@ -56,10 +56,8 @@ import org.opendaylight.mdsal.dom.api.DOMRpcProviderService;
 import org.opendaylight.mdsal.dom.api.DOMRpcResult;
 import org.opendaylight.mdsal.dom.api.DOMRpcService;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
-import org.opendaylight.yangtools.concepts.AbstractListenerRegistration;
 import org.opendaylight.yangtools.concepts.AbstractObjectRegistration;
 import org.opendaylight.yangtools.concepts.AbstractRegistration;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.concepts.ObjectRegistration;
 import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.common.QName;
@@ -89,10 +87,10 @@ public final class DOMRpcRouter extends AbstractRegistration implements Effectiv
     private final @NonNull DOMRpcService rpcService = new RpcServiceFacade();
 
     @GuardedBy("this")
-    private ImmutableList<RegImpl<?>> listeners = ImmutableList.of();
+    private ImmutableList<RegImpl> listeners = ImmutableList.of();
 
     @GuardedBy("this")
-    private ImmutableList<ActionRegistration<?>> actionListeners = ImmutableList.of();
+    private ImmutableList<ActionRegistration> actionListeners = ImmutableList.of();
 
     private volatile DOMRpcRoutingTable routingTable = DOMRpcRoutingTable.EMPTY;
 
@@ -168,38 +166,38 @@ public final class DOMRpcRouter extends AbstractRegistration implements Effectiv
         listenerNotifier.execute(() -> notifyActionChanged(newTable, implementation));
     }
 
-    private synchronized void removeListener(final ListenerRegistration<? extends DOMRpcAvailabilityListener> reg) {
+    private synchronized void removeListener(final RegImpl reg) {
         listeners = ImmutableList.copyOf(Collections2.filter(listeners, input -> !reg.equals(input)));
     }
 
-    private synchronized void removeActionListener(final ListenerRegistration<? extends AvailabilityListener> reg) {
+    private synchronized void removeActionListener(final ActionRegistration reg) {
         actionListeners = ImmutableList.copyOf(Collections2.filter(actionListeners, input -> !reg.equals(input)));
     }
 
     private synchronized void notifyAdded(final DOMRpcRoutingTable newTable, final DOMRpcImplementation impl) {
-        for (RegImpl<?> l : listeners) {
+        for (var l : listeners) {
             l.addRpc(newTable, impl);
         }
     }
 
     private synchronized void notifyAdded(final DOMRpcRoutingTable newTable,
             final Collection<? extends DOMRpcImplementation> impls) {
-        for (RegImpl<?> l : listeners) {
-            for (DOMRpcImplementation impl : impls) {
+        for (var l : listeners) {
+            for (var impl : impls) {
                 l.addRpc(newTable, impl);
             }
         }
     }
 
     private synchronized void notifyRemoved(final DOMRpcRoutingTable newTable, final DOMRpcImplementation impl) {
-        for (RegImpl<?> l : listeners) {
+        for (var l : listeners) {
             l.removeRpc(newTable, impl);
         }
     }
 
     private synchronized void notifyRemoved(final DOMRpcRoutingTable newTable,
             final Collection<? extends DOMRpcImplementation> impls) {
-        for (RegImpl<?> l : listeners) {
+        for (var l : listeners) {
             for (DOMRpcImplementation impl : impls) {
                 l.removeRpc(newTable, impl);
             }
@@ -208,7 +206,7 @@ public final class DOMRpcRouter extends AbstractRegistration implements Effectiv
 
     private synchronized void notifyActionChanged(final DOMActionRoutingTable newTable,
             final DOMActionImplementation impl) {
-        for (ActionRegistration<?> l : actionListeners) {
+        for (var l : actionListeners) {
             l.actionChanged(newTable, impl);
         }
     }
@@ -250,11 +248,12 @@ public final class DOMRpcRouter extends AbstractRegistration implements Effectiv
         return routingTable;
     }
 
-    private static final class RegImpl<T extends DOMRpcAvailabilityListener> extends AbstractListenerRegistration<T> {
+    private static final class RegImpl extends AbstractObjectRegistration<DOMRpcAvailabilityListener> {
         private Map<QName, Set<YangInstanceIdentifier>> prevRpcs;
         private DOMRpcRouter router;
 
-        RegImpl(final DOMRpcRouter router, final T listener, final Map<QName, Set<YangInstanceIdentifier>> rpcs) {
+        RegImpl(final DOMRpcRouter router, final DOMRpcAvailabilityListener listener,
+                final Map<QName, Set<YangInstanceIdentifier>> rpcs) {
             super(listener);
             this.router = requireNonNull(router);
             prevRpcs = requireNonNull(rpcs);
@@ -277,7 +276,7 @@ public final class DOMRpcRouter extends AbstractRegistration implements Effectiv
         }
 
         void addRpc(final DOMRpcRoutingTable newTable, final DOMRpcImplementation impl) {
-            final T l = getInstance();
+            final var l = getInstance();
             if (!l.acceptsImplementation(impl)) {
                 return;
             }
@@ -302,7 +301,7 @@ public final class DOMRpcRouter extends AbstractRegistration implements Effectiv
         }
 
         void removeRpc(final DOMRpcRoutingTable newTable, final DOMRpcImplementation impl) {
-            final T l = getInstance();
+            final var l = getInstance();
             if (!l.acceptsImplementation(impl)) {
                 return;
             }
@@ -327,14 +326,11 @@ public final class DOMRpcRouter extends AbstractRegistration implements Effectiv
         }
     }
 
-    // FIXME: just Registration or ObjectRegistration and without generics
-    private static final class ActionRegistration<T extends AvailabilityListener>
-        extends AbstractListenerRegistration<T> {
-
+    private static final class ActionRegistration extends AbstractObjectRegistration<AvailabilityListener> {
         private Map<Absolute, Set<DOMDataTreeIdentifier>> prevActions;
         private DOMRpcRouter router;
 
-        ActionRegistration(final DOMRpcRouter router, final T listener,
+        ActionRegistration(final DOMRpcRouter router, final AvailabilityListener listener,
                 final Map<Absolute, Set<DOMDataTreeIdentifier>> actions) {
             super(listener);
             this.router = requireNonNull(router);
@@ -358,7 +354,7 @@ public final class DOMRpcRouter extends AbstractRegistration implements Effectiv
         }
 
         void actionChanged(final DOMActionRoutingTable newTable, final DOMActionImplementation impl) {
-            final T l = getInstance();
+            final var l = getInstance();
             if (!l.acceptsImplementation(impl)) {
                 return;
             }
@@ -416,9 +412,9 @@ public final class DOMRpcRouter extends AbstractRegistration implements Effectiv
         @Override
         public Registration registerAvailabilityListener(final AvailabilityListener listener) {
             synchronized (DOMRpcRouter.this) {
-                final var ret = new ActionRegistration<>(DOMRpcRouter.this, listener,
+                final var ret = new ActionRegistration(DOMRpcRouter.this, listener,
                     actionRoutingTable.getOperations(listener));
-                actionListeners = ImmutableList.<ActionRegistration<?>>builder()
+                actionListeners = ImmutableList.<ActionRegistration>builder()
                     .addAll(actionListeners)
                     .add(ret)
                     .build();
@@ -468,8 +464,8 @@ public final class DOMRpcRouter extends AbstractRegistration implements Effectiv
         @Override
         public Registration registerRpcListener(final DOMRpcAvailabilityListener listener) {
             synchronized (DOMRpcRouter.this) {
-                final var ret = new RegImpl<>(DOMRpcRouter.this, listener, routingTable.getOperations(listener));
-                listeners = ImmutableList.<RegImpl<?>>builder().addAll(listeners).add(ret).build();
+                final var ret = new RegImpl(DOMRpcRouter.this, listener, routingTable.getOperations(listener));
+                listeners = ImmutableList.<RegImpl>builder().addAll(listeners).add(ret).build();
 
                 listenerNotifier.execute(ret::initialTable);
                 return ret;

diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMRpcRouterTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMRpcRouterTest.java
index edce7f522a0f5a1826e83cf27fa4540efdfe1793..3d51e14cfee35d74f260d9f512a6828190b4872e 100644 (file)
--- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMRpcRouterTest.java
+++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMRpcRouterTest.java
@@ -46,14 +46,12 @@ import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier;
 import org.opendaylight.mdsal.dom.api.DOMRpcImplementationNotAvailableException;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.mdsal.dom.spi.SimpleDOMActionResult;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
 import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
-import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextListener;
 
 @RunWith(MockitoJUnitRunner.StrictStubs.class)
 public class DOMRpcRouterTest {
@@ -179,7 +177,7 @@ public class DOMRpcRouterTest {
 
     @Test
     public void testClose() {
-        final ListenerRegistration<EffectiveModelContextListener> reg = mock(ListenerRegistration.class);
+        final var reg = mock(Registration.class);
         doNothing().when(reg).close();
         final DOMSchemaService schema = mock(DOMSchemaService.class);
         doReturn(reg).when(schema).registerSchemaContextListener(any());