From 79cd3aa0c58fdad9c466a5623600b85b690843c5 Mon Sep 17 00:00:00 2001 From: "tobias.pobocik" Date: Tue, 8 Oct 2024 09:05:06 +0200 Subject: [PATCH] Remove deprecated QNameModule methods https://github.com/opendaylight/yangtools/commit/9eec47a5b4a3d36f09d41ee5d25472118fd0e7ed#diff-b319acda0f33f7ef2fe84100c0504480415efb2a996ba868b6e25526b08f69abL150 JIRA:LIGHTY-317 Signed-off-by: tobias.pobocik --- .../io/lighty/yang/validator/formats/MultiModulePrinter.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/lighty/yang/validator/formats/MultiModulePrinter.java b/src/main/java/io/lighty/yang/validator/formats/MultiModulePrinter.java index 7a46c134..763e90ec 100644 --- a/src/main/java/io/lighty/yang/validator/formats/MultiModulePrinter.java +++ b/src/main/java/io/lighty/yang/validator/formats/MultiModulePrinter.java @@ -147,7 +147,10 @@ private void resolveType(final TypeDefinition> type, final TypeDefinition rootType = getRootType(type); final String rootLocalName = rootType.getQName().getLocalName(); if (!Objects.equals(rootLocalName, type.getQName().getLocalName()) && !rootLocalName.equals("boolean")) { - final QNameModule mod = QNameModule.create(type.getQName().getNamespace(), type.getQName().getRevision()); + final QNameModule mod = type.getQName().getRevision().isPresent() + ? QNameModule.of(type.getQName().getNamespace(), type.getQName().getRevision().get()) + : QNameModule.of(type.getQName().getNamespace()); + usedImportedTypeDefs.computeIfAbsent(mod, k -> new TreeSet<>(Comparator.comparing(SchemaNode::getQName))) .add(type); usedImports.computeIfAbsent(module.getQNameModule(), k -> new HashSet<>())