X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=dom%2Fmdsal-dom-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fdom%2Fbroker%2FDOMRpcRouter.java;h=3b6587a80285a68bdfb22af085506872a8a4ce40;hb=5f8a373c07549a901b70595067dd11c161d0c4e4;hp=e05d4e628ed75a79465191e71c8de93a8d5848e6;hpb=c71394328f488ea5f3bccf5ac8d42c8802cb637e;p=mdsal.git 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 e05d4e628e..3b6587a802 100644 --- 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 @@ -7,16 +7,15 @@ */ 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.ClassToInstanceMap; import com.google.common.collect.Collections2; -import com.google.common.collect.ImmutableClassToInstanceMap; 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; @@ -24,20 +23,21 @@ import com.google.common.collect.Sets; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 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.Optional; import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; +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; @@ -45,82 +45,98 @@ 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.DOMActionProviderServiceExtension; 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; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; -import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodes; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.api.SchemaContextListener; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +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; -public final class DOMRpcRouter extends AbstractRegistration implements SchemaContextListener { +@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 DOMActionProviderService actionProviderService = new ActionProviderServiceFacade(); - private final DOMActionService actionService = new ActionServiceFacade(); - private final DOMRpcProviderService rpcProviderService = new RpcProviderServiceFacade(); - private final DOMRpcService rpcService = new RpcServiceFacade(); + 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> listeners = Collections.emptyList(); + private ImmutableList listeners = ImmutableList.of(); @GuardedBy("this") - private Collection> actionListeners = Collections.emptyList(); + private ImmutableList actionListeners = ImmutableList.of(); private volatile DOMRpcRoutingTable routingTable = DOMRpcRoutingTable.EMPTY; private volatile DOMActionRoutingTable actionRoutingTable = DOMActionRoutingTable.EMPTY; - private ListenerRegistration listenerRegistration; + private Registration listenerRegistration; + @Deprecated + @VisibleForTesting + // FIXME: 9.0.0: make this constructor package-private + public DOMRpcRouter() { + + } + + @Inject + @Activate + public DOMRpcRouter(@Reference final DOMSchemaService schemaService) { + listenerRegistration = schemaService.registerSchemaContextListener(this); + LOG.info("DOM RPC/Action router started"); + } + + @Deprecated(forRemoval = true) public static DOMRpcRouter newInstance(final DOMSchemaService schemaService) { - final DOMRpcRouter rpcRouter = new DOMRpcRouter(); - rpcRouter.listenerRegistration = schemaService.registerSchemaContextListener(rpcRouter); - return rpcRouter; + return new DOMRpcRouter(schemaService); + } + + @PreDestroy + @Deactivate + public void shutdown() { + close(); } - public DOMActionService getActionService() { + public @NonNull DOMActionService actionService() { return actionService; } - public DOMActionProviderService getActionProviderService() { + public @NonNull DOMActionProviderService actionProviderService() { return actionProviderService; } - public DOMRpcService getRpcService() { + public @NonNull DOMRpcService rpcService() { return rpcService; } - public DOMRpcProviderService getRpcProviderService() { + public @NonNull DOMRpcProviderService rpcProviderService() { return rpcProviderService; } - @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", - justification = "https://github.com/spotbugs/spotbugs/issues/811") private synchronized void removeRpcImplementation(final DOMRpcImplementation implementation, final Set rpcs) { final DOMRpcRoutingTable oldTable = routingTable; @@ -130,8 +146,15 @@ public final class DOMRpcRouter extends AbstractRegistration implements SchemaCo listenerNotifier.execute(() -> notifyRemoved(newTable, implementation)); } - @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", - justification = "https://github.com/spotbugs/spotbugs/issues/811") + private synchronized void removeRpcImplementations( + final ImmutableTable 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 actions) { final DOMActionRoutingTable oldTable = actionRoutingTable; @@ -141,47 +164,60 @@ public final class DOMRpcRouter extends AbstractRegistration implements SchemaCo listenerNotifier.execute(() -> notifyActionChanged(newTable, implementation)); } - @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", - justification = "https://github.com/spotbugs/spotbugs/issues/811") - private synchronized void removeListener(final ListenerRegistration reg) { + private synchronized void removeListener(final RpcAvailReg reg) { listeners = ImmutableList.copyOf(Collections2.filter(listeners, input -> !reg.equals(input))); } - @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", - justification = "https://github.com/spotbugs/spotbugs/issues/811") - private synchronized void removeActionListener(final ListenerRegistration reg) { + private synchronized void removeActionListener(final ActionAvailReg reg) { actionListeners = ImmutableList.copyOf(Collections2.filter(actionListeners, input -> !reg.equals(input))); } - @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", - justification = "https://github.com/spotbugs/spotbugs/issues/811") 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 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); } } + private synchronized void notifyRemoved(final DOMRpcRoutingTable newTable, + final Collection impls) { + for (var l : listeners) { + for (DOMRpcImplementation impl : impls) { + l.removeRpc(newTable, impl); + } + } + } + private synchronized void notifyActionChanged(final DOMActionRoutingTable newTable, final DOMActionImplementation impl) { - for (ActionRegistration l : actionListeners) { + 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 = (DOMRpcRoutingTable) oldTable.setSchemaContext(context); + final DOMRpcRoutingTable newTable = (DOMRpcRoutingTable) oldTable.setSchemaContext(newModelContext); routingTable = newTable; final DOMActionRoutingTable oldActionTable = actionRoutingTable; - final DOMActionRoutingTable newActionTable = (DOMActionRoutingTable) oldActionTable.setSchemaContext(context); + final DOMActionRoutingTable newActionTable = + (DOMActionRoutingTable) oldActionTable.setSchemaContext(newModelContext); actionRoutingTable = newActionTable; } @@ -192,29 +228,35 @@ public final class DOMRpcRouter extends AbstractRegistration implements SchemaCo listenerRegistration = null; } listenerNotifier.shutdown(); + LOG.info("DOM RPC/Action router stopped"); } @VisibleForTesting - synchronized Collection listeners() { + synchronized List listeners() { return listeners; } + @VisibleForTesting + synchronized List actionListeners() { + return actionListeners; + } + @VisibleForTesting DOMRpcRoutingTable routingTable() { return routingTable; } - private static final class Registration - extends AbstractListenerRegistration { + private static final class RpcAvailReg extends AbstractRegistration { + private final DOMRpcAvailabilityListener listener; - private Map> prevRpcs; + private Map> prevRpcs; private DOMRpcRouter router; - Registration(final DOMRpcRouter router, final T listener, - final Map> rpcs) { - super(listener); + RpcAvailReg(final DOMRpcRouter router, final DOMRpcAvailabilityListener listener, + final Map> rpcs) { + this.listener = requireNonNull(listener); this.router = requireNonNull(router); - this.prevRpcs = requireNonNull(rpcs); + prevRpcs = requireNonNull(rpcs); } @Override @@ -224,30 +266,28 @@ public final class DOMRpcRouter extends AbstractRegistration implements SchemaCo } void initialTable() { - final Collection added = new ArrayList<>(); - for (Entry> e : prevRpcs.entrySet()) { + final List added = new ArrayList<>(); + for (Entry> e : prevRpcs.entrySet()) { added.addAll(Collections2.transform(e.getValue(), i -> DOMRpcIdentifier.create(e.getKey(), i))); } if (!added.isEmpty()) { - getInstance().onRpcAvailable(added); + listener.onRpcAvailable(added); } } void addRpc(final DOMRpcRoutingTable newTable, final DOMRpcImplementation impl) { - final T l = getInstance(); - if (!l.acceptsImplementation(impl)) { + if (!listener.acceptsImplementation(impl)) { return; } - final Map> rpcs = verifyNotNull(newTable.getOperations(l)); - final MapDifference> diff = Maps.difference(prevRpcs, rpcs); + final Map> rpcs = verifyNotNull(newTable.getOperations(listener)); + final MapDifference> diff = Maps.difference(prevRpcs, rpcs); - final Collection added = new ArrayList<>(); - for (Entry> e : diff.entriesOnlyOnRight().entrySet()) { + final List added = new ArrayList<>(); + for (Entry> e : diff.entriesOnlyOnRight().entrySet()) { added.addAll(Collections2.transform(e.getValue(), i -> DOMRpcIdentifier.create(e.getKey(), i))); } - for (Entry>> e : - diff.entriesDiffering().entrySet()) { + for (Entry>> e : diff.entriesDiffering().entrySet()) { for (YangInstanceIdentifier i : Sets.difference(e.getValue().rightValue(), e.getValue().leftValue())) { added.add(DOMRpcIdentifier.create(e.getKey(), i)); } @@ -255,25 +295,23 @@ public final class DOMRpcRouter extends AbstractRegistration implements SchemaCo 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.acceptsImplementation(impl)) { + if (!listener.acceptsImplementation(impl)) { return; } - final Map> rpcs = verifyNotNull(newTable.getOperations(l)); - final MapDifference> diff = Maps.difference(prevRpcs, rpcs); + final Map> rpcs = verifyNotNull(newTable.getOperations(listener)); + final MapDifference> diff = Maps.difference(prevRpcs, rpcs); - final Collection removed = new ArrayList<>(); - for (Entry> e : diff.entriesOnlyOnLeft().entrySet()) { + final List removed = new ArrayList<>(); + for (Entry> e : diff.entriesOnlyOnLeft().entrySet()) { removed.addAll(Collections2.transform(e.getValue(), i -> DOMRpcIdentifier.create(e.getKey(), i))); } - for (Entry>> e : - diff.entriesDiffering().entrySet()) { + for (Entry>> e : diff.entriesDiffering().entrySet()) { for (YangInstanceIdentifier i : Sets.difference(e.getValue().leftValue(), e.getValue().rightValue())) { removed.add(DOMRpcIdentifier.create(e.getKey(), i)); } @@ -281,22 +319,22 @@ public final class DOMRpcRouter extends AbstractRegistration implements SchemaCo prevRpcs = rpcs; if (!removed.isEmpty()) { - l.onRpcUnavailable(removed); + listener.onRpcUnavailable(removed); } } } - private static final class ActionRegistration - extends AbstractListenerRegistration { + private static final class ActionAvailReg extends AbstractRegistration { + private final AvailabilityListener listener; - private Map> prevActions; + private Map> prevActions; private DOMRpcRouter router; - ActionRegistration(final DOMRpcRouter router, final T listener, - final Map> actions) { - super(listener); + ActionAvailReg(final DOMRpcRouter router, final AvailabilityListener listener, + final Map> actions) { + this.listener = requireNonNull(listener); this.router = requireNonNull(router); - this.prevActions = requireNonNull(actions); + prevActions = requireNonNull(actions); } @Override @@ -306,37 +344,35 @@ public final class DOMRpcRouter extends AbstractRegistration implements SchemaCo } void initialTable() { - final Collection added = new ArrayList<>(); - for (Entry> e : prevActions.entrySet()) { + final var added = new ArrayList(); + for (var e : prevActions.entrySet()) { added.addAll(Collections2.transform(e.getValue(), i -> DOMActionInstance.of(e.getKey(), i))); } if (!added.isEmpty()) { - getInstance().onActionsChanged(ImmutableSet.of(), ImmutableSet.copyOf(added)); + listener.onActionsChanged(ImmutableSet.of(), ImmutableSet.copyOf(added)); } } void actionChanged(final DOMActionRoutingTable newTable, final DOMActionImplementation impl) { - final T l = getInstance(); - if (!l.acceptsImplementation(impl)) { + if (!listener.acceptsImplementation(impl)) { return; } - final Map> actions = verifyNotNull(newTable.getOperations(l)); - final MapDifference> diff = Maps.difference(prevActions, actions); + final Map> actions = verifyNotNull(newTable.getOperations(listener)); + final MapDifference> diff = Maps.difference(prevActions, actions); final Set removed = new HashSet<>(); final Set added = new HashSet<>(); - for (Entry> e : diff.entriesOnlyOnLeft().entrySet()) { + for (Entry> e : diff.entriesOnlyOnLeft().entrySet()) { removed.addAll(Collections2.transform(e.getValue(), i -> DOMActionInstance.of(e.getKey(), i))); } - for (Entry> e : diff.entriesOnlyOnRight().entrySet()) { + for (Entry> e : diff.entriesOnlyOnRight().entrySet()) { added.addAll(Collections2.transform(e.getValue(), i -> DOMActionInstance.of(e.getKey(), i))); } - for (Entry>> e : - diff.entriesDiffering().entrySet()) { + for (Entry>> e : diff.entriesDiffering().entrySet()) { for (DOMDataTreeIdentifier i : Sets.difference(e.getValue().leftValue(), e.getValue().rightValue())) { removed.add(DOMActionInstance.of(e.getKey(), i)); } @@ -348,62 +384,52 @@ public final class DOMRpcRouter extends AbstractRegistration implements SchemaCo prevActions = actions; if (!removed.isEmpty() || !added.isEmpty()) { - l.onActionsChanged(removed, added); + listener.onActionsChanged(removed, added); } } } @NonNullByDefault - private final class ActionAvailabilityFacade implements DOMActionAvailabilityExtension { - @Override - public ListenerRegistration registerAvailabilityListener(final T listener) { - synchronized (DOMRpcRouter.this) { - final ActionRegistration ret = new ActionRegistration<>(DOMRpcRouter.this, - listener, actionRoutingTable.getOperations(listener)); - final Builder> b = ImmutableList.builder(); - b.addAll(actionListeners); - b.add(ret); - actionListeners = b.build(); - - listenerNotifier.execute(ret::initialTable); - return ret; - } - } - } - - @NonNullByDefault - private final class ActionServiceFacade implements DOMActionService { - private final ClassToInstanceMap extensions = ImmutableClassToInstanceMap.of( - DOMActionAvailabilityExtension.class, new ActionAvailabilityFacade()); - + private final class ActionServiceFacade implements DOMActionService, DOMActionAvailabilityExtension { @Override - public ClassToInstanceMap getExtensions() { - return extensions; + public List supportedExtensions() { + return List.of(this); } @Override - public ListenableFuture invokeAction(final SchemaPath type, + public ListenableFuture 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); - if (entry == null) { - return Futures.immediateFailedFuture( + return entry != null ? OperationInvocation.invoke(entry, type, path, requireNonNull(input)) + : Futures.immediateFailedFuture( new DOMActionNotAvailableException("No implementation of Action %s available", type)); - } + } - return OperationInvocation.invoke(entry, type, path, input); + @Override + public Registration registerAvailabilityListener(final AvailabilityListener listener) { + synchronized (DOMRpcRouter.this) { + final var ret = new ActionAvailReg(DOMRpcRouter.this, listener, + actionRoutingTable.getOperations(listener)); + actionListeners = ImmutableList.builder() + .addAll(actionListeners) + .add(ret) + .build(); + + listenerNotifier.execute(ret::initialTable); + return ret; + } } } @NonNullByDefault private final class ActionProviderServiceFacade implements DOMActionProviderService { @Override - public ClassToInstanceMap getExtensions() { - return ImmutableClassToInstanceMap.of(); - } - - @Override - public ObjectRegistration registerActionImplementation( - final T implementation, final Set instances) { + public Registration registerActionImplementation(final DOMActionImplementation implementation, + final Set instances) { + checkArgument(!instances.isEmpty(), "Instances must not be empty"); synchronized (DOMRpcRouter.this) { final DOMActionRoutingTable oldTable = actionRoutingTable; @@ -413,10 +439,10 @@ public final class DOMRpcRouter extends AbstractRegistration implements SchemaCo listenerNotifier.execute(() -> notifyActionChanged(newTable, implementation)); } - return new AbstractObjectRegistration<>(implementation) { + return new AbstractRegistration() { @Override protected void removeRegistration() { - removeActionImplementation(getInstance(), instances); + removeActionImplementation(implementation, instances); } }; } @@ -424,25 +450,21 @@ public final class DOMRpcRouter extends AbstractRegistration implements SchemaCo private final class RpcServiceFacade implements DOMRpcService { @Override - public ListenableFuture invokeRpc(final SchemaPath type, final NormalizedNode input) { - final AbstractDOMRpcRoutingTableEntry entry = (AbstractDOMRpcRoutingTableEntry) routingTable.getEntry(type); + public ListenableFuture 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, input); + return OperationInvocation.invoke(entry, requireNonNull(input)); } @Override - public ListenerRegistration registerRpcListener(final T listener) { + public Registration registerRpcListener(final DOMRpcAvailabilityListener listener) { synchronized (DOMRpcRouter.this) { - final Registration ret = new Registration<>(DOMRpcRouter.this, listener, - routingTable.getOperations(listener)); - final Builder> b = ImmutableList.builder(); - b.addAll(listeners); - b.add(ret); - listeners = b.build(); + final var ret = new RpcAvailReg(DOMRpcRouter.this, listener, routingTable.getOperations(listener)); + listeners = ImmutableList.builder().addAll(listeners).add(ret).build(); listenerNotifier.execute(ret::initialTable); return ret; @@ -452,14 +474,8 @@ public final class DOMRpcRouter extends AbstractRegistration implements SchemaCo private final class RpcProviderServiceFacade implements DOMRpcProviderService { @Override - public DOMRpcImplementationRegistration registerRpcImplementation( - final T implementation, final DOMRpcIdentifier... rpcs) { - return registerRpcImplementation(implementation, ImmutableSet.copyOf(rpcs)); - } - - @Override - public DOMRpcImplementationRegistration registerRpcImplementation( - final T implementation, final Set rpcs) { + public Registration registerRpcImplementation(final DOMRpcImplementation implementation, + final Set rpcs) { synchronized (DOMRpcRouter.this) { final DOMRpcRoutingTable oldTable = routingTable; @@ -469,88 +485,39 @@ public final class DOMRpcRouter extends AbstractRegistration implements SchemaCo listenerNotifier.execute(() -> notifyAdded(newTable, implementation)); } - return new AbstractDOMRpcImplementationRegistration<>(implementation) { + return new AbstractRegistration() { @Override protected void removeRegistration() { - removeRpcImplementation(getInstance(), rpcs); + removeRpcImplementation(implementation, rpcs); } }; } - } - static final class OperationInvocation { - private static final Logger LOG = LoggerFactory.getLogger(OperationInvocation.class); - - static ListenableFuture invoke(final DOMActionRoutingTableEntry entry, - final SchemaPath type, final DOMDataTreeIdentifier path, final ContainerNode input) { - return entry.getImplementations(path).get(0).invokeAction(type, path, input); - } + @Override + public Registration registerRpcImplementations(final Map map) { + checkArgument(!map.isEmpty()); - static ListenableFuture invoke(final AbstractDOMRpcRoutingTableEntry entry, - final NormalizedNode input) { - if (entry instanceof UnknownDOMRpcRoutingTableEntry) { - return Futures.immediateFailedFuture( - new DOMRpcImplementationNotAvailableException("SchemaPath %s is not resolved to an RPC", - entry.getType())); - } else if (entry instanceof RoutedDOMRpcRoutingTableEntry) { - return invokeRoutedRpc((RoutedDOMRpcRoutingTableEntry) entry, input); - } else if (entry instanceof GlobalDOMRpcRoutingTableEntry) { - return invokeGlobalRpc((GlobalDOMRpcRoutingTableEntry) entry, input); + final var builder = ImmutableTable.builder(); + for (var entry : map.entrySet()) { + final var id = entry.getKey(); + builder.put(id.getType(), id.getContextReference(), entry.getValue()); } + final var implTable = builder.build(); - return Futures.immediateFailedFuture( - new DOMRpcImplementationNotAvailableException("Unsupported RPC entry.")); - } - - private static ListenableFuture invokeRoutedRpc(final RoutedDOMRpcRoutingTableEntry entry, - final NormalizedNode input) { - final Optional> maybeKey = NormalizedNodes.findNode(input, - entry.getRpcId().getContextReference()); - - // Routing key is present, attempt to deliver as a routed RPC - if (maybeKey.isPresent()) { - final NormalizedNode key = maybeKey.get(); - final Object value = key.getValue(); - if (value instanceof YangInstanceIdentifier) { - final YangInstanceIdentifier iid = (YangInstanceIdentifier) value; - - // Find a DOMRpcImplementation for a specific iid - final List specificImpls = entry.getImplementations(iid); - if (specificImpls != null) { - return specificImpls.get(0) - .invokeRpc(DOMRpcIdentifier.create(entry.getType(), iid), input); - } - - LOG.debug("No implementation for context {} found will now look for wildcard id", iid); - - // Find a DOMRpcImplementation for a wild card. Usually remote-rpc-connector would register an - // implementation this way - final List mayBeRemoteImpls = - entry.getImplementations(YangInstanceIdentifier.empty()); - - if (mayBeRemoteImpls != null) { - return mayBeRemoteImpls.get(0) - .invokeRpc(DOMRpcIdentifier.create(entry.getType(), iid), input); - } - - } else { - LOG.warn("Ignoring wrong context value {}", value); - } - } + synchronized (DOMRpcRouter.this) { + final DOMRpcRoutingTable oldTable = routingTable; + final DOMRpcRoutingTable newTable = (DOMRpcRoutingTable) oldTable.addAll(implTable); + routingTable = newTable; - final List impls = entry.getImplementations(null); - if (impls != null) { - return impls.get(0).invokeRpc(entry.getRpcId(), input); + listenerNotifier.execute(() -> notifyAdded(newTable, implTable.values())); } - return Futures.immediateFailedFuture( - new DOMRpcImplementationNotAvailableException("No implementation of RPC %s available", - entry.getType())); - } - - private static ListenableFuture invokeGlobalRpc(final GlobalDOMRpcRoutingTableEntry entry, - final NormalizedNode input) { - return entry.getImplementations(YangInstanceIdentifier.empty()).get(0).invokeRpc(entry.getRpcId(), input); + return new AbstractRegistration() { + @Override + protected void removeRegistration() { + removeRpcImplementations(implTable); + } + }; } } }