X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fmd-sal%2Fsal-inmemory-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fdom%2Fstore%2Fimpl%2FResolveDataChangeEventsTask.java;h=2e45150bb34576f77e8f1a58d9fef913a7d2fb1b;hb=401577076374485afea34caeb33bce474563f752;hp=07a9fb7a88a7c5c37a3f748d84c7659e825dc9d5;hpb=107324809285bfbb9890cba38ffa18390f8de4bd;p=controller.git
diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/ResolveDataChangeEventsTask.java b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/ResolveDataChangeEventsTask.java
index 07a9fb7a88..2e45150bb3 100644
--- a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/ResolveDataChangeEventsTask.java
+++ b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/ResolveDataChangeEventsTask.java
@@ -8,17 +8,18 @@
package org.opendaylight.controller.md.sal.dom.store.impl;
import com.google.common.annotations.Beta;
-import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
import java.util.Collection;
import java.util.Map.Entry;
+import java.util.Optional;
import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope;
-import org.opendaylight.controller.md.sal.dom.spi.RegistrationTreeSnapshot;
import org.opendaylight.controller.md.sal.dom.store.impl.DOMImmutableDataChangeEvent.Builder;
import org.opendaylight.controller.md.sal.dom.store.impl.DOMImmutableDataChangeEvent.SimpleEventFactory;
-import org.opendaylight.controller.md.sal.dom.store.impl.tree.ListenerTree;
+import org.opendaylight.controller.sal.core.compat.DataChangeListenerRegistration;
+import org.opendaylight.controller.sal.core.compat.ListenerTree;
+import org.opendaylight.mdsal.dom.spi.RegistrationTreeSnapshot;
import org.opendaylight.yangtools.util.concurrent.NotificationManager;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
@@ -32,8 +33,8 @@ import org.slf4j.LoggerFactory;
/**
* Resolve Data Change Events based on modifications and listeners
*
- * Computes data change events for all affected registered listeners in data
- * tree.
+ *
+ * Computes data change events for all affected registered listeners in data tree.
*/
@Beta
public final class ResolveDataChangeEventsTask {
@@ -52,8 +53,9 @@ public final class ResolveDataChangeEventsTask {
/**
* Resolves and submits notification tasks to the specified manager.
*/
- public synchronized void resolve(final NotificationManager, DOMImmutableDataChangeEvent> manager) {
- try (final RegistrationTreeSnapshot> w = listenerRoot.takeSnapshot()) {
+ public synchronized void resolve(final NotificationManager,
+ DOMImmutableDataChangeEvent> manager) {
+ try (RegistrationTreeSnapshot> w = listenerRoot.takeSnapshot()) {
// Defensive: reset internal state
collectedEvents = ArrayListMultimap.create();
@@ -65,7 +67,8 @@ public final class ResolveDataChangeEventsTask {
* Convert to tasks, but be mindful of multiple values -- those indicate multiple
* wildcard matches, which need to be merged.
*/
- for (Entry, Collection> e : collectedEvents.asMap().entrySet()) {
+ for (Entry, Collection> e :
+ collectedEvents.asMap().entrySet()) {
final Collection col = e.getValue();
final DOMImmutableDataChangeEvent event;
@@ -87,7 +90,7 @@ public final class ResolveDataChangeEventsTask {
}
/**
- * Resolves data change event for supplied node
+ * Resolves data change event for supplied node.
*
* @param path
* Path to current node in tree
@@ -116,30 +119,33 @@ public final class ResolveDataChangeEventsTask {
// no before and after state is present
switch (type) {
- case SUBTREE_MODIFIED:
- return resolveSubtreeChangeEvent(state, node);
- case MERGE:
- case WRITE:
- Preconditions.checkArgument(maybeAfter.isPresent(),
- "Modification at {} has type {} but no after-data", state.getPath(), type);
- if (!maybeBefore.isPresent()) {
- @SuppressWarnings({ "unchecked", "rawtypes" })
- final NormalizedNode afterNode = (NormalizedNode)maybeAfter.get();
- resolveSameEventRecursivelly(state, afterNode, DOMImmutableDataChangeEvent.getCreateEventFactory());
- return true;
- }
+ case SUBTREE_MODIFIED:
+ return resolveSubtreeChangeEvent(state, node);
+ case APPEARED:
+ case WRITE:
+ Preconditions.checkArgument(maybeAfter.isPresent(),
+ "Modification at {} has type {} but no after-data", state.getPath(), type);
+ if (!maybeBefore.isPresent()) {
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ final NormalizedNode afterNode = (NormalizedNode)maybeAfter.get();
+ resolveSameEventRecursivelly(state, afterNode, DOMImmutableDataChangeEvent.getCreateEventFactory());
+ return true;
+ }
- return resolveReplacedEvent(state, maybeBefore.get(), maybeAfter.get());
- case DELETE:
- Preconditions.checkArgument(maybeBefore.isPresent(),
- "Modification at {} has type {} but no before-data", state.getPath(), type);
+ return resolveReplacedEvent(state, maybeBefore.get(), maybeAfter.get());
+ case DISAPPEARED:
+ case DELETE:
+ Preconditions.checkArgument(maybeBefore.isPresent(),
+ "Modification at {} has type {} but no before-data", state.getPath(), type);
- @SuppressWarnings({ "unchecked", "rawtypes" })
- final NormalizedNode beforeNode = (NormalizedNode)maybeBefore.get();
- resolveSameEventRecursivelly(state, beforeNode, DOMImmutableDataChangeEvent.getRemoveEventFactory());
- return true;
- case UNMODIFIED:
- return false;
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ final NormalizedNode beforeNode = (NormalizedNode)maybeBefore.get();
+ resolveSameEventRecursivelly(state, beforeNode, DOMImmutableDataChangeEvent.getRemoveEventFactory());
+ return true;
+ case UNMODIFIED:
+ return false;
+ default:
+ break;
}
throw new IllegalStateException(String.format("Unhandled node state %s at %s", type, state.getPath()));
@@ -155,11 +161,14 @@ public final class ResolveDataChangeEventsTask {
* resolution of changes on children level and can not
* shortcut resolution.
*/
- LOG.trace("Resolving subtree replace event for {} before {}, after {}", state.getPath(), beforeData, afterData);
+ LOG.trace("Resolving subtree replace event for {} before {}, after {}", state.getPath(), beforeData,
+ afterData);
@SuppressWarnings("unchecked")
- NormalizedNodeContainer, PathArgument, NormalizedNode> beforeCont = (NormalizedNodeContainer, PathArgument, NormalizedNode>) beforeData;
+ NormalizedNodeContainer, PathArgument, NormalizedNode> beforeCont =
+ (NormalizedNodeContainer, PathArgument, NormalizedNode>) beforeData;
@SuppressWarnings("unchecked")
- NormalizedNodeContainer, PathArgument, NormalizedNode> afterCont = (NormalizedNodeContainer, PathArgument, NormalizedNode>) afterData;
+ NormalizedNodeContainer, PathArgument, NormalizedNode> afterCont =
+ (NormalizedNodeContainer, PathArgument, NormalizedNode>) afterData;
return resolveNodeContainerReplaced(state, beforeCont, afterCont);
}
@@ -171,7 +180,8 @@ public final class ResolveDataChangeEventsTask {
}
LOG.trace("Resolving leaf replace event for {} , before {}, after {}", state.getPath(), beforeData, afterData);
- DOMImmutableDataChangeEvent event = DOMImmutableDataChangeEvent.builder(DataChangeScope.BASE).addUpdated(state.getPath(), beforeData, afterData).build();
+ DOMImmutableDataChangeEvent event = DOMImmutableDataChangeEvent.builder(DataChangeScope.BASE)
+ .addUpdated(state.getPath(), beforeData, afterData).build();
state.addEvent(event);
state.collectEvents(beforeData, afterData, collectedEvents);
return true;
@@ -204,7 +214,8 @@ public final class ResolveDataChangeEventsTask {
* created.
*/
if (!beforeCont.getChild(childId).isPresent()) {
- resolveSameEventRecursivelly(state.child(childId), afterChild, DOMImmutableDataChangeEvent.getCreateEventFactory());
+ resolveSameEventRecursivelly(state.child(childId), afterChild,
+ DOMImmutableDataChangeEvent.getCreateEventFactory());
childChanged = true;
}
}
@@ -246,7 +257,8 @@ public final class ResolveDataChangeEventsTask {
// Node has children, so we will try to resolve it's children
// changes.
@SuppressWarnings("unchecked")
- NormalizedNodeContainer, PathArgument, NormalizedNode> container = (NormalizedNodeContainer, PathArgument, NormalizedNode>) node;
+ NormalizedNodeContainer, PathArgument, NormalizedNode> container =
+ (NormalizedNodeContainer, PathArgument, NormalizedNode>) node;
for (NormalizedNode child : container.getValue()) {
final PathArgument childId = child.getIdentifier();
@@ -261,12 +273,15 @@ public final class ResolveDataChangeEventsTask {
state.collectEvents(event.getOriginalSubtree(), event.getUpdatedSubtree(), collectedEvents);
}
- private boolean resolveSubtreeChangeEvent(final ResolveDataChangeState state, final DataTreeCandidateNode modification) {
+ private boolean resolveSubtreeChangeEvent(final ResolveDataChangeState state,
+ final DataTreeCandidateNode modification) {
final Optional> maybeBefore = modification.getDataBefore();
final Optional> maybeAfter = modification.getDataAfter();
- Preconditions.checkArgument(maybeBefore.isPresent(), "Subtree change with before-data not present at path %s", state.getPath());
- Preconditions.checkArgument(maybeAfter.isPresent(), "Subtree change with after-data not present at path %s", state.getPath());
+ Preconditions.checkArgument(maybeBefore.isPresent(), "Subtree change with before-data not present at path %s",
+ state.getPath());
+ Preconditions.checkArgument(maybeAfter.isPresent(), "Subtree change with after-data not present at path %s",
+ state.getPath());
if (!state.needsProcessing()) {
LOG.trace("Not processing modified subtree {}", state.getPath());
@@ -278,21 +293,24 @@ public final class ResolveDataChangeEventsTask {
final ResolveDataChangeState childState = state.child(childMod.getIdentifier());
switch (childMod.getModificationType()) {
- case WRITE:
- case MERGE:
- case DELETE:
- if (resolveAnyChangeEvent(childState, childMod)) {
- scope = DataChangeScope.ONE;
- }
- break;
- case SUBTREE_MODIFIED:
- if (resolveSubtreeChangeEvent(childState, childMod) && scope == null) {
- scope = DataChangeScope.SUBTREE;
- }
- break;
- case UNMODIFIED:
- // no-op
- break;
+ case APPEARED:
+ case DELETE:
+ case DISAPPEARED:
+ case WRITE:
+ if (resolveAnyChangeEvent(childState, childMod)) {
+ scope = DataChangeScope.ONE;
+ }
+ break;
+ case SUBTREE_MODIFIED:
+ if (resolveSubtreeChangeEvent(childState, childMod) && scope == null) {
+ scope = DataChangeScope.SUBTREE;
+ }
+ break;
+ case UNMODIFIED:
+ // no-op
+ break;
+ default:
+ break;
}
}
@@ -300,7 +318,8 @@ public final class ResolveDataChangeEventsTask {
final NormalizedNode, ?> after = maybeAfter.get();
if (scope != null) {
- DOMImmutableDataChangeEvent one = DOMImmutableDataChangeEvent.builder(scope).addUpdated(state.getPath(), before, after).build();
+ DOMImmutableDataChangeEvent one = DOMImmutableDataChangeEvent.builder(scope)
+ .addUpdated(state.getPath(), before, after).build();
state.addEvent(one);
}
@@ -308,7 +327,8 @@ public final class ResolveDataChangeEventsTask {
return scope != null;
}
- public static ResolveDataChangeEventsTask create(final DataTreeCandidate candidate, final ListenerTree listenerTree) {
+ public static ResolveDataChangeEventsTask create(final DataTreeCandidate candidate,
+ final ListenerTree listenerTree) {
return new ResolveDataChangeEventsTask(candidate, listenerTree);
}
}