Bug 4295: Fixed incorrectly introduced nodes when MERGE was followed by DELETE

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

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/NodeModification.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/NodeModification.java
index 8e92ff1f22af9a54444033d8af1a18f4f04cdfe6..225a931ec0a5eb65286cfe288936696bb28c27d1 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/NodeModification.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/NodeModification.java
@@ -7,11 +7,10 @@
  */
 package org.opendaylight.yangtools.yang.data.impl.schema.tree;
 
-
 import com.google.common.base.Optional;
+import java.util.Collection;
 import org.opendaylight.yangtools.concepts.Identifiable;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode;
 
 /**
@@ -23,9 +22,9 @@ abstract class NodeModification implements Identifiable<PathArgument> {
     /**
      * Get the type of modification.
      *
-     * @return Modification type.
+     * @return Operation type.
      */
-    abstract ModificationType getType();
+    abstract LogicalOperation getOperation();
 
     /**
      * Get the original tree node to which the modification is to be applied.
@@ -38,7 +37,7 @@ abstract class NodeModification implements Identifiable<PathArgument> {
     /**
      * Get a read-only view of children nodes.
      *
-     * @return Iterable of all children nodes.
+     * @return Collection of all children nodes.
      */
-    abstract Iterable<? extends NodeModification> getChildren();
+    abstract Collection<? extends NodeModification> getChildren();
 }