package org.opendaylight.mdsal.dom.spi.store;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ListMultimap;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.Multimaps;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.IdentityHashMap;
import java.util.List;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener;
import org.opendaylight.mdsal.dom.spi.AbstractDOMDataTreeChangeListenerRegistration;
import org.opendaylight.mdsal.dom.spi.AbstractRegistrationTree;
import org.opendaylight.mdsal.dom.spi.RegistrationTreeNode;
-import org.opendaylight.mdsal.dom.spi.RegistrationTreeSnapshot;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateNode;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType;
+import org.opendaylight.yangtools.yang.data.tree.api.DataTreeCandidate;
+import org.opendaylight.yangtools.yang.data.tree.api.DataTreeCandidateNode;
+import org.opendaylight.yangtools.yang.data.tree.api.ModificationType;
+import org.opendaylight.yangtools.yang.data.tree.spi.DataTreeCandidates;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
private static final Logger LOG = LoggerFactory.getLogger(AbstractDOMStoreTreeChangePublisher.class);
/**
- * Callback for subclass to notify specified registrations
- * of a candidate at a specified path. This method is guaranteed
+ * Callback for subclass to notify a specified registration of a list of candidates. This method is guaranteed
* to be only called from within {@link #processCandidateTree(DataTreeCandidate)}.
- * @param registrations Registrations which are affected by the candidate node
- * @param path Path of changed candidate node. Guaranteed to match the path specified by the registration
- * @param node Candidate node
+ * @param registration the registration to notify
+ * @param changes the list of DataTreeCandidate changes
*/
- protected abstract void notifyListeners(
- @Nonnull Collection<AbstractDOMDataTreeChangeListenerRegistration<?>> registrations,
- @Nonnull YangInstanceIdentifier path, @Nonnull DataTreeCandidateNode node);
+ protected abstract void notifyListener(@NonNull AbstractDOMDataTreeChangeListenerRegistration<?> registration,
+ @NonNull List<DataTreeCandidate> changes);
/**
* Callback notifying the subclass that the specified registration is being
* @param registration Registration which is being closed
*/
protected abstract void registrationRemoved(
- @Nonnull AbstractDOMDataTreeChangeListenerRegistration<?> registration);
+ @NonNull AbstractDOMDataTreeChangeListenerRegistration<?> registration);
/**
* Process a candidate tree with respect to registered listeners.
*
* @param candidate candidate three which needs to be processed
+ * @return true if at least one listener was notified or false.
*/
- protected final void processCandidateTree(@Nonnull final DataTreeCandidate candidate) {
+ protected final boolean processCandidateTree(final @NonNull DataTreeCandidate candidate) {
final DataTreeCandidateNode node = candidate.getRootNode();
if (node.getModificationType() == ModificationType.UNMODIFIED) {
LOG.debug("Skipping unmodified candidate {}", candidate);
- return;
+ return false;
}
- try (final RegistrationTreeSnapshot<AbstractDOMDataTreeChangeListenerRegistration<?>> snapshot
- = takeSnapshot()) {
- final List<PathArgument> toLookup
- = ImmutableList.copyOf(candidate.getRootPath().getPathArguments());
- lookupAndNotify(toLookup, 0, snapshot.getRootNode(), candidate);
+ try (var snapshot = takeSnapshot()) {
+ final List<PathArgument> toLookup = ImmutableList.copyOf(candidate.getRootPath().getPathArguments());
+ final ListMultimap<AbstractDOMDataTreeChangeListenerRegistration<?>, DataTreeCandidate> listenerChanges =
+ Multimaps.newListMultimap(new IdentityHashMap<>(), ArrayList::new);
+ lookupAndNotify(toLookup, 0, snapshot.getRootNode(), candidate, listenerChanges);
+
+ for (var entry : Multimaps.asMap(listenerChanges).entrySet()) {
+ notifyListener(entry.getKey(), entry.getValue());
+ }
+
+ return !listenerChanges.isEmpty();
}
}
try {
final RegistrationTreeNode<AbstractDOMDataTreeChangeListenerRegistration<?>> node =
findNodeFor(treeId.getPathArguments());
- final AbstractDOMDataTreeChangeListenerRegistration<L> reg =
- new AbstractDOMDataTreeChangeListenerRegistration<L>(listener) {
+ final var reg = new AbstractDOMDataTreeChangeListenerRegistration<>(listener) {
@Override
protected void removeRegistration() {
AbstractDOMStoreTreeChangePublisher.this.removeRegistration(node, this);
private void lookupAndNotify(final List<PathArgument> args,
final int offset, final RegistrationTreeNode<AbstractDOMDataTreeChangeListenerRegistration<?>> node,
- final DataTreeCandidate candidate) {
+ final DataTreeCandidate candidate,
+ final Multimap<AbstractDOMDataTreeChangeListenerRegistration<?>, DataTreeCandidate> listenerChanges) {
if (args.size() != offset) {
final PathArgument arg = args.get(offset);
final RegistrationTreeNode<AbstractDOMDataTreeChangeListenerRegistration<?>> exactChild
= node.getExactChild(arg);
if (exactChild != null) {
- lookupAndNotify(args, offset + 1, exactChild, candidate);
+ lookupAndNotify(args, offset + 1, exactChild, candidate, listenerChanges);
}
for (RegistrationTreeNode<AbstractDOMDataTreeChangeListenerRegistration<?>> c :
node.getInexactChildren(arg)) {
- lookupAndNotify(args, offset + 1, c, candidate);
+ lookupAndNotify(args, offset + 1, c, candidate, listenerChanges);
}
} else {
- notifyNode(candidate.getRootPath(), node, candidate.getRootNode());
+ notifyNode(candidate.getRootPath(), node, candidate.getRootNode(), listenerChanges);
}
}
private void notifyNode(final YangInstanceIdentifier path,
final RegistrationTreeNode<AbstractDOMDataTreeChangeListenerRegistration<?>> regNode,
- final DataTreeCandidateNode candNode) {
+ final DataTreeCandidateNode candNode,
+ final Multimap<AbstractDOMDataTreeChangeListenerRegistration<?>, DataTreeCandidate> listenerChanges) {
if (candNode.getModificationType() == ModificationType.UNMODIFIED) {
LOG.debug("Skipping unmodified candidate {}", path);
return;
final Collection<AbstractDOMDataTreeChangeListenerRegistration<?>> regs = regNode.getRegistrations();
if (!regs.isEmpty()) {
- notifyListeners(regs, path, candNode);
+ addToListenerChanges(regs, path, candNode, listenerChanges);
}
for (DataTreeCandidateNode candChild : candNode.getChildNodes()) {
final RegistrationTreeNode<AbstractDOMDataTreeChangeListenerRegistration<?>> regChild =
regNode.getExactChild(candChild.getIdentifier());
if (regChild != null) {
- notifyNode(path.node(candChild.getIdentifier()), regChild, candChild);
+ notifyNode(path.node(candChild.getIdentifier()), regChild, candChild, listenerChanges);
}
for (RegistrationTreeNode<AbstractDOMDataTreeChangeListenerRegistration<?>> rc :
regNode.getInexactChildren(candChild.getIdentifier())) {
- notifyNode(path.node(candChild.getIdentifier()), rc, candChild);
+ notifyNode(path.node(candChild.getIdentifier()), rc, candChild, listenerChanges);
}
}
}
}
+
+ private static void addToListenerChanges(
+ final Collection<AbstractDOMDataTreeChangeListenerRegistration<?>> registrations,
+ final YangInstanceIdentifier path, final DataTreeCandidateNode node,
+ final Multimap<AbstractDOMDataTreeChangeListenerRegistration<?>, DataTreeCandidate> listenerChanges) {
+ final DataTreeCandidate dataTreeCandidate = DataTreeCandidates.newDataTreeCandidate(path, node);
+
+ for (AbstractDOMDataTreeChangeListenerRegistration<?> reg : registrations) {
+ listenerChanges.put(reg, dataTreeCandidate);
+ }
+ }
}
Code Review / mdsal.git / blobdiff