From 2911b0930d95a2c0586167732e8f232ce2a0b366 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 17 Sep 2015 05:33:45 +0200 Subject: [PATCH] BUG-865: remove the use of ModificationType.MERGE Change-Id: I5209acc1ec3165dc2d4e25851cfea50f91df524c Signed-off-by: Robert Varga --- .../store/inmemory/ResolveDataChangeEventsTask.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/ResolveDataChangeEventsTask.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/ResolveDataChangeEventsTask.java index 0892de5df0..7fe2c54523 100644 --- a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/ResolveDataChangeEventsTask.java +++ b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/ResolveDataChangeEventsTask.java @@ -7,12 +7,6 @@ */ package org.opendaylight.mdsal.dom.store.inmemory; -import org.opendaylight.mdsal.dom.store.inmemory.tree.ListenerTree; - -import org.opendaylight.mdsal.dom.store.inmemory.DOMImmutableDataChangeEvent.Builder; -import org.opendaylight.mdsal.dom.store.inmemory.DOMImmutableDataChangeEvent.SimpleEventFactory; -import org.opendaylight.mdsal.dom.spi.RegistrationTreeSnapshot; -import org.opendaylight.mdsal.common.api.AsyncDataBroker.DataChangeScope; import com.google.common.annotations.Beta; import com.google.common.base.Optional; import com.google.common.base.Preconditions; @@ -20,6 +14,11 @@ import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; import java.util.Collection; import java.util.Map.Entry; +import org.opendaylight.mdsal.common.api.AsyncDataBroker.DataChangeScope; +import org.opendaylight.mdsal.dom.spi.RegistrationTreeSnapshot; +import org.opendaylight.mdsal.dom.store.inmemory.DOMImmutableDataChangeEvent.Builder; +import org.opendaylight.mdsal.dom.store.inmemory.DOMImmutableDataChangeEvent.SimpleEventFactory; +import org.opendaylight.mdsal.dom.store.inmemory.tree.ListenerTree; 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; @@ -119,7 +118,6 @@ public final class ResolveDataChangeEventsTask { 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); @@ -280,7 +278,6 @@ public final class ResolveDataChangeEventsTask { switch (childMod.getModificationType()) { case WRITE: - case MERGE: case DELETE: if (resolveAnyChangeEvent(childState, childMod)) { scope = DataChangeScope.ONE; -- 2.36.6