X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=data%2Fyang-data-util%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fdata%2Futil%2FUnorderedLeafListMixinContextNode.java;h=9d6618c2fac608d28e7c36e28e65143eabd38968;hb=refs%2Fchanges%2F10%2F100210%2F4;hp=c6907f31c1756f0eacffb0a9612eac754a1dbc7c;hpb=fe9e3e1b7804c6d5e63409a0bf1cb1480a4c8899;p=yangtools.git

diff --git a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/UnorderedLeafListMixinContextNode.java b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/UnorderedLeafListMixinContextNode.java
index c6907f31c1..9d6618c2fa 100644
--- a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/UnorderedLeafListMixinContextNode.java
+++ b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/UnorderedLeafListMixinContextNode.java
@@ -14,27 +14,22 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgum
 import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode;
 
 class UnorderedLeafListMixinContextNode extends AbstractMixinContextNode<NodeIdentifier> {
+    private final LeafListEntryContextNode innerOp;
 
-    private final DataSchemaContextNode<?> innerOp;
-
-    UnorderedLeafListMixinContextNode(final LeafListSchemaNode potential) {
-        super(NodeIdentifier.create(potential.getQName()), potential);
-        innerOp = new LeafListEntryContextNode(potential);
+    UnorderedLeafListMixinContextNode(final LeafListSchemaNode schema) {
+        super(NodeIdentifier.create(schema.getQName()), schema);
+        innerOp = new LeafListEntryContextNode(schema);
     }
 
     @Override
-    public DataSchemaContextNode<?> getChild(final PathArgument child) {
-        if (child instanceof NodeWithValue) {
-            return innerOp;
-        }
-        return null;
+    public final DataSchemaContextNode<?> getChild(final PathArgument child) {
+        // FIXME: 10.0.0: reject null and invalid
+        return child instanceof NodeWithValue ? innerOp : null;
     }
 
     @Override
-    public DataSchemaContextNode<?> getChild(final QName child) {
-        if (getIdentifier().getNodeType().equals(child)) {
-            return innerOp;
-        }
-        return null;
+    public final DataSchemaContextNode<?> getChild(final QName child) {
+        // FIXME: requireNonNull, common code with UnkeyedListMixinNode
+        return getIdentifier().getNodeType().equals(child) ? innerOp : null;
     }
 }