Update Logging Specifications

[clamp.git] / src / main / java / org / onap / clamp / clds / util / LoggingUtils.java

diff --git a/src/main/java/org/onap/clamp/clds/util/LoggingUtils.java b/src/main/java/org/onap/clamp/clds/util/LoggingUtils.java
index a20a700..cdb2e29 100644 (file)
--- a/src/main/java/org/onap/clamp/clds/util/LoggingUtils.java
+++ b/src/main/java/org/onap/clamp/clds/util/LoggingUtils.java
@@ -45,7 +45,6 @@ import org.slf4j.event.Level;
 import org.springframework.security.core.context.SecurityContextHolder;\r
 \r
 import org.onap.clamp.clds.service.DefaultUserNameHandler;\r
-import org.onap.logging.ref.slf4j.ONAPLogConstants;\r
 \r
 /**\r
  * This class handles the special info that appear in the log, like RequestID,\r
@@ -58,8 +57,6 @@ public class LoggingUtils {
 \r
     /** String constant for messages <tt>ENTERING</tt>, <tt>EXITING</tt>, etc. */\r
     private static final String EMPTY_MESSAGE = "";\r
-    private static final String INVOCATIONID_OUT = "InvocationIDOut";\r
-    private static final String TARGET_ENTITY = "TargetEngity";\r
 \r
     /** Logger delegate. */\r
     private EELFLogger mLogger;\r
@@ -209,8 +206,8 @@ public class LoggingUtils {
                        serviceName.equalsIgnoreCase(EMPTY_MESSAGE)) {\r
             MDC.put(ONAPLogConstants.MDCs.SERVICE_NAME, request.getRequestURI());\r
         }\r
-        \r
-        this.mLogger.info("ENTRY");\r
+\r
+        this.mLogger.info(ONAPLogConstants.Markers.ENTRY);\r
     }\r
 \r
     /**\r
@@ -224,7 +221,7 @@ public class LoggingUtils {
             MDC.put(ONAPLogConstants.MDCs.RESPONSE_DESCRIPTION, defaultToEmpty(descrption));\r
             MDC.put(ONAPLogConstants.MDCs.RESPONSE_SEVERITY, defaultToEmpty(severity));\r
             MDC.put(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE, defaultToEmpty(status));\r
-            this.mLogger.info("EXIT");\r
+            this.mLogger.info(ONAPLogConstants.Markers.EXIT);\r
         }\r
         finally {\r
             MDC.clear();\r
@@ -255,13 +252,13 @@ public class LoggingUtils {
         // Log INVOKE*, with the invocationID as the message body.\r
         // (We didn't really want this kind of behavior in the standard,\r
         // but is it worse than new, single-message MDC?)\r
-        this.mLogger.info("INVOKE");\r
-        this.mLogger.info("INVOKE-" + ONAPLogConstants.InvocationMode.SYNCHRONOUS.toString() + "{"+ invocationID +"}");\r
+        this.mLogger.info(ONAPLogConstants.Markers.INVOKE);\r
+        this.mLogger.info(ONAPLogConstants.Markers.INVOKE_SYNC + "{"+ invocationID +"}");\r
         return con;\r
     }\r
     public void invokeReturn() {\r
         // Add the Invoke-return marker and clear the needed MDC\r
-        this.mLogger.info("INVOKE-RETURN");\r
+        this.mLogger.info(ONAPLogConstants.Markers.INVOKE_RETURN);\r
         invokeReturnContext();\r
     }\r
 \r
@@ -313,9 +310,9 @@ public class LoggingUtils {
      * @param invocationId The invocation ID\r
      */\r
     private void invokeContext (String targetEntity, String targetServiceName, String invocationID) {\r
-        MDC.put(TARGET_ENTITY, defaultToEmpty(targetEntity));\r
+        MDC.put(ONAPLogConstants.MDCs.TARGET_ENTITY, defaultToEmpty(targetEntity));\r
         MDC.put(ONAPLogConstants.MDCs.TARGET_SERVICE_NAME, defaultToEmpty(targetServiceName));\r
-        MDC.put(INVOCATIONID_OUT, invocationID);\r
+        MDC.put(ONAPLogConstants.MDCs.INVOCATIONID_OUT, invocationID);\r
         MDC.put(ONAPLogConstants.MDCs.INVOKE_TIMESTAMP,\r
                 ZonedDateTime.now(ZoneOffset.UTC)\r
                         .format(DateTimeFormatter.ISO_INSTANT));\r
@@ -326,8 +323,8 @@ public class LoggingUtils {
      *\r
      */\r
     private void invokeReturnContext () {\r
-        MDC.remove(TARGET_ENTITY);\r
+        MDC.remove(ONAPLogConstants.MDCs.TARGET_ENTITY);\r
         MDC.remove(ONAPLogConstants.MDCs.TARGET_SERVICE_NAME);\r
-        MDC.remove(INVOCATIONID_OUT);\r
+        MDC.remove(ONAPLogConstants.MDCs.INVOCATIONID_OUT);\r
     }\r
 }\r