Convert TapiNetworkUtilsImpl into a Component

JIRA: TRNSPRTPCE-736
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I97ec3379b01f2988d08ba2c923eb53dece67bb9e
(cherry picked from commit eeadba530158493c810870bd2083f3918b6d3d76)

diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiNetworkUtilsImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiNetworkUtilsImpl.java
index 8f56d0215443f59f50b059308fe859f1d755638a..5190aac02a5a0f16a7fcb0db3093a7f43f12ca1f 100644 (file)
--- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiNetworkUtilsImpl.java
+++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiNetworkUtilsImpl.java
@@ -41,9 +41,13 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.ErrorType;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@Component
 public class TapiNetworkUtilsImpl implements TransportpceTapinetworkutilsService {
 
     private static final Logger LOG = LoggerFactory.getLogger(TapiNetworkUtilsImpl.class);
@@ -52,7 +56,9 @@ public class TapiNetworkUtilsImpl implements TransportpceTapinetworkutilsService
     private final NetworkTransactionService networkTransactionService;
     private final TapiLink tapiLink;
 
-    public TapiNetworkUtilsImpl(NetworkTransactionService networkTransactionService, TapiLink tapiLink) {
+    @Activate
+    public TapiNetworkUtilsImpl(@Reference NetworkTransactionService networkTransactionService,
+            @Reference TapiLink tapiLink) {
         this.networkTransactionService = networkTransactionService;
         this.tapiLink = tapiLink;
     }

diff --git a/tapi/src/main/resources/OSGI-INF/blueprint/tapi-blueprint.xml b/tapi/src/main/resources/OSGI-INF/blueprint/tapi-blueprint.xml
index ea27da793f4bff55be35c83c6d0196172424e483..806cc596cc690d25d8526e14374892f98f1eb788 100644 (file)
--- a/tapi/src/main/resources/OSGI-INF/blueprint/tapi-blueprint.xml
+++ b/tapi/src/main/resources/OSGI-INF/blueprint/tapi-blueprint.xml
@@ -36,6 +36,8 @@ Author: Gilles Thouenon <gilles.thouenon@orange.com>
                interface="org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperations" />
     <reference id="tapiLink" interface="org.opendaylight.transportpce.tapi.utils.TapiLink" />
     <reference id="tapiNetworkModelService" interface="org.opendaylight.transportpce.tapi.topology.TapiNetworkModelService" />
+    <reference id="tapiNetworkUtilsImpl"
+        interface="org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.tapinetworkutils.rev210408.TransportpceTapinetworkutilsService" />
 
     <bean id="tapiListener"
           class="org.opendaylight.transportpce.tapi.utils.TapiListener">
@@ -68,11 +70,6 @@ Author: Gilles Thouenon <gilles.thouenon@orange.com>
         <argument ref="networkTransactionImpl" />
     </bean>
 
-    <bean id="tapiNetworkUtilsImpl" class="org.opendaylight.transportpce.tapi.topology.TapiNetworkUtilsImpl">
-        <argument ref="networkTransactionImpl" />
-        <argument ref="tapiLink" />
-    </bean>
-
     <bean id="tapiProvider"
           class="org.opendaylight.transportpce.tapi.impl.TapiProvider"
           init-method="init" destroy-method="close">