Use OSGi DS instead of Activator/blueprint

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

diff --git a/yanglib/mdsal-yanglib-rfc7895/src/main/java/org/opendaylight/mdsal/yanglib/rfc7895/YangModuleLibrarySupportFactory.java b/yanglib/mdsal-yanglib-rfc7895/src/main/java/org/opendaylight/mdsal/yanglib/rfc7895/YangModuleLibrarySupportFactory.java
index 147921821773d1459873bd855985d41349c7bba7..acb9567e6a10a42f69e7de056def96bdcc23a208 100644 (file)
--- a/yanglib/mdsal-yanglib-rfc7895/src/main/java/org/opendaylight/mdsal/yanglib/rfc7895/YangModuleLibrarySupportFactory.java
+++ b/yanglib/mdsal-yanglib-rfc7895/src/main/java/org/opendaylight/mdsal/yanglib/rfc7895/YangModuleLibrarySupportFactory.java
@@ -7,22 +7,37 @@
  */
 package org.opendaylight.mdsal.yanglib.rfc7895;
 
+import static java.util.Objects.requireNonNull;
+
+import com.google.common.annotations.Beta;
 import java.io.IOException;
+import java.util.ServiceLoader;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.kohsuke.MetaInfServices;
+import org.opendaylight.binding.runtime.api.BindingRuntimeGenerator;
 import org.opendaylight.mdsal.yanglib.api.YangLibSupport;
 import org.opendaylight.mdsal.yanglib.api.YangLibSupportFactory;
 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;
 
+@Beta
 @MetaInfServices
 @NonNullByDefault
 public final class YangModuleLibrarySupportFactory implements YangLibSupportFactory {
+    private final BindingRuntimeGenerator generator;
+
+    public YangModuleLibrarySupportFactory() {
+        this(ServiceLoader.load(BindingRuntimeGenerator.class).findFirst()
+            .orElseThrow(() -> new IllegalStateException("Failed to find a BindingRuntimeGenerator service")));
+    }
+
+    public YangModuleLibrarySupportFactory(final BindingRuntimeGenerator generator) {
+        this.generator = requireNonNull(generator);
+    }
+
     @Override
     public YangLibSupport createYangLibSupport(final YangParserFactory parserFactory)
-            throws YangSyntaxErrorException, YangParserException, IOException {
-        return new YangModuleLibrarySupport(parserFactory);
-
+            throws YangParserException, IOException {
+        return new YangModuleLibrarySupport(parserFactory, generator);
     }
 }