Adjust to yangtools-2.0.0/odlparent-3.0.0 changes

[netconf.git] / netconf / mdsal-netconf-yang-library / src / main / java / org / opendaylight / netconf / mdsal / yang / library / SchemaServiceToMdsalWriter.java

diff --git a/netconf/mdsal-netconf-yang-library/src/main/java/org/opendaylight/netconf/mdsal/yang/library/SchemaServiceToMdsalWriter.java b/netconf/mdsal-netconf-yang-library/src/main/java/org/opendaylight/netconf/mdsal/yang/library/SchemaServiceToMdsalWriter.java
index d0d383a2bb0dbfe28f2d59ef3cf94f4dc2aa163b..918e71d13f9aae83c3bf3a72fad293e702c0e2dc 100644 (file)
--- a/netconf/mdsal-netconf-yang-library/src/main/java/org/opendaylight/netconf/mdsal/yang/library/SchemaServiceToMdsalWriter.java
+++ b/netconf/mdsal-netconf-yang-library/src/main/java/org/opendaylight/netconf/mdsal/yang/library/SchemaServiceToMdsalWriter.java
@@ -115,21 +115,24 @@ public class SchemaServiceToMdsalWriter implements SchemaContextListener, AutoCl
 
         // TODO Conformance type is always set to Implement value, but it should it really be like this?
         // TODO Add also deviations and features lists to module entries
-        moduleBuilder.setName(new YangIdentifier(module.getName()))
-                .setRevision(new OptionalRevision(module.getQNameModule().getFormattedRevision()))
-                .setNamespace(new Uri(module.getNamespace().toString()))
-                .setConformanceType(ConformanceType.Implement)
-                .setSubmodules(createSubmodulesForModule(module));
+        moduleBuilder.setName(new YangIdentifier(module.getName()));
+
+        module.getQNameModule().getRevision().ifPresent(rev -> moduleBuilder.setRevision(
+            new OptionalRevision(rev.toString())));
 
-        return moduleBuilder.build();
+        return moduleBuilder.setNamespace(new Uri(module.getNamespace().toString()))
+                .setConformanceType(ConformanceType.Implement)
+                .setSubmodules(createSubmodulesForModule(module))
+                .build();
     }
 
-    private Submodules createSubmodulesForModule(final Module module) {
+    private static Submodules createSubmodulesForModule(final Module module) {
         final List<Submodule> submodulesList = Lists.newArrayList();
         for (final Module subModule : module.getSubmodules()) {
-            final SubmoduleBuilder subModuleEntryBuilder = new SubmoduleBuilder();
-            subModuleEntryBuilder.setName(new YangIdentifier(subModule.getName()))
-                    .setRevision(new OptionalRevision(subModule.getQNameModule().getFormattedRevision()));
+            final SubmoduleBuilder subModuleEntryBuilder = new SubmoduleBuilder()
+                    .setName(new YangIdentifier(subModule.getName()));
+            subModule.getQNameModule().getRevision().ifPresent(
+                rev -> subModuleEntryBuilder.setRevision(new OptionalRevision(rev.toString())));
             submodulesList.add(subModuleEntryBuilder.build());
         }