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 <robert.varga@pantheon.tech>

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 00a0d9d334f607a43b3b9a60b4be0edbd796db27..aefbe5d51a3e4f72efcc5d8b4424fea9235a5978 100644 (file)
--- 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<Uri> buildSchemaSourceUrl(final @NonNull ModuleLike module,