Convert OlmPowerServiceRpcImpl into a Component

JIRA: TRNSPRTPCE-736
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I97475ccc0365d5a37c8d0ffaaf0c10164ae9920b

diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/OlmPowerServiceRpcImpl.java b/olm/src/main/java/org/opendaylight/transportpce/olm/OlmPowerServiceRpcImpl.java
index c12491b58945a9fa57dcdec709a9460ac8392e1d..78c165b2be31c5738699d21220f6cfd6201ca17b 100644 (file)
--- a/olm/src/main/java/org/opendaylight/transportpce/olm/OlmPowerServiceRpcImpl.java
+++ b/olm/src/main/java/org/opendaylight/transportpce/olm/OlmPowerServiceRpcImpl.java
@@ -26,17 +26,22 @@ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev21
 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;
 
 /**
  * The Class OlmPowerServiceRpcImpl.
  */
+@Component
 public class OlmPowerServiceRpcImpl implements TransportpceOlmService {
     private static final Logger LOG = LoggerFactory.getLogger(OlmPowerServiceRpcImpl.class);
     private final OlmPowerService olmPowerService;
 
-    public OlmPowerServiceRpcImpl(OlmPowerService olmPowerService) {
+    @Activate
+    public OlmPowerServiceRpcImpl(@Reference OlmPowerService olmPowerService) {
         this.olmPowerService = olmPowerService;
     }
 

diff --git a/olm/src/main/resources/OSGI-INF/blueprint/olm-blueprint.xml b/olm/src/main/resources/OSGI-INF/blueprint/olm-blueprint.xml
index f85f4cb6340a385d0c5fec4c5292106a360285c1..252ac06fdca0531a9edad7a066e844e8543742a5 100644 (file)
--- a/olm/src/main/resources/OSGI-INF/blueprint/olm-blueprint.xml
+++ b/olm/src/main/resources/OSGI-INF/blueprint/olm-blueprint.xml
@@ -10,10 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
   <reference id="rpcProviderService" interface="org.opendaylight.mdsal.binding.api.RpcProviderService" />
   <reference id="olmPowerServiceImpl" interface="org.opendaylight.transportpce.olm.service.OlmPowerService" />
-
-  <bean id="olmPowerServiceRpcImpl" class="org.opendaylight.transportpce.olm.OlmPowerServiceRpcImpl">
-    <argument ref="olmPowerServiceImpl" />
-  </bean>
+  <reference id="olmPowerServiceRpcImpl" interface="org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.TransportpceOlmService"/>
 
   <bean id="provider" class="org.opendaylight.transportpce.olm.OlmProvider"
         init-method="init" destroy-method="close">
@@ -21,6 +18,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <argument ref="olmPowerServiceRpcImpl" />
   </bean>
 
-  <service ref="olmPowerServiceRpcImpl"
-           interface="org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.TransportpceOlmService"/>
   </blueprint>