HONEYCOMB-350 - APPEAR/DISAPPEAR modification handling

Allows these types of modifications to check in depth,
to see if some of their children nodes were not modified

Change-Id: Ice2f988732c2d9ecad8e960c4f10d01863fb0cfd
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>

14 files changed, 1014 insertions, 373 deletions

diff --git a/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/AugmentationRewriteDeleteProducer.java b/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/AugmentationRewriteDeleteProducer.java
new file mode 100644
index 000000000..1a9397eb4
--- /dev/null
+++ b/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/AugmentationRewriteDeleteProducer.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.honeycomb.data.impl;
+
+import java.util.Collection;
+import java.util.Map;
+import javax.annotation.Nonnull;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+class AugmentationRewriteDeleteProducer extends DelegatingRewriteDeleteProducer implements RewriteDeleteProducer {
+
+    private static final Logger LOG = LoggerFactory.getLogger(AugmentationRewriteDeleteProducer.class);
+
+    AugmentationRewriteDeleteProducer(
+            @Nonnull final NormalizedNodeRewriteDeleteRegistry baseRewriteProducer) {
+        super(baseRewriteProducer);
+    }
+
+    @Override
+    public Collection<NormalizedNodeUpdate> normalizedUpdates(@Nonnull final YangInstanceIdentifier topLevelIdentifier,
+                                                              @Nonnull final Map.Entry<YangInstanceIdentifier.PathArgument, DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?>> entry) {
+        LOG.debug("Processing {} as augmentation", topLevelIdentifier);
+        return super.normalizedUpdates(topLevelIdentifier, entry);
+    }
+}
diff --git a/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/CaseRewriteDeleteProducer.java b/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/CaseRewriteDeleteProducer.java
new file mode 100644
index 000000000..37fdef0e4
--- /dev/null
+++ b/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/CaseRewriteDeleteProducer.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.honeycomb.data.impl;
+
+import java.util.Collection;
+import java.util.Map;
+import javax.annotation.Nonnull;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+class CaseRewriteDeleteProducer extends DelegatingRewriteDeleteProducer implements RewriteDeleteProducer {
+
+    private static final Logger LOG = LoggerFactory.getLogger(CaseRewriteDeleteProducer.class);
+
+    CaseRewriteDeleteProducer(@Nonnull final NormalizedNodeRewriteDeleteRegistry baseRewriteProducer) {
+        super(baseRewriteProducer);
+    }
+
+    @Override
+    public Collection<NormalizedNodeUpdate> normalizedUpdates(@Nonnull final YangInstanceIdentifier topLevelIdentifier,
+                                                              @Nonnull final Map.Entry<YangInstanceIdentifier.PathArgument, DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?>> entry) {
+        // just delegates to lower level, there is nothing to detect on case level
+        LOG.debug("Processing {} as case", topLevelIdentifier);
+        return super.normalizedUpdates(topLevelIdentifier, entry);
+    }
+}
diff --git a/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/ChoiceRewriteDeleteProducer.java b/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/ChoiceRewriteDeleteProducer.java
new file mode 100644
index 000000000..4c249e084
--- /dev/null
+++ b/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/ChoiceRewriteDeleteProducer.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.honeycomb.data.impl;
+
+import java.util.Collection;
+import java.util.Map;
+import javax.annotation.Nonnull;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+class ChoiceRewriteDeleteProducer extends DelegatingRewriteDeleteProducer implements RewriteDeleteProducer {
+
+    private static final Logger LOG = LoggerFactory.getLogger(ChoiceRewriteDeleteProducer.class);
+
+    ChoiceRewriteDeleteProducer(@Nonnull final NormalizedNodeRewriteDeleteRegistry baseRewriteProducer) {
+        super(baseRewriteProducer);
+    }
+
+    @Override
+    public Collection<NormalizedNodeUpdate> normalizedUpdates(@Nonnull final YangInstanceIdentifier topLevelIdentifier,
+                                                              @Nonnull final Map.Entry<YangInstanceIdentifier.PathArgument, DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?>> entry) {
+        // just delegates to lower level, there is nothing to detect on choice level
+        LOG.debug("Processing {} as choice", topLevelIdentifier);
+        return super.normalizedUpdates(topLevelIdentifier, entry);
+    }
+}
diff --git a/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/ContainerRewriteDeleteProducer.java b/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/ContainerRewriteDeleteProducer.java
new file mode 100644
index 000000000..7a2b31eea
--- /dev/null
+++ b/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/ContainerRewriteDeleteProducer.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.honeycomb.data.impl;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javax.annotation.Nonnull;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
+import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
+import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+class ContainerRewriteDeleteProducer extends DelegatingRewriteDeleteProducer implements RewriteDeleteProducer {
+
+    private static final Logger LOG = LoggerFactory.getLogger(ContainerRewriteDeleteProducer.class);
+
+    private final SchemaContext ctx;
+
+    ContainerRewriteDeleteProducer(@Nonnull final NormalizedNodeRewriteDeleteRegistry baseRewriteProducer,
+                                   @Nonnull final SchemaContext ctx) {
+        super(baseRewriteProducer);
+        this.ctx = ctx;
+    }
+
+    @Override
+    public Collection<NormalizedNodeUpdate> normalizedUpdates(@Nonnull final YangInstanceIdentifier topLevelIdentifier,
+                                                              @Nonnull final Map.Entry<YangInstanceIdentifier.PathArgument, DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?>> entry) {
+        final ContainerSchemaNode containerSchemaNode =
+                (ContainerSchemaNode) SchemaContextUtil
+                        .findDataSchemaNode(ctx, getSchemaPath(topLevelIdentifier, entry));
+
+        if (containerSchemaNode.isPresenceContainer()) {
+            LOG.debug("Processing {} as presence container", topLevelIdentifier);
+            // if presence container  - create delete right away
+            return ((ContainerNode) entry.getValue()).getValue().stream()
+                    .map(containerNode -> new NormalizedNodeUpdate(
+                            YangInstanceIdentifier.builder(topLevelIdentifier)
+                                    .node(containerNode.getIdentifier()).build(), containerNode, null))
+                    .collect(Collectors.toList());
+        } else {
+            LOG.debug("Processing {} as non-presence container", topLevelIdentifier);
+            // if non-presence - goes deep with base logic
+            return super.normalizedUpdates(topLevelIdentifier, entry);
+        }
+    }
+
+    private static SchemaPath getSchemaPath(final YangInstanceIdentifier topLevelIdentifier,
+                                            final Map.Entry<YangInstanceIdentifier.PathArgument, DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?>> entry) {
+        return SchemaPath.create(extractSchemaPathQNames(topLevelIdentifier, entry), true);
+    }
+
+    private static List<QName> extractSchemaPathQNames(final YangInstanceIdentifier topLevelIdentifier,
+                                                       final Map.Entry<YangInstanceIdentifier.PathArgument, DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?>> entry) {
+        // must be filtered out of augmentation and keyed NodeIdentifiers
+        return Stream.concat(topLevelIdentifier.getPathArguments().stream(), Stream.of(entry.getKey()))
+                .filter(pathArgument -> pathArgument instanceof YangInstanceIdentifier.NodeIdentifier)
+                .map(YangInstanceIdentifier.PathArgument::getNodeType)
+                .collect(Collectors.toList());
+    }
+}
diff --git a/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/DelegatingRewriteDeleteProducer.java b/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/DelegatingRewriteDeleteProducer.java
new file mode 100644
index 000000000..e3b3c74dc
--- /dev/null
+++ b/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/DelegatingRewriteDeleteProducer.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.honeycomb.data.impl;
+
+import static com.google.common.base.Preconditions.checkState;
+
+import java.util.AbstractMap;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
+import org.opendaylight.yangtools.yang.data.api.schema.DataContainerNode;
+
+/**
+ * Basic implementation for nodes that are not considered modifications but their children could be
+ */
+abstract class DelegatingRewriteDeleteProducer implements RewriteDeleteProducer {
+
+    private final NormalizedNodeRewriteDeleteRegistry baseRewriteProducer;
+
+    DelegatingRewriteDeleteProducer(@Nonnull final NormalizedNodeRewriteDeleteRegistry baseRewriteProducer) {
+        this.baseRewriteProducer = baseRewriteProducer;
+    }
+
+    @Override
+    public Collection<NormalizedNodeUpdate> normalizedUpdates(@Nonnull final YangInstanceIdentifier topLevelIdentifier,
+                                                              @Nonnull final Map.Entry<YangInstanceIdentifier.PathArgument, DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?>> entry) {
+        // just delegates to lower level
+        checkState(entry.getValue() instanceof DataContainerNode, "Unable to extract children");
+        checkState(entry.getValue() instanceof DataContainerChild, "Unable to extract identifier");
+        final Collection<DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?>> value =
+                DataContainerNode.class.cast(entry.getValue()).getValue();
+        return value.stream()
+                .map(DataContainerChild.class::cast)
+                .flatMap(node -> baseRewriteProducer
+                        .normalizedUpdates(childYangId(topLevelIdentifier, entry), childMapEntry(node)).stream())
+                .collect(Collectors.toList());
+    }
+
+    private static AbstractMap.SimpleEntry<YangInstanceIdentifier.PathArgument, DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?>> childMapEntry(
+            final DataContainerChild node) {
+        return new HashMap.SimpleEntry<YangInstanceIdentifier.PathArgument, DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?>>(
+                node.getIdentifier(), node);
+    }
+
+    private static YangInstanceIdentifier childYangId(final @Nonnull YangInstanceIdentifier topLevelIdentifier,
+                                                      final @Nonnull Map.Entry<YangInstanceIdentifier.PathArgument, DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?>> entry) {
+        return YangInstanceIdentifier.builder(topLevelIdentifier)
+                .node(entry.getKey()).build();
+    }
+}
diff --git a/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/LeafListRewriteDeleteProducer.java b/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/LeafListRewriteDeleteProducer.java
new file mode 100644
index 000000000..ca7899694
--- /dev/null
+++ b/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/LeafListRewriteDeleteProducer.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.honeycomb.data.impl;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import javax.annotation.Nonnull;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+class LeafListRewriteDeleteProducer implements RewriteDeleteProducer{
+
+    private static final Logger LOG = LoggerFactory.getLogger(LeafListRewriteDeleteProducer.class);
+
+    @Override
+    public Collection<NormalizedNodeUpdate> normalizedUpdates(@Nonnull final YangInstanceIdentifier topLevelIdentifier,
+                                                              @Nonnull final Map.Entry<YangInstanceIdentifier.PathArgument, DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?>> entry) {
+        // if leaf-list,just builds delete right away
+        LOG.debug("Processing {} as leaf-list", topLevelIdentifier);
+        return Collections.singletonList(new NormalizedNodeUpdate(YangInstanceIdentifier.builder(topLevelIdentifier)
+                .node(entry.getKey()).build(), entry.getValue(), null));
+    }
+}
diff --git a/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/LeafRewriteDeleteProducer.java b/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/LeafRewriteDeleteProducer.java
new file mode 100644
index 000000000..ddf0d64f7
--- /dev/null
+++ b/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/LeafRewriteDeleteProducer.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.honeycomb.data.impl;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import javax.annotation.Nonnull;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+class LeafRewriteDeleteProducer implements RewriteDeleteProducer {
+
+    private static final Logger LOG = LoggerFactory.getLogger(LeafRewriteDeleteProducer.class);
+
+    @Override
+    public Collection<NormalizedNodeUpdate> normalizedUpdates(@Nonnull final YangInstanceIdentifier topLevelIdentifier,
+                                                              @Nonnull final Map.Entry<YangInstanceIdentifier.PathArgument, DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?>> entry) {
+        // if leaf,just builds delete right away
+        LOG.debug("Processing {} as leaf", topLevelIdentifier);
+        return Collections.singletonList(new NormalizedNodeUpdate(YangInstanceIdentifier.builder(topLevelIdentifier)
+                .node(entry.getKey()).build(), entry.getValue(), null));
+    }
+}
diff --git a/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/ListRewriteDeleteProducer.java b/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/ListRewriteDeleteProducer.java
new file mode 100644
index 000000000..793cab8fa
--- /dev/null
+++ b/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/ListRewriteDeleteProducer.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.honeycomb.data.impl;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
+import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+class ListRewriteDeleteProducer implements RewriteDeleteProducer {
+
+    private static final Logger LOG = LoggerFactory.getLogger(ListRewriteDeleteProducer.class);
+
+    @Override
+    public Collection<NormalizedNodeUpdate> normalizedUpdates(@Nonnull final YangInstanceIdentifier topLevelIdentifier,
+                                                              @Nonnull final Map.Entry<YangInstanceIdentifier.PathArgument, DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?>> entry) {
+        // identifier has different format : parent_node/list_node/list_node_with_key
+        LOG.debug("Processing {} as list", topLevelIdentifier);
+        return ((MapNode) entry.getValue()).getValue().stream()
+                .map(mapEntryNode -> new NormalizedNodeUpdate(YangInstanceIdentifier.builder(topLevelIdentifier)
+                        .node(mapEntryNode.getNodeType())
+                        .node(mapEntryNode.getIdentifier()).build(), mapEntryNode, null))
+                .collect(Collectors.toList());
+    }
+}
diff --git a/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/ModifiableDataTreeDelegator.java b/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/ModifiableDataTreeDelegator.java
index f4989aa37..ccc40576a 100644
--- a/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/ModifiableDataTreeDelegator.java
+++ b/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/ModifiableDataTreeDelegator.java
@@ -119,8 +119,8 @@ public final class ModifiableDataTreeDelegator extends ModifiableDataTreeManager
             LOG.trace("ConfigDataTree.modify() rootPath={}, rootNode={}, dataBefore={}, dataAfter={}",
                 rootPath, rootNode, rootNode.getDataBefore(), rootNode.getDataAfter());
 
-            final ModificationDiff modificationDiff =
-                    ModificationDiff.recursivelyFromCandidateRoot(rootNode, schema);
+            final ModificationDiff modificationDiff = new ModificationDiff.ModificationDiffBuilder()
+                    .setCtx(schema).build(rootNode);
             LOG.debug("ConfigDataTree.modify() diff: {}", modificationDiff);
 
             // Distinguish between updates (create + update) and deletes
@@ -194,25 +194,25 @@ public final class ModifiableDataTreeDelegator extends ModifiableDataTreeManager
         }
 
         private WriterRegistry.DataObjectUpdates toBindingAware(
-                final Map<YangInstanceIdentifier, ModificationDiff.NormalizedNodeUpdate> biNodes) {
+                final Map<YangInstanceIdentifier, NormalizedNodeUpdate> biNodes) {
             return ModifiableDataTreeDelegator.toBindingAware(biNodes, serializer);
         }
     }
 
     @VisibleForTesting
     static WriterRegistry.DataObjectUpdates toBindingAware(
-            final Map<YangInstanceIdentifier, ModificationDiff.NormalizedNodeUpdate> biNodes,
+            final Map<YangInstanceIdentifier, NormalizedNodeUpdate> biNodes,
             final BindingNormalizedNodeSerializer serializer) {
 
         final Multimap<InstanceIdentifier<?>, DataObjectUpdate> dataObjectUpdates = HashMultimap.create();
         final Multimap<InstanceIdentifier<?>, DataObjectUpdate.DataObjectDelete> dataObjectDeletes =
                 HashMultimap.create();
 
-        for (Map.Entry<YangInstanceIdentifier, ModificationDiff.NormalizedNodeUpdate> biEntry : biNodes.entrySet()) {
+        for (Map.Entry<YangInstanceIdentifier, NormalizedNodeUpdate> biEntry : biNodes.entrySet()) {
             final InstanceIdentifier<?> unkeyedIid =
                     RWUtils.makeIidWildcarded(serializer.fromYangInstanceIdentifier(biEntry.getKey()));
 
-            ModificationDiff.NormalizedNodeUpdate normalizedNodeUpdate = biEntry.getValue();
+            NormalizedNodeUpdate normalizedNodeUpdate = biEntry.getValue();
             final DataObjectUpdate dataObjectUpdate = toDataObjectUpdate(normalizedNodeUpdate, serializer);
             if (dataObjectUpdate != null) {
                 if (dataObjectUpdate instanceof DataObjectUpdate.DataObjectDelete) {
@@ -227,7 +227,7 @@ public final class ModifiableDataTreeDelegator extends ModifiableDataTreeManager
 
     @Nullable
     private static DataObjectUpdate toDataObjectUpdate(
-            final ModificationDiff.NormalizedNodeUpdate normalizedNodeUpdate,
+            final NormalizedNodeUpdate normalizedNodeUpdate,
             final BindingNormalizedNodeSerializer serializer) {
 
         InstanceIdentifier<?> baId = serializer.fromYangInstanceIdentifier(normalizedNodeUpdate.getId());
diff --git a/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/Modification.java b/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/Modification.java
new file mode 100644
index 000000000..88823c53d
--- /dev/null
+++ b/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/Modification.java
@@ -0,0 +1,243 @@
+/*
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.honeycomb.data.impl;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.MixinNode;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+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.model.api.AugmentationSchema;
+import org.opendaylight.yangtools.yang.model.api.AugmentationTarget;
+import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
+import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.SchemaNode;
+
+/**
+ * Intermediate representation of a modification + its schema.
+ */
+final class Modification {
+    private final YangInstanceIdentifier id;
+    private final DataTreeCandidateNode dataCandidate;
+    // Using Object as type for schema node since it's the only type that's a parent to all schema node types from
+    // yangtools. The hierarchy does not use e.g. SchemaNode class for all types
+    private final Object parentNode;
+    private final Object schemaNode;
+    private final boolean updateParentNode;
+
+    private Modification(final YangInstanceIdentifier id,
+                         final DataTreeCandidateNode dataCandidate,
+                         final Object parentNode,
+                         final Object schemaNode,
+                         final boolean updateParentNode) {
+        this.id = id;
+        this.dataCandidate = dataCandidate;
+        this.parentNode = parentNode;
+        this.schemaNode = schemaNode;
+        // controls process of updating parent node while moving down the schema tree:
+        this.updateParentNode = updateParentNode;
+    }
+
+    Modification(final YangInstanceIdentifier id,
+                 final DataTreeCandidateNode dataCandidate,
+                 final Object parentNode,
+                 final Object schemaNode) {
+        this(id, dataCandidate, parentNode, schemaNode, true);
+    }
+
+    Modification(final YangInstanceIdentifier id,
+                 final DataTreeCandidateNode dataCandidate,
+                 final Object schemaNode) {
+        this(id, dataCandidate, schemaNode, schemaNode);
+    }
+
+    List<Modification> getChildNodes() {
+        return streamChildren().collect(Collectors.toList());
+    }
+
+    YangInstanceIdentifier getId() {
+        return id;
+    }
+
+    ModificationType getModificationType() {
+        return dataCandidate.getModificationType();
+    }
+
+    com.google.common.base.Optional<NormalizedNode<?, ?>> getDataBefore() {
+        return dataCandidate.getDataBefore();
+    }
+
+    com.google.common.base.Optional<NormalizedNode<?, ?>> getDataAfter() {
+        return dataCandidate.getDataAfter();
+    }
+
+    Object getSchemaNode() {
+        return schemaNode;
+    }
+
+    boolean is(final Class<?> schemaType) {
+        return schemaType.isAssignableFrom(schemaNode.getClass());
+    }
+
+    boolean isMixin() {
+        // Checking whether node is a mixin is not performed on schema, but on data since mixin is
+        // only a NormalizedNode concept, not a schema concept
+        return dataCandidate.getDataBefore().orNull() instanceof MixinNode ||
+                dataCandidate.getDataAfter().orNull() instanceof MixinNode;
+    }
+
+    boolean isBeforeAndAfterDifferent() {
+        if (dataCandidate.getDataBefore().isPresent()) {
+            return !dataCandidate.getDataBefore().get().equals(dataCandidate.getDataAfter().orNull());
+        }
+
+        // considering not a modification if data after is also null
+        return dataCandidate.getDataAfter().isPresent();
+    }
+
+    private AugmentationSchema findAugmentation(Object currentNode,
+                                                final YangInstanceIdentifier.AugmentationIdentifier identifier) {
+        if (currentNode != null) {
+            // check if identifier points to some augmentation of currentNode
+            if (currentNode instanceof AugmentationTarget) {
+                Optional<AugmentationSchema> augmentationSchema =
+                    ((AugmentationTarget) currentNode).getAvailableAugmentations().stream()
+                        .filter(aug -> identifier.equals(new YangInstanceIdentifier.AugmentationIdentifier(
+                            aug.getChildNodes().stream()
+                                .map(SchemaNode::getQName)
+                                .collect(Collectors.toSet()))))
+                        .findFirst();
+                if (augmentationSchema.isPresent()) {
+                    return augmentationSchema.get();
+                }
+            }
+
+            // continue search:
+            Collection<DataSchemaNode> childNodes = Collections.emptyList();
+            if (currentNode instanceof DataNodeContainer) {
+                childNodes = ((DataNodeContainer) currentNode).getChildNodes();
+            } else if (currentNode instanceof ChoiceSchemaNode) {
+                childNodes = ((ChoiceSchemaNode) currentNode).getCases().stream()
+                    .flatMap(cas -> cas.getChildNodes().stream()).collect(Collectors.toList());
+            }
+            return childNodes.stream().map(n -> findAugmentation(n, identifier)).filter(n -> n != null).findFirst()
+                .orElse(null);
+        } else {
+            return null;
+        }
+    }
+
+    Stream<Modification> streamChildren() {
+        return dataCandidate.getChildNodes().stream()
+            .map(child -> {
+                final YangInstanceIdentifier childId = id.node(child.getIdentifier());
+                final Object schemaChild = schemaChild(schemaNode, child.getIdentifier());
+
+                // An augment cannot change other augment, so we do not update parent node if we are streaming
+                // children of AugmentationSchema (otherwise we would fail to find schema for nested augmentations):
+                if (updateParentNode) {
+                    if (schemaNode instanceof AugmentationSchema) {
+                        // child nodes would not have nested augmentations, so we stop moving parentNode:
+                        return new Modification(childId, child, parentNode, schemaChild, false);
+                    } else {
+                        // update parent node:
+                        return new Modification(childId, child, schemaNode, schemaChild, true);
+                    }
+                }
+                return new Modification(childId, child, parentNode, schemaChild, updateParentNode);
+            });
+    }
+
+    /**
+     * Find next schema node in hierarchy.
+     */
+    private Object schemaChild(final Object schemaNode, final YangInstanceIdentifier.PathArgument identifier) {
+        Object found = null;
+
+        if (identifier instanceof YangInstanceIdentifier.AugmentationIdentifier) {
+            if (schemaNode instanceof AugmentationTarget) {
+                // Find matching augmentation
+                found = ((AugmentationTarget) schemaNode).getAvailableAugmentations().stream()
+                    .filter(aug -> identifier.equals(new YangInstanceIdentifier.AugmentationIdentifier(
+                        aug.getChildNodes().stream()
+                            .map(SchemaNode::getQName)
+                            .collect(Collectors.toSet()))))
+                    .findFirst()
+                    .orElse(null);
+
+                if (found == null) {
+                    // An augment cannot change other augment, but all augments only change their targets (data nodes).
+                    //
+                    // As a consequence, if nested augmentations are present,
+                    // AugmentationSchema might reference child schema node instances that do not include changes
+                    // from nested augments.
+                    //
+                    // But schemaNode, as mentioned earlier, contains all the changes introduced by augments.
+                    //
+                    // On the other hand, in case of augments which introduce leaves,
+                    // we need to address AugmentationSchema node directly so we can't simply do
+                    // found = schemaNode;
+                    //
+                    found =
+                        findAugmentation(parentNode, (YangInstanceIdentifier.AugmentationIdentifier) identifier);
+                }
+            }
+        } else if (schemaNode instanceof DataNodeContainer) {
+            // Special handling for list aggregator nodes. If we are at list aggregator node e.g. MapNode and
+            // we are searching for schema for a list entry e.g. MapEntryNode just return the same schema
+            if (schemaNode instanceof ListSchemaNode &&
+                ((SchemaNode) schemaNode).getQName().equals(identifier.getNodeType())) {
+                found = schemaNode;
+            } else {
+                found = ((DataNodeContainer) schemaNode).getDataChildByName(identifier.getNodeType());
+            }
+        } else if (schemaNode instanceof ChoiceSchemaNode) {
+            // For choices, iterate through all the cases
+            final Optional<DataSchemaNode> maybeChild = ((ChoiceSchemaNode) schemaNode).getCases().stream()
+                    .flatMap(cas -> cas.getChildNodes().stream())
+                    .filter(child -> child.getQName().equals(identifier.getNodeType()))
+                    .findFirst();
+            if (maybeChild.isPresent()) {
+                found = maybeChild.get();
+            }
+            // Special handling for leaf-list nodes. Basically the same as is for list mixin nodes
+        } else if (schemaNode instanceof LeafListSchemaNode &&
+            ((SchemaNode) schemaNode).getQName().equals(identifier.getNodeType())) {
+            found = schemaNode;
+        }
+
+        return checkNotNull(found, "Unable to find child node in: %s identifiable by: %s", schemaNode, identifier);
+    }
+
+    @Override
+    public String toString() {
+        return "Modification{" +
+                "id=" + id +
+                '}';
+    }
+}
diff --git a/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/ModificationDiff.java b/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/ModificationDiff.java
index 863f8abb2..74e21dfa1 100644
--- a/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/ModificationDiff.java
+++ b/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/ModificationDiff.java
@@ -16,41 +16,28 @@
 
 package io.fd.honeycomb.data.impl;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
-import static org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType.APPEARED;
 import static org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType.DELETE;
-import static org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType.DISAPPEARED;
 import static org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType.WRITE;
 
 import com.google.common.collect.ImmutableMap;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.MixinNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 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.impl.schema.nodes.AbstractImmutableDataContainerNode;
 import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
-import org.opendaylight.yangtools.yang.model.api.AugmentationTarget;
 import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
-import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
-import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
-import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -63,7 +50,6 @@ final class ModificationDiff {
 
     private static final ModificationDiff EMPTY_DIFF = new ModificationDiff(Collections.emptyMap());
     private static final EnumSet VALID_MODIFICATIONS = EnumSet.of(WRITE, DELETE);
-    private static final EnumSet IGNORED_MODIFICATIONS = EnumSet.of(APPEARED, DISAPPEARED);
 
     private final Map<YangInstanceIdentifier, NormalizedNodeUpdate> updates;
 
@@ -105,391 +91,166 @@ final class ModificationDiff {
         return new ModificationDiff(ImmutableMap.of(modification.getId(), NormalizedNodeUpdate.create(modification)));
     }
 
-    /**
-     * Produce an aggregated diff from a candidate node recursively. MixinNodes are ignored as modifications and so
-     * are complex nodes which direct leaves were not modified.
-     */
-    @Nonnull
-    static ModificationDiff recursivelyFromCandidate(@Nonnull final Modification modification) {
-        // recursively process child nodes for exact modifications
-        return recursivelyChildrenFromCandidate(modification)
-                // also add modification on current level, if elligible
-                .merge(isModification(modification)
-                        ? ModificationDiff.create(modification)
-                        : EMPTY_DIFF);
-    }
-
-    /**
-     * Same as {@link #recursivelyFromCandidate(Modification)} but does
-     * not process the root node for modifications, since it's the artificial data root, that has no child leaves but
-     * always is marked as SUBTREE_MODIFIED.
-     */
-    @Nonnull
-    static ModificationDiff recursivelyFromCandidateRoot(@Nonnull final DataTreeCandidateNode currentCandidate,
-                                                         @Nonnull final SchemaContext ctx) {
-        return recursivelyChildrenFromCandidate(new Modification(YangInstanceIdentifier.EMPTY, currentCandidate, ctx));
-    }
-
-    /**
-     * Check whether current node was modified. {@link MixinNode}s are ignored
-     * and only nodes which direct leaves(or choices) are modified are considered a modification.
-     */
-    private static Boolean isModification(@Nonnull final Modification modification) {
-        // Disappear is not a modification
-        if (IGNORED_MODIFICATIONS.contains(modification.getModificationType())) {
-            return false;
-        // Mixin nodes are not considered modifications
-        } else if (modification.isMixin() && !modification.is(AugmentationSchema.class)) {
-            return false;
-        } else {
-            return isCurrentModified(modification);
-        }
-    }
-
-    private static Boolean isCurrentModified(@Nonnull final Modification modification) {
-        // First check if it's an empty presence node
-        final boolean emptyPresenceNode = isEmptyPresenceNode(modification);
-
-        // Check if there are any modified leaves and if so, consider current node as modified
-        final Boolean directLeavesModified = emptyPresenceNode
-                || modification.streamChildren()
-                // Checking leaf or leaf-lists children for direct modification, which means that leafs of leaf lists
-                // trigger a modification on parent node
-                .filter(child -> child.is(LeafSchemaNode.class) || child.is(LeafListSchemaNode.class))
-                // For some reason, we get modifications on unmodified list keys
-                // and that messes up our modifications collection here, so we need to skip
-                .filter(Modification::isBeforeAndAfterDifferent)
-                .filter(child -> VALID_MODIFICATIONS.contains(child.getModificationType()))
-                .findFirst()
-                .isPresent();
-
-        // Also as fallback check choices (choices do not exist in BA world and if anything within a choice was modified,
-        // consider its parent as being modified)
-        final boolean modified = directLeavesModified
-                || modification.streamChildren()
-                .filter(child -> child.is(ChoiceSchemaNode.class))
-                // Recursively check each choice if there was any change to it
-                .filter(ModificationDiff::isCurrentModified)
-                .findFirst()
-                .isPresent();
-
-        if (modified) {
-            LOG.debug("Modification detected as {} at {}",
-                    modification.getModificationType(), modification.getId());
-        }
-
-        return modified;
-    }
-
-    /**
-     * Check if new data are empty but still to be considered as a modification, meaning it's presence has a meaning
-     * e.g. containers with presence statement.
-     */
-    private static boolean isEmptyPresenceNode(@Nonnull final Modification modification) {
-        return modification.is(ContainerSchemaNode.class)
-                && ((ContainerSchemaNode) modification.getSchemaNode()).isPresenceContainer()
-                && modification.getChildNodes().isEmpty()
-                && VALID_MODIFICATIONS.contains(modification.getModificationType());
-    }
-
-    /**
-     * Process all non-leaf child nodes recursively, creating aggregated {@link ModificationDiff}.
-     */
-    private static ModificationDiff recursivelyChildrenFromCandidate(@Nonnull final Modification modification) {
-        // recursively process child nodes for specific modifications
-        return modification.streamChildren()
-                .filter(child -> !child.is(LeafSchemaNode.class))
-                .map(ModificationDiff::recursivelyFromCandidate)
-                .reduce(ModificationDiff::merge)
-                .orElse(EMPTY_DIFF);
-    }
-
     @Override
     public String toString() {
         return "ModificationDiff{updates=" + updates + '}';
     }
 
-    /**
-     * Update to a normalized node identifiable by its {@link YangInstanceIdentifier}.
-     */
-    static final class NormalizedNodeUpdate {
+    static final class ModificationDiffBuilder {
+        private NormalizedNodeRewriteDeleteRegistry registry;
+        private SchemaContext ctx;
 
-        @Nonnull
-        private final YangInstanceIdentifier id;
-        @Nullable
-        private final NormalizedNode<?, ?> dataBefore;
-        @Nullable
-        private final NormalizedNode<?, ?> dataAfter;
-
-        private NormalizedNodeUpdate(@Nonnull final YangInstanceIdentifier id,
-                                     @Nullable final NormalizedNode<?, ?> dataBefore,
-                                     @Nullable final NormalizedNode<?, ?> dataAfter) {
-            this.id = checkNotNull(id);
-            this.dataAfter = dataAfter;
-            this.dataBefore = dataBefore;
+        ModificationDiffBuilder setCtx(final SchemaContext ctx) {
+            this.ctx = ctx;
+            registry = new NormalizedNodeRewriteDeleteRegistry(ctx);
+            return this;
         }
 
-        @Nullable
-        public NormalizedNode<?, ?> getDataBefore() {
-            return dataBefore;
-        }
+        ModificationDiff build(@Nonnull final DataTreeCandidateNode currentCandidate) {
+            checkNotNull(currentCandidate, "Data tree candidate cannot be null");
+            checkNotNull(ctx, "Schema ctx cannot be null");
 
-        @Nullable
-        public NormalizedNode<?, ?> getDataAfter() {
-            return dataAfter;
+            return recursivelyFromCandidateRoot(currentCandidate, ctx);
         }
 
+        /**
+         * Produce an aggregated diff from a candidate node recursively. MixinNodes are ignored as modifications and so
+         * are complex nodes which direct leaves were not modified.
+         */
         @Nonnull
-        public YangInstanceIdentifier getId() {
-            return id;
-        }
-
-        static NormalizedNodeUpdate create(@Nonnull final Modification modification) {
-            final com.google.common.base.Optional<NormalizedNode<?, ?>> beforeData =
-                    modification.getDataBefore();
-            final com.google.common.base.Optional<NormalizedNode<?, ?>> afterData =
-                    modification.getDataAfter();
-            checkArgument(beforeData.isPresent() || afterData.isPresent(),
-                    "Both before and after data are null for %s", modification.getId());
-            return NormalizedNodeUpdate.create(modification.getId(), beforeData.orNull(), afterData.orNull());
-        }
-
-        static NormalizedNodeUpdate create(@Nonnull final YangInstanceIdentifier id,
-                                           @Nullable final NormalizedNode<?, ?> dataBefore,
-                                           @Nullable final NormalizedNode<?, ?> dataAfter) {
-            return new NormalizedNodeUpdate(id, dataBefore, dataAfter);
-        }
-
-        @Override
-        public boolean equals(final Object other) {
-            if (this == other) {
-                return true;
-            }
-            if (other == null || getClass() != other.getClass()) {
-                return false;
-            }
-
-            final NormalizedNodeUpdate that = (NormalizedNodeUpdate) other;
-
-            return id.equals(that.id);
-
-        }
-
-        @Override
-        public int hashCode() {
-            return id.hashCode();
-        }
-
-        @Override
-        public String toString() {
-            return "NormalizedNodeUpdate{" + "id=" + id
-                    + ", dataBefore=" + dataBefore
-                    + ", dataAfter=" + dataAfter
-                    + '}';
-        }
-    }
-
-    /**
-     * Intermediate representation of a modification + its schema.
-     */
-    private static final class Modification {
-        private final YangInstanceIdentifier id;
-        private final DataTreeCandidateNode dataCandidate;
-        // Using Object as type for schema node since it's the only type that's a parent to all schema node types from
-        // yangtools. The hierarchy does not use e.g. SchemaNode class for all types
-        private final Object parentNode;
-        private final Object schemaNode;
-        private final boolean updateParentNode;
-
-        private Modification(final YangInstanceIdentifier id,
-                             final DataTreeCandidateNode dataCandidate,
-                             final Object parentNode,
-                             final Object schemaNode,
-                             final boolean updateParentNode) {
-            this.id = id;
-            this.dataCandidate = dataCandidate;
-            this.parentNode = parentNode;
-            this.schemaNode = schemaNode;
-            // controls process of updating parent node while moving down the schema tree:
-            this.updateParentNode = updateParentNode;
+        ModificationDiff recursivelyFromCandidate(@Nonnull final Modification modification) {
+            // recursively process child nodes for exact modifications
+            return recursivelyChildrenFromCandidate(modification)
+                    // also add modification on current level, if elligible
+                    .merge(isModification(modification)
+                            ? ModificationDiff.create(modification)
+                            // Modification that writes only non-presence container to override nested nodes wont have
+                            // child nodes(in data tree candidate) so logic before will not detected such change, so checking directly
+                            : isNonPresenceOverride(modification)
+                                    ? detectUnderDisappearedNonPresenceContainer(modification)
+                                    : EMPTY_DIFF);
         }
 
-        Modification(final YangInstanceIdentifier id,
-                     final DataTreeCandidateNode dataCandidate,
-                     final Object parentNode,
-                     final Object schemaNode) {
-            this(id, dataCandidate, parentNode, schemaNode, true);
-        }
+        private ModificationDiff detectUnderDisappearedNonPresenceContainer(
+                @Nonnull final Modification modification) {
+            final com.google.common.base.Optional<NormalizedNode<?, ?>> dataBefore = modification.getDataBefore();
 
-        Modification(final YangInstanceIdentifier id,
-                     final DataTreeCandidateNode dataCandidate,
-                     final Object schemaNode) {
-            this(id, dataCandidate, schemaNode, schemaNode);
-        }
+            // is disappear case
+            if (dataBefore.isPresent()) {
+                final NormalizedNode<?, ?> parentData = dataBefore.get();
 
-        List<Modification> getChildNodes() {
-            return streamChildren().collect(Collectors.toList());
-        }
+                // have potential to extract children
+                if (parentData instanceof AbstractImmutableDataContainerNode) {
+                    final AbstractImmutableDataContainerNode<YangInstanceIdentifier.PathArgument> parentContainerNode =
+                            (AbstractImmutableDataContainerNode) parentData;
 
-        YangInstanceIdentifier getId() {
-            return id;
-        }
+                    final Map<YangInstanceIdentifier, NormalizedNodeUpdate> updates =
+                            parentContainerNode.getChildren().entrySet().stream()
+                                    .flatMap(entry -> registry.normalizedUpdates(modification.getId(), entry).stream())
+                                    .collect(Collectors.toMap(NormalizedNodeUpdate::getId, update -> update));
 
-        ModificationType getModificationType() {
-            return dataCandidate.getModificationType();
-        }
-
-        com.google.common.base.Optional<NormalizedNode<?, ?>> getDataBefore() {
-            return dataCandidate.getDataBefore();
-        }
-
-        com.google.common.base.Optional<NormalizedNode<?, ?>> getDataAfter() {
-            return dataCandidate.getDataAfter();
-        }
-
-        Object getSchemaNode() {
-            return schemaNode;
-        }
-
-        boolean is(final Class<?> schemaType) {
-            return schemaType.isAssignableFrom(schemaNode.getClass());
+                    return new ModificationDiff(updates);
+                }
+            }
+            return EMPTY_DIFF;
         }
 
-        boolean isMixin() {
-            // Checking whether node is a mixin is not performed on schema, but on data since mixin is
-            // only a NormalizedNode concept, not a schema concept
-            return dataCandidate.getDataBefore().orNull() instanceof MixinNode ||
-                    dataCandidate.getDataAfter().orNull() instanceof MixinNode;
+        /**
+         * Same as {@link #recursivelyFromCandidate(Modification)} but does not process the root node for modifications,
+         * since it's the artificial data root, that has no child leaves but always is marked as SUBTREE_MODIFIED.
+         */
+        @Nonnull
+        ModificationDiff recursivelyFromCandidateRoot(@Nonnull final DataTreeCandidateNode currentCandidate,
+                                                      @Nonnull final SchemaContext ctx) {
+            return recursivelyChildrenFromCandidate(
+                    new Modification(YangInstanceIdentifier.EMPTY, currentCandidate, ctx));
         }
 
-        private boolean isBeforeAndAfterDifferent() {
-            if (dataCandidate.getDataBefore().isPresent()) {
-                return !dataCandidate.getDataBefore().get().equals(dataCandidate.getDataAfter().orNull());
+        /**
+         * Check whether current node was modified. {@link MixinNode}s are ignored
+         * and only nodes which direct leaves(or choices) are modified are considered a modification.
+         */
+        private Boolean isModification(@Nonnull final Modification modification) {
+            // APPEAR/DISAPPEAR are not valid modifications, but some of the children can be modified
+            // aka. list entry added to nested list under non-presence container, which would be resolved as APPEAR for
+            // that container, but MERGE for nested list
+            if (modification.isMixin() && !modification.is(AugmentationSchema.class)) {
+                return false;
+            } else {
+                return isCurrentModified(modification);
             }
-
-            // considering not a modification if data after is also null
-            return dataCandidate.getDataAfter().isPresent();
         }
 
-        private AugmentationSchema findAugmentation(Object currentNode,
-                                                    final YangInstanceIdentifier.AugmentationIdentifier identifier) {
-            if (currentNode != null) {
-                // check if identifier points to some augmentation of currentNode
-                if (currentNode instanceof AugmentationTarget) {
-                    Optional<AugmentationSchema> augmentationSchema =
-                        ((AugmentationTarget) currentNode).getAvailableAugmentations().stream()
-                            .filter(aug -> identifier.equals(new YangInstanceIdentifier.AugmentationIdentifier(
-                                aug.getChildNodes().stream()
-                                    .map(SchemaNode::getQName)
-                                    .collect(Collectors.toSet()))))
-                            .findFirst();
-                    if (augmentationSchema.isPresent()) {
-                        return augmentationSchema.get();
-                    }
-                }
-
-                // continue search:
-                Collection<DataSchemaNode> childNodes = Collections.emptyList();
-                if (currentNode instanceof DataNodeContainer) {
-                    childNodes = ((DataNodeContainer) currentNode).getChildNodes();
-                } else if (currentNode instanceof ChoiceSchemaNode) {
-                    childNodes = ((ChoiceSchemaNode) currentNode).getCases().stream()
-                        .flatMap(cas -> cas.getChildNodes().stream()).collect(Collectors.toList());
-                }
-                return childNodes.stream().map(n -> findAugmentation(n, identifier)).filter(n -> n != null).findFirst()
-                    .orElse(null);
-            } else {
-                return null;
+        private Boolean isCurrentModified(@Nonnull final Modification modification) {
+            // First check if it's an empty presence node
+            final boolean emptyPresenceNode = isEmptyPresenceNode(modification);
+
+            // Check if there are any modified leaves and if so, consider current node as modified
+            final Boolean directLeavesModified = emptyPresenceNode
+                    || modification.streamChildren()
+                    // Checking leaf or leaf-lists children for direct modification, which means that leafs of leaf lists
+                    // trigger a modification on parent node
+                    .filter(child -> child.is(LeafSchemaNode.class) || child.is(LeafListSchemaNode.class))
+                    // For some reason, we get modifications on unmodified list keys
+                    // and that messes up our modifications collection here, so we need to skip
+                    .filter(Modification::isBeforeAndAfterDifferent)
+                    .filter(child -> VALID_MODIFICATIONS.contains(child.getModificationType()))
+                    .findFirst()
+                    .isPresent();
+
+            // Also as fallback check choices (choices do not exist in BA world and if anything within a choice was modified,
+            // consider its parent as being modified)
+            final boolean modified = directLeavesModified
+                    || modification.streamChildren()
+                    .filter(child -> child.is(ChoiceSchemaNode.class))
+                    // Recursively check each choice if there was any change to it
+                    .filter(this::isCurrentModified)
+                    .findFirst()
+                    .isPresent();
+
+            if (modified) {
+                LOG.debug("Modification detected as {} at {}",
+                        modification.getModificationType(), modification.getId());
             }
-        }
 
-        Stream<Modification> streamChildren() {
-            return dataCandidate.getChildNodes().stream()
-                .map(child -> {
-                    final YangInstanceIdentifier childId = id.node(child.getIdentifier());
-                    final Object schemaChild = schemaChild(schemaNode, child.getIdentifier());
-
-                    // An augment cannot change other augment, so we do not update parent node if we are streaming
-                    // children of AugmentationSchema (otherwise we would fail to find schema for nested augmentations):
-                    if (updateParentNode) {
-                        if (schemaNode instanceof AugmentationSchema) {
-                            // child nodes would not have nested augmentations, so we stop moving parentNode:
-                            return new Modification(childId, child, parentNode, schemaChild, false);
-                        } else {
-                            // update parent node:
-                            return new Modification(childId, child, schemaNode, schemaChild, true);
-                        }
-                    }
-                    return new Modification(childId, child, parentNode, schemaChild, updateParentNode);
-                });
+            return modified;
         }
 
         /**
-         * Find next schema node in hierarchy.
+         * Check if new data are empty but still to be considered as a modification, meaning it's presence has a meaning
+         * e.g. containers with presence statement.
          */
-        private Object schemaChild(final Object schemaNode, final YangInstanceIdentifier.PathArgument identifier) {
-            Object found = null;
-
-            if (identifier instanceof YangInstanceIdentifier.AugmentationIdentifier) {
-                if (schemaNode instanceof AugmentationTarget) {
-                    // Find matching augmentation
-                    found = ((AugmentationTarget) schemaNode).getAvailableAugmentations().stream()
-                        .filter(aug -> identifier.equals(new YangInstanceIdentifier.AugmentationIdentifier(
-                            aug.getChildNodes().stream()
-                                .map(SchemaNode::getQName)
-                                .collect(Collectors.toSet()))))
-                        .findFirst()
-                        .orElse(null);
-
-                    if (found == null) {
-                        // An augment cannot change other augment, but all augments only change their targets (data nodes).
-                        //
-                        // As a consequence, if nested augmentations are present,
-                        // AugmentationSchema might reference child schema node instances that do not include changes
-                        // from nested augments.
-                        //
-                        // But schemaNode, as mentioned earlier, contains all the changes introduced by augments.
-                        //
-                        // On the other hand, in case of augments which introduce leaves,
-                        // we need to address AugmentationSchema node directly so we can't simply do
-                        // found = schemaNode;
-                        //
-                        found =
-                            findAugmentation(parentNode, (YangInstanceIdentifier.AugmentationIdentifier) identifier);
-                    }
-                }
-            } else if (schemaNode instanceof DataNodeContainer) {
-                // Special handling for list aggregator nodes. If we are at list aggregator node e.g. MapNode and
-                // we are searching for schema for a list entry e.g. MapEntryNode just return the same schema
-                if (schemaNode instanceof ListSchemaNode &&
-                    ((SchemaNode) schemaNode).getQName().equals(identifier.getNodeType())) {
-                    found = schemaNode;
-                } else {
-                    found = ((DataNodeContainer) schemaNode).getDataChildByName(identifier.getNodeType());
-                }
-            } else if (schemaNode instanceof ChoiceSchemaNode) {
-                // For choices, iterate through all the cases
-                final Optional<DataSchemaNode> maybeChild = ((ChoiceSchemaNode) schemaNode).getCases().stream()
-                        .flatMap(cas -> cas.getChildNodes().stream())
-                        .filter(child -> child.getQName().equals(identifier.getNodeType()))
-                        .findFirst();
-                if (maybeChild.isPresent()) {
-                    found = maybeChild.get();
-                }
-                // Special handling for leaf-list nodes. Basically the same as is for list mixin nodes
-            } else if (schemaNode instanceof LeafListSchemaNode &&
-                ((SchemaNode) schemaNode).getQName().equals(identifier.getNodeType())) {
-                found = schemaNode;
-            }
+        private static boolean isEmptyPresenceNode(@Nonnull final Modification modification) {
+            return modification.is(ContainerSchemaNode.class)
+                    && ((ContainerSchemaNode) modification.getSchemaNode()).isPresenceContainer()
+                    && modification.getChildNodes().isEmpty()
+                    && VALID_MODIFICATIONS.contains(modification.getModificationType());
+        }
 
-            return checkNotNull(found, "Unable to find child node in: %s identifiable by: %s", schemaNode, identifier);
+        /**
+         * Checks whether node is non-presence container but with changed nested data
+         */
+        private static boolean isNonPresenceOverride(@Nonnull final Modification modification) {
+            return modification.is(ContainerSchemaNode.class)// must be container
+                    && !((ContainerSchemaNode) modification.getSchemaNode()).isPresenceContainer()
+                    // must be non-presence
+                    && modification.getChildNodes().isEmpty() // is override to empty
+                    && modification.isBeforeAndAfterDifferent()// to detect that it is modification
+                    &&
+                    modification.getDataBefore().isPresent(); // to ensure the case when overriding previously existing
         }
 
-        @Override
-        public String toString() {
-            return "Modification{" +
-                    "id=" + id +
-                    '}';
+        /**
+         * Process all non-leaf child nodes recursively, creating aggregated {@link ModificationDiff}.
+         */
+        private ModificationDiff recursivelyChildrenFromCandidate(@Nonnull final Modification modification) {
+            // recursively process child nodes for specific modifications
+            return modification.streamChildren()
+                    .filter(child -> !child.is(LeafSchemaNode.class))
+                    .map(this::recursivelyFromCandidate)
+                    .reduce(ModificationDiff::merge)
+                    .orElse(EMPTY_DIFF);
         }
     }
+
 }
diff --git a/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/NormalizedNodeRewriteDeleteRegistry.java b/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/NormalizedNodeRewriteDeleteRegistry.java
new file mode 100644
index 000000000..c7832ac0e
--- /dev/null
+++ b/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/NormalizedNodeRewriteDeleteRegistry.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.honeycomb.data.impl;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import javax.annotation.Nonnull;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode;
+import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
+import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
+import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
+import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode;
+import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
+import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode;
+import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Basic logic for creating {@link NormalizedNodeUpdate} for changed that delete by rewrite
+ */
+final class NormalizedNodeRewriteDeleteRegistry implements RewriteDeleteProducer {
+
+    private static final Logger LOG = LoggerFactory.getLogger(NormalizedNodeRewriteDeleteRegistry.class);
+
+    private final RewriteDeleteProducer leafDeleteProducer;
+    private final RewriteDeleteProducer leafListDeleteProducer;
+    private final RewriteDeleteProducer listDeleteProducer;
+    private final RewriteDeleteProducer containerDeleteProducer;
+    private final RewriteDeleteProducer choiceDeleteProducer;
+    private final RewriteDeleteProducer caseDeleteProducer;
+    private final RewriteDeleteProducer augmentationDeleteProducer;
+
+    NormalizedNodeRewriteDeleteRegistry(@Nonnull final SchemaContext ctx) {
+        leafDeleteProducer = new LeafRewriteDeleteProducer();
+        leafListDeleteProducer = new LeafListRewriteDeleteProducer();
+        listDeleteProducer = new ListRewriteDeleteProducer();
+        containerDeleteProducer = new ContainerRewriteDeleteProducer(this, ctx);
+        choiceDeleteProducer = new ChoiceRewriteDeleteProducer(this);
+        caseDeleteProducer = new CaseRewriteDeleteProducer(this);
+        augmentationDeleteProducer = new AugmentationRewriteDeleteProducer(this);
+    }
+
+    @Override
+    public Collection<NormalizedNodeUpdate> normalizedUpdates(@Nonnull final YangInstanceIdentifier topLevelIdentifier,
+                                                              @Nonnull final Map.Entry<YangInstanceIdentifier.PathArgument, DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?>> entry) {
+        if (entry.getValue() instanceof LeafNode) {
+            LOG.debug("Processing leaf node {}", topLevelIdentifier);
+            return leafDeleteProducer.normalizedUpdates(topLevelIdentifier, entry);
+        }
+
+        if (entry.getValue() instanceof LeafSetNode) {
+            LOG.debug("Processing leaf-list node {}", topLevelIdentifier);
+            return leafListDeleteProducer.normalizedUpdates(topLevelIdentifier, entry);
+        }
+
+        if (entry.getValue() instanceof MapNode) {
+            LOG.debug("Processing list {}", topLevelIdentifier);
+            return listDeleteProducer.normalizedUpdates(topLevelIdentifier, entry);
+        }
+
+        if (entry.getValue() instanceof ContainerNode) {
+            LOG.debug("Processing container {}", topLevelIdentifier);
+            return containerDeleteProducer.normalizedUpdates(topLevelIdentifier, entry);
+        }
+
+        if (entry.getValue() instanceof ChoiceNode) {
+            LOG.debug("Processing choice {}", topLevelIdentifier);
+            return choiceDeleteProducer.normalizedUpdates(topLevelIdentifier, entry);
+        }
+
+        if (entry.getValue() instanceof ChoiceCaseNode) {
+            LOG.debug("Processing case {}", topLevelIdentifier);
+            return caseDeleteProducer.normalizedUpdates(topLevelIdentifier, entry);
+        }
+
+        if (entry.getValue() instanceof AugmentationNode) {
+            LOG.debug("Processing augmentation {}", topLevelIdentifier);
+            return augmentationDeleteProducer.normalizedUpdates(topLevelIdentifier, entry);
+        }
+
+        return Collections.emptyList();
+    }
+}
diff --git a/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/NormalizedNodeUpdate.java b/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/NormalizedNodeUpdate.java
new file mode 100644
index 000000000..bfc8a1e2c
--- /dev/null
+++ b/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/NormalizedNodeUpdate.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.honeycomb.data.impl;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+
+/**
+ * Update to a normalized node identifiable by its {@link YangInstanceIdentifier}.
+ */
+final class NormalizedNodeUpdate {
+
+    @Nonnull
+    private final YangInstanceIdentifier id;
+    @Nullable
+    private final NormalizedNode<?, ?> dataBefore;
+    @Nullable
+    private final NormalizedNode<?, ?> dataAfter;
+
+    NormalizedNodeUpdate(@Nonnull final YangInstanceIdentifier id,
+                         @Nullable final NormalizedNode<?, ?> dataBefore,
+                         @Nullable final NormalizedNode<?, ?> dataAfter) {
+        this.id = checkNotNull(id);
+        this.dataAfter = dataAfter;
+        this.dataBefore = dataBefore;
+    }
+
+    @Nullable
+    public NormalizedNode<?, ?> getDataBefore() {
+        return dataBefore;
+    }
+
+    @Nullable
+    public NormalizedNode<?, ?> getDataAfter() {
+        return dataAfter;
+    }
+
+    @Nonnull
+    public YangInstanceIdentifier getId() {
+        return id;
+    }
+
+    static NormalizedNodeUpdate create(@Nonnull final Modification modification) {
+        final com.google.common.base.Optional<NormalizedNode<?, ?>> beforeData =
+                modification.getDataBefore();
+        final com.google.common.base.Optional<NormalizedNode<?, ?>> afterData =
+                modification.getDataAfter();
+        checkArgument(beforeData.isPresent() || afterData.isPresent(),
+                "Both before and after data are null for %s", modification.getId());
+        return NormalizedNodeUpdate.create(modification.getId(), beforeData.orNull(), afterData.orNull());
+    }
+
+    static NormalizedNodeUpdate create(@Nonnull final YangInstanceIdentifier id,
+                                       @Nullable final NormalizedNode<?, ?> dataBefore,
+                                       @Nullable final NormalizedNode<?, ?> dataAfter) {
+        return new NormalizedNodeUpdate(id, dataBefore, dataAfter);
+    }
+
+    @Override
+    public boolean equals(final Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+
+        final NormalizedNodeUpdate that = (NormalizedNodeUpdate) other;
+
+        return id.equals(that.id);
+
+    }
+
+    @Override
+    public int hashCode() {
+        return id.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return "NormalizedNodeUpdate{" + "id=" + id
+                + ", dataBefore=" + dataBefore
+                + ", dataAfter=" + dataAfter
+                + '}';
+    }
+}
diff --git a/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/RewriteDeleteProducer.java b/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/RewriteDeleteProducer.java
new file mode 100644
index 000000000..e2c5f4ae0
--- /dev/null
+++ b/infra/data-impl/src/main/java/io/fd/honeycomb/data/impl/RewriteDeleteProducer.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.honeycomb.data.impl;
+
+
+import java.util.Collection;
+import java.util.Map;
+import javax.annotation.Nonnull;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
+
+interface RewriteDeleteProducer {
+
+    Collection<NormalizedNodeUpdate> normalizedUpdates(@Nonnull final YangInstanceIdentifier topLevelIdentifier,
+                                                       @Nonnull final Map.Entry<YangInstanceIdentifier.PathArgument, DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?>> entry);
+}
\ No newline at end of file