Merge branch 'master' of https://repository.entgra.net/community/device-mgt-core

components/logger/io.entgra.device.mgt.core.notification.logger/src/main/java/io/entgra/device/mgt/core/notification/logger/impl/EntgraDeviceLoggerImpl.java

@@ -35,63 +35,24 @@ public class EntgraDeviceLoggerImpl implements EntgraLogger {
         log = LogFactory.getLog(clazz);
     }
 
-    @Override
-    public void info(Object object, LogContext logContext) {
-    }
-
-    @Override
-    public void info(Object object, Throwable t, LogContext logContext) {
-    }
-
-    @Override
-    public void debug(Object object, LogContext logContext) {
-    }
-
-    @Override
-    public void debug(Object object, Throwable t, LogContext logContext) {
-    }
-
-    @Override
-    public void error(Object object, LogContext logContext) {
-    }
-
-    @Override
-    public void error(Object object, Throwable t, LogContext logContext) {
-    }
-
-    @Override
-    public void fatal(Object object, LogContext logContext) {
-    }
-
-    @Override
-    public void fatal(Object object, Throwable t, LogContext logContext) {
-    }
-
-    @Override
-    public void trace(Object object, LogContext logContext) {
-
-    }
-
-    @Override
-    public void trace(Object object, Throwable t, LogContext logContext) {
-
-    }
-
-    @Override
-    public void warn(Object object, LogContext logContext) {
-    }
-
-    @Override
-    public void warn(Object object, Throwable t, LogContext logContext) {
-    }
-
     public void info(String message) {
+        log.info(message);
     }
 
     public void info(String message, Throwable t) {
         log.info(message, t);
     }
 
+    @Override
+    public void info(Object o) {
+        log.info(o);
+    }
+
+    @Override
+    public void info(Object o, Throwable throwable) {
+        log.info(o, throwable);
+    }
+
     @Override
     public void info(String message, LogContext logContext) {
         DeviceLogContext deviceLogContext = (DeviceLogContext) logContext;
@@ -99,16 +60,39 @@ public class EntgraDeviceLoggerImpl implements EntgraLogger {
         log.info(message);
     }
 
+    @Override
+    public void info(Object object, LogContext logContext) {
+        DeviceLogContext deviceLogContext = (DeviceLogContext) logContext;
+        MDCContextUtil.populateDeviceMDCContext(deviceLogContext);
+        log.info(object);
+    }
+
+    @Override
+    public void info(Object object, Throwable t, LogContext logContext) {
+        DeviceLogContext deviceLogContext = (DeviceLogContext) logContext;
+        MDCContextUtil.populateDeviceMDCContext(deviceLogContext);
+        log.info(object, t);
+    }
+
 
     public void debug(String message) {
         log.debug(message);
     }
 
-
     public void debug(String message, Throwable t) {
         log.debug(message, t);
     }
 
+    @Override
+    public void debug(Object o) {
+        log.debug(o);
+    }
+
+    @Override
+    public void debug(Object o, Throwable throwable) {
+        log.debug(o, throwable);
+    }
+
     @Override
     public void debug(String message, LogContext logContext) {
         DeviceLogContext deviceLogContext = (DeviceLogContext) logContext;
@@ -116,15 +100,39 @@ public class EntgraDeviceLoggerImpl implements EntgraLogger {
         log.debug(message);
     }
 
+    @Override
+    public void debug(Object object, LogContext logContext) {
+        DeviceLogContext deviceLogContext = (DeviceLogContext) logContext;
+        MDCContextUtil.populateDeviceMDCContext(deviceLogContext);
+        log.debug(object);
+    }
+
+    @Override
+    public void debug(Object object, Throwable t, LogContext logContext) {
+        DeviceLogContext deviceLogContext = (DeviceLogContext) logContext;
+        MDCContextUtil.populateDeviceMDCContext(deviceLogContext);
+        log.debug(object, t);
+    }
+
+
     public void error(String message) {
         log.error(message);
     }
 
-
     public void error(String message, Throwable t) {
         log.error(message, t);
     }
 
+    @Override
+    public void error(Object o) {
+        log.error(o);
+    }
+
+    @Override
+    public void error(Object o, Throwable throwable) {
+        log.error(o, throwable);
+    }
+
     @Override
     public void error(String message, LogContext logContext) {
         DeviceLogContext deviceLogContext = (DeviceLogContext) logContext;
@@ -139,16 +147,39 @@ public class EntgraDeviceLoggerImpl implements EntgraLogger {
         log.error(message, t);
     }
 
+    @Override
+    public void error(Object object, LogContext logContext) {
+        DeviceLogContext deviceLogContext = (DeviceLogContext) logContext;
+        MDCContextUtil.populateDeviceMDCContext(deviceLogContext);
+        log.error(object);
+    }
+
+    @Override
+    public void error(Object object, Throwable t, LogContext logContext) {
+        DeviceLogContext deviceLogContext = (DeviceLogContext) logContext;
+        MDCContextUtil.populateDeviceMDCContext(deviceLogContext);
+        log.error(object, t);
+    }
+
 
     public void warn(String message) {
         log.warn(message);
     }
 
-
     public void warn(String message, Throwable t) {
         log.warn(message, t);
     }
 
+    @Override
+    public void warn(Object o) {
+        log.warn(o);
+    }
+
+    @Override
+    public void warn(Object o, Throwable throwable) {
+        log.warn(o, throwable);
+    }
+
     @Override
     public void warn(String message, LogContext logContext) {
         DeviceLogContext deviceLogContext = (DeviceLogContext) logContext;
@@ -163,16 +194,39 @@ public class EntgraDeviceLoggerImpl implements EntgraLogger {
         log.warn(message, t);
     }
 
+    @Override
+    public void warn(Object object, LogContext logContext) {
+        DeviceLogContext deviceLogContext = (DeviceLogContext) logContext;
+        MDCContextUtil.populateDeviceMDCContext(deviceLogContext);
+        log.warn(object);
+    }
+
+    @Override
+    public void warn(Object object, Throwable t, LogContext logContext) {
+        DeviceLogContext deviceLogContext = (DeviceLogContext) logContext;
+        MDCContextUtil.populateDeviceMDCContext(deviceLogContext);
+        log.warn(object, t);
+    }
+
 
     public void trace(String message) {
         log.trace(message);
     }
 
-
     public void trace(String message, Throwable t) {
         log.trace(message, t);
     }
 
+    @Override
+    public void trace(Object o) {
+        log.trace(o);
+    }
+
+    @Override
+    public void trace(Object o, Throwable throwable) {
+        log.trace(o, throwable);
+    }
+
     @Override
     public void trace(String message, LogContext logContext) {
         DeviceLogContext deviceLogContext = (DeviceLogContext) logContext;
@@ -180,43 +234,29 @@ public class EntgraDeviceLoggerImpl implements EntgraLogger {
         log.trace(message);
     }
 
+    @Override
+    public void trace(Object object, LogContext logContext) {
+        DeviceLogContext deviceLogContext = (DeviceLogContext) logContext;
+        MDCContextUtil.populateDeviceMDCContext(deviceLogContext);
+        log.trace(object);
+    }
+
+    @Override
+    public void trace(Object object, Throwable t, LogContext logContext) {
+        DeviceLogContext deviceLogContext = (DeviceLogContext) logContext;
+        MDCContextUtil.populateDeviceMDCContext(deviceLogContext);
+        log.trace(object, t);
+    }
+
 
     public void fatal(String message) {
         log.fatal(message);
     }
 
-
     public void fatal(String message, Throwable t) {
         log.fatal(message, t);
     }
 
-    @Override
-    public void fatal(String message, LogContext logContext) {
-        DeviceLogContext deviceLogContext = (DeviceLogContext) logContext;
-        MDCContextUtil.populateDeviceMDCContext(deviceLogContext);
-        log.fatal(message);
-    }
-
-    @Override
-    public void debug(Object o) {
-        log.debug(o);
-    }
-
-    @Override
-    public void debug(Object o, Throwable throwable) {
-        log.debug(o, throwable);
-    }
-
-    @Override
-    public void error(Object o) {
-        log.error(o);
-    }
-
-    @Override
-    public void error(Object o, Throwable throwable) {
-        log.error(o, throwable);
-    }
-
     @Override
     public void fatal(Object o) {
         log.fatal(0);
@@ -228,13 +268,24 @@ public class EntgraDeviceLoggerImpl implements EntgraLogger {
     }
 
     @Override
-    public void info(Object o) {
+    public void fatal(String message, LogContext logContext) {
-        log.info(o);
+        DeviceLogContext deviceLogContext = (DeviceLogContext) logContext;
+        MDCContextUtil.populateDeviceMDCContext(deviceLogContext);
+        log.fatal(message);
     }
 
     @Override
-    public void info(Object o, Throwable throwable) {
+    public void fatal(Object object, LogContext logContext) {
-        log.info(o, throwable);
+        DeviceLogContext deviceLogContext = (DeviceLogContext) logContext;
+        MDCContextUtil.populateDeviceMDCContext(deviceLogContext);
+        log.fatal(object);
+    }
+
+    @Override
+    public void fatal(Object object, Throwable t, LogContext logContext) {
+        DeviceLogContext deviceLogContext = (DeviceLogContext) logContext;
+        MDCContextUtil.populateDeviceMDCContext(deviceLogContext);
+        log.fatal(object, t);
     }
 
     @Override
@@ -267,26 +318,6 @@ public class EntgraDeviceLoggerImpl implements EntgraLogger {
         return log.isWarnEnabled();
     }
 
-    @Override
-    public void trace(Object o) {
-        log.trace(o);
-    }
-
-    @Override
-    public void trace(Object o, Throwable throwable) {
-        log.trace(o, throwable);
-    }
-
-    @Override
-    public void warn(Object o) {
-        log.warn(o);
-    }
-
-    @Override
-    public void warn(Object o, Throwable throwable) {
-        log.warn(o, throwable);
-    }
-
     @Override
     public void clearLogContext() {
         MDC.clear();

components/logger/io.entgra.device.mgt.core.notification.logger/src/main/java/io/entgra/device/mgt/core/notification/logger/impl/EntgraUserLoggerImpl.java

@@ -35,63 +35,24 @@ public class EntgraUserLoggerImpl implements EntgraLogger {
         log = LogFactory.getLog(clazz);
     }
 
-    @Override
-    public void info(Object object, LogContext logContext) {
-    }
-
-    @Override
-    public void info(Object object, Throwable t, LogContext logContext) {
-    }
-
-    @Override
-    public void debug(Object object, LogContext logContext) {
-    }
-
-    @Override
-    public void debug(Object object, Throwable t, LogContext logContext) {
-    }
-
-    @Override
-    public void error(Object object, LogContext logContext) {
-    }
-
-    @Override
-    public void error(Object object, Throwable t, LogContext logContext) {
-    }
-
-    @Override
-    public void fatal(Object object, LogContext logContext) {
-    }
-
-    @Override
-    public void fatal(Object object, Throwable t, LogContext logContext) {
-    }
-
-    @Override
-    public void trace(Object object, LogContext logContext) {
-
-    }
-
-    @Override
-    public void trace(Object object, Throwable t, LogContext logContext) {
-
-    }
-
-    @Override
-    public void warn(Object object, LogContext logContext) {
-    }
-
-    @Override
-    public void warn(Object object, Throwable t, LogContext logContext) {
-    }
-
     public void info(String message) {
+        log.info(message);
     }
 
     public void info(String message, Throwable t) {
         log.info(message, t);
     }
 
+    @Override
+    public void info(Object o) {
+        log.info(o);
+    }
+
+    @Override
+    public void info(Object o, Throwable throwable) {
+        log.info(o, throwable);
+    }
+
     @Override
     public void info(String message, LogContext logContext) {
         UserLogContext userLogContext = (UserLogContext) logContext;
@@ -99,16 +60,39 @@ public class EntgraUserLoggerImpl implements EntgraLogger {
         log.info(message);
     }
 
+    @Override
+    public void info(Object object, LogContext logContext) {
+        UserLogContext userLogContext = (UserLogContext) logContext;
+        MDCContextUtil.populateUserMDCContext(userLogContext);
+        log.info(object);
+    }
+
+    @Override
+    public void info(Object object, Throwable t, LogContext logContext) {
+        UserLogContext userLogContext = (UserLogContext) logContext;
+        MDCContextUtil.populateUserMDCContext(userLogContext);
+        log.info(object, t);
+    }
+
 
     public void debug(String message) {
         log.debug(message);
     }
 
-
     public void debug(String message, Throwable t) {
         log.debug(message, t);
     }
 
+    @Override
+    public void debug(Object o) {
+        log.debug(o);
+    }
+
+    @Override
+    public void debug(Object o, Throwable throwable) {
+        log.debug(o, throwable);
+    }
+
     @Override
     public void debug(String message, LogContext logContext) {
         UserLogContext userLogContext = (UserLogContext) logContext;
@@ -116,15 +100,39 @@ public class EntgraUserLoggerImpl implements EntgraLogger {
         log.debug(message);
     }
 
+    @Override
+    public void debug(Object object, LogContext logContext) {
+        UserLogContext userLogContext = (UserLogContext) logContext;
+        MDCContextUtil.populateUserMDCContext(userLogContext);
+        log.debug(object);
+    }
+
+    @Override
+    public void debug(Object object, Throwable t, LogContext logContext) {
+        UserLogContext userLogContext = (UserLogContext) logContext;
+        MDCContextUtil.populateUserMDCContext(userLogContext);
+        log.debug(object, t);
+    }
+
+
     public void error(String message) {
         log.error(message);
     }
 
-
     public void error(String message, Throwable t) {
         log.error(message, t);
     }
 
+    @Override
+    public void error(Object o) {
+        log.error(o);
+    }
+
+    @Override
+    public void error(Object o, Throwable throwable) {
+        log.error(o, throwable);
+    }
+
     @Override
     public void error(String message, LogContext logContext) {
         UserLogContext userLogContext = (UserLogContext) logContext;
@@ -139,16 +147,39 @@ public class EntgraUserLoggerImpl implements EntgraLogger {
         log.error(message, t);
     }
 
+    @Override
+    public void error(Object object, LogContext logContext) {
+        UserLogContext userLogContext = (UserLogContext) logContext;
+        MDCContextUtil.populateUserMDCContext(userLogContext);
+        log.error(object);
+    }
+
+    @Override
+    public void error(Object object, Throwable t, LogContext logContext) {
+        UserLogContext userLogContext = (UserLogContext) logContext;
+        MDCContextUtil.populateUserMDCContext(userLogContext);
+        log.error(object, t);
+    }
+
 
     public void warn(String message) {
         log.warn(message);
     }
 
-
     public void warn(String message, Throwable t) {
         log.warn(message, t);
     }
 
+    @Override
+    public void warn(Object o) {
+        log.warn(o);
+    }
+
+    @Override
+    public void warn(Object o, Throwable throwable) {
+        log.warn(o, throwable);
+    }
+
     @Override
     public void warn(String message, LogContext logContext) {
         UserLogContext userLogContext = (UserLogContext) logContext;
@@ -163,16 +194,38 @@ public class EntgraUserLoggerImpl implements EntgraLogger {
         log.warn(message, t);
     }
 
+    @Override
+    public void warn(Object object, LogContext logContext) {
+        UserLogContext userLogContext = (UserLogContext) logContext;
+        MDCContextUtil.populateUserMDCContext(userLogContext);
+        log.warn(object);
+    }
+
+    @Override
+    public void warn(Object object, Throwable t, LogContext logContext) {
+        UserLogContext userLogContext = (UserLogContext) logContext;
+        MDCContextUtil.populateUserMDCContext(userLogContext);
+        log.warn(object, t);
+    }
 
     public void trace(String message) {
         log.trace(message);
     }
 
-
     public void trace(String message, Throwable t) {
         log.trace(message, t);
     }
 
+    @Override
+    public void trace(Object o) {
+        log.trace(o);
+    }
+
+    @Override
+    public void trace(Object o, Throwable throwable) {
+        log.trace(o, throwable);
+    }
+
     @Override
     public void trace(String message, LogContext logContext) {
         UserLogContext userLogContext = (UserLogContext) logContext;
@@ -180,43 +233,30 @@ public class EntgraUserLoggerImpl implements EntgraLogger {
         log.trace(message);
     }
 
+    @Override
+    public void trace(Object object, LogContext logContext) {
+        UserLogContext userLogContext = (UserLogContext) logContext;
+        MDCContextUtil.populateUserMDCContext(userLogContext);
+        log.trace(object);
+    }
+
+    @Override
+    public void trace(Object object, Throwable t, LogContext logContext) {
+        UserLogContext userLogContext = (UserLogContext) logContext;
+        MDCContextUtil.populateUserMDCContext(userLogContext);
+        log.trace(object, t);
+
+    }
+
 
     public void fatal(String message) {
         log.fatal(message);
     }
 
-
     public void fatal(String message, Throwable t) {
         log.fatal(message, t);
     }
 
-    @Override
-    public void fatal(String message, LogContext logContext) {
-        UserLogContext userLogContext = (UserLogContext) logContext;
-        MDCContextUtil.populateUserMDCContext(userLogContext);
-        log.fatal(message);
-    }
-
-    @Override
-    public void debug(Object o) {
-        log.debug(o);
-    }
-
-    @Override
-    public void debug(Object o, Throwable throwable) {
-        log.debug(o, throwable);
-    }
-
-    @Override
-    public void error(Object o) {
-        log.error(o);
-    }
-
-    @Override
-    public void error(Object o, Throwable throwable) {
-        log.error(o, throwable);
-    }
-
     @Override
     public void fatal(Object o) {
         log.fatal(0);
@@ -228,13 +268,24 @@ public class EntgraUserLoggerImpl implements EntgraLogger {
     }
 
     @Override
-    public void info(Object o) {
+    public void fatal(String message, LogContext logContext) {
-        log.info(o);
+        UserLogContext userLogContext = (UserLogContext) logContext;
+        MDCContextUtil.populateUserMDCContext(userLogContext);
+        log.fatal(message);
     }
 
     @Override
-    public void info(Object o, Throwable throwable) {
+    public void fatal(Object object, LogContext logContext) {
-        log.info(o, throwable);
+        UserLogContext userLogContext = (UserLogContext) logContext;
+        MDCContextUtil.populateUserMDCContext(userLogContext);
+        log.fatal(object);
+    }
+
+    @Override
+    public void fatal(Object object, Throwable t, LogContext logContext) {
+        UserLogContext userLogContext = (UserLogContext) logContext;
+        MDCContextUtil.populateUserMDCContext(userLogContext);
+        log.fatal(object, t);
     }
 
     @Override
@@ -267,26 +318,6 @@ public class EntgraUserLoggerImpl implements EntgraLogger {
         return log.isWarnEnabled();
     }
 
-    @Override
-    public void trace(Object o) {
-        log.trace(o);
-    }
-
-    @Override
-    public void trace(Object o, Throwable throwable) {
-        log.trace(o, throwable);
-    }
-
-    @Override
-    public void warn(Object o) {
-        log.warn(o);
-    }
-
-    @Override
-    public void warn(Object o, Throwable throwable) {
-        log.warn(o, throwable);
-    }
-
     @Override
     public void clearLogContext() {
         MDC.clear();