import static com.google.common.base.Preconditions.checkState;
-import java.util.Collection;
+import java.util.List;
import java.util.Optional;
import java.util.concurrent.ExecutorService;
import org.eclipse.jdt.annotation.NonNull;
import org.opendaylight.mdsal.dom.spi.AbstractDOMDataTreeChangeListenerRegistration;
import org.opendaylight.mdsal.dom.spi.store.AbstractDOMStoreTreeChangePublisher;
import org.opendaylight.yangtools.concepts.ListenerRegistration;
-import org.opendaylight.yangtools.util.concurrent.QueuedNotificationManager;
+import org.opendaylight.yangtools.util.concurrent.EqualityQueuedNotificationManager;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.DataContainerNode;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidates;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeSnapshot;
+import org.opendaylight.yangtools.yang.data.tree.api.DataTreeCandidate;
+import org.opendaylight.yangtools.yang.data.tree.api.DataTreeSnapshot;
+import org.opendaylight.yangtools.yang.data.tree.spi.DataTreeCandidates;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
final class InMemoryDOMStoreTreeChangePublisher extends AbstractDOMStoreTreeChangePublisher {
private static final Logger LOG = LoggerFactory.getLogger(InMemoryDOMStoreTreeChangePublisher.class);
- private final QueuedNotificationManager<AbstractDOMDataTreeChangeListenerRegistration<?>, DataTreeCandidate>
+ // Registrations use identity for equality, hence we can skip wrapping them
+ private final EqualityQueuedNotificationManager<AbstractDOMDataTreeChangeListenerRegistration<?>, DataTreeCandidate>
notificationManager;
- InMemoryDOMStoreTreeChangePublisher(final ExecutorService listenerExecutor, final int maxQueueSize) {
- notificationManager = QueuedNotificationManager.create(listenerExecutor, (listener, notifications) -> {
- if (!listener.isClosed()) {
- listener.getInstance().onDataTreeChanged(notifications);
- }
- }, maxQueueSize, "DataTreeChangeListenerQueueMgr");
+ InMemoryDOMStoreTreeChangePublisher(final String dsName, final ExecutorService listenerExecutor,
+ final int maxQueueSize) {
+ notificationManager = new EqualityQueuedNotificationManager<>("DataTreeChangeListenerQueueMgr + dsName",
+ listenerExecutor, maxQueueSize,
+ (listener, notifications) -> {
+ if (!listener.isClosed()) {
+ listener.getInstance().onDataTreeChanged(notifications);
+ }
+ });
}
- private InMemoryDOMStoreTreeChangePublisher(final QueuedNotificationManager<
+ private InMemoryDOMStoreTreeChangePublisher(final EqualityQueuedNotificationManager<
AbstractDOMDataTreeChangeListenerRegistration<?>, DataTreeCandidate> notificationManager) {
this.notificationManager = notificationManager;
}
- QueuedNotificationManager<?, ?> getNotificationManager() {
+ EqualityQueuedNotificationManager<?, ?> getNotificationManager() {
return notificationManager;
}
@Override
protected void notifyListener(final AbstractDOMDataTreeChangeListenerRegistration<?> registration,
- final Collection<DataTreeCandidate> changes) {
+ final List<DataTreeCandidate> changes) {
LOG.debug("Enqueueing candidates {} for registration {}", changes, registration);
notificationManager.submitNotifications(registration, changes);
}
<L extends DOMDataTreeChangeListener> ListenerRegistration<L> registerTreeChangeListener(
final YangInstanceIdentifier treeId, final L listener, final DataTreeSnapshot snapshot) {
final AbstractDOMDataTreeChangeListenerRegistration<L> reg = registerTreeChangeListener(treeId, listener);
- final Optional<NormalizedNode<?, ?>> preExistingData = snapshot.readNode(YangInstanceIdentifier.empty());
+ final Optional<NormalizedNode> preExistingData = snapshot.readNode(YangInstanceIdentifier.empty());
if (!preExistingData.isPresent()) {
listener.onInitialData();
return reg;
}
- final NormalizedNode<?, ?> data = preExistingData.get();
+ final NormalizedNode data = preExistingData.get();
if (treeId.isEmpty()) {
checkState(data instanceof DataContainerNode, "Unexpected root node %s", data);
- if (((DataContainerNode) data).getValue().isEmpty()) {
+ if (((DataContainerNode) data).isEmpty()) {
// If we are listening on root of data tree we still get empty normalized node, root is always present,
// we should filter this out separately and notify it by 'onInitialData()' once.
// Otherwise, it is just a valid data node with empty value which also should be notified by
- // "onDataTreeChanged(Collection<DataTreeCandidate>)".
+ // "onDataTreeChanged(List<DataTreeCandidate>)".
listener.onInitialData();
return reg;
}