X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fcontroller%2FExternalAccessRolesController.java;h=f9c36af1c2f7afe24bc0feeb17639c0e62a3c992;hb=54c5ed82662ef681375675e58abc8058e3203466;hp=67e71c501f6ce25a41652f8a94c72fb199e557d5;hpb=ce34d843f7e16ecddc839ee9976b4652bfdde571;p=portal.git

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/ExternalAccessRolesController.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/ExternalAccessRolesController.java
index 67e71c50..f9c36af1 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/ExternalAccessRolesController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/ExternalAccessRolesController.java
@@ -412,17 +412,10 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 								PortalConstants.AUDIT_LOG_COMMENT_SIZE));
 				auditLog.setAffectedRecordId(user.getOrgUserId());
 				auditService.logActivity(auditLog, null);
-				MDC.put(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP, EPEELFLoggerAdvice.getCurrentDateTimeUTC());
-				MDC.put(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP, EPEELFLoggerAdvice.getCurrentDateTimeUTC());
-				EcompPortalUtils.calculateDateTimeDifferenceForLog(
-						MDC.get(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP),
-						MDC.get(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP));
-				logger.info(EELFLoggerDelegate.auditLogger,
-						EPLogUtil.formatAuditLogMessage("ExternalAccessRolesController.saveRoleFunction", activityCode,
-								String.valueOf(user.getId()), user.getOrgUserId(), availableRoleFunction.getCode()));
-				MDC.remove(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP);
-				MDC.remove(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP);
-				MDC.remove(SystemProperties.MDC_TIMER);
+				String auditMessageInfo = EPLogUtil.formatAuditLogMessage("ExternalAccessRolesController.saveRoleFunction", activityCode,
+						String.valueOf(user.getId()), user.getOrgUserId(), availableRoleFunction.getCode());		
+				EPLogUtil.logAuditMessage(logger, auditMessageInfo);	
+				
 			} else {
 				logger.error(EELFLoggerDelegate.errorLogger, "saveRoleFunction failed");
 				return new PortalRestResponse<>(PortalRestStatusEnum.ERROR,
@@ -465,18 +458,11 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 						PortalConstants.AUDIT_LOG_COMMENT_SIZE));
 				auditLog.setAffectedRecordId(user.getOrgUserId());
 				auditService.logActivity(auditLog, null);
-				MDC.put(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP, EPEELFLoggerAdvice.getCurrentDateTimeUTC());
-				MDC.put(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP, EPEELFLoggerAdvice.getCurrentDateTimeUTC());
-				EcompPortalUtils.calculateDateTimeDifferenceForLog(
-						MDC.get(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP),
-						MDC.get(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP));
-				logger.info(EELFLoggerDelegate.auditLogger,
-						EPLogUtil.formatAuditLogMessage("ExternalAccessRolesController.deleteRoleFunction",
-								EcompAuditLog.CD_ACTIVITY_EXTERNAL_AUTH_DELETE_FUNCTION, String.valueOf(user.getId()),
-								user.getOrgUserId(), code));
-				MDC.remove(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP);
-				MDC.remove(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP);
-				MDC.remove(SystemProperties.MDC_TIMER);
+				String auditMessageInfo = EPLogUtil.formatAuditLogMessage("ExternalAccessRolesController.deleteRoleFunction",
+						EcompAuditLog.CD_ACTIVITY_EXTERNAL_AUTH_DELETE_FUNCTION, String.valueOf(user.getId()),
+						user.getOrgUserId(), code);		
+				EPLogUtil.logAuditMessage(logger, auditMessageInfo);	
+				
 			} else {
 				logger.error(EELFLoggerDelegate.errorLogger, "deleteRoleFunction failed");
 				return new PortalRestResponse<>(PortalRestStatusEnum.ERROR,
@@ -521,17 +507,10 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 						PortalConstants.AUDIT_LOG_COMMENT_SIZE));
 				auditLog.setAffectedRecordId(user.getOrgUserId());
 				auditService.logActivity(auditLog, null);
-				MDC.put(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP, EPEELFLoggerAdvice.getCurrentDateTimeUTC());
-				MDC.put(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP, EPEELFLoggerAdvice.getCurrentDateTimeUTC());
-				EcompPortalUtils.calculateDateTimeDifferenceForLog(
-						MDC.get(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP),
-						MDC.get(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP));
-				logger.info(EELFLoggerDelegate.auditLogger,
-						EPLogUtil.formatAuditLogMessage("ExternalAccessRolesController.saveRole", activityCode,
-								String.valueOf(user.getId()), user.getOrgUserId(), role.getName()));
-				MDC.remove(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP);
-				MDC.remove(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP);
-				MDC.remove(SystemProperties.MDC_TIMER);
+				String auditMessageInfo = EPLogUtil.formatAuditLogMessage("ExternalAccessRolesController.saveRole", activityCode,
+						String.valueOf(user.getId()), user.getOrgUserId(), role.getName());		
+				EPLogUtil.logAuditMessage(logger, auditMessageInfo);	
+				
 			} else {
 				if(saveRoleResult.getDetailMessage().contains("406")){
 					response.setStatus(HttpServletResponse.SC_NOT_ACCEPTABLE);
@@ -582,18 +561,11 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 						PortalConstants.AUDIT_LOG_COMMENT_SIZE));
 				auditLog.setAffectedRecordId(user.getOrgUserId());
 				auditService.logActivity(auditLog, null);
-				MDC.put(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP, EPEELFLoggerAdvice.getCurrentDateTimeUTC());
-				MDC.put(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP, EPEELFLoggerAdvice.getCurrentDateTimeUTC());
-				EcompPortalUtils.calculateDateTimeDifferenceForLog(
-						MDC.get(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP),
-						MDC.get(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP));
-				logger.info(EELFLoggerDelegate.auditLogger,
-						EPLogUtil.formatAuditLogMessage("ExternalAccessRolesController.deleteRole",
-								EcompAuditLog.CD_ACTIVITY_EXTERNAL_AUTH_DELETE_ROLE, String.valueOf(user.getId()),
-								user.getOrgUserId(), code));
-				MDC.remove(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP);
-				MDC.remove(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP);
-				MDC.remove(SystemProperties.MDC_TIMER);
+				String auditMessageInfo = EPLogUtil.formatAuditLogMessage("ExternalAccessRolesController.deleteRole",
+						EcompAuditLog.CD_ACTIVITY_EXTERNAL_AUTH_DELETE_ROLE, String.valueOf(user.getId()),
+						user.getOrgUserId(), code);		
+				EPLogUtil.logAuditMessage(logger, auditMessageInfo);	
+				
 			} else {
 				logger.error(EELFLoggerDelegate.errorLogger, "deleteRole failed");
 				return new PortalRestResponse<>(PortalRestStatusEnum.ERROR,