Use schemaless builders in RestconfMappingNodeUtil

[netconf.git] / restconf / restconf-nb-rfc8040 / src / main / java / org / opendaylight / restconf / nb / rfc8040 / handlers / SchemaContextHandler.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/handlers/SchemaContextHandler.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/handlers/SchemaContextHandler.java
index 993edb5e547e96bb89d7b90baae36817f31b3585..5c126d4dbfaf72f07b6bbb7e7b44bf3d0a13678b 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/handlers/SchemaContextHandler.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/handlers/SchemaContextHandler.java
@@ -83,21 +83,14 @@ public class SchemaContextHandler implements SchemaContextListenerHandler, AutoC
     public void onModelContextUpdated(final EffectiveModelContext context) {
         schemaContext = requireNonNull(context);
 
-        final Module ietfYangLibraryModule =
-                context.findModule(IetfYangLibrary.MODULE_QNAME).orElse(null);
-        if (ietfYangLibraryModule != null) {
-            NormalizedNode<NodeIdentifier, Collection<DataContainerChild<? extends PathArgument, ?>>> normNode =
-                    RestconfMappingNodeUtil.mapModulesByIetfYangLibraryYang(context.getModules(), ietfYangLibraryModule,
-                            context, String.valueOf(this.moduleSetId.incrementAndGet()));
-            putData(normNode);
+        if (context.findModule(IetfYangLibrary.MODULE_QNAME).isPresent()) {
+            putData(RestconfMappingNodeUtil.mapModulesByIetfYangLibraryYang(context.getModules(), context,
+                String.valueOf(this.moduleSetId.incrementAndGet())));
         }
 
-        final Module monitoringModule =
-                schemaContext.findModule(MonitoringModule.MODULE_QNAME).orElse(null);
+        final Module monitoringModule = schemaContext.findModule(MonitoringModule.MODULE_QNAME).orElse(null);
         if (monitoringModule != null) {
-            NormalizedNode<NodeIdentifier, Collection<DataContainerChild<? extends PathArgument, ?>>> normNode =
-                    RestconfMappingNodeUtil.mapCapabilites(monitoringModule);
-            putData(normNode);
+            putData(RestconfMappingNodeUtil.mapCapabilites(monitoringModule));
         }
     }