Use OSGi DS instead of Activator/blueprint

[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 0adca0f5131e28104c97db38e1844ce7f4bf681c..ad803c8cfac292626ea546813dd0ee6ecbb1ba13 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
@@ -14,10 +14,9 @@ import com.google.common.collect.Collections2;
 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.BindingRuntimeContext;
 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.BindingDataObjectCodecTreeNode;
 import org.opendaylight.mdsal.binding.dom.codec.impl.BindingNormalizedNodeCodecRegistry;
@@ -44,8 +43,8 @@ public final class YangModuleLibrarySupport implements YangLibSupport {
     private final EffectiveModelContext context;
 
     @Inject
-    public YangModuleLibrarySupport(final @Reference YangParserFactory parserFactory,
-            final @Reference BindingRuntimeGenerator generator) throws YangParserException, IOException {
+    public YangModuleLibrarySupport(final YangParserFactory parserFactory, final BindingRuntimeGenerator generator)
+            throws YangParserException, IOException {
         final YangModuleInfo yangLibModule = $YangModuleInfoImpl.getInstance();
 
         context = parserFactory.createParser()
@@ -53,7 +52,7 @@ public final class YangModuleLibrarySupport implements YangLibSupport {
                     YangModuleLibrarySupport::createSource))
                 .addSource(createSource(yangLibModule))
                 .buildEffectiveModel();
-        final BindingCodecTree codecTree = new BindingNormalizedNodeCodecRegistry(BindingRuntimeContext.create(
+        final BindingCodecTree codecTree = new BindingNormalizedNodeCodecRegistry(DefaultBindingRuntimeContext.create(
             generator.generateTypeMapping(context), SimpleStrategy.INSTANCE)).getCodecContext();
 
         this.codec = verifyNotNull(codecTree.getSubtreeCodec(InstanceIdentifier.create(ModulesState.class)));