Add support for formatting EffectiveModelContext

[mdsal.git] / yanglib / mdsal-yanglib-rfc7895 / src / main / java / org / opendaylight / mdsal / yanglib / rfc7895 / YangModuleLibrarySupport.java

diff --git a/yanglib/mdsal-yanglib-rfc7895/src/main/java/org/opendaylight/mdsal/yanglib/rfc7895/YangModuleLibrarySupport.java b/yanglib/mdsal-yanglib-rfc7895/src/main/java/org/opendaylight/mdsal/yanglib/rfc7895/YangModuleLibrarySupport.java
index 627928ba3540cf21c90455adfcb5c84a622cd81a..f485bd0739c3d5e206cfdbb811ed5be2f9d1b011 100644 (file)
--- a/yanglib/mdsal-yanglib-rfc7895/src/main/java/org/opendaylight/mdsal/yanglib/rfc7895/YangModuleLibrarySupport.java
+++ b/yanglib/mdsal-yanglib-rfc7895/src/main/java/org/opendaylight/mdsal/yanglib/rfc7895/YangModuleLibrarySupport.java
@@ -10,50 +10,48 @@ package org.opendaylight.mdsal.yanglib.rfc7895;
 import static com.google.common.base.Verify.verifyNotNull;
 
 import com.google.common.annotations.Beta;
-import com.google.common.collect.Collections2;
-import java.io.IOException;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.opendaylight.binding.runtime.api.BindingRuntimeGenerator;
-import org.opendaylight.binding.runtime.api.DefaultBindingRuntimeContext;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTree;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTreeFactory;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingDataObjectCodecTreeNode;
+import org.opendaylight.mdsal.binding.runtime.api.BindingRuntimeGenerator;
+import org.opendaylight.mdsal.binding.runtime.api.DefaultBindingRuntimeContext;
+import org.opendaylight.mdsal.binding.runtime.api.ModuleInfoSnapshot;
+import org.opendaylight.mdsal.binding.runtime.spi.ModuleInfoSnapshotBuilder;
 import org.opendaylight.mdsal.yanglib.api.SchemaContextResolver;
 import org.opendaylight.mdsal.yanglib.api.YangLibSupport;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160621.$YangModuleInfoImpl;
+import org.opendaylight.mdsal.yanglib.api.YangLibraryContentBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160621.ModulesState;
 import org.opendaylight.yangtools.rfc8528.data.api.MountPointContextFactory;
 import org.opendaylight.yangtools.rfc8528.data.api.MountPointIdentifier;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.binding.YangModuleInfo;
-import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.Revision;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.parser.api.YangParserException;
 import org.opendaylight.yangtools.yang.model.parser.api.YangParserFactory;
-import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier;
-import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
 
 @Beta
 @NonNullByDefault
 @Singleton
 public final class YangModuleLibrarySupport implements YangLibSupport {
+    private static final Revision REVISION = ModulesState.QNAME.getRevision().orElseThrow();
+
     private final BindingDataObjectCodecTreeNode<ModulesState> codec;
     private final EffectiveModelContext context;
+    private final BindingCodecTree codecTree;
 
     @Inject
     public YangModuleLibrarySupport(final YangParserFactory parserFactory, final BindingRuntimeGenerator generator,
-            final BindingCodecTreeFactory codecFactory) throws YangParserException, IOException {
-        final YangModuleInfo yangLibModule = $YangModuleInfoImpl.getInstance();
+            final BindingCodecTreeFactory codecFactory) throws YangParserException {
+        final ModuleInfoSnapshot snapshot = new ModuleInfoSnapshotBuilder(parserFactory)
+                .add(ModulesState.class)
+                .build();
+        context = snapshot.getEffectiveModelContext();
 
-        context = parserFactory.createParser()
-                .addLibSources(Collections2.transform(yangLibModule.getImportedModules(),
-                    YangModuleLibrarySupport::createSource))
-                .addSource(createSource(yangLibModule))
-                .buildEffectiveModel();
-        final BindingCodecTree codecTree = codecFactory.create(DefaultBindingRuntimeContext.create(
-            generator.generateTypeMapping(context), SimpleStrategy.INSTANCE));
+        codecTree = codecFactory.create(new DefaultBindingRuntimeContext(
+            generator.generateTypeMapping(context), snapshot));
 
         this.codec = verifyNotNull(codecTree.getSubtreeCodec(InstanceIdentifier.create(ModulesState.class)));
     }
@@ -64,9 +62,13 @@ public final class YangModuleLibrarySupport implements YangLibSupport {
         return new MountPointContextFactoryImpl(mountId, resolver, context, codec);
     }
 
-    private static YangTextSchemaSource createSource(final YangModuleInfo info) {
-        final QName name = info.getName();
-        return YangTextSchemaSource.delegateForByteSource(
-            RevisionSourceIdentifier.create(name.getLocalName(), name.getRevision()), info.getYangTextByteSource());
+    @Override
+    public Revision implementedRevision() {
+        return REVISION;
+    }
+
+    @Override
+    public YangLibraryContentBuilder newContentBuilder() {
+        return new Rfc7895ContentBuilder(codecTree);
     }
 }