Rework NormalizedNode type hierarchy

[yangtools.git] / yang / yang-data-impl / src / main / java / org / opendaylight / yangtools / yang / data / impl / schema / builder / impl / valid / DataNodeContainerValidator.java

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/valid/DataNodeContainerValidator.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/valid/DataNodeContainerValidator.java
index 452f1e341eff9901de7f6eb605e936290d23c680..abdfaabd92722cbc7641acf19ebf0e8fb19d6c87 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/valid/DataNodeContainerValidator.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/valid/DataNodeContainerValidator.java
@@ -7,17 +7,18 @@
  */
 package org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.valid;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import java.util.HashSet;
 import java.util.Set;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
-import org.opendaylight.yangtools.yang.data.impl.schema.SchemaUtils;
+import org.opendaylight.yangtools.yang.data.util.DataSchemaContextNode;
 import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.AugmentationTarget;
-import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode;
+import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 
@@ -30,12 +31,12 @@ public class DataNodeContainerValidator {
     private final Set<QName> childNodes;
 
     public DataNodeContainerValidator(final DataNodeContainer schema) {
-        this.schema = Preconditions.checkNotNull(schema, "Schema was null");
+        this.schema = requireNonNull(schema, "Schema was null");
         this.childNodes = getChildNodes(schema);
 
         if (schema instanceof AugmentationTarget) {
             for (AugmentationSchemaNode augmentation : ((AugmentationTarget) schema).getAvailableAugmentations()) {
-                augments.add(SchemaUtils.getNodeIdentifierForAugmentation(augmentation));
+                augments.add(DataSchemaContextNode.augmentationIdentifierFrom(augmentation));
             }
         }
     }
@@ -52,7 +53,7 @@ public class DataNodeContainerValidator {
         DataValidationException.checkLegalChild(isKnownChild(child), child, schema, childNodes, augments);
     }
 
-    public DataContainerChild<?, ?> validateChild(final DataContainerChild<?, ?> child) {
+    public DataContainerChild validateChild(final DataContainerChild child) {
         validateChild(child.getIdentifier());
         return child;
     }
@@ -65,7 +66,7 @@ public class DataNodeContainerValidator {
         Set<QName> allChildNodes = new HashSet<>();
 
         for (DataSchemaNode childSchema : nodeContainer.getChildNodes()) {
-            if (childSchema instanceof ChoiceCaseNode) {
+            if (childSchema instanceof CaseSchemaNode) {
                 allChildNodes.addAll(getChildNodes((DataNodeContainer) childSchema));
             } else if (!(childSchema instanceof AugmentationSchemaNode)) {
                 allChildNodes.add(childSchema.getQName());