From b99617ef7127097335289debd8eee5f79c18170a Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 16 Mar 2024 16:17:05 +0100 Subject: [PATCH] Migrate yanglib-mdsal-writer QNameModule method users We have an Optional-free QNameModule.revision() method, which makes things a tad easier on the eyes. Change-Id: Ie1c040d54e6ec51ad05ca337e50154c0865a98a5 Signed-off-by: Robert Varga --- .../writer/YangLibraryContentBuilderUtil.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/apps/yanglib-mdsal-writer/src/main/java/org/opendaylight/netconf/yanglib/writer/YangLibraryContentBuilderUtil.java b/apps/yanglib-mdsal-writer/src/main/java/org/opendaylight/netconf/yanglib/writer/YangLibraryContentBuilderUtil.java index 00a0d9d334..aefbe5d51a 100644 --- a/apps/yanglib-mdsal-writer/src/main/java/org/opendaylight/netconf/yanglib/writer/YangLibraryContentBuilderUtil.java +++ b/apps/yanglib-mdsal-writer/src/main/java/org/opendaylight/netconf/yanglib/writer/YangLibraryContentBuilderUtil.java @@ -158,17 +158,20 @@ final class YangLibraryContentBuilderUtil { } private static RevisionIdentifier buildRevision(final ModuleLike module) { - return module.getQNameModule().getRevision().map(rev -> new RevisionIdentifier(rev.toString())).orElse(null); + final var revision = module.getQNameModule().revision(); + return revision != null ? new RevisionIdentifier(revision.toString()) : null; } private static CommonLeafs.Revision buildLegacyRevision(final ModuleLike module) { - return module.getQNameModule().getRevision() - .map(rev -> new CommonLeafs.Revision(new RevisionIdentifier(rev.toString()))).orElse(EMPTY_REVISION); + final var revision = module.getQNameModule().revision(); + return revision != null ? new CommonLeafs.Revision(new RevisionIdentifier(revision.toString())) + : EMPTY_REVISION; } private static YangIdentifier buildModuleKeyName(final ModuleLike module) { - return new YangIdentifier(module.getName() - + module.getQNameModule().getRevision().map(revision -> "_" + revision).orElse("")); + final var revision = module.getQNameModule().revision(); + return revision == null ? new YangIdentifier(module.getName()) : + new YangIdentifier(module.getName() + "_" + revision); } private static @NonNull Optional buildSchemaSourceUrl(final @NonNull ModuleLike module, -- 2.36.6