Reduce ObjectRegistration use
[mdsal.git] / dom / mdsal-dom-broker / src / main / java / org / opendaylight / mdsal / dom / broker / DOMRpcRouter.java
index 492fd4abfbd8854b6a3381d62c24710a178636ef..3b6587a80285a68bdfb22af085506872a8a4ce40 100644 (file)
  */
 package org.opendaylight.mdsal.dom.broker;
 
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Verify.verifyNotNull;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableList.Builder;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableTable;
 import com.google.common.collect.MapDifference;
 import com.google.common.collect.MapDifference.ValueDifference;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-import com.google.common.util.concurrent.CheckedFuture;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
-import javax.annotation.concurrent.GuardedBy;
+import javax.annotation.PreDestroy;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import org.checkerframework.checker.lock.qual.GuardedBy;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.opendaylight.mdsal.dom.api.DOMActionAvailabilityExtension;
+import org.opendaylight.mdsal.dom.api.DOMActionAvailabilityExtension.AvailabilityListener;
+import org.opendaylight.mdsal.dom.api.DOMActionImplementation;
+import org.opendaylight.mdsal.dom.api.DOMActionInstance;
+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.DOMDataTreeIdentifier;
 import org.opendaylight.mdsal.dom.api.DOMRpcAvailabilityListener;
-import org.opendaylight.mdsal.dom.api.DOMRpcException;
 import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier;
 import org.opendaylight.mdsal.dom.api.DOMRpcImplementation;
-import org.opendaylight.mdsal.dom.api.DOMRpcImplementationRegistration;
+import org.opendaylight.mdsal.dom.api.DOMRpcImplementationNotAvailableException;
 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.spi.AbstractDOMRpcImplementationRegistration;
-import org.opendaylight.yangtools.concepts.AbstractListenerRegistration;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
+import org.opendaylight.mdsal.dom.api.DOMSchemaService;
+import org.opendaylight.yangtools.concepts.AbstractRegistration;
+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.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.model.api.SchemaContextListener;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
-
-public final class DOMRpcRouter implements AutoCloseable, DOMRpcService, DOMRpcProviderService, SchemaContextListener {
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextListener;
+import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Reference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Singleton
+@Component(service = DOMRpcRouter.class)
+public final class DOMRpcRouter extends AbstractRegistration implements EffectiveModelContextListener {
+    private static final Logger LOG = LoggerFactory.getLogger(DOMRpcRouter.class);
     private static final ThreadFactory THREAD_FACTORY = new ThreadFactoryBuilder().setNameFormat(
             "DOMRpcRouter-listener-%s").setDaemon(true).build();
 
     private final ExecutorService listenerNotifier = Executors.newSingleThreadExecutor(THREAD_FACTORY);
+    private final @NonNull DOMActionProviderService actionProviderService = new ActionProviderServiceFacade();
+    private final @NonNull DOMActionService actionService = new ActionServiceFacade();
+    private final @NonNull DOMRpcProviderService rpcProviderService = new RpcProviderServiceFacade();
+    private final @NonNull DOMRpcService rpcService = new RpcServiceFacade();
 
     @GuardedBy("this")
-    private Collection<Registration<?>> listeners = Collections.emptyList();
+    private ImmutableList<RpcAvailReg> listeners = ImmutableList.of();
+
+    @GuardedBy("this")
+    private ImmutableList<ActionAvailReg> actionListeners = ImmutableList.of();
 
     private volatile DOMRpcRoutingTable routingTable = DOMRpcRoutingTable.EMPTY;
 
-    @Override
-    public <T extends DOMRpcImplementation> DOMRpcImplementationRegistration<T> registerRpcImplementation(
-            final T implementation, final DOMRpcIdentifier... rpcs) {
-        return registerRpcImplementation(implementation, ImmutableSet.copyOf(rpcs));
+    private volatile DOMActionRoutingTable actionRoutingTable = DOMActionRoutingTable.EMPTY;
+
+    private Registration listenerRegistration;
+
+    @Deprecated
+    @VisibleForTesting
+    // FIXME: 9.0.0: make this constructor package-private
+    public DOMRpcRouter() {
+
     }
 
-    @Override
-    public synchronized <T extends DOMRpcImplementation> DOMRpcImplementationRegistration<T>
-            registerRpcImplementation(final T implementation, final Set<DOMRpcIdentifier> rpcs) {
-        final DOMRpcRoutingTable oldTable = routingTable;
-        final DOMRpcRoutingTable newTable = oldTable.add(implementation, rpcs);
-        routingTable = newTable;
+    @Inject
+    @Activate
+    public DOMRpcRouter(@Reference final DOMSchemaService schemaService) {
+        listenerRegistration = schemaService.registerSchemaContextListener(this);
+        LOG.info("DOM RPC/Action router started");
+    }
 
-        listenerNotifier.execute(() -> notifyAdded(newTable, implementation));
+    @Deprecated(forRemoval = true)
+    public static DOMRpcRouter newInstance(final DOMSchemaService schemaService) {
+        return new DOMRpcRouter(schemaService);
+    }
 
-        return new AbstractDOMRpcImplementationRegistration<T>(implementation) {
-            @Override
-            protected void removeRegistration() {
-                removeRpcImplementation(getInstance(), rpcs);
-            }
-        };
+    @PreDestroy
+    @Deactivate
+    public void shutdown() {
+        close();
+    }
+
+    public @NonNull DOMActionService actionService() {
+        return actionService;
+    }
+
+    public @NonNull DOMActionProviderService actionProviderService() {
+        return actionProviderService;
+    }
+
+    public @NonNull DOMRpcService rpcService() {
+        return rpcService;
+    }
+
+    public @NonNull DOMRpcProviderService rpcProviderService() {
+        return rpcProviderService;
     }
 
     private synchronized void removeRpcImplementation(final DOMRpcImplementation implementation,
             final Set<DOMRpcIdentifier> rpcs) {
         final DOMRpcRoutingTable oldTable = routingTable;
-        final DOMRpcRoutingTable newTable = oldTable.remove(implementation, rpcs);
+        final DOMRpcRoutingTable newTable = (DOMRpcRoutingTable) oldTable.remove(implementation, rpcs);
         routingTable = newTable;
 
         listenerNotifier.execute(() -> notifyRemoved(newTable, implementation));
     }
 
-    @Override
-    public CheckedFuture<DOMRpcResult, DOMRpcException> invokeRpc(final SchemaPath type,
-            final NormalizedNode<?, ?> input) {
-        return routingTable.invokeRpc(type, input);
+    private synchronized void removeRpcImplementations(
+            final ImmutableTable<QName, YangInstanceIdentifier, DOMRpcImplementation> implTable) {
+        final DOMRpcRoutingTable oldTable = routingTable;
+        final DOMRpcRoutingTable newTable = (DOMRpcRoutingTable) oldTable.removeAll(implTable);
+        routingTable = newTable;
+
+        listenerNotifier.execute(() -> notifyRemoved(newTable, implTable.values()));
+    }
+
+    private synchronized void removeActionImplementation(final DOMActionImplementation implementation,
+            final Set<DOMActionInstance> actions) {
+        final DOMActionRoutingTable oldTable = actionRoutingTable;
+        final DOMActionRoutingTable newTable = (DOMActionRoutingTable) oldTable.remove(implementation, actions);
+        actionRoutingTable = newTable;
+
+        listenerNotifier.execute(() -> notifyActionChanged(newTable, implementation));
     }
 
-    private synchronized void removeListener(final ListenerRegistration<? extends DOMRpcAvailabilityListener> reg) {
+    private synchronized void removeListener(final RpcAvailReg reg) {
         listeners = ImmutableList.copyOf(Collections2.filter(listeners, input -> !reg.equals(input)));
     }
 
+    private synchronized void removeActionListener(final ActionAvailReg reg) {
+        actionListeners = ImmutableList.copyOf(Collections2.filter(actionListeners, input -> !reg.equals(input)));
+    }
+
     private synchronized void notifyAdded(final DOMRpcRoutingTable newTable, final DOMRpcImplementation impl) {
-        for (Registration<?> l : listeners) {
+        for (var l : listeners) {
             l.addRpc(newTable, impl);
         }
     }
 
+    private synchronized void notifyAdded(final DOMRpcRoutingTable newTable,
+            final Collection<? extends DOMRpcImplementation> impls) {
+        for (var l : listeners) {
+            for (var impl : impls) {
+                l.addRpc(newTable, impl);
+            }
+        }
+    }
+
     private synchronized void notifyRemoved(final DOMRpcRoutingTable newTable, final DOMRpcImplementation impl) {
-        for (Registration<?> l : listeners) {
+        for (var l : listeners) {
             l.removeRpc(newTable, impl);
         }
     }
 
-    @Override
-    public synchronized <T extends DOMRpcAvailabilityListener> ListenerRegistration<T> registerRpcListener(
-            final T listener) {
-        final Registration<T> ret = new Registration<>(this, listener);
-        final Builder<Registration<?>> b = ImmutableList.builder();
-        b.addAll(listeners);
-        b.add(ret);
-        listeners = b.build();
+    private synchronized void notifyRemoved(final DOMRpcRoutingTable newTable,
+            final Collection<? extends DOMRpcImplementation> impls) {
+        for (var l : listeners) {
+            for (DOMRpcImplementation impl : impls) {
+                l.removeRpc(newTable, impl);
+            }
+        }
+    }
 
-        listenerNotifier.execute(() -> ret.initialTable(routingTable));
-        return ret;
+    private synchronized void notifyActionChanged(final DOMActionRoutingTable newTable,
+            final DOMActionImplementation impl) {
+        for (var l : actionListeners) {
+            l.actionChanged(newTable, impl);
+        }
     }
 
     @Override
-    public synchronized void onGlobalContextUpdated(final SchemaContext context) {
+    public synchronized void onModelContextUpdated(final EffectiveModelContext newModelContext) {
         final DOMRpcRoutingTable oldTable = routingTable;
-        final DOMRpcRoutingTable newTable = oldTable.setSchemaContext(context);
+        final DOMRpcRoutingTable newTable = (DOMRpcRoutingTable) oldTable.setSchemaContext(newModelContext);
         routingTable = newTable;
+
+        final DOMActionRoutingTable oldActionTable = actionRoutingTable;
+        final DOMActionRoutingTable newActionTable =
+                (DOMActionRoutingTable) oldActionTable.setSchemaContext(newModelContext);
+        actionRoutingTable = newActionTable;
     }
 
     @Override
-    public void close() {
+    protected void removeRegistration() {
+        if (listenerRegistration != null) {
+            listenerRegistration.close();
+            listenerRegistration = null;
+        }
         listenerNotifier.shutdown();
+        LOG.info("DOM RPC/Action router stopped");
     }
 
     @VisibleForTesting
-    Collection<?> listeners() {
+    synchronized List<?> listeners() {
         return listeners;
     }
 
+    @VisibleForTesting
+    synchronized List<?> actionListeners() {
+        return actionListeners;
+    }
+
     @VisibleForTesting
     DOMRpcRoutingTable routingTable() {
         return routingTable;
     }
 
-    private static final class Registration<T extends DOMRpcAvailabilityListener>
-        extends AbstractListenerRegistration<T> {
+    private static final class RpcAvailReg extends AbstractRegistration {
+        private final DOMRpcAvailabilityListener listener;
 
-        private final DOMRpcRouter router;
+        private Map<QName, Set<YangInstanceIdentifier>> prevRpcs;
+        private DOMRpcRouter router;
 
-        private Map<SchemaPath, Set<YangInstanceIdentifier>> prevRpcs;
-
-        Registration(final DOMRpcRouter router, final T listener) {
-            super(listener);
-            this.router = router;
+        RpcAvailReg(final DOMRpcRouter router, final DOMRpcAvailabilityListener listener,
+                final Map<QName, Set<YangInstanceIdentifier>> rpcs) {
+            this.listener = requireNonNull(listener);
+            this.router = requireNonNull(router);
+            prevRpcs = requireNonNull(rpcs);
         }
 
         @Override
         protected void removeRegistration() {
             router.removeListener(this);
+            router = null;
         }
 
-        void initialTable(final DOMRpcRoutingTable newTable) {
-            final T l = getInstance();
-            if (l == null) {
-                return;
-            }
-
-            final Map<SchemaPath, Set<YangInstanceIdentifier>> rpcs = newTable.getRpcs(l);
-            final Collection<DOMRpcIdentifier> added = new ArrayList<>();
-            for (Entry<SchemaPath, Set<YangInstanceIdentifier>> e : rpcs.entrySet()) {
+        void initialTable() {
+            final List<DOMRpcIdentifier> added = new ArrayList<>();
+            for (Entry<QName, Set<YangInstanceIdentifier>> e : prevRpcs.entrySet()) {
                 added.addAll(Collections2.transform(e.getValue(), i -> DOMRpcIdentifier.create(e.getKey(), i)));
             }
-            prevRpcs = rpcs;
             if (!added.isEmpty()) {
-                l.onRpcAvailable(added);
+                listener.onRpcAvailable(added);
             }
         }
 
         void addRpc(final DOMRpcRoutingTable newTable, final DOMRpcImplementation impl) {
-            final T l = getInstance();
-            if (l == null || !l.acceptsImplementation(impl)) {
+            if (!listener.acceptsImplementation(impl)) {
                 return;
             }
 
-            final Map<SchemaPath, Set<YangInstanceIdentifier>> rpcs = newTable.getRpcs(l);
-            final MapDifference<SchemaPath, Set<YangInstanceIdentifier>> diff = Maps.difference(prevRpcs, rpcs);
+            final Map<QName, Set<YangInstanceIdentifier>> rpcs = verifyNotNull(newTable.getOperations(listener));
+            final MapDifference<QName, Set<YangInstanceIdentifier>> diff = Maps.difference(prevRpcs, rpcs);
 
-            final Collection<DOMRpcIdentifier> added = new ArrayList<>();
-            for (Entry<SchemaPath, Set<YangInstanceIdentifier>> e : diff.entriesOnlyOnRight().entrySet()) {
+            final List<DOMRpcIdentifier> added = new ArrayList<>();
+            for (Entry<QName, Set<YangInstanceIdentifier>> e : diff.entriesOnlyOnRight().entrySet()) {
                 added.addAll(Collections2.transform(e.getValue(), i -> DOMRpcIdentifier.create(e.getKey(), i)));
             }
-            for (Entry<SchemaPath, ValueDifference<Set<YangInstanceIdentifier>>> e :
-                    diff.entriesDiffering().entrySet()) {
+            for (Entry<QName, ValueDifference<Set<YangInstanceIdentifier>>> e : diff.entriesDiffering().entrySet()) {
                 for (YangInstanceIdentifier i : Sets.difference(e.getValue().rightValue(), e.getValue().leftValue())) {
                     added.add(DOMRpcIdentifier.create(e.getKey(), i));
                 }
@@ -201,25 +295,23 @@ public final class DOMRpcRouter implements AutoCloseable, DOMRpcService, DOMRpcP
 
             prevRpcs = rpcs;
             if (!added.isEmpty()) {
-                l.onRpcAvailable(added);
+                listener.onRpcAvailable(added);
             }
         }
 
         void removeRpc(final DOMRpcRoutingTable newTable, final DOMRpcImplementation impl) {
-            final T l = getInstance();
-            if (l == null || !l.acceptsImplementation(impl)) {
+            if (!listener.acceptsImplementation(impl)) {
                 return;
             }
 
-            final Map<SchemaPath, Set<YangInstanceIdentifier>> rpcs = newTable.getRpcs(l);
-            final MapDifference<SchemaPath, Set<YangInstanceIdentifier>> diff = Maps.difference(prevRpcs, rpcs);
+            final Map<QName, Set<YangInstanceIdentifier>> rpcs = verifyNotNull(newTable.getOperations(listener));
+            final MapDifference<QName, Set<YangInstanceIdentifier>> diff = Maps.difference(prevRpcs, rpcs);
 
-            final Collection<DOMRpcIdentifier> removed = new ArrayList<>();
-            for (Entry<SchemaPath, Set<YangInstanceIdentifier>> e : diff.entriesOnlyOnLeft().entrySet()) {
+            final List<DOMRpcIdentifier> removed = new ArrayList<>();
+            for (Entry<QName, Set<YangInstanceIdentifier>> e : diff.entriesOnlyOnLeft().entrySet()) {
                 removed.addAll(Collections2.transform(e.getValue(), i -> DOMRpcIdentifier.create(e.getKey(), i)));
             }
-            for (Entry<SchemaPath, ValueDifference<Set<YangInstanceIdentifier>>> e :
-                    diff.entriesDiffering().entrySet()) {
+            for (Entry<QName, ValueDifference<Set<YangInstanceIdentifier>>> e : diff.entriesDiffering().entrySet()) {
                 for (YangInstanceIdentifier i : Sets.difference(e.getValue().leftValue(), e.getValue().rightValue())) {
                     removed.add(DOMRpcIdentifier.create(e.getKey(), i));
                 }
@@ -227,8 +319,205 @@ public final class DOMRpcRouter implements AutoCloseable, DOMRpcService, DOMRpcP
 
             prevRpcs = rpcs;
             if (!removed.isEmpty()) {
-                l.onRpcUnavailable(removed);
+                listener.onRpcUnavailable(removed);
+            }
+        }
+    }
+
+    private static final class ActionAvailReg extends AbstractRegistration {
+        private final AvailabilityListener listener;
+
+        private Map<Absolute, Set<DOMDataTreeIdentifier>> prevActions;
+        private DOMRpcRouter router;
+
+        ActionAvailReg(final DOMRpcRouter router, final AvailabilityListener listener,
+                final Map<Absolute, Set<DOMDataTreeIdentifier>> actions) {
+            this.listener = requireNonNull(listener);
+            this.router = requireNonNull(router);
+            prevActions = requireNonNull(actions);
+        }
+
+        @Override
+        protected void removeRegistration() {
+            router.removeActionListener(this);
+            router = null;
+        }
+
+        void initialTable() {
+            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()) {
+                listener.onActionsChanged(ImmutableSet.of(), ImmutableSet.copyOf(added));
+            }
+        }
+
+        void actionChanged(final DOMActionRoutingTable newTable, final DOMActionImplementation impl) {
+            if (!listener.acceptsImplementation(impl)) {
+                return;
+            }
+
+            final Map<Absolute, Set<DOMDataTreeIdentifier>> actions = verifyNotNull(newTable.getOperations(listener));
+            final MapDifference<Absolute, Set<DOMDataTreeIdentifier>> diff = Maps.difference(prevActions, actions);
+
+            final Set<DOMActionInstance> removed = new HashSet<>();
+            final Set<DOMActionInstance> added = new HashSet<>();
+
+            for (Entry<Absolute, Set<DOMDataTreeIdentifier>> e : diff.entriesOnlyOnLeft().entrySet()) {
+                removed.addAll(Collections2.transform(e.getValue(), i -> DOMActionInstance.of(e.getKey(), i)));
+            }
+
+            for (Entry<Absolute, Set<DOMDataTreeIdentifier>> e : diff.entriesOnlyOnRight().entrySet()) {
+                added.addAll(Collections2.transform(e.getValue(), i -> DOMActionInstance.of(e.getKey(), i)));
+            }
+
+            for (Entry<Absolute, ValueDifference<Set<DOMDataTreeIdentifier>>> e : diff.entriesDiffering().entrySet()) {
+                for (DOMDataTreeIdentifier i : Sets.difference(e.getValue().leftValue(), e.getValue().rightValue())) {
+                    removed.add(DOMActionInstance.of(e.getKey(), i));
+                }
+
+                for (DOMDataTreeIdentifier i : Sets.difference(e.getValue().rightValue(), e.getValue().leftValue())) {
+                    added.add(DOMActionInstance.of(e.getKey(), i));
+                }
+            }
+
+            prevActions = actions;
+            if (!removed.isEmpty() || !added.isEmpty()) {
+                listener.onActionsChanged(removed, added);
+            }
+        }
+    }
+
+    @NonNullByDefault
+    private final class ActionServiceFacade implements DOMActionService, DOMActionAvailabilityExtension {
+        @Override
+        public List<Extension> supportedExtensions() {
+            return List.of(this);
+        }
+
+        @Override
+        public ListenableFuture<? extends DOMActionResult> invokeAction(final Absolute type,
+                final DOMDataTreeIdentifier path, final ContainerNode input) {
+            final YangInstanceIdentifier pathRoot = path.path();
+            checkArgument(!pathRoot.isEmpty(), "Action path must not be empty");
+
+            final DOMActionRoutingTableEntry entry = (DOMActionRoutingTableEntry) actionRoutingTable.getEntry(type);
+            return entry != null ? OperationInvocation.invoke(entry, type, path, requireNonNull(input))
+                : Futures.immediateFailedFuture(
+                    new DOMActionNotAvailableException("No implementation of Action %s available", type));
+        }
+
+        @Override
+        public Registration registerAvailabilityListener(final AvailabilityListener listener) {
+            synchronized (DOMRpcRouter.this) {
+                final var ret = new ActionAvailReg(DOMRpcRouter.this, listener,
+                    actionRoutingTable.getOperations(listener));
+                actionListeners = ImmutableList.<ActionAvailReg>builder()
+                    .addAll(actionListeners)
+                    .add(ret)
+                    .build();
+
+                listenerNotifier.execute(ret::initialTable);
+                return ret;
+            }
+        }
+    }
+
+    @NonNullByDefault
+    private final class ActionProviderServiceFacade implements DOMActionProviderService {
+        @Override
+        public Registration registerActionImplementation(final DOMActionImplementation implementation,
+                final Set<DOMActionInstance> instances) {
+            checkArgument(!instances.isEmpty(), "Instances must not be empty");
+
+            synchronized (DOMRpcRouter.this) {
+                final DOMActionRoutingTable oldTable = actionRoutingTable;
+                final DOMActionRoutingTable newTable = (DOMActionRoutingTable) oldTable.add(implementation, instances);
+                actionRoutingTable = newTable;
+
+                listenerNotifier.execute(() -> notifyActionChanged(newTable, implementation));
             }
+
+            return new AbstractRegistration() {
+                @Override
+                protected void removeRegistration() {
+                    removeActionImplementation(implementation, instances);
+                }
+            };
+        }
+    }
+
+    private final class RpcServiceFacade implements DOMRpcService {
+        @Override
+        public ListenableFuture<? extends DOMRpcResult> invokeRpc(final QName type, final ContainerNode input) {
+            final var entry = (AbstractDOMRpcRoutingTableEntry) routingTable.getEntry(type);
+            if (entry == null) {
+                return Futures.immediateFailedFuture(
+                    new DOMRpcImplementationNotAvailableException("No implementation of RPC %s available", type));
+            }
+
+            return OperationInvocation.invoke(entry, requireNonNull(input));
+        }
+
+        @Override
+        public Registration registerRpcListener(final DOMRpcAvailabilityListener listener) {
+            synchronized (DOMRpcRouter.this) {
+                final var ret = new RpcAvailReg(DOMRpcRouter.this, listener, routingTable.getOperations(listener));
+                listeners = ImmutableList.<RpcAvailReg>builder().addAll(listeners).add(ret).build();
+
+                listenerNotifier.execute(ret::initialTable);
+                return ret;
+            }
+        }
+    }
+
+    private final class RpcProviderServiceFacade implements DOMRpcProviderService {
+        @Override
+        public Registration registerRpcImplementation(final DOMRpcImplementation implementation,
+                final Set<DOMRpcIdentifier> rpcs) {
+
+            synchronized (DOMRpcRouter.this) {
+                final DOMRpcRoutingTable oldTable = routingTable;
+                final DOMRpcRoutingTable newTable = (DOMRpcRoutingTable) oldTable.add(implementation, rpcs);
+                routingTable = newTable;
+
+                listenerNotifier.execute(() -> notifyAdded(newTable, implementation));
+            }
+
+            return new AbstractRegistration() {
+                @Override
+                protected void removeRegistration() {
+                    removeRpcImplementation(implementation, rpcs);
+                }
+            };
+        }
+
+        @Override
+        public Registration registerRpcImplementations(final Map<DOMRpcIdentifier, DOMRpcImplementation> map) {
+            checkArgument(!map.isEmpty());
+
+            final var builder = ImmutableTable.<QName, YangInstanceIdentifier, DOMRpcImplementation>builder();
+            for (var entry : map.entrySet()) {
+                final var id = entry.getKey();
+                builder.put(id.getType(), id.getContextReference(), entry.getValue());
+            }
+            final var implTable = builder.build();
+
+            synchronized (DOMRpcRouter.this) {
+                final DOMRpcRoutingTable oldTable = routingTable;
+                final DOMRpcRoutingTable newTable = (DOMRpcRoutingTable) oldTable.addAll(implTable);
+                routingTable = newTable;
+
+                listenerNotifier.execute(() -> notifyAdded(newTable, implTable.values()));
+            }
+
+            return new AbstractRegistration() {
+                @Override
+                protected void removeRegistration() {
+                    removeRpcImplementations(implTable);
+                }
+            };
         }
     }
 }