Fix checkListKey not checking actual/expected values

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

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/valid/DataValidationException.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/valid/DataValidationException.java
index c36298887c260d6c9cb7e8dac4fcd159b4f89309..7a58253377462d2b61c855ab75d20f357ba80fce 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/valid/DataValidationException.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/valid/DataValidationException.java
@@ -7,90 +7,93 @@
  */
 package org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.valid;
 
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
 import org.opendaylight.yangtools.yang.model.api.ChoiceNode;
 import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 
-import java.util.Map;
-import java.util.Set;
-
 public class DataValidationException extends RuntimeException {
+    private static final long serialVersionUID = 1L;
 
-    public DataValidationException(String message) {
+    public DataValidationException(final String message) {
         super(message);
     }
 
-    public static void checkLegalChild(boolean isLegal, InstanceIdentifier.PathArgument child, DataNodeContainer schema,
-            Set<QName> childNodes, Set<InstanceIdentifier.AugmentationIdentifier> augments) {
-        if (isLegal == false) {
+    public static void checkLegalChild(final boolean isLegal, final YangInstanceIdentifier.PathArgument child, final DataNodeContainer schema,
+            final Set<QName> childNodes, final Set<YangInstanceIdentifier.AugmentationIdentifier> augments) {
+        if (!isLegal) {
             throw new IllegalChildException(child, schema, childNodes, augments);
         }
     }
 
-    public static void checkLegalChild(boolean isLegal, InstanceIdentifier.PathArgument child, DataSchemaNode schema,
-            Set<QName> childNodes) {
-        if (isLegal == false) {
+    public static void checkLegalChild(final boolean isLegal, final YangInstanceIdentifier.PathArgument child, final DataSchemaNode schema,
+            final Set<QName> childNodes) {
+        if (!isLegal) {
             throw new IllegalChildException(child, schema, childNodes);
         }
     }
 
-    public static void checkLegalChild(boolean isLegal, InstanceIdentifier.PathArgument child, ChoiceNode schema) {
-        if (isLegal == false) {
+    public static void checkLegalChild(final boolean isLegal, final YangInstanceIdentifier.PathArgument child, final ChoiceNode schema) {
+        if (!isLegal) {
             throw new IllegalChildException(child, schema);
         }
     }
 
-    public static void checkLegalData(boolean isLegal, String messageTemplate, Object... messageAttrs) {
-        if (isLegal == false) {
+    public static void checkLegalData(final boolean isLegal, final String messageTemplate, final Object... messageAttrs) {
+        if (!isLegal) {
             throw new DataValidationException(String.format(messageTemplate, messageAttrs));
         }
     }
 
-    public static void checkListKey(DataContainerChild<?, ?> childNode, Map<QName, Object> keyValues, QName keyQName,
-            InstanceIdentifier.NodeIdentifierWithPredicates nodeId) {
+    public static void checkListKey(final DataContainerChild<?, ?> childNode, final Map<QName, Object> keyValues, final QName keyQName,
+            final YangInstanceIdentifier.NodeIdentifierWithPredicates nodeId) {
         checkListKey(childNode, keyQName, nodeId);
 
-        Object expectedValue = nodeId.getKeyValues().get(keyQName);
-        Object actualValue = childNode.getValue();
-        if (childNode == null) {
-            throw new IllegalListKeyException(keyQName, nodeId, actualValue, expectedValue);
+        final Object expected = nodeId.getKeyValues().get(keyQName);
+        final Object actual = childNode.getValue();
+        if (!Objects.equals(expected, actual)) {
+            throw new IllegalListKeyException(keyQName, nodeId, actual, expected);
         }
     }
 
-    public static void checkListKey(DataContainerChild<?, ?> childNode, QName keyQName, InstanceIdentifier.NodeIdentifierWithPredicates nodeId) {
+    public static void checkListKey(final DataContainerChild<?, ?> childNode, final QName keyQName, final YangInstanceIdentifier.NodeIdentifierWithPredicates nodeId) {
         if (childNode == null) {
             throw new IllegalListKeyException(keyQName, nodeId);
         }
     }
 
-    static final class IllegalChildException extends DataValidationException {
+    private static final class IllegalChildException extends DataValidationException {
+        private static final long serialVersionUID = 1L;
 
-        public IllegalChildException(InstanceIdentifier.PathArgument child, DataNodeContainer schema,
-                Set<QName> childNodes, Set<InstanceIdentifier.AugmentationIdentifier> augments) {
+        private IllegalChildException(final YangInstanceIdentifier.PathArgument child, final DataNodeContainer schema,
+                final Set<QName> childNodes, final Set<YangInstanceIdentifier.AugmentationIdentifier> augments) {
             super(String.format("Unknown child node: %s, does not belong to: %s as a direct child. "
                     + "Direct child nodes: %s, augmented child nodes: %s", child, schema, childNodes, augments));
         }
 
-        public IllegalChildException(InstanceIdentifier.PathArgument child, ChoiceNode schema) {
+        private IllegalChildException(final YangInstanceIdentifier.PathArgument child, final ChoiceNode schema) {
             super(String.format("Unknown child node: %s, not detected in choice: %s", child, schema));
         }
 
-        public IllegalChildException(InstanceIdentifier.PathArgument child, DataSchemaNode schema, Set<QName> childNodes) {
+        private IllegalChildException(final YangInstanceIdentifier.PathArgument child, final DataSchemaNode schema, final Set<QName> childNodes) {
             super(String.format("Unknown child node: %s, does not belong to: %s as a child. "
                     + "Child nodes: %s", child, schema, childNodes));
         }
     }
 
-    static final class IllegalListKeyException extends DataValidationException {
+    private static final class IllegalListKeyException extends DataValidationException {
+        private static final long serialVersionUID = 1L;
 
-        public IllegalListKeyException(QName keyQName, InstanceIdentifier.NodeIdentifierWithPredicates id) {
+        private IllegalListKeyException(final QName keyQName, final YangInstanceIdentifier.NodeIdentifierWithPredicates id) {
             super(String.format("Key value not present for key: %s, in: %s", keyQName, id));
         }
 
-        public IllegalListKeyException(QName keyQName, InstanceIdentifier.NodeIdentifierWithPredicates id, Object actualValue, Object expectedValue) {
+        private IllegalListKeyException(final QName keyQName, final YangInstanceIdentifier.NodeIdentifierWithPredicates id, final Object actualValue, final Object expectedValue) {
             super(String.format("Illegal value for key: %s, in: %s, actual value: %s, expected value from key: %s", keyQName, id, actualValue, expectedValue));
         }
     }