BUG-4295: fix merge callsite

[yangtools.git] / yang / yang-data-impl / src / main / java / org / opendaylight / yangtools / yang / data / impl / schema / tree / AbstractNodeContainerModificationStrategy.java

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractNodeContainerModificationStrategy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractNodeContainerModificationStrategy.java
index 831c818647ff333b89366e02032f23126ae179ee..c6190f1cbc311d0c13422ebf859f148ac8fb1208 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractNodeContainerModificationStrategy.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractNodeContainerModificationStrategy.java
@@ -160,7 +160,7 @@ abstract class AbstractNodeContainerModificationStrategy extends SchemaAwareAppl
         final Collection<NormalizedNode<?, ?>> children = ((NormalizedNodeContainer) value).getValue();
         for (NormalizedNode<?, ?> c : children) {
             final PathArgument id = c.getIdentifier();
-            modification.modifyChild(id, resolveChildOperation(id).getChildPolicy(), version);
+            modification.modifyChild(id, resolveChildOperation(id), version);
         }
         return applyTouch(modification, currentMeta, version);
     }
@@ -169,7 +169,7 @@ abstract class AbstractNodeContainerModificationStrategy extends SchemaAwareAppl
             final Collection<NormalizedNode<?, ?>> children, final Version version) {
         for (NormalizedNode<?, ?> c : children) {
             final ModificationApplyOperation childOp = resolveChildOperation(c.getIdentifier());
-            final ModifiedNode childNode = modification.modifyChild(c.getIdentifier(), childOp.getChildPolicy(), version);
+            final ModifiedNode childNode = modification.modifyChild(c.getIdentifier(), childOp, version);
             childOp.mergeIntoModifiedNode(childNode, c, version);
         }
     }
@@ -231,16 +231,6 @@ abstract class AbstractNodeContainerModificationStrategy extends SchemaAwareAppl
         throw new IllegalArgumentException("Unsupported operation " + modification.getOperation());
     }
 
-    @SuppressWarnings({"rawtypes", "unchecked"})
-    private NormalizedNode<?, ?> createEmptyValue(NormalizedNode<?, ?> value,
-            Collection<NormalizedNode<?, ?>> children) {
-        NormalizedNodeContainerBuilder builder = createBuilder(value);
-        for (NormalizedNode<?, ?> child : children) {
-            builder.removeChild(child.getIdentifier());
-        }
-        return builder.build();
-    }
-
     @Override
     protected TreeNode applyTouch(final ModifiedNode modification, final TreeNode currentMeta, final Version version) {
         /*