From e7f305bc5ea2a404b73709b11b9d51ab13e8df90 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tibor=20Kr=C3=A1l?= Date: Thu, 15 Aug 2019 17:13:28 +0200 Subject: [PATCH] Fix mapping of Revision in Deviations MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit "IllegalArgumentException: Unknown value type Optional" exception is thrown during initialization of RESTCONF with yang model containing deviation. JIRA: NETCONF-637 Change-Id: I8c19eb39d06ff38e691ea9a079507dab40311341 Signed-off-by: Tibor Král Signed-off-by: Robert Varga --- .../rfc8040/utils/mapping/RestconfMappingNodeUtil.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingNodeUtil.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingNodeUtil.java index 8361ace56e..8a3fed5c00 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingNodeUtil.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingNodeUtil.java @@ -197,14 +197,8 @@ public final class RestconfMappingNodeUtil { final DataContainerNodeBuilder deviationEntryNode = Builders.mapEntryBuilder((ListSchemaNode) deviationsSchema); final QName lastComponent = deviation.getTargetPath().getLastComponent(); - addChildOfModuleBySpecificModuleInternal(IetfYangLibrary.SPECIFIC_MODULE_NAME_LEAF_QNAME, - deviationEntryNode, context.findModule(lastComponent.getModule()).get().getName(), - ietfYangLibraryModule); - if (lastComponent.getRevision().isPresent()) { - addChildOfModuleBySpecificModuleInternal(IetfYangLibrary.SPECIFIC_MODULE_REVISION_LEAF_QNAME, - deviationEntryNode, lastComponent.getRevision(), - ietfYangLibraryModule); - } + addCommonLeafs(context.findModule(lastComponent.getModule()).get(), deviationEntryNode, + ietfYangLibraryModule); deviations.withChild(deviationEntryNode.build()); } mapEntryBuilder.withChild(deviations.build()); -- 2.36.6