Clean up CaseEnforcer.enforceOnTreeNode()

This method is misnamed, as it does not operate on TreeNode, but rather
(always!) on a ChoiceNode. Rename it to enforceOnChoice() and make sure
it takes ChoiceNode as the argument..

Change-Id: Id00176e3f26d2925b9fdcdf75b5c0cd257baa585
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/CaseEnforcer.java b/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/CaseEnforcer.java
index 3c88b78f67d986662ebdcba7f4135a08f6df9632..eb5e22f65d707ab864d8c9f85573b49e2e80828d 100644 (file)
--- a/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/CaseEnforcer.java
+++ b/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/CaseEnforcer.java
@@ -15,7 +15,7 @@ import java.util.Map.Entry;
 import java.util.Set;
 import org.opendaylight.yangtools.concepts.Immutable;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode;
 import org.opendaylight.yangtools.yang.data.tree.api.DataTreeConfiguration;
 import org.opendaylight.yangtools.yang.data.tree.api.TreeType;
 import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode;
@@ -32,8 +32,8 @@ class CaseEnforcer implements Immutable {
         }
 
         @Override
-        void enforceOnTreeNode(final NormalizedNode normalizedNode) {
-            enforcer.enforceOnData(normalizedNode);
+        void enforceOnChoice(final ChoiceNode choice) {
+            enforcer.enforceOnData(choice);
         }
     }
 
@@ -70,7 +70,7 @@ class CaseEnforcer implements Immutable {
         return children.keySet();
     }
 
-    void enforceOnTreeNode(final NormalizedNode normalizedNode) {
+    void enforceOnChoice(final ChoiceNode choice) {
         // Default is no-op
     }
 }

diff --git a/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/ChoiceModificationStrategy.java b/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/ChoiceModificationStrategy.java
index e768c1da3af988117f5fcc06401465147ecc96aa..7d193b6909a5ec3a198b32a30af2ef72728c8299 100644 (file)
--- a/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/ChoiceModificationStrategy.java
+++ b/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/ChoiceModificationStrategy.java
@@ -127,7 +127,7 @@ final class ChoiceModificationStrategy extends Visible<ChoiceSchemaNode> {
             }
 
             // Make sure all mandatory children are present
-            enforcer.enforceOnTreeNode(normalizedNode);
+            enforcer.enforceOnChoice(choice);
         }
     }