Remove OSGiYangParserFactory

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / impl / YangParserFactoryImpl.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserFactoryImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserFactoryImpl.java
index f64fb23d6454e532f49979e6ab0b37f0747e1816..a8e9748b8566a258d490dfe71b9dc2fdaca6e75f 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserFactoryImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserFactoryImpl.java
@@ -12,26 +12,35 @@ import static java.util.Objects.requireNonNull;
 import com.google.common.annotations.Beta;
 import com.google.common.collect.ImmutableList;
 import java.util.Collection;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import org.eclipse.jdt.annotation.NonNull;
 import org.kohsuke.MetaInfServices;
 import org.opendaylight.yangtools.yang.model.parser.api.YangParser;
 import org.opendaylight.yangtools.yang.model.parser.api.YangParserFactory;
 import org.opendaylight.yangtools.yang.model.repo.api.StatementParserMode;
 import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor;
+import org.opendaylight.yangtools.yang.xpath.api.YangXPathParserFactory;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
 
 /**
  * Reference {@link YangParserFactory} implementation.
- *
- * @author Robert Varga
  */
 @Beta
 @MetaInfServices
+@Singleton
+@Component(immediate = true)
 public final class YangParserFactoryImpl implements YangParserFactory {
     private static final ImmutableList<StatementParserMode> SUPPORTED_MODES = ImmutableList.of(
         StatementParserMode.DEFAULT_MODE, StatementParserMode.SEMVER_MODE);
-
     private final CrossSourceStatementReactor reactor;
 
+    private YangParserFactoryImpl(final @NonNull CrossSourceStatementReactor reactor) {
+        this.reactor = requireNonNull(reactor);
+    }
+
     /**
      * Construct a new {@link YangParserFactory} backed by {@link DefaultReactors#defaultReactor()}.
      */
@@ -39,13 +48,20 @@ public final class YangParserFactoryImpl implements YangParserFactory {
         this(DefaultReactors.defaultReactor());
     }
 
+    @Inject
+    @Activate
+    public YangParserFactoryImpl(final @Reference YangXPathParserFactory xpathFactory) {
+        this(DefaultReactors.defaultReactorBuilder(xpathFactory).build());
+    }
+
     /**
      * Construct a new {@link YangParserFactory} backed by specified reactor.
      *
      * @param reactor Backing reactor
+     * @return A new YangParserFactory
      */
-    public YangParserFactoryImpl(@NonNull final CrossSourceStatementReactor reactor) {
-        this.reactor = requireNonNull(reactor);
+    public static @NonNull YangParserFactory forReactor(final @NonNull CrossSourceStatementReactor reactor) {
+        return new YangParserFactoryImpl(reactor);
     }
 
     @Override