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 / ChildTrackingPolicy.java

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ChildTrackingPolicy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ChildTrackingPolicy.java
index 52bffc73cfe87f0a7ece97d61bb0cd8bc5bb4316..a8ad75de7be3222afe9f040bbfa8588b42d006a4 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ChildTrackingPolicy.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ChildTrackingPolicy.java
@@ -7,21 +7,51 @@
  */
 package org.opendaylight.yangtools.yang.data.impl.schema.tree;
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
+
 /**
  * Child ordering policy. It defines how a {@link ModifiedNode} tracks its children.
  */
-enum ChildTrackingPolicy {
+abstract class ChildTrackingPolicy {
+    private static final int DEFAULT_CHILD_COUNT = 8;
+
     /**
      * No child nodes are possible, ever.
      */
-    NONE,
+    static final ChildTrackingPolicy NONE = new ChildTrackingPolicy() {
+        @Override
+        Map<PathArgument, ModifiedNode> createMap() {
+            return Collections.emptyMap();
+        }
+    };
     /**
      * Child nodes are possible and we need to make sure that their iteration order
      * matches the order in which they are introduced.
      */
-    ORDERED,
+    static final ChildTrackingPolicy ORDERED = new ChildTrackingPolicy() {
+        @Override
+        Map<PathArgument, ModifiedNode> createMap() {
+            return new LinkedHashMap<>(DEFAULT_CHILD_COUNT);
+        }
+    };
     /**
      * Child nodes are possible, but their iteration order can be undefined.
      */
-    UNORDERED,
+    static final ChildTrackingPolicy UNORDERED = new ChildTrackingPolicy() {
+        @Override
+        Map<PathArgument, ModifiedNode> createMap() {
+            return new HashMap<>();
+        }
+    };
+
+    /**
+     * Instantiate a new map for all possible children.
+     *
+     * @return An empty map instance
+     */
+    abstract Map<PathArgument, ModifiedNode> createMap();
 }