From db624d26df35260b2588160e36d9568913cad9e3 Mon Sep 17 00:00:00 2001
From: pramilaniroshan <pramila@entgra.io>
Date: Mon, 6 Feb 2023 11:06:05 +0530
Subject: [PATCH] Add Entgra Device Notification Logger

---
 .../org.wso2.carbon.device.mgt.core/pom.xml           |  8 +++++++-
 .../mgt/NotificationManagementServiceImpl.java        |  9 +++++----
 .../logger/io.entgra.notification.logger/pom.xml      | 11 +++++------
 components/logger/pom.xml                             |  2 +-
 pom.xml                                               |  5 +++++
 5 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
index aa41e41e30..491d213d9a 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
@@ -112,7 +112,9 @@
                             org.wso2.carbon.event.processor.stub,
                             org.wso2.carbon.identity.jwt.client.extension.service,
                             org.apache.commons.codec.binary,
-                            io.entgra.server.bootup.heartbeat.beacon
+                            io.entgra.server.bootup.heartbeat.beacon,
+                            io.entgra.device.mgt.extensions.logger.*,
+                            io.entgra.logger.*,
                         </Import-Package>
                         <Export-Package>
                             !org.wso2.carbon.device.mgt.core.internal,
@@ -347,6 +349,10 @@
             <artifactId>okhttp</artifactId>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>io.entgra.notification.logger</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/notification/mgt/NotificationManagementServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/notification/mgt/NotificationManagementServiceImpl.java
index 3371f8d804..0e7867b0d1 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/notification/mgt/NotificationManagementServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/notification/mgt/NotificationManagementServiceImpl.java
@@ -18,8 +18,9 @@
 
 package org.wso2.carbon.device.mgt.core.notification.mgt;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import io.entgra.device.mgt.extensions.logger.spi.EntgraLogger;
+import io.entgra.notification.logger.DeviceLogContext;
+import io.entgra.notification.logger.impl.EntgraLoggerImpl;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
@@ -45,8 +46,8 @@ import java.util.List;
  */
 public class NotificationManagementServiceImpl implements NotificationManagementService {
 
-    private static final Log log = LogFactory.getLog(NotificationManagementServiceImpl.class);
-
+    private static final EntgraLogger log = new EntgraLoggerImpl(NotificationManagementServiceImpl.class);
+    DeviceLogContext.Builder deviceLogContexBuilder = new DeviceLogContext.Builder();
     private NotificationDAO notificationDAO;
 
     public NotificationManagementServiceImpl() {
diff --git a/components/logger/io.entgra.notification.logger/pom.xml b/components/logger/io.entgra.notification.logger/pom.xml
index ced09b3157..6b96ad58c2 100644
--- a/components/logger/io.entgra.notification.logger/pom.xml
+++ b/components/logger/io.entgra.notification.logger/pom.xml
@@ -25,17 +25,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>logger</artifactId>
-        <version>5.0.16-SNAPSHOT</version>
+        <version>5.0.17-SNAPSHOT</version>
     </parent>
 
     <artifactId>io.entgra.notification.logger</artifactId>
     <packaging>bundle</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
-            <artifactId>io.entgra.device.mgt.extensions.logger</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.logging</artifactId>
@@ -45,8 +41,11 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>io.entgra.device.mgt.extensions.logger</artifactId>
+        </dependency>
     </dependencies>
-    <version>5.0.16-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
diff --git a/components/logger/pom.xml b/components/logger/pom.xml
index b65b0e419d..4312ce069a 100644
--- a/components/logger/pom.xml
+++ b/components/logger/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>carbon-devicemgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>5.0.16-SNAPSHOT</version>
+        <version>5.0.17-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index b55d87112c..d8dcfcc2e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -349,6 +349,11 @@
                 <artifactId>org.wso2.carbon.apimgt.keymgt.extension.api</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.devicemgt</groupId>
+                <artifactId>io.entgra.notification.logger</artifactId>
+                <version>${carbon.device.mgt.version}</version>
+            </dependency>
             <!-- Device Management dependencies -->
 
             <!-- Governance dependencies -->