From 0c51ad4d13ab3908cc5c579a55a9e5c364c5adfe Mon Sep 17 00:00:00 2001
From: Gilles Thouenon <gilles.thouenon@orange.com>
Date: Thu, 16 Mar 2023 15:44:31 +0100
Subject: [PATCH] Remove dmaap-blueprint.xml file

Convert DmaapClientProvider into a Component.

JIRA: TRNSPRTPCE-736
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I7dd15f32a597dfee0e2ee77e90fe17f17a40c627
(cherry picked from commit 8cde36c2ece92e26e0ebee020525ba5ab08d18f3)
---
 dmaap-client/pom.xml                          |  8 ++++
 .../client/impl/DmaapClientProvider.java      | 39 +++++++++++--------
 .../OSGI-INF/blueprint/dmaap-blueprint.xml    | 25 ------------
 .../client/impl/DmaapClientProviderTest.java  |  8 ++--
 4 files changed, 34 insertions(+), 46 deletions(-)
 delete mode 100644 dmaap-client/src/main/resources/OSGI-INF/blueprint/dmaap-blueprint.xml

diff --git a/dmaap-client/pom.xml b/dmaap-client/pom.xml
index e4e2e7bfd..7834390a5 100644
--- a/dmaap-client/pom.xml
+++ b/dmaap-client/pom.xml
@@ -99,6 +99,14 @@
       <groupId>jakarta.ws.rs</groupId>
       <artifactId>jakarta.ws.rs-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.service.component.annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.service.metatype.annotations</artifactId>
+    </dependency>
 
     <!-- Testing dependencies -->
     <dependency>
diff --git a/dmaap-client/src/main/java/org/opendaylight/transportpce/dmaap/client/impl/DmaapClientProvider.java b/dmaap-client/src/main/java/org/opendaylight/transportpce/dmaap/client/impl/DmaapClientProvider.java
index 482a46b78..51742f2c8 100644
--- a/dmaap-client/src/main/java/org/opendaylight/transportpce/dmaap/client/impl/DmaapClientProvider.java
+++ b/dmaap-client/src/main/java/org/opendaylight/transportpce/dmaap/client/impl/DmaapClientProvider.java
@@ -11,32 +11,40 @@ import org.opendaylight.mdsal.binding.api.NotificationService;
 import org.opendaylight.transportpce.dmaap.client.listener.NbiNotificationsListenerImpl;
 import org.opendaylight.yang.gen.v1.nbi.notifications.rev211013.NbiNotificationsListener;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.metatype.annotations.AttributeDefinition;
+import org.osgi.service.metatype.annotations.ObjectClassDefinition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@Component(configurationPid = "org.opendaylight.transportpce.dmaap")
 public class DmaapClientProvider {
+
+    @ObjectClassDefinition
+    public @interface Configuration {
+        @AttributeDefinition
+        String dmaapBaseUrl() default "http://localhost:8080";
+        @AttributeDefinition
+        String dmaapUsername() default "";
+        @AttributeDefinition
+        String dmaapPassword() default "";
+    }
+
     private static final Logger LOG = LoggerFactory.getLogger(DmaapClientProvider.class);
     private ListenerRegistration<NbiNotificationsListener> listenerRegistration;
-    private NotificationService notificationService;
-    private final String baseUrl;
-    private final String username;
-    private final String password;
 
-    public DmaapClientProvider(NotificationService notificationService, String baseUrl,
-            String username, String password) {
-        this.notificationService = notificationService;
-        this.baseUrl = baseUrl;
-        this.username = username;
-        this.password = password;
+    @Activate
+    public DmaapClientProvider(@Reference NotificationService notificationService, Configuration config) {
+        this(notificationService, config.dmaapBaseUrl(), config.dmaapUsername(), config.dmaapPassword());
     }
 
-    /**
-     * Method called when the blueprint container is created.
-     */
-    public void init() {
-        LOG.info("DmaapClientProvider Session Initiated");
+    public DmaapClientProvider(NotificationService notificationService, String baseUrl,
+            String username, String password) {
         listenerRegistration = notificationService.registerNotificationListener(
                 new NbiNotificationsListenerImpl(baseUrl, username, password));
+        LOG.info("DmaapClientProvider Session Initiated");
     }
 
     /**
@@ -46,5 +54,4 @@ public class DmaapClientProvider {
         listenerRegistration.close();
         LOG.info("DmaapClientProvider Closed");
     }
-
 }
diff --git a/dmaap-client/src/main/resources/OSGI-INF/blueprint/dmaap-blueprint.xml b/dmaap-client/src/main/resources/OSGI-INF/blueprint/dmaap-blueprint.xml
deleted file mode 100644
index ece6f2140..000000000
--- a/dmaap-client/src/main/resources/OSGI-INF/blueprint/dmaap-blueprint.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!-- Copyright © 2021 Orange and others. All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution,
-    and is available at http://www.eclipse.org/legal/epl-v10.html -->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0">
-    <cm:property-placeholder persistent-id="org.opendaylight.transportpce.dmaap" update-strategy="reload">
-        <cm:default-properties>
-            <cm:property name="dmaap.baseUrl" value="http://localhost:8080" />
-            <cm:property name="dmaap.username" value="" />
-             <cm:property name="dmaap.password" value="" />
-        </cm:default-properties>
-    </cm:property-placeholder>
-    <reference id="notificationService" interface="org.opendaylight.mdsal.binding.api.NotificationService"/>
-
-    <bean id="provider"
-          class="org.opendaylight.transportpce.dmaap.client.impl.DmaapClientProvider"
-          init-method="init" destroy-method="close">
-        <argument ref="notificationService" />
-        <argument value="${dmaap.baseUrl}" />
-        <argument value="${dmaap.username}" />
-        <argument value="${dmaap.password}" />
-    </bean>
-</blueprint>
diff --git a/dmaap-client/src/test/java/org/opendaylight/transportpce/dmaap/client/impl/DmaapClientProviderTest.java b/dmaap-client/src/test/java/org/opendaylight/transportpce/dmaap/client/impl/DmaapClientProviderTest.java
index 6c66201aa..79f7edcf3 100644
--- a/dmaap-client/src/test/java/org/opendaylight/transportpce/dmaap/client/impl/DmaapClientProviderTest.java
+++ b/dmaap-client/src/test/java/org/opendaylight/transportpce/dmaap/client/impl/DmaapClientProviderTest.java
@@ -31,11 +31,9 @@ public class DmaapClientProviderTest {
 
     @Test
     void testInitRegisterNbiNotificationsToRpcRegistry() {
-        DmaapClientProvider provider =
-            new DmaapClientProvider(notificationService, "http://localhost", "username", "password");
-        provider.init();
-        (verify(notificationService, times(1)))
-                .registerNotificationListener(Mockito.any(NbiNotificationsListenerImpl.class));
+        new DmaapClientProvider(notificationService, "http://localhost", "username", "password");
+        verify(notificationService, times(1))
+            .registerNotificationListener(Mockito.any(NbiNotificationsListenerImpl.class));
     }
 
 }
-- 
2.36.6