From 36a7dbfd2672ee6629c4b375df2d6982d942fa43 Mon Sep 17 00:00:00 2001 From: "Sotiropoulos, Ioannis (is948x)" Date: Wed, 6 Jun 2018 15:37:35 +0100 Subject: Add tests for X-FromMsId Add tests for X-FromMsId header parameter changes Issue-ID: AAI-1198 Change-Id: I6342cf95e5c635b500245bfa90040376ffa1b992 Signed-off-by: Sotiropoulos, Ioannis (is948x) --- .../java/org/onap/crud/logging/LoggingUtil.java | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'src/main') diff --git a/src/main/java/org/onap/crud/logging/LoggingUtil.java b/src/main/java/org/onap/crud/logging/LoggingUtil.java index f9cb905..31c0c1f 100644 --- a/src/main/java/org/onap/crud/logging/LoggingUtil.java +++ b/src/main/java/org/onap/crud/logging/LoggingUtil.java @@ -37,21 +37,29 @@ public class LoggingUtil { */ public static void initMdcContext(HttpServletRequest httpReq, HttpHeaders headers) { String fromIp = httpReq.getRemoteAddr(); - String fromAppId = ""; - String transId = null; - if (headers.getRequestHeaders().getFirst("X-FromAppId") != null) { + MdcContext.initialize(getTransactionId(headers), CrudServiceConstants.CRD_SERVICE_NAME, "", getAppId(headers), fromIp); + } + + public static String getAppId(HttpHeaders headers) { + String fromAppId = ""; + if (headers.getRequestHeaders().getFirst("X-FromMsId") != null) { + fromAppId = headers.getRequestHeaders().getFirst("X-FromMsId"); + } else if (headers.getRequestHeaders().getFirst("X-FromAppId") != null) { fromAppId = headers.getRequestHeaders().getFirst("X-FromAppId"); } - + return fromAppId; + } + + public static String getTransactionId(HttpHeaders headers) { + String transId = null; if ((headers.getRequestHeaders().getFirst("X-TransactionId") == null) - || headers.getRequestHeaders().getFirst("X-TransactionId").isEmpty()) { + || headers.getRequestHeaders().getFirst("X-TransactionId").isEmpty()) { transId = java.util.UUID.randomUUID().toString(); } else { transId = headers.getRequestHeaders().getFirst("X-TransactionId"); } - - MdcContext.initialize(transId, CrudServiceConstants.CRD_SERVICE_NAME, "", fromAppId, fromIp); + return transId; } /** -- cgit 1.2.3-korg