*/
package org.opendaylight.controller.cluster.datastore;
-import com.google.common.base.Optional;
-import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
import java.util.function.Consumer;
-import javax.annotation.concurrent.NotThreadSafe;
import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener;
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.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
+import org.opendaylight.yangtools.yang.data.tree.api.DataTreeCandidate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Default implementation of ShardDataTreeChangeListenerPublisher that directly generates and publishes
- * notifications for DataTreeChangeListeners.
+ * notifications for DataTreeChangeListeners. This class is NOT thread-safe.
*
* @author Thomas Pantelis
*/
-@NotThreadSafe
final class DefaultShardDataTreeChangeListenerPublisher extends AbstractDOMStoreTreeChangePublisher
implements ShardDataTreeChangeListenerPublisher {
private static final Logger LOG = LoggerFactory.getLogger(DefaultShardDataTreeChangeListenerPublisher.class);
private String logContext;
- DefaultShardDataTreeChangeListenerPublisher(String logContext) {
+ DefaultShardDataTreeChangeListenerPublisher(final String logContext) {
this.logContext = logContext;
}
}
@Override
- protected void notifyListener(AbstractDOMDataTreeChangeListenerRegistration<?> registration,
- Collection<DataTreeCandidate> changes) {
+ protected void notifyListener(final AbstractDOMDataTreeChangeListenerRegistration<?> registration,
+ final List<DataTreeCandidate> changes) {
LOG.debug("{}: notifyListener: listener: {}", logContext, registration.getInstance());
registration.getInstance().onDataTreeChanged(changes);
}
}
@Override
- public void registerTreeChangeListener(YangInstanceIdentifier treeId, DOMDataTreeChangeListener listener,
- Optional<DataTreeCandidate> initialState,
- Consumer<ListenerRegistration<DOMDataTreeChangeListener>> onRegistration) {
+ public void registerTreeChangeListener(final YangInstanceIdentifier treeId,
+ final DOMDataTreeChangeListener listener, final Optional<DataTreeCandidate> initialState,
+ final Consumer<ListenerRegistration<DOMDataTreeChangeListener>> onRegistration) {
+ registerTreeChangeListener(treeId, listener, onRegistration);
+
+ if (initialState.isPresent()) {
+ notifySingleListener(treeId, listener, initialState.get(), logContext);
+ } else {
+ listener.onInitialData();
+ }
+ }
+
+ void registerTreeChangeListener(final YangInstanceIdentifier treeId, final DOMDataTreeChangeListener listener,
+ final Consumer<ListenerRegistration<DOMDataTreeChangeListener>> onRegistration) {
LOG.debug("{}: registerTreeChangeListener: path: {}, listener: {}", logContext, treeId, listener);
AbstractDOMDataTreeChangeListenerRegistration<DOMDataTreeChangeListener> registration =
super.registerTreeChangeListener(treeId, listener);
onRegistration.accept(registration);
-
- if (initialState.isPresent()) {
- notifySingleListener(treeId, listener, initialState.get(), logContext);
- }
}
- static void notifySingleListener(YangInstanceIdentifier treeId, DOMDataTreeChangeListener listener,
- DataTreeCandidate state, String logContext) {
+ static void notifySingleListener(final YangInstanceIdentifier treeId, final DOMDataTreeChangeListener listener,
+ final DataTreeCandidate state, final String logContext) {
LOG.debug("{}: notifySingleListener: path: {}, listener: {}", logContext, treeId, listener);
DefaultShardDataTreeChangeListenerPublisher publisher =
new DefaultShardDataTreeChangeListenerPublisher(logContext);
publisher.logContext = logContext;
- publisher.registerTreeChangeListener(treeId, listener, Optional.absent(), noop -> { /* NOOP */ });
- publisher.publishChanges(state);
+ publisher.registerTreeChangeListener(treeId, listener);
+
+ if (!publisher.processCandidateTree(state)) {
+ listener.onInitialData();
+ }
}
}