From 4c56cc8e5da2bb9887300eacf3bd58dea7f99ba7 Mon Sep 17 00:00:00 2001
From: Gilles Thouenon <gilles.thouenon@orange.com>
Date: Sat, 11 Mar 2023 10:46:23 +0100
Subject: [PATCH] Convert FrequenciesServiceImpl into Component

JIRA: TRNSPRTPCE-736
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ic155e5edb7bcf89cb632934d1bca774c32807e9b
---
 networkmodel/pom.xml                                      | 4 ++++
 .../networkmodel/service/FrequenciesServiceImpl.java      | 7 ++++++-
 .../OSGI-INF/blueprint/networkmodel-blueprint.xml         | 8 +-------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/networkmodel/pom.xml b/networkmodel/pom.xml
index d2c4e9070..2fc497f61 100644
--- a/networkmodel/pom.xml
+++ b/networkmodel/pom.xml
@@ -162,6 +162,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.service.component.annotations</artifactId>
+    </dependency>
 
     <!-- Sodium bump: javax.annotation.Nullable and friends -->
     <dependency>
diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesServiceImpl.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesServiceImpl.java
index f2e777610..09221559c 100644
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesServiceImpl.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesServiceImpl.java
@@ -62,16 +62,21 @@ import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdes
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.Decimal64;
 import org.opendaylight.yangtools.yang.common.Uint32;
+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 FrequenciesServiceImpl implements FrequenciesService {
 
     private static final Logger LOG = LoggerFactory.getLogger(FrequenciesServiceImpl.class);
     private final DataBroker dataBroker;
     private final AvailFreqMapsKey availFreqMapKey = new AvailFreqMapsKey(GridConstant.C_BAND);
 
-    public FrequenciesServiceImpl(DataBroker dataBroker) {
+    @Activate
+    public FrequenciesServiceImpl(@Reference DataBroker dataBroker) {
         this.dataBroker = dataBroker;
     }
 
diff --git a/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml b/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml
index e129842c3..3badba5d4 100644
--- a/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml
+++ b/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml
@@ -13,6 +13,7 @@
     <reference id="mappingUtils" interface="org.opendaylight.transportpce.common.mapping.MappingUtils" />
     <reference id="notificationService" interface="org.opendaylight.mdsal.binding.api.NotificationService"/>
     <reference id="notificationPublishService" interface="org.opendaylight.mdsal.binding.api.NotificationPublishService"/>
+    <reference id="frequenciesService" interface="org.opendaylight.transportpce.networkmodel.service.FrequenciesService" />
 
     <bean id="networkModelService" class="org.opendaylight.transportpce.networkmodel.service.NetworkModelServiceImpl">
         <argument ref="networkTransactionImpl" />
@@ -54,12 +55,5 @@
         <argument ref="networkTransactionImpl" />
    </bean>
 
-    <bean id="frequenciesService" class="org.opendaylight.transportpce.networkmodel.service.FrequenciesServiceImpl">
-        <argument ref="dataBroker" />
-    </bean>
-
     <service ref="networkModelService" interface="org.opendaylight.transportpce.networkmodel.service.NetworkModelService" />
-
-    <service ref="frequenciesService" interface="org.opendaylight.transportpce.networkmodel.service.FrequenciesService" />
-
 </blueprint>
-- 
2.36.6