Clean up DOMRpcRouter registrations

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

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 578f84cfded611ee2af64e2dec6939c735e568e5..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
@@ -47,22 +47,17 @@ import org.opendaylight.mdsal.dom.api.DOMActionNotAvailableException;
 import org.opendaylight.mdsal.dom.api.DOMActionProviderService;
 import org.opendaylight.mdsal.dom.api.DOMActionResult;
 import org.opendaylight.mdsal.dom.api.DOMActionService;
-import org.opendaylight.mdsal.dom.api.DOMActionServiceExtension;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
 import org.opendaylight.mdsal.dom.api.DOMRpcAvailabilityListener;
 import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier;
 import org.opendaylight.mdsal.dom.api.DOMRpcImplementation;
 import org.opendaylight.mdsal.dom.api.DOMRpcImplementationNotAvailableException;
-import org.opendaylight.mdsal.dom.api.DOMRpcImplementationRegistration;
 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.mdsal.dom.spi.AbstractDOMRpcImplementationRegistration;
-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;
@@ -92,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;
 
@@ -171,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);
             }
@@ -211,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);
         }
     }
@@ -253,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);
@@ -280,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;
             }
@@ -305,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;
             }
@@ -330,13 +326,11 @@ public final class DOMRpcRouter extends AbstractRegistration implements Effectiv
         }
     }
 
-    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);
@@ -350,8 +344,8 @@ public final class DOMRpcRouter extends AbstractRegistration implements Effectiv
         }
 
         void initialTable() {
-            final List<DOMActionInstance> added = new ArrayList<>();
-            for (Entry<Absolute, Set<DOMDataTreeIdentifier>> e : prevActions.entrySet()) {
+            final var added = new ArrayList<DOMActionInstance>();
+            for (var e : prevActions.entrySet()) {
                 added.addAll(Collections2.transform(e.getValue(), i -> DOMActionInstance.of(e.getKey(), i)));
             }
             if (!added.isEmpty()) {
@@ -360,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;
             }
@@ -399,7 +393,7 @@ public final class DOMRpcRouter extends AbstractRegistration implements Effectiv
     @NonNullByDefault
     private final class ActionServiceFacade implements DOMActionService, DOMActionAvailabilityExtension {
         @Override
-        public Collection<DOMActionServiceExtension> supportedExtensions() {
+        public List<Extension> supportedExtensions() {
             return List.of(this);
         }
 
@@ -416,11 +410,11 @@ public final class DOMRpcRouter extends AbstractRegistration implements Effectiv
         }
 
         @Override
-        public <T extends AvailabilityListener> ListenerRegistration<T> registerAvailabilityListener(final T listener) {
+        public Registration registerAvailabilityListener(final AvailabilityListener listener) {
             synchronized (DOMRpcRouter.this) {
-                final ActionRegistration<T> 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();
@@ -458,7 +452,7 @@ public final class DOMRpcRouter extends AbstractRegistration implements Effectiv
     private final class RpcServiceFacade implements DOMRpcService {
         @Override
         public ListenableFuture<? extends DOMRpcResult> invokeRpc(final QName type, final ContainerNode input) {
-            final AbstractDOMRpcRoutingTableEntry entry = (AbstractDOMRpcRoutingTableEntry) routingTable.getEntry(type);
+            final var entry = (AbstractDOMRpcRoutingTableEntry) routingTable.getEntry(type);
             if (entry == null) {
                 return Futures.immediateFailedFuture(
                     new DOMRpcImplementationNotAvailableException("No implementation of RPC %s available", type));
@@ -468,10 +462,10 @@ public final class DOMRpcRouter extends AbstractRegistration implements Effectiv
         }
 
         @Override
-        public <T extends DOMRpcAvailabilityListener> ListenerRegistration<T> registerRpcListener(final T listener) {
+        public Registration registerRpcListener(final DOMRpcAvailabilityListener listener) {
             synchronized (DOMRpcRouter.this) {
-                final RegImpl<T> 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;
@@ -481,14 +475,8 @@ public final class DOMRpcRouter extends AbstractRegistration implements Effectiv
 
     private final class RpcProviderServiceFacade implements DOMRpcProviderService {
         @Override
-        public <T extends DOMRpcImplementation> DOMRpcImplementationRegistration<T> registerRpcImplementation(
-                final T implementation, final DOMRpcIdentifier... rpcs) {
-            return registerRpcImplementation(implementation, ImmutableSet.copyOf(rpcs));
-        }
-
-        @Override
-        public <T extends DOMRpcImplementation> DOMRpcImplementationRegistration<T> registerRpcImplementation(
-                final T implementation, final Set<DOMRpcIdentifier> rpcs) {
+        public Registration registerRpcImplementation(final DOMRpcImplementation implementation,
+                final Set<DOMRpcIdentifier> rpcs) {
 
             synchronized (DOMRpcRouter.this) {
                 final DOMRpcRoutingTable oldTable = routingTable;
@@ -498,17 +486,16 @@ public final class DOMRpcRouter extends AbstractRegistration implements Effectiv
                 listenerNotifier.execute(() -> notifyAdded(newTable, implementation));
             }
 
-            return new AbstractDOMRpcImplementationRegistration<>(implementation) {
+            return new AbstractRegistration() {
                 @Override
                 protected void removeRegistration() {
-                    removeRpcImplementation(getInstance(), rpcs);
+                    removeRpcImplementation(implementation, rpcs);
                 }
             };
         }
 
         @Override
-        public org.opendaylight.yangtools.concepts.Registration registerRpcImplementations(
-                final Map<DOMRpcIdentifier, DOMRpcImplementation> map) {
+        public Registration registerRpcImplementations(final Map<DOMRpcIdentifier, DOMRpcImplementation> map) {
             checkArgument(!map.isEmpty());
 
             final var builder = ImmutableTable.<QName, YangInstanceIdentifier, DOMRpcImplementation>builder();