From 43911f80415346850e87a2bf34c74bc5db8d89a6 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 20 Feb 2020 08:45:15 +0100
Subject: [PATCH] Add inject annotations

Add @Singleton to activation factories, so that they get
recognized by DI frameworks.

Change-Id: Ic7955fc712946a1477512416c84ac2c97e6ae5ad
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 yang/yang-data-impl/pom.xml                                  | 5 +++++
 .../yang/data/impl/schema/tree/InMemoryDataTreeFactory.java  | 2 ++
 yang/yang-xpath-impl/pom.xml                                 | 5 +++++
 .../yangtools/yang/xpath/impl/AntlrXPathParserFactory.java   | 2 ++
 4 files changed, 14 insertions(+)

diff --git a/yang/yang-data-impl/pom.xml b/yang/yang-data-impl/pom.xml
index 7b0627939c..cd9165bb26 100644
--- a/yang/yang-data-impl/pom.xml
+++ b/yang/yang-data-impl/pom.xml
@@ -81,6 +81,11 @@
             <artifactId>jaxb-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.kohsuke.metainf-services</groupId>
             <artifactId>metainf-services</artifactId>
diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeFactory.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeFactory.java
index dd23823d62..5563544135 100644
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeFactory.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeFactory.java
@@ -10,6 +10,7 @@ package org.opendaylight.yangtools.yang.data.impl.schema.tree;
 import static com.google.common.base.Preconditions.checkArgument;
 
 import java.util.Optional;
+import javax.inject.Singleton;
 import org.kohsuke.MetaInfServices;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
@@ -39,6 +40,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext;
  * A factory for creating in-memory data trees.
  */
 @MetaInfServices
+@Singleton
 public final class InMemoryDataTreeFactory implements DataTreeFactory {
     private static final NormalizedNode<?, ?> ROOT_CONTAINER = ImmutableNodes.containerNode(SchemaContext.NAME);
 
diff --git a/yang/yang-xpath-impl/pom.xml b/yang/yang-xpath-impl/pom.xml
index 6683a0c3a6..183162a66f 100644
--- a/yang/yang-xpath-impl/pom.xml
+++ b/yang/yang-xpath-impl/pom.xml
@@ -44,6 +44,11 @@
             <artifactId>yang-xpath-antlr</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.kohsuke.metainf-services</groupId>
             <artifactId>metainf-services</artifactId>
diff --git a/yang/yang-xpath-impl/src/main/java/org/opendaylight/yangtools/yang/xpath/impl/AntlrXPathParserFactory.java b/yang/yang-xpath-impl/src/main/java/org/opendaylight/yangtools/yang/xpath/impl/AntlrXPathParserFactory.java
index d061bfcc20..52f77cdab3 100644
--- a/yang/yang-xpath-impl/src/main/java/org/opendaylight/yangtools/yang/xpath/impl/AntlrXPathParserFactory.java
+++ b/yang/yang-xpath-impl/src/main/java/org/opendaylight/yangtools/yang/xpath/impl/AntlrXPathParserFactory.java
@@ -7,6 +7,7 @@
  */
 package org.opendaylight.yangtools.yang.xpath.impl;
 
+import javax.inject.Singleton;
 import org.kohsuke.MetaInfServices;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.common.YangNamespaceContext;
@@ -17,6 +18,7 @@ import org.opendaylight.yangtools.yang.xpath.api.YangXPathParser.UnqualifiedBoun
 import org.opendaylight.yangtools.yang.xpath.api.YangXPathParserFactory;
 
 @MetaInfServices
+@Singleton
 public final class AntlrXPathParserFactory implements YangXPathParserFactory {
     @Override
     public YangXPathParser newParser(final YangXPathMathMode mathMode) {
-- 
2.36.6