From bbbd3c4e766d31d63446f43e40545cd0758dab08 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 12 Apr 2022 18:06:10 +0200 Subject: [PATCH] Do not use RestUtil.resolveBaseTypeFrom() Derived types have been using their proper type for a long time now and there is essentially cannot be a semantic difference between a derived/restricted type which would make any difference during resolution. Ditch the base type lookup and just use the type at hand. JIRA: NETCONF-837 Change-Id: I21afc3ac15c954358f62070065531e75ff360924 Signed-off-by: Robert Varga --- .../utils/parser/YangInstanceIdentifierDeserializer.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierDeserializer.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierDeserializer.java index ca4c28db7b..9f73482f41 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierDeserializer.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierDeserializer.java @@ -17,7 +17,6 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.restconf.common.errors.RestconfDocumentedException; -import org.opendaylight.restconf.common.util.RestUtil; import org.opendaylight.restconf.nb.rfc8040.ApiPath; import org.opendaylight.restconf.nb.rfc8040.ApiPath.ListInstance; import org.opendaylight.yangtools.yang.common.ErrorTag; @@ -261,9 +260,8 @@ public final class YangInstanceIdentifierDeserializer { } else { typedef = ((LeafSchemaNode) schemaNode).getType(); } - final TypeDefinition baseType = RestUtil.resolveBaseTypeFrom(typedef); - if (baseType instanceof LeafrefTypeDefinition) { - typedef = stack.resolveLeafref((LeafrefTypeDefinition) baseType); + if (typedef instanceof LeafrefTypeDefinition) { + typedef = stack.resolveLeafref((LeafrefTypeDefinition) typedef); } if (typedef instanceof IdentityrefTypeDefinition) { -- 2.36.6