re base code

[sdc.git] / catalog-be / src / main / java / org / openecomp / sdc / be / auditing / impl / AuditConsumerEventFactory.java

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditConsumerEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditConsumerEventFactory.java
index 01c82e8..81a6e7f 100644 (file)
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditConsumerEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditConsumerEventFactory.java
@@ -9,18 +9,33 @@ import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 
 public class AuditConsumerEventFactory extends AuditBaseEventFactory {
 
-    protected static final String LOG_STR = "ACTION = \"%s\" MODIFIER = \"%s\" ECOMP_USER = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
-
+    private static final String LOG_STR = "ACTION = \"%s\" MODIFIER = \"%s\" ECOMP_USER = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
     private final ConsumerEvent event;
 
     public AuditConsumerEventFactory(AuditingActionEnum action, CommonAuditData commonFields, User modifier, ConsumerDefinition ecompUser) {
+        this(action, commonFields, buildConsumerName(ecompUser), buildUserName(modifier));
+    }
+
+    public AuditConsumerEventFactory(AuditingActionEnum action, CommonAuditData commonFields,
+                                     String ecompUser, String modifier, String timestamp) {
+        this(action, commonFields, ecompUser, modifier);
+        this.event.setTimestamp1(timestamp);
+    }
+
+    private AuditConsumerEventFactory(AuditingActionEnum action, CommonAuditData commonFields,
+                                     String ecompUser, String modifier) {
         super(action);
-        event = new ConsumerEvent(getAction().getName(), commonFields, buildConsumerName(ecompUser), buildUserName(modifier));
+        event = new ConsumerEvent(getAction().getName(), commonFields, ecompUser, modifier);
     }
 
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getModifier(), event.getEcompUser(), event.getStatus(), event.getDesc());
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getModifier(), event.getEcompUser(), event.getStatus(), event.getDesc()};
     }
 
     @Override
@@ -28,8 +43,6 @@ public class AuditConsumerEventFactory extends AuditBaseEventFactory {
         return event;
     }
 
-
-
     static String buildConsumerName(ConsumerDefinition consumer) {
         StringBuilder ecompUser = new StringBuilder();
         if (consumer != null) {