1 files changed, 21 insertions, 11 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/usersadmin/AuditUserAccessEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/usersadmin/AuditUserAccessEventFactory.java
index 4f97ae12c9..758e5858c9 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/usersadmin/AuditUserAccessEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/usersadmin/AuditUserAccessEventFactory.java
@@ -9,26 +9,36 @@ import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 
 public class AuditUserAccessEventFactory extends AuditBaseEventFactory {
 
-    protected final static String LOG_STR = "ACTION = \"%s\" USER = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
-
+    private final static String LOG_STR = "ACTION = \"%s\" USER = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
     private final UserAccessEvent event;
 
+    public AuditUserAccessEventFactory(CommonAuditData commonFields, User user) {
+        this(commonFields, AuditBaseEventFactory.buildUserName(user));
+    }
 
-    @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getUserUid(), event.getStatus(), event.getDesc());
+    public AuditUserAccessEventFactory(CommonAuditData commonFields, String user, String timestamp) {
+        this(commonFields, user);
+        this.event.setTimestamp1(timestamp);
     }
 
-    @Override
-    public AuditingGenericEvent getDbEvent() {
-        return event;
+    private AuditUserAccessEventFactory(CommonAuditData commonFields, String user) {
+        super(AuditingActionEnum.USER_ACCESS);
+        event = new UserAccessEvent(getAction().getName(), commonFields, user);
     }
 
+    @Override
+    public String getLogPattern() {
+        return LOG_STR;
+    }
 
-    public AuditUserAccessEventFactory(CommonAuditData commonFields, User user) {
-        super(AuditingActionEnum.USER_ACCESS);
-        event = new UserAccessEvent(getAction().getName(), commonFields, AuditBaseEventFactory.buildUserName(user));
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getUserUid(), event.getStatus(), event.getDesc()};
     }
 
+    @Override
+    public AuditingGenericEvent getDbEvent() {
+        return event;
+    }
 
 }