X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-data-jaxen%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fdata%2Fjaxen%2FYangFunctionContext.java;h=429697d2f73ebbb718f06979e17404ffebb4b2cf;hb=64b6f4d58b2e676b98233030aca74df92003aad8;hp=a335a5099f4d2e3dbdcb9acb4d4fa82bc5944548;hpb=ab74073597716f9080f38dc5f4e58a4bee8f2662;p=yangtools.git

diff --git a/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/YangFunctionContext.java b/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/YangFunctionContext.java
index a335a5099f..429697d2f7 100644
--- a/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/YangFunctionContext.java
+++ b/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/YangFunctionContext.java
@@ -29,6 +29,8 @@ import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode;
+import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
+import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode;
 import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
@@ -113,19 +115,7 @@ final class YangFunctionContext implements FunctionContext {
         if (correspondingSchemaNode.getType() instanceof LeafrefTypeDefinition) {
             final LeafrefTypeDefinition leafrefType = (LeafrefTypeDefinition) correspondingSchemaNode.getType();
             final RevisionAwareXPath xPath = leafrefType.getPathStatement();
-            if (xPath.isAbsolute()) {
-                final NormalizedNode<?, ?> referencedNode = getNodeReferencedByAbsoluteLeafref(
-                        xPath, currentNodeContext, schemaContext, correspondingSchemaNode);
-                if (referencedNode.getValue().equals(nodeValue)) {
-                    return referencedNode;
-                }
-            } else {
-                final NormalizedNode<?, ?> referencedNode = getNodeReferencedByRelativeLeafref(
-                        xPath, currentNodeContext, schemaContext, correspondingSchemaNode);
-                if (referencedNode.getValue().equals(nodeValue)) {
-                    return referencedNode;
-                }
-            }
+            return getNodeReferencedByLeafref(xPath, currentNodeContext, schemaContext, correspondingSchemaNode, nodeValue);
         }
 
         return null;
@@ -142,8 +132,24 @@ final class YangFunctionContext implements FunctionContext {
             if (possibleNode.isPresent()) {
                 return possibleNode.get();
             }
+        }
+
+        return null;
+    }
+
+    private static NormalizedNode<?, ?> getNodeReferencedByLeafref(final RevisionAwareXPath xPath,
+            final NormalizedNodeContext currentNodeContext, final SchemaContext schemaContext,
+            final TypedSchemaNode correspondingSchemaNode, final Object nodeValue) {
+        final NormalizedNode<?, ?> referencedNode = xPath.isAbsolute() ? getNodeReferencedByAbsoluteLeafref(xPath,
+                currentNodeContext, schemaContext, correspondingSchemaNode) : getNodeReferencedByRelativeLeafref(xPath,
+                currentNodeContext, schemaContext, correspondingSchemaNode);
+
+        if (referencedNode instanceof LeafSetNode) {
+            return getReferencedLeafSetEntryNode((LeafSetNode<?>) referencedNode, nodeValue);
+        }
 
-            return null;
+        if (referencedNode instanceof LeafNode && referencedNode.getValue().equals(nodeValue)) {
+            return referencedNode;
         }
 
         return null;
@@ -163,8 +169,6 @@ final class YangFunctionContext implements FunctionContext {
             if (possibleNode.isPresent()) {
                 return possibleNode.get();
             }
-
-            return null;
         }
 
         return null;
@@ -195,6 +199,17 @@ final class YangFunctionContext implements FunctionContext {
         return null;
     }
 
+    private static LeafSetEntryNode<?> getReferencedLeafSetEntryNode(final LeafSetNode<?> referencedNode,
+            final Object currentNodeValue) {
+        for (final LeafSetEntryNode<?> entryNode : referencedNode.getValue()) {
+            if (currentNodeValue.equals(entryNode.getValue())) {
+                return entryNode;
+            }
+        }
+
+        return null;
+    }
+
     // derived-from(node-set nodes, string identity) function as per https://tools.ietf.org/html/rfc7950#section-10.4.1
     private static final Function DERIVED_FROM_FUNCTION = (context, args) -> {
         if (args == null || args.size() != 1) {
@@ -313,7 +328,8 @@ final class YangFunctionContext implements FunctionContext {
                 }
             }
 
-            throw new IllegalArgumentException("Cannot resolve prefix '%s' from identity '%s'.");
+            throw new IllegalArgumentException(String.format("Cannot resolve prefix '%s' from identity '%s'.",
+                    identityPrefixAndName.get(0), identity));
         }
 
         if (identityPrefixAndName.size() == 1) { // without prefix
@@ -335,8 +351,6 @@ final class YangFunctionContext implements FunctionContext {
                 " identity schema node in the module %s.", identityQName, module));
     }
 
-
-
     // enum-value(node-set nodes) function as per https://tools.ietf.org/html/rfc7950#section-10.5.1
     private static final Function ENUM_VALUE_FUNCTION = (context, args) -> {
         if (!args.isEmpty()) {
@@ -350,16 +364,18 @@ final class YangFunctionContext implements FunctionContext {
         final TypedSchemaNode correspondingSchemaNode = getCorrespondingTypedSchemaNode(schemaContext,
             currentNodeContext);
 
-        if (!(correspondingSchemaNode.getType() instanceof EnumTypeDefinition)) {
+        final TypeDefinition<?> nodeType = correspondingSchemaNode.getType();
+        if (!(nodeType instanceof EnumTypeDefinition)) {
             return DOUBLE_NAN;
         }
 
-        if (!(currentNodeContext.getNode().getValue() instanceof String)) {
+        final Object nodeValue = currentNodeContext.getNode().getValue();
+        if (!(nodeValue instanceof String)) {
             return DOUBLE_NAN;
         }
 
-        final EnumTypeDefinition enumerationType = (EnumTypeDefinition) correspondingSchemaNode.getType();
-        final String enumName = (String) currentNodeContext.getNode().getValue();
+        final EnumTypeDefinition enumerationType = (EnumTypeDefinition) nodeType;
+        final String enumName = (String) nodeValue;
 
         return getEnumValue(enumerationType, enumName);
     };