import java.io.IOException;
import javax.inject.Inject;
import javax.inject.Singleton;
-import org.apache.aries.blueprint.annotation.service.Reference;
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.dom.codec.impl.BindingNormalizedNodeCodecRegistry;
-import org.opendaylight.mdsal.binding.generator.util.BindingRuntimeContext;
+import org.opendaylight.mdsal.binding.dom.codec.api.BindingIdentityCodec;
import org.opendaylight.mdsal.yanglib.api.SchemaContextResolver;
import org.opendaylight.mdsal.yanglib.api.YangLibSupport;
+import org.opendaylight.mdsal.yanglib.api.YangLibraryContentBuilder;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev190104.$YangModuleInfoImpl;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev190104.ModulesState;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev190104.YangLibrary;
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.parser.api.YangSyntaxErrorException;
import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier;
-import org.opendaylight.yangtools.yang.model.repo.api.StatementParserMode;
import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
@Beta
@NonNullByDefault
@Singleton
public final class YangLibrarySupport implements YangLibSupport {
+ private static final Revision REVISION = YangLibrary.QNAME.getRevision().orElseThrow();
+
private final BindingDataObjectCodecTreeNode<YangLibrary> codec;
@SuppressWarnings("deprecation")
private final BindingDataObjectCodecTreeNode<ModulesState> legacyCodec;
+ private final BindingIdentityCodec identityCodec;
private final EffectiveModelContext context;
+ private final BindingCodecTree codecTree;
@Inject
- public YangLibrarySupport(final @Reference YangParserFactory parserFactory)
- throws YangSyntaxErrorException, YangParserException, IOException {
+ public YangLibrarySupport(final YangParserFactory parserFactory, final BindingRuntimeGenerator generator,
+ final BindingCodecTreeFactory codecFactory) throws YangParserException, IOException {
final YangModuleInfo yangLibModule = $YangModuleInfoImpl.getInstance();
- // FIXME: DEFAULT_MODE should not be necessary, but it seems blueprint is still b0rked
- context = parserFactory.createParser(StatementParserMode.DEFAULT_MODE)
+ context = parserFactory.createParser()
.addLibSources(Collections2.transform(yangLibModule.getImportedModules(),
YangLibrarySupport::createSource))
.addSource(createSource(yangLibModule))
.buildEffectiveModel();
- final BindingCodecTree codecTree = new BindingNormalizedNodeCodecRegistry(BindingRuntimeContext.create(
- SimpleStrategy.INSTANCE, context)).getCodecContext();
+ codecTree = codecFactory.create(DefaultBindingRuntimeContext.create(
+ generator.generateTypeMapping(context), SimpleStrategy.INSTANCE));
+ this.identityCodec = codecTree.getIdentityCodec();
this.codec = verifyNotNull(codecTree.getSubtreeCodec(InstanceIdentifier.create(YangLibrary.class)));
this.legacyCodec = verifyNotNull(codecTree.getSubtreeCodec(InstanceIdentifier.create(ModulesState.class)));
}
@Override
public MountPointContextFactory createMountPointContextFactory(final MountPointIdentifier mountId,
final SchemaContextResolver resolver) {
- return new MountPointContextFactoryImpl(mountId, resolver, context, codec, legacyCodec);
+ return new MountPointContextFactoryImpl(mountId, resolver, context, identityCodec, codec, legacyCodec);
+ }
+
+ @Override
+ public Revision implementedRevision() {
+ return REVISION;
+ }
+
+ @Override
+ public YangLibraryContentBuilder newContentBuilder() {
+ return new YangLibraryContentBuilderImpl(codecTree);
}
private static YangTextSchemaSource createSource(final YangModuleInfo info) {