re base code

Change-Id: I12a5ca14a6d8a87e9316b9ff362eb131105f98a5
Issue-ID: SDC-1566
Signed-off-by: Michael Lando <ml636r@att.com>

64 files changed, 981 insertions, 1461 deletions

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/api/AuditEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/api/AuditEventFactory.java
index 1ea8ff9541..eed347f781 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/api/AuditEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/api/AuditEventFactory.java
@@ -1,10 +1,10 @@
 package org.openecomp.sdc.be.auditing.api;
 
-import java.util.List;
-
 import org.javatuples.Pair;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
 
+import java.util.List;
+
 public interface AuditEventFactory {
 
     String getLogMessage();
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditAuthRequestEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditAuthRequestEventFactory.java
index b68ee0db23..63e55f70f2 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditAuthRequestEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditAuthRequestEventFactory.java
@@ -7,21 +7,30 @@ import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 
 public class AuditAuthRequestEventFactory extends AuditBaseEventFactory {
 
-    private final static String LOG_STR =  "ACTION = \"%s\" URL = \"%s\" USER = \"%s\" AUTH_STATUS = \"%s\" REALM = \"%s\"";
-
-    final private AuthEvent event;
+    private static final String LOG_STR =  "ACTION = \"%s\" URL = \"%s\" USER = \"%s\" AUTH_STATUS = \"%s\" REALM = \"%s\"";
+    private final AuthEvent event;
 
     public AuditAuthRequestEventFactory(CommonAuditData commonFields, String authUser, String authUrl, String realm, String authStatus) {
         super(AuditingActionEnum.AUTH_REQUEST);
         event = new AuthEvent(getAction().getName(), commonFields, authUser, authUrl, realm, authStatus);
     }
 
-    @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getUrl(), event.getUser(), event.getAuthStatus(), event.getRealm());
+    public AuditAuthRequestEventFactory(CommonAuditData commonFields, String authUser, String authUrl, String realm,
+                                        String authStatus, String timestamp) {
+       this(commonFields, authUser, authUrl, realm, authStatus);
+       this.event.setTimestamp1(timestamp);
     }
 
+    @Override
+    public String getLogPattern() {
+        return LOG_STR;
+    }
 
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getUrl(), event.getUser(),
+                event.getAuthStatus(), event.getRealm()};
+    }
 
     @Override
     public AuditingGenericEvent getDbEvent() { return event; }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditBaseEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditBaseEventFactory.java
index 2ccc7910fa..b3769f0d68 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditBaseEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditBaseEventFactory.java
@@ -1,8 +1,5 @@
 package org.openecomp.sdc.be.auditing.impl;
 
-import java.util.Collections;
-import java.util.List;
-
 import org.apache.commons.lang.StringUtils;
 import org.javatuples.Pair;
 import org.openecomp.sdc.be.auditing.api.AuditEventFactory;
@@ -10,17 +7,20 @@ import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.common.api.Constants;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
 public abstract class AuditBaseEventFactory implements AuditEventFactory {
 
-    //TODO imanzon: Check if requestId and serviceInstanceId fields are required for all tables.
-    //Currently they are included even if they ahs null value. If they should not appear then
-    //createTable code should be updated so that they need to be removed from the tables
     private AuditingActionEnum action;
 
     public AuditBaseEventFactory(AuditingActionEnum action) {
-        this.action = action;
+        this.action = Objects.requireNonNull(action);
     }
 
+    public AuditBaseEventFactory() {}
+
     public AuditingActionEnum getAction() {
         return action;
     }
@@ -68,8 +68,8 @@ public abstract class AuditBaseEventFactory implements AuditEventFactory {
     }
 
     protected static String buildUserName(User user) {
-        if (user == null || user.getUserId() == null || user.getUserId().isEmpty()) {
-            return Constants.EMPTY_STRING;
+        if (user == null || StringUtils.isEmpty(user.getUserId())) {
+            return StringUtils.EMPTY;
         }
         StringBuilder sb = new StringBuilder();
         String firstName = replaceNullNameWithEmpty(user.getFirstName());
@@ -85,9 +85,9 @@ public abstract class AuditBaseEventFactory implements AuditEventFactory {
         return sb.toString();
     }
 
-    public static String buildValue(String value) {
+    private static String buildValue(String value) {
         if (value == null) {
-            return Constants.EMPTY_STRING;
+            return StringUtils.EMPTY;
         }
         return value;
     }
@@ -96,7 +96,7 @@ public abstract class AuditBaseEventFactory implements AuditEventFactory {
         if (name != null && !name.trim().contains(Constants.NULL_STRING)) {
             return name;
         }
-        return Constants.EMPTY_STRING;
+        return StringUtils.EMPTY;
     }
 
     @Override
@@ -110,5 +110,22 @@ public abstract class AuditBaseEventFactory implements AuditEventFactory {
         return this.action.getAuditingEsType();
     }
 
+    @Override
+    public final String getLogMessage() {
+       return String.format(getLogPattern(), getLogArgs());
+    }
+
+    private Object[] getLogArgs() {
+        return Arrays.stream(getLogMessageParams())
+                .map(AuditBaseEventFactory::buildValue)
+                .toArray(String[]::new);
+    }
+
+    public abstract String getLogPattern();
+
+    public abstract String[] getLogMessageParams();
+
+
+
 
 }
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 01c82e88da..81a6e7f954 100644
--- 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) {
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditEcompOpEnvEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditEcompOpEnvEventFactory.java
index 95dddec3ad..4eb346b098 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditEcompOpEnvEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditEcompOpEnvEventFactory.java
@@ -7,7 +7,6 @@ import org.openecomp.sdc.be.resources.data.auditing.EcompOperationalEnvironmentE
 public class AuditEcompOpEnvEventFactory extends AuditBaseEventFactory {
     private static final String LOG_STR =  "ACTION = \"%s\" OPERATIONAL_ENVIRONMENT_ACTION = \"%s\" OPERATIONAL_ENVIRONMENT_ID = \"%s\"" +
             " OPERATIONAL_ENVIRONMENT_NAME = \"%s\" OPERATIONAL_ENVIRONMENT_TYPE = \"%s\" TENANT_CONTEXT = \"%s\"";
-
     private final EcompOperationalEnvironmentEvent event;
 
     public AuditEcompOpEnvEventFactory(AuditingActionEnum action, String operationalEnvironmentId, String operationalEnvironmentName,
@@ -18,10 +17,15 @@ public class AuditEcompOpEnvEventFactory extends AuditBaseEventFactory {
     }
 
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, buildValue(event.getAction()), buildValue(event.getOperationalEnvironmentAction()),
-                buildValue(event.getOperationalEnvironmentId()), buildValue(event.getOperationalEnvironmentName()),
-                buildValue(event.getOperationalEnvironmentType()), buildValue(event.getTenantContext()));
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getOperationalEnvironmentAction(),
+                event.getOperationalEnvironmentId(), event.getOperationalEnvironmentName(),
+                event.getOperationalEnvironmentType(), event.getTenantContext()};
     }
 
    @Override
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditGetUebClusterEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditGetUebClusterEventFactory.java
new file mode 100644
index 0000000000..792566c8b6
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditGetUebClusterEventFactory.java
@@ -0,0 +1,39 @@
+package org.openecomp.sdc.be.auditing.impl;
+
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingGetUebClusterEvent;
+import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
+
+public class AuditGetUebClusterEventFactory extends AuditBaseEventFactory {
+
+    private static final String LOG_STR = "ACTION = \"%s\" CONSUMER_ID = \"%s\" STATUS_TIME = \"%s\" STATUS = \"%s\" STATUS_DESC = \"%s\"";
+    private final AuditingGetUebClusterEvent event;
+
+    public AuditGetUebClusterEventFactory(CommonAuditData commonFields, String consumerId) {
+
+        super(AuditingActionEnum.GET_UEB_CLUSTER);
+        event = new AuditingGetUebClusterEvent(getAction().getName(), commonFields, consumerId);
+    }
+
+    public AuditGetUebClusterEventFactory(CommonAuditData commonFields, String consumerId, String timestamp) {
+        this(commonFields, consumerId);
+        this.event.setTimestamp1(timestamp);
+    }
+
+    @Override
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getConsumerId(), event.getTimestamp(), event.getStatus(), event.getDesc()};
+    }
+
+    @Override
+    public AuditingGenericEvent getDbEvent() {
+        return event;
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditResourceEventFactoryMananger.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditResourceEventFactoryMananger.java
deleted file mode 100644
index 25ce6e46a7..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditResourceEventFactoryMananger.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl;
-
-import org.openecomp.sdc.be.auditing.impl.resourceadmin.AuditArtifactResourceAdminEventFactory;
-import org.openecomp.sdc.be.auditing.impl.resourceadmin.AuditCertificationResourceAdminEventFactory;
-import org.openecomp.sdc.be.auditing.impl.resourceadmin.AuditCreateUpdateResourceAdminEventFactory;
-import org.openecomp.sdc.be.auditing.impl.resourceadmin.AuditDistStateChangeRequestResourceAdminEventFactory;
-import org.openecomp.sdc.be.auditing.impl.resourceadmin.AuditDistStateChangeResourceAdminEventFactory;
-import org.openecomp.sdc.be.auditing.impl.resourceadmin.AuditImportResourceAdminEventFactory;
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
-
-public class AuditResourceEventFactoryMananger {
-
-
-    public static AuditBaseEventFactory createResourceEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceAuditData prevParams,
-                                                                   ResourceAuditData currParams, String resourceType, String resourceName, String invariantUuid,
-                                                                   User modifier, String artifactData, String comment, String did, String toscaNodeType) {
-        AuditBaseEventFactory factory = null;
-
-        switch (action) {
-            case IMPORT_RESOURCE:
-                factory = new AuditImportResourceAdminEventFactory(commonFields, prevParams, currParams,
-                        resourceType, resourceName, invariantUuid,
-                        modifier, artifactData, comment, did, toscaNodeType);
-                break;
-            case CREATE_RESOURCE:
-            case UPDATE_RESOURCE_METADATA:
-                factory = new AuditCreateUpdateResourceAdminEventFactory(action, commonFields, prevParams, currParams,
-                        resourceType, resourceName, invariantUuid,
-                        modifier, artifactData, comment, did, org.openecomp.sdc.common.api.Constants.EMPTY_STRING);
-                break;
-            case CHECKIN_RESOURCE:
-            case CHECKOUT_RESOURCE:
-            case UNDO_CHECKOUT_RESOURCE:
-            case CERTIFICATION_REQUEST_RESOURCE:
-            case START_CERTIFICATION_RESOURCE:
-            case CERTIFICATION_SUCCESS_RESOURCE:
-            case FAIL_CERTIFICATION_RESOURCE:
-            case CANCEL_CERTIFICATION_RESOURCE:
-                factory = new AuditCertificationResourceAdminEventFactory(action, commonFields, prevParams, currParams,
-                        resourceType, resourceName, invariantUuid,
-                        modifier, artifactData, comment, did);
-                break;
-            case ARTIFACT_UPLOAD:
-            case ARTIFACT_DELETE:
-            case ARTIFACT_METADATA_UPDATE:
-            case ARTIFACT_PAYLOAD_UPDATE:
-            case ARTIFACT_DOWNLOAD:
-                factory = new AuditArtifactResourceAdminEventFactory(action, commonFields, prevParams, currParams,
-                        resourceType, resourceName, invariantUuid,
-                        modifier, artifactData, comment, did);
-                break;
-            case DISTRIBUTION_STATE_CHANGE_REQUEST:
-                factory = new AuditDistStateChangeRequestResourceAdminEventFactory(commonFields, prevParams, currParams,
-                        resourceType, resourceName, invariantUuid,
-                        modifier, artifactData, comment, did);
-                break;
-            case DISTRIBUTION_STATE_CHANGE_APPROV:
-            case DISTRIBUTION_STATE_CHANGE_REJECT:
-                factory = new AuditDistStateChangeResourceAdminEventFactory(action, commonFields, prevParams, currParams,
-                        resourceType, resourceName, invariantUuid,
-                        modifier, artifactData, comment, did);
-                break;
-            default:
-                throw new UnsupportedOperationException();
-        }
-        return factory;
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditingLogFormatConstants.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditingLogFormatConstants.java
deleted file mode 100644
index 69c4eb82a0..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditingLogFormatConstants.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.be.auditing.impl;
-
-import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
-
-class AuditingLogFormatConstants {
-
-    private AuditingLogFormatConstants() {}
-
-    static final AuditingFieldsKeysEnum[] DISTRIBUTION_REGISTRATION_TEMPLATE_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_API_KEY,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ENVRIONMENT_NAME,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_NOTIFICATION_TOPIC_NAME,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_STATUS_TOPIC_NAME};
-
-    static final AuditingFieldsKeysEnum[] DISTRIBUTION_DOWNLOAD_TEMPLATE_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-
-    static final AuditingFieldsKeysEnum[] GET_UEB_CLUSTER_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_STATUS_TIME,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_STATUS_DESC
-    };
-
-    static final AuditingFieldsKeysEnum[] DISTRIBUTION_DEPLOY_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE,
-        AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION,
-        AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ID,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-
-    static final AuditingFieldsKeysEnum[] DISTRIBUTION_STATUS_TEMPLATE_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ID,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID,
-//        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_STATUS_TOPIC_NAME, - check if required
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_TOPIC_NAME,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_STATUS_TIME,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-
-    static final AuditingFieldsKeysEnum[] DISTRIBUTION_NOTIFY_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE,
-        AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION,
-        AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ID,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_TOPIC_NAME,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_TENANT,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_VNF_WORKLOAD_CONTEXT,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ENVIRONMENT_ID
-    };
-
-    static final AuditingFieldsKeysEnum[] ADD_REMOVE_TOPIC_KEY_ACL_TEMPLATE_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ENVRIONMENT_NAME,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_TOPIC_NAME,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ROLE,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_API_KEY,
-        AuditingFieldsKeysEnum.AUDIT_STATUS
-    };
-
-    static final AuditingFieldsKeysEnum[] CREATE_TOPIC_TEMPLATE_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ENVRIONMENT_NAME,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_TOPIC_NAME,
-        AuditingFieldsKeysEnum.AUDIT_STATUS
-    };
-
-    static final AuditingFieldsKeysEnum[] ACTIVATE_DISTRIBUTION_ARRAY ={
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE,
-        AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION,
-        AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_DPREV_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_DCURR_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ID,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-
-    static final AuditingFieldsKeysEnum[] CHANGE_DISTRIBUTION_STATUS_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE,
-        AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION,
-        AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_DPREV_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_DCURR_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_COMMENT
-    };
-
-    static final AuditingFieldsKeysEnum[] CREATE_RESOURCE_TEMPLATE_SUFFIX_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-
-    static final AuditingFieldsKeysEnum[] CREATE_RESOURCE_TEMPLATE_PREFIX_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE,
-        AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID,
-        AuditingFieldsKeysEnum.AUDIT_INVARIANT_UUID,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_VERSION,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION,
-        AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_STATE,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE
-
-    };
-
-    static final AuditingFieldsKeysEnum[] USER_ACCESS_TEMPLATE_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_USER_UID,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-
-    static final AuditingFieldsKeysEnum[] USER_TEMPLATE_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID,
-        AuditingFieldsKeysEnum.AUDIT_USER_UID,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-
-    static final AuditingFieldsKeysEnum[] AUTH_TEMPLATE_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_AUTH_URL,
-        AuditingFieldsKeysEnum.AUDIT_AUTH_USER,
-        AuditingFieldsKeysEnum.AUDIT_AUTH_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_AUTH_REALM
-    };
-
-    static final  AuditingFieldsKeysEnum[] ECOMP_USER_TEMPLATE_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID,
-        AuditingFieldsKeysEnum.AUDIT_ECOMP_USER,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-
-    static final  AuditingFieldsKeysEnum[] CATEGORY_TEMPLATE_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID,
-        AuditingFieldsKeysEnum.AUDIT_CATEGORY_NAME,
-        AuditingFieldsKeysEnum.AUDIT_SUB_CATEGORY_NAME,
-        AuditingFieldsKeysEnum.AUDIT_GROUPING_NAME,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-
-    static final  AuditingFieldsKeysEnum[] GET_USERS_LIST_TEMPLATE_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID,
-        AuditingFieldsKeysEnum.AUDIT_USER_DETAILS,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-
-    static final  AuditingFieldsKeysEnum[] GET_CATEGORY_HIERARCHY_TEMPLATE_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID,
-        AuditingFieldsKeysEnum.AUDIT_DETAILS,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-    static final AuditingFieldsKeysEnum[] USER_ADMIN_TEMPLATE_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID,
-        AuditingFieldsKeysEnum.AUDIT_USER_BEFORE,
-        AuditingFieldsKeysEnum.AUDIT_USER_AFTER,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-    static final AuditingFieldsKeysEnum[] EXTERNAL_GET_ASSET_LIST_TEMPLATE_ARRAY = {
-            AuditingFieldsKeysEnum.AUDIT_ACTION,
-            AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID,
-            AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL,
-            AuditingFieldsKeysEnum.AUDIT_STATUS,
-            AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-    static final AuditingFieldsKeysEnum[] EXTERNAL_GET_ASSET_TEMPLATE_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE,
-        AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-    static AuditingFieldsKeysEnum[] ECOMP_OPERATIONAL_ENVIRONMENT_ARRAY = {
-            AuditingFieldsKeysEnum.AUDIT_ACTION,
-            AuditingFieldsKeysEnum.AUDIT_OPERATIONAL_ENVIRONMENT_ACTION,
-            AuditingFieldsKeysEnum.AUDIT_OPERATIONAL_ENVIRONMENT_ID,
-            AuditingFieldsKeysEnum.AUDIT_OPERATIONAL_ENVIRONMENT_NAME,
-            AuditingFieldsKeysEnum.AUDIT_OPERATIONAL_ENVIRONMENT_TYPE,
-            AuditingFieldsKeysEnum.AUDIT_TENANT_CONTEXT
-    };
-    static final AuditingFieldsKeysEnum[] EXTERNAL_DOWNLOAD_ARTIFACT_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-    static final AuditingFieldsKeysEnum[] EXTERNAL_CRUD_API_ARTIFACT_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL,
-        AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID,
-        AuditingFieldsKeysEnum.AUDIT_PREV_ARTIFACT_UUID,
-        AuditingFieldsKeysEnum.AUDIT_CURR_ARTIFACT_UUID,
-        AuditingFieldsKeysEnum.AUDIT_ARTIFACT_DATA,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-
-    static final AuditingFieldsKeysEnum[] EXTERNAL_CRUD_API_ARRAY = {
-            AuditingFieldsKeysEnum.AUDIT_ACTION,
-            AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME,
-            AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE,
-            AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID,
-            AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL,
-            AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID,
-
-            AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_VERSION,
-            AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION,
-            AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_STATE,
-            AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE,
-
-            AuditingFieldsKeysEnum.AUDIT_PREV_ARTIFACT_UUID,
-            AuditingFieldsKeysEnum.AUDIT_CURR_ARTIFACT_UUID,
-            AuditingFieldsKeysEnum.AUDIT_STATUS,
-            AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID,
-            AuditingFieldsKeysEnum.AUDIT_INVARIANT_UUID,
-            AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-
-    static AuditingFieldsKeysEnum[] EXTERNAL_ACTIVATE_SERVICE_ARRAY = {
-            AuditingFieldsKeysEnum.AUDIT_ACTION,
-            AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE,
-            AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID,
-            AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL,
-            AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID,
-
-            AuditingFieldsKeysEnum.AUDIT_STATUS,
-            AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID,
-            AuditingFieldsKeysEnum.AUDIT_INVARIANT_UUID,
-            AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-
-    static final AuditingFieldsKeysEnum[] EXTERNAL_LYFECYCLE_API_ARRAY = {
-            AuditingFieldsKeysEnum.AUDIT_ACTION,
-            AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME,
-            AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE,
-            AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID,
-            AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL,
-            AuditingFieldsKeysEnum.AUDIT_MODIFIER_NAME,
-            AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID,
-
-            AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_VERSION,
-            AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION,
-            AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_STATE,
-            AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE,
-
-            AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID,
-            AuditingFieldsKeysEnum.AUDIT_INVARIANT_UUID,
-            AuditingFieldsKeysEnum.AUDIT_STATUS,
-            AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditingLogFormatUtil.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditingLogFormatUtil.java
deleted file mode 100644
index 92baba260c..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditingLogFormatUtil.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.be.auditing.impl;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Formatter;
-import java.util.Locale;
-import java.util.Map;
-
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.common.api.Constants;
-import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.slf4j.Marker;
-import org.slf4j.MarkerFactory;
-
-public class AuditingLogFormatUtil {
-
-    // When adding any new fields here, please keep the convention <fieldName>=
-    // <value>, with the space between them.
-    private static final Logger log = LoggerFactory.getLogger(AuditingLogFormatUtil.class);
-
-    // This is the key by which audit marker is recognized in logback.xml
-    private static String AUDIT_MARKER_STR = "AUDIT_MARKER";
-
-    public static final Marker auditMarker = MarkerFactory.getMarker(AUDIT_MARKER_STR);
-
-    protected static String logAuditEvent(Map<AuditingFieldsKeysEnum, Object> auditingFields) {
-
-        StringBuilder sb = new StringBuilder();
-        Formatter formatter = new Formatter(sb, Locale.US);
-        log.trace("logAuditEvent - start");
-
-        String formattedString = "";
-
-        try {
-
-            // Common fields
-            String modifier = getModifier((String) auditingFields.get(AuditingFieldsKeysEnum.AUDIT_MODIFIER_NAME), (String) auditingFields.get(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID));
-            Object statusObj = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_STATUS);
-            String status = null;
-            if (statusObj != null) {
-                status = String.valueOf(statusObj);
-            }
-            String desc = (String) auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DESC);
-            String action = (String) auditingFields.get(AuditingFieldsKeysEnum.AUDIT_ACTION);
-
-            AuditingActionEnum auditEventType = AuditingActionEnum.getActionByName(action);
-            StringBuilder formattedEvent = getFormattedEvent(auditingFields, modifier, status, desc, action, auditEventType);
-            formattedString = formattedEvent.toString();
-
-            // This is the only way to fix DE166225 without major refactoring,
-            // after it was previously agreed with Ella that activity type will
-            // be the method name.
-
-            if (auditEventType.equals(AuditingActionEnum.AUTH_REQUEST)) {
-                HttpRequestAuthentication(formattedString);
-            } else {
-                log.info(auditMarker, formattedString);
-            }
-        } catch (Exception e) {
-            log.debug("unexpected error occurred: {}", e.getMessage(), e);
-
-        } finally {
-            formatter.close();
-            log.trace("logAuditEvent - end");
-        }
-        return formattedString;
-
-    }
-
-    protected static void logAuditEvent(final String formattedString) {
-        log.trace("logAuditEvent - start");
-        log.info(auditMarker, formattedString);
-        log.trace("logAuditEvent - end");
-    }
-
-
-    private static void HttpRequestAuthentication(String formattedString) {
-        log.info(auditMarker, formattedString);
-    }
-
-    private static StringBuilder getFormattedEvent(Map<AuditingFieldsKeysEnum, Object> auditingFields, String modifier, String status, String desc, String action, AuditingActionEnum auditEventType) {
-
-        StringBuilder formattedString = new StringBuilder();
-
-        switch (auditEventType) {
-        case ADD_USER:
-        case DELETE_USER:
-        case UPDATE_USER:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.USER_ADMIN_TEMPLATE_ARRAY, auditingFields);
-
-            break;
-        case USER_ACCESS:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.USER_ACCESS_TEMPLATE_ARRAY, auditingFields);
-            break;
-        case DISTRIBUTION_REGISTER:
-        case DISTRIBUTION_UN_REGISTER:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.DISTRIBUTION_REGISTRATION_TEMPLATE_ARRAY, auditingFields);
-            break;
-        case UPDATE_RESOURCE_METADATA:
-        case CREATE_RESOURCE:
-        case IMPORT_RESOURCE:
-            ArrayList<AuditingFieldsKeysEnum> createResourceList = new ArrayList(Arrays.asList(AuditingLogFormatConstants.CREATE_RESOURCE_TEMPLATE_PREFIX_ARRAY));
-            createResourceList.addAll(Arrays.asList(AuditingLogFormatConstants.CREATE_RESOURCE_TEMPLATE_SUFFIX_ARRAY));
-            if (auditEventType == AuditingActionEnum.IMPORT_RESOURCE) {
-                createResourceList.add(AuditingFieldsKeysEnum.AUDIT_RESOURCE_TOSCA_NODE_TYPE);
-            }
-            AuditingFieldsKeysEnum[] createResourceArray = new AuditingFieldsKeysEnum[100];
-            createResourceArray = createResourceList.toArray(createResourceArray);
-            formattedString = buildStringAccrodingToArray(createResourceArray, auditingFields);
-            break;
-        case CHECKIN_RESOURCE:
-        case CHECKOUT_RESOURCE:
-        case UNDO_CHECKOUT_RESOURCE:
-        case CERTIFICATION_REQUEST_RESOURCE:
-        case START_CERTIFICATION_RESOURCE:
-        case CERTIFICATION_SUCCESS_RESOURCE:
-        case FAIL_CERTIFICATION_RESOURCE:
-        case CANCEL_CERTIFICATION_RESOURCE:
-            ArrayList<AuditingFieldsKeysEnum> checkinFieldsList = new ArrayList(Arrays.asList(AuditingLogFormatConstants.CREATE_RESOURCE_TEMPLATE_PREFIX_ARRAY));
-            checkinFieldsList.add(AuditingFieldsKeysEnum.AUDIT_RESOURCE_COMMENT);
-            checkinFieldsList.addAll(Arrays.asList(AuditingLogFormatConstants.CREATE_RESOURCE_TEMPLATE_SUFFIX_ARRAY));
-            AuditingFieldsKeysEnum[] checkinFieldsArray = new AuditingFieldsKeysEnum[100];
-            checkinFieldsArray = checkinFieldsList.toArray(checkinFieldsArray);
-            String comment = (String) auditingFields.get(AuditingFieldsKeysEnum.AUDIT_RESOURCE_COMMENT);
-            if (comment == null || comment.equals(Constants.NULL_STRING)) {
-                auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_COMMENT, Constants.EMPTY_STRING);
-            }
-            formattedString = buildStringAccrodingToArray(checkinFieldsArray, auditingFields);
-            break;
-        case ARTIFACT_UPLOAD:
-        case ARTIFACT_DELETE:
-        case ARTIFACT_METADATA_UPDATE:
-        case ARTIFACT_PAYLOAD_UPDATE:
-        case ARTIFACT_DOWNLOAD:
-            ArrayList<AuditingFieldsKeysEnum> artifactFieldsSet = new ArrayList<>(Arrays.asList(AuditingLogFormatConstants.CREATE_RESOURCE_TEMPLATE_PREFIX_ARRAY)) ;
-            artifactFieldsSet.add(AuditingFieldsKeysEnum.AUDIT_PREV_ARTIFACT_UUID);
-            artifactFieldsSet.add(AuditingFieldsKeysEnum.AUDIT_CURR_ARTIFACT_UUID);
-            artifactFieldsSet.add(AuditingFieldsKeysEnum.AUDIT_ARTIFACT_DATA);
-            artifactFieldsSet.addAll(Arrays.asList(AuditingLogFormatConstants.EXTERNAL_DOWNLOAD_ARTIFACT_ARRAY));
-            AuditingFieldsKeysEnum[] artifactFieldsArray = new AuditingFieldsKeysEnum[100];
-            artifactFieldsArray = artifactFieldsSet.toArray(artifactFieldsArray);
-            formattedString = buildStringAccrodingToArray(artifactFieldsArray, auditingFields);
-            break;
-        case DOWNLOAD_ARTIFACT:
-            ArrayList<AuditingFieldsKeysEnum> downloadArtifactFieldsList = new ArrayList(Arrays.asList(AuditingLogFormatConstants.EXTERNAL_DOWNLOAD_ARTIFACT_ARRAY));
-            AuditingFieldsKeysEnum[] downloadArtifactFieldsArray = new AuditingFieldsKeysEnum[100];
-            artifactFieldsArray = downloadArtifactFieldsList.toArray(downloadArtifactFieldsArray);
-            formattedString = buildStringAccrodingToArray(artifactFieldsArray, auditingFields);
-            break;
-        case DISTRIBUTION_STATE_CHANGE_REQUEST:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.ACTIVATE_DISTRIBUTION_ARRAY, auditingFields);
-            break;
-        case DISTRIBUTION_STATE_CHANGE_APPROV:
-        case DISTRIBUTION_STATE_CHANGE_REJECT:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.CHANGE_DISTRIBUTION_STATUS_ARRAY, auditingFields);
-            break;
-        case CREATE_DISTRIBUTION_TOPIC:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.CREATE_TOPIC_TEMPLATE_ARRAY, auditingFields);
-            break;
-        case ADD_KEY_TO_TOPIC_ACL:
-        case REMOVE_KEY_FROM_TOPIC_ACL:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.ADD_REMOVE_TOPIC_KEY_ACL_TEMPLATE_ARRAY, auditingFields);
-            break;
-        case DISTRIBUTION_STATUS:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.DISTRIBUTION_STATUS_TEMPLATE_ARRAY, auditingFields);
-            break;
-        case DISTRIBUTION_NOTIFY:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.DISTRIBUTION_NOTIFY_ARRAY, auditingFields);
-            break;
-        case DISTRIBUTION_DEPLOY:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.DISTRIBUTION_DEPLOY_ARRAY, auditingFields);
-            break;
-        case GET_UEB_CLUSTER:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.GET_UEB_CLUSTER_ARRAY, auditingFields);
-            break;
-        case DISTRIBUTION_ARTIFACT_DOWNLOAD:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.DISTRIBUTION_DOWNLOAD_TEMPLATE_ARRAY, auditingFields);
-            break;
-        case AUTH_REQUEST:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.AUTH_TEMPLATE_ARRAY, auditingFields);
-            break;
-        case ADD_ECOMP_USER_CREDENTIALS:
-        case GET_ECOMP_USER_CREDENTIALS:
-        case DELETE_ECOMP_USER_CREDENTIALS:
-        case UPDATE_ECOMP_USER_CREDENTIALS:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.ECOMP_USER_TEMPLATE_ARRAY, auditingFields);
-            break;
-        case ADD_CATEGORY:
-        case ADD_SUB_CATEGORY:
-        case ADD_GROUPING:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.CATEGORY_TEMPLATE_ARRAY, auditingFields);
-            break;
-        case GET_USERS_LIST:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.GET_USERS_LIST_TEMPLATE_ARRAY, auditingFields);
-            break;
-        case GET_CATEGORY_HIERARCHY:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.GET_CATEGORY_HIERARCHY_TEMPLATE_ARRAY, auditingFields);
-            break;
-        case GET_ASSET_LIST:
-        case GET_FILTERED_ASSET_LIST:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.EXTERNAL_GET_ASSET_LIST_TEMPLATE_ARRAY, auditingFields);
-            break;
-        case GET_ASSET_METADATA:
-        case GET_TOSCA_MODEL:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.EXTERNAL_GET_ASSET_TEMPLATE_ARRAY, auditingFields);
-            break;
-        case ARTIFACT_UPLOAD_BY_API:
-        case ARTIFACT_DELETE_BY_API:
-        case ARTIFACT_UPDATE_BY_API:
-            ArrayList<AuditingFieldsKeysEnum> uploadArtifactFieldsList = new ArrayList(Arrays.asList(AuditingLogFormatConstants.EXTERNAL_CRUD_API_ARTIFACT_ARRAY));
-            AuditingFieldsKeysEnum[] uploadArtifactFieldsArray = new AuditingFieldsKeysEnum[100];
-            artifactFieldsArray = uploadArtifactFieldsList.toArray(uploadArtifactFieldsArray);
-            formattedString = buildStringAccrodingToArray(artifactFieldsArray, auditingFields);
-            break;
-        case CREATE_RESOURCE_BY_API:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.EXTERNAL_CRUD_API_ARRAY, auditingFields);
-            break;
-        case CHANGE_LIFECYCLE_BY_API:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.EXTERNAL_LYFECYCLE_API_ARRAY, auditingFields);
-            break;
-            case ACTIVATE_SERVICE_BY_API:
-                formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.EXTERNAL_ACTIVATE_SERVICE_ARRAY, auditingFields);
-                break;
-        case CREATE_ENVIRONMENT:
-        case UPDATE_ENVIRONMENT:
-        case DELETE_ENVIRONMENT:
-        case UNKNOWN_ENVIRONMENT_NOTIFICATION:
-        case UNSUPPORTED_ENVIRONMENT_TYPE:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.ECOMP_OPERATIONAL_ENVIRONMENT_ARRAY, auditingFields);
-            break;
-        default:
-            break;
-        }
-
-        return formattedString;
-    }
-
-    private static StringBuilder buildStringAccrodingToArray(AuditingFieldsKeysEnum[] sortedFieldsArray, Map<AuditingFieldsKeysEnum, Object> auditingFields) {
-        StringBuilder formattedString = new StringBuilder();
-        for (int i = 0; i < sortedFieldsArray.length; i++) {
-            AuditingFieldsKeysEnum key = sortedFieldsArray[i];
-
-            Object fieldVal = auditingFields.get(key);
-            if (fieldVal != null) {
-                formattedString.append(key.getDisplayName()).append(" = \"").append(fieldVal).append("\"");
-                if (i < sortedFieldsArray.length - 1) {
-                    formattedString.append(" ");
-                }
-            }
-        }
-        return formattedString;
-    }
-
-    protected static String getModifier(String modifierName, String modifierUid) {
-        if (modifierUid == null || modifierUid.equals(Constants.EMPTY_STRING)) {
-            return Constants.EMPTY_STRING;
-        }
-        StringBuilder sb = new StringBuilder();
-        if (modifierName != null) {
-            sb.append(modifierName);
-        }
-        sb.append("(").append(modifierUid).append(")");
-        return sb.toString();
-    }
-
-    protected static String getUser(String userData) {
-        StringBuilder sb = new StringBuilder();
-        sb.append(userData);
-        return sb.toString();
-    }
-
-
-
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditingManager.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditingManager.java
index daf16390ae..f7c46b2eb9 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditingManager.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditingManager.java
@@ -20,29 +20,23 @@
 
 package org.openecomp.sdc.be.auditing.impl;
 
-import java.util.Map;
-import java.util.Map.Entry;
-
 import org.openecomp.sdc.be.auditing.api.AuditEventFactory;
 import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.dao.cassandra.AuditCassandraDao;
 import org.openecomp.sdc.be.dao.cassandra.CassandraOperationStatus;
 import org.openecomp.sdc.be.dao.impl.AuditingDao;
-import org.openecomp.sdc.be.resources.data.auditing.AuditRecordFactory;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
-import org.openecomp.sdc.common.api.Constants;
-import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
-import org.openecomp.sdc.common.util.ThreadLocalsHolder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.elements.LogFieldsMdcHandler;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+import org.openecomp.sdc.common.log.wrappers.LoggerSdcAudit;
 import org.springframework.stereotype.Component;
 
 @Component
 public class AuditingManager {
 
-    private static final Logger log = LoggerFactory.getLogger(AuditingManager.class);
+    private static final Logger log = Logger.getLogger(AuditingManager.class.getName());
+
     private final AuditingDao auditingDao;
     private final AuditCassandraDao cassandraDao;
 
@@ -51,66 +45,17 @@ public class AuditingManager {
         this.cassandraDao = cassandraDao;
     }
 
-    // TODO remove after completing refactoring
-    public String auditEvent(Map<AuditingFieldsKeysEnum, Object> auditingFields) {
-        String msg = "";
-        try {
-            boolean disableAudit = ConfigurationManager.getConfigurationManager().getConfiguration().isDisableAudit();
-            if (disableAudit) {
-                return null;
-            }
-            // Adding UUID from thread local
-            auditingFields.put(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID, ThreadLocalsHolder.getUuid());
-
-            Object status = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_STATUS);
-            auditingFields.put(AuditingFieldsKeysEnum.AUDIT_STATUS, String.valueOf(status));
-
-            // normalizing empty string values - US471661
-            normalizeEmptyAuditStringValues(auditingFields);
-
-            // Format modifier
-            formatModifier(auditingFields);
-
-            // Format user
-            formatUser(auditingFields);
-
-            // Logging the event
-            msg = AuditingLogFormatUtil.logAuditEvent(auditingFields);
-
-            // Determining the type of the auditing data object
-            AuditingActionEnum actionEnum = AuditingActionEnum.getActionByName((String) auditingFields.get(AuditingFieldsKeysEnum.AUDIT_ACTION));
-            log.info("audit event {} of type {}", actionEnum.getName(), actionEnum.getAuditingEsType());
-            ActionStatus addRecordStatus = auditingDao.addRecord(auditingFields, actionEnum.getAuditingEsType());
-            if (!addRecordStatus.equals(ActionStatus.OK)) {
-                log.warn("Failed to persist auditing event: {}", addRecordStatus);
-            }
-
-            AuditingGenericEvent recordForCassandra = AuditRecordFactory.createAuditRecord(auditingFields);
-            if (recordForCassandra != null) {
-                saveEventToCassandra(recordForCassandra);
-            }
-
-        } catch (Exception e) {
-            // Error during auditing shouldn't terminate flow
-            log.warn("Error during auditEvent: {}", e);
-        }
-        return msg;
-    }
-
 
     public String auditEvent(AuditEventFactory factory) {
         if (ConfigurationManager.getConfigurationManager().getConfiguration().isDisableAudit()) {
             return null;
         }
-        AuditingGenericEvent event = factory.getDbEvent();
-        // Logging the event
-        //TODO - change this call after EELF Audit stuff merge
         String msg = factory.getLogMessage();
-        AuditingLogFormatUtil.logAuditEvent(msg);
+        logAuditEvent(msg);
 
         //TODO - remove this method after we got rid of ES
-        saveEventToElasticSearch(factory, event);
-        saveEventToCassandra(event);
+        saveEventToElasticSearch(factory);
+        saveEventToCassandra(factory.getDbEvent());
         return msg;
     }
 
@@ -121,47 +66,22 @@ public class AuditingManager {
         }
     }
 
-    private void saveEventToElasticSearch(AuditEventFactory factory, AuditingGenericEvent event) {
-        ActionStatus addRecordStatus = auditingDao.addRecord(event, factory.getAuditingEsType());
+    private void saveEventToElasticSearch(AuditEventFactory factory) {
+        ActionStatus addRecordStatus = auditingDao.addRecord(factory.getDbEvent(), factory.getAuditingEsType());
         if (!addRecordStatus.equals(ActionStatus.OK)) {
             log.warn("Failed to persist auditing event: {}", addRecordStatus.name());
         }
     }
 
-
-    private void formatUser(Map<AuditingFieldsKeysEnum, Object> auditingFields) {
-        if (auditingFields.get(AuditingFieldsKeysEnum.AUDIT_USER_UID) != null) {
-            String userDetails = (String) auditingFields.get(AuditingFieldsKeysEnum.AUDIT_USER_UID);
-
-            String user = AuditingLogFormatUtil.getUser(userDetails);
-            auditingFields.put(AuditingFieldsKeysEnum.AUDIT_USER_UID, user);
+    private void logAuditEvent(final String formattedString) {
+        log.trace("logAuditEvent - start");
+        log.debug(formattedString);
+        LogFieldsMdcHandler.getInstance()
+                .setAuditMessage(formattedString);
+        if (!LoggerSdcAudit.isFlowBeingTakenCare()){
+            log.debug("MOVED FROM AUDIT LOG: {}", formattedString);
         }
+        log.trace("logAuditEvent - end");
     }
 
-    private void formatModifier(Map<AuditingFieldsKeysEnum, Object> auditingFields) {
-        String modifier = AuditingLogFormatUtil.getModifier((String) auditingFields.get(AuditingFieldsKeysEnum.AUDIT_MODIFIER_NAME), (String) auditingFields.get(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID));
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID, modifier);
-        auditingFields.remove(AuditingFieldsKeysEnum.AUDIT_MODIFIER_NAME);
-    }
-
-    private void normalizeEmptyAuditStringValues(Map<AuditingFieldsKeysEnum, Object> auditingFields) {
-        for (Entry<AuditingFieldsKeysEnum, Object> auditingEntry : auditingFields.entrySet()) {
-            if (auditingEntry.getKey().getValueClass().equals(String.class)) {
-                String auditingValue = (String) auditingEntry.getValue();
-                boolean isEmpty = false;
-                if (auditingValue != null) {
-                    String trimmedValue = auditingValue.trim();
-                    if ((trimmedValue.equals(Constants.EMPTY_STRING)) || trimmedValue.equals(Constants.NULL_STRING) || trimmedValue.equals(Constants.DOUBLE_NULL_STRING)) {
-                        isEmpty = true;
-                    }
-                } else {// is null
-                    isEmpty = true;
-                }
-                // Normalizing to ""
-                if (isEmpty) {
-                    auditingEntry.setValue(Constants.EMPTY_STRING);
-                }
-            }
-        }
-    }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditAddCategoryEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditAddCategoryEventFactory.java
deleted file mode 100644
index 84c3a0392d..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditAddCategoryEventFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.category;
-
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-
-public class AuditAddCategoryEventFactory extends AuditCategoryEventFactory {
-
-    public AuditAddCategoryEventFactory(CommonAuditData commonFields, User modifier,
-                                        String categoryName, String subCategoryName, String groupingName, String resourceType) {
-        super(AuditingActionEnum.ADD_CATEGORY, commonFields, modifier, categoryName, subCategoryName, groupingName, resourceType);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditAddGroupingCategoryEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditAddGroupingCategoryEventFactory.java
deleted file mode 100644
index 6ee7624ddf..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditAddGroupingCategoryEventFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.category;
-
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-
-public class AuditAddGroupingCategoryEventFactory extends AuditCategoryEventFactory {
-
-    public AuditAddGroupingCategoryEventFactory(CommonAuditData commonFields, User modifier, String categoryName,
-                                                String subCategoryName, String groupingName, String resourceType) {
-        super(AuditingActionEnum.ADD_GROUPING, commonFields, modifier, categoryName, subCategoryName, groupingName, resourceType);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditAddSubCategoryEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditAddSubCategoryEventFactory.java
deleted file mode 100644
index 241d0c0fc5..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditAddSubCategoryEventFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.category;
-
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-
-public class AuditAddSubCategoryEventFactory extends AuditCategoryEventFactory {
-
-    public AuditAddSubCategoryEventFactory(CommonAuditData commonFields, User modifier,
-                                           String categoryName, String subCategoryName, String groupingName, String resourceType) {
-        super(AuditingActionEnum.ADD_SUB_CATEGORY, commonFields, modifier, categoryName, subCategoryName, groupingName, resourceType);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditCategoryEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditCategoryEventFactory.java
index 9a2d7b09a8..d4827f8938 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditCategoryEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditCategoryEventFactory.java
@@ -7,17 +7,40 @@ import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
 import org.openecomp.sdc.be.resources.data.auditing.CategoryEvent;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 
-public abstract class AuditCategoryEventFactory extends AuditBaseEventFactory {
+public class AuditCategoryEventFactory extends AuditBaseEventFactory {
 
+    private static final  String LOG_STR = "ACTION = \"%s\" MODIFIER = \"%s\" CATEGORY_NAME = \"%s\" SUB_CATEGORY_NAME = \"%s\"" +
+            " GROUPING_NAME = \"%s\" RESOURCE_TYPE = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
     private final CategoryEvent event;
 
-    protected static final  String LOG_STR = "ACTION = \"%s\" MODIFIER = \"%s\" CATEGORY_NAME = \"%s\" SUB_CATEGORY_NAME = \"%s\"" +
-            " GROUPING_NAME = \"%s\" RESOURCE_TYPE = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
+
+    private AuditCategoryEventFactory(AuditingActionEnum action, CommonAuditData commonFields, String modifier, String categoryName,
+                                      String subCategoryName, String groupingName, String resourceType) {
+        super(action);
+        event = new CategoryEvent(getAction().getName(), commonFields, modifier, categoryName,
+                subCategoryName, groupingName, resourceType);
+    }
+
+    public AuditCategoryEventFactory(AuditingActionEnum action, CommonAuditData commonFields, User modifier,
+                                     String categoryName, String subCategoryName, String groupingName, String resourceType) {
+        this(action, commonFields, buildUserName(modifier), categoryName, subCategoryName, groupingName, resourceType);
+    }
+
+    public AuditCategoryEventFactory(AuditingActionEnum action, CommonAuditData commonFields, String modifier, String categoryName,
+                                     String subCategoryName, String groupingName, String resourceType, String timestamp) {
+        this(action, commonFields, modifier, categoryName, subCategoryName, groupingName, resourceType);
+        event.setTimestamp1(timestamp);
+    }
 
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getModifier(), event.getCategoryName(), event.getSubCategoryName(),
-                event.getGroupingName(), event.getResourceType(), event.getStatus(), event.getDesc());
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getModifier(), event.getCategoryName(), event.getSubCategoryName(),
+                event.getGroupingName(), event.getResourceType(), event.getStatus(), event.getDesc()};
     }
 
     @Override
@@ -25,10 +48,5 @@ public abstract class AuditCategoryEventFactory extends AuditBaseEventFactory {
         return event;
     }
 
-    public AuditCategoryEventFactory(AuditingActionEnum action, CommonAuditData commonFields, User modifier,
-                                     String categoryName, String subCategoryName, String groupingName, String resourceType) {
-        super(action);
-        event = new CategoryEvent(getAction().getName(), commonFields, buildUserName(modifier), categoryName,
-                subCategoryName, groupingName, resourceType);
-    }
+
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditGetCategoryHierarchyEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditGetCategoryHierarchyEventFactory.java
index 8c4de3c43d..a007174b32 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditGetCategoryHierarchyEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditGetCategoryHierarchyEventFactory.java
@@ -9,13 +9,31 @@ import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 
 public class AuditGetCategoryHierarchyEventFactory extends AuditBaseEventFactory {
 
+    private static final String LOG_STR = "ACTION = \"%s\" MODIFIER = \"%s\" DETAILS = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
     private final  GetCategoryHierarchyEvent event;
 
-    protected static final String LOG_STR = "ACTION = \"%s\" MODIFIER = \"%s\" DETAILS = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
+    public AuditGetCategoryHierarchyEventFactory(CommonAuditData commonFields, User modifier, String details) {
+        this(commonFields, buildUserName(modifier), details);
+    }
+
+    public AuditGetCategoryHierarchyEventFactory(CommonAuditData commonFields, String modifier, String details, String timestamp) {
+        this(commonFields, modifier, details);
+        this.event.setTimestamp1(timestamp);
+    }
+
+    private AuditGetCategoryHierarchyEventFactory(CommonAuditData commonFields, String modifier, String details) {
+        super(AuditingActionEnum.GET_CATEGORY_HIERARCHY);
+        event = new GetCategoryHierarchyEvent(getAction().getName(), commonFields, modifier, details);
+    }
 
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getModifier(), event.getDetails(), event.getStatus(), event.getDesc());
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getModifier(), event.getDetails(), event.getStatus(), event.getDesc()};
     }
 
     @Override
@@ -23,8 +41,5 @@ public class AuditGetCategoryHierarchyEventFactory extends AuditBaseEventFactory
         return event;
     }
 
-    public AuditGetCategoryHierarchyEventFactory(AuditingActionEnum action, CommonAuditData commonFields, User modifier, String details) {
-        super(action);
-        event = new GetCategoryHierarchyEvent(getAction().getName(), commonFields, buildUserName(modifier), details);
-    }
+
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditAddKeyDistribEngineEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditAddKeyDistribEngineEventFactory.java
deleted file mode 100644
index 907d73546f..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditAddKeyDistribEngineEventFactory.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.distribution;
-
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-
-public class AuditAddKeyDistribEngineEventFactory extends AuditAddRemoveKeyDistribEngineEventFactory {
-
-    public AuditAddKeyDistribEngineEventFactory(CommonAuditData commonFields, String consumerId, String distStatusTopic, String distNotifTopic,
-                                                String apiKey, String envName, String role) {
-        super(AuditingActionEnum.ADD_KEY_TO_TOPIC_ACL, commonFields, consumerId, distStatusTopic, distNotifTopic, apiKey, envName, role);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditAddRemoveKeyDistribEngineEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditAddRemoveKeyDistribEngineEventFactory.java
deleted file mode 100644
index 5ad7380051..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditAddRemoveKeyDistribEngineEventFactory.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.distribution;
-
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-
-public abstract class AuditAddRemoveKeyDistribEngineEventFactory extends AuditDistribEngineEventFactory{
-
-    private static final String LOG_STR = "ACTION = \"%s\" D_ENV = \"%s\" TOPIC_NAME = \"%s\" ROLE = \"%s\" " +
-            "API_KEY = \"%s\" STATUS = \"%s\"";
-
-    public AuditAddRemoveKeyDistribEngineEventFactory(AuditingActionEnum action, CommonAuditData commonFields, String consumerId, String distStatusTopic, String distNotifTopic,
-                                                      String apiKey, String envName, String role) {
-        super(action, commonFields, consumerId, distStatusTopic, distNotifTopic, apiKey, envName, role);
-    }
-
-    @Override
-    public String getLogMessage() {
-        String topicName = event.getDnotifTopic() != null ? event.getDnotifTopic() : buildValue(event.getDstatusTopic());
-        return String.format(LOG_STR, event.getAction(), event.getEnvironmentName(), topicName,
-                event.getRole(), event.getApiKey(), event.getStatus());
-    }
-
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditAddRemoveKeyDistributionEngineEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditAddRemoveKeyDistributionEngineEventFactory.java
new file mode 100644
index 0000000000..7fd999bc4f
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditAddRemoveKeyDistributionEngineEventFactory.java
@@ -0,0 +1,29 @@
+package org.openecomp.sdc.be.auditing.impl.distribution;
+
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionTopicData;
+
+public class AuditAddRemoveKeyDistributionEngineEventFactory extends AuditDistributionEngineEventFactory {
+
+    private static final String LOG_STR = "ACTION = \"%s\" D_ENV = \"%s\" TOPIC_NAME = \"%s\" ROLE = \"%s\" " +
+            "API_KEY = \"%s\" STATUS = \"%s\"";
+
+    AuditAddRemoveKeyDistributionEngineEventFactory(AuditingActionEnum action, CommonAuditData commonFields, DistributionTopicData distributionTopicData,
+                                                           String apiKey, String envName, String role) {
+        super(action, commonFields, distributionTopicData, null, apiKey, envName, role);
+    }
+
+    @Override
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        String topicName = event.getDnotifTopic() != null ? event.getDnotifTopic() : event.getDstatusTopic();
+        return new String[] {event.getAction(), event.getEnvironmentName(), topicName,
+                event.getRole(), event.getApiKey(), event.getStatus()};
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditCreateTopicDistribEngineEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditCreateTopicDistribEngineEventFactory.java
deleted file mode 100644
index 7825cca0e9..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditCreateTopicDistribEngineEventFactory.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.distribution;
-
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-
-public class AuditCreateTopicDistribEngineEventFactory extends AuditDistribEngineEventFactory{
-
-   private static final String LOG_STR = "ACTION = \"%s\" D_ENV = \"%s\" TOPIC_NAME = \"%s\" STATUS = \"%s\"";
-
-    public AuditCreateTopicDistribEngineEventFactory(CommonAuditData commonFields, String consumerId, String distStatusTopic, String distNotifTopic,
-                                                     String apiKey, String envName, String role) {
-        super(AuditingActionEnum.CREATE_DISTRIBUTION_TOPIC, commonFields, consumerId, distStatusTopic, distNotifTopic, apiKey, envName, role);
-    }
-
-    @Override
-    public String getLogMessage() {
-        String topicName = event.getDnotifTopic() != null ? event.getDnotifTopic() : buildValue(event.getDstatusTopic());
-        return String.format(LOG_STR, event.getAction(), event.getEnvironmentName(), topicName, event.getStatus());
-    }
-
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditCreateTopicDistributionEngineEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditCreateTopicDistributionEngineEventFactory.java
new file mode 100644
index 0000000000..e8767be0a6
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditCreateTopicDistributionEngineEventFactory.java
@@ -0,0 +1,26 @@
+package org.openecomp.sdc.be.auditing.impl.distribution;
+
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionTopicData;
+
+public class AuditCreateTopicDistributionEngineEventFactory extends AuditDistributionEngineEventFactory {
+
+    private static final String LOG_STR = "ACTION = \"%s\" D_ENV = \"%s\" TOPIC_NAME = \"%s\" STATUS = \"%s\"";
+
+    AuditCreateTopicDistributionEngineEventFactory(CommonAuditData commonFields, DistributionTopicData distributionTopicData,
+                                                          String apiKey, String envName, String role) {
+        super(AuditingActionEnum.CREATE_DISTRIBUTION_TOPIC, commonFields, distributionTopicData,null, apiKey, envName, role);
+    }
+
+    @Override
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getEnvironmentName(), getTopicName(), event.getStatus()};
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribDeployEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribDeployEventFactory.java
deleted file mode 100644
index cb86f5059c..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribDeployEventFactory.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.distribution;
-
-import org.openecomp.sdc.be.auditing.impl.AuditBaseEventFactory;
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
-import org.openecomp.sdc.be.resources.data.auditing.DistributionDeployEvent;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-
-public class AuditDistribDeployEventFactory extends AuditBaseEventFactory {
-
-    private DistributionDeployEvent event;
-
-    private static final String LOG_STR = "ACTION = \"%s\" RESOURCE_NAME = \"%s\" RESOURCE_TYPE = \"%s\" " +
-            "SERVICE_INSTANCE_ID = \"%s\" CURR_VERSION = \"%s\" MODIFIER = \"%s\" DID = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
-
-    @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getResourceName(), event.getResourceType(), event.getServiceInstanceId(),
-                event.getCurrVersion(), event.getModifier(), event.getDid(), event.getStatus(), event.getDesc());
-    }
-
-    @Override
-    public AuditingGenericEvent getDbEvent() {
-        return event;
-    }
-
-    public AuditDistribDeployEventFactory(CommonAuditData commonFields, String currentVersion,
-                                          String did, User modifier, String resourceName, String resourceType) {
-
-       super(AuditingActionEnum.DISTRIBUTION_DEPLOY);
-       this.event = new DistributionDeployEvent(getAction().getName(), commonFields, did, buildUserName(modifier),
-                                currentVersion, resourceName, resourceType);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribEngineEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribEngineEventFactory.java
deleted file mode 100644
index 3ebacb49d9..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribEngineEventFactory.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.distribution;
-
-import org.openecomp.sdc.be.auditing.impl.AuditBaseEventFactory;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
-import org.openecomp.sdc.be.resources.data.auditing.DistributionEngineEvent;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-
-public abstract class AuditDistribEngineEventFactory extends AuditBaseEventFactory{
-
-    protected final DistributionEngineEvent event;
-
-    public AuditDistribEngineEventFactory(AuditingActionEnum action, CommonAuditData commonFields, String consumerId, String distStatusTopic, String distNotifTopic,
-                                          String apiKey, String envName, String role) {
-        super(action);
-        event = new DistributionEngineEvent(getAction().getName(), commonFields, consumerId, distStatusTopic, distNotifTopic, apiKey, envName, role);
-    }
-
-    @Override
-    public AuditingGenericEvent getDbEvent() {
-        return event;
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribNotificationEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribNotificationEventFactory.java
deleted file mode 100644
index 80c4590b8d..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribNotificationEventFactory.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.distribution;
-
-import org.openecomp.sdc.be.auditing.impl.AuditBaseEventFactory;
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
-import org.openecomp.sdc.be.resources.data.auditing.DistributionNotificationEvent;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.OperationalEnvAuditData;
-
-public class AuditDistribNotificationEventFactory extends AuditBaseEventFactory {
-
-    private DistributionNotificationEvent event;
-
-    private static final String LOG_STR = "ACTION = \"%s\" RESOURCE_NAME = \"%s\" RESOURCE_TYPE = \"%s\" " +
-            "SERVICE_INSTANCE_ID = \"%s\" CURR_VERSION = \"%s\" MODIFIER = \"%s\" CURR_STATE = \"%s\" DID = \"%s\" " +
-            "TOPIC_NAME = \"%s\" STATUS = \"%s\" DESC = \"%s\" TENANT = \"%s\" VNF_WORKLOAD_CONTEXT = \"%s\" ENV_ID = \"%s\"";
-
-    @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getResourceName(), event.getResourceType(), event.getServiceInstanceId(),
-                event.getCurrVersion(), event.getModifier(), event.getCurrState(), event.getDid(), event.getTopicName(), event.getStatus(), event.getDesc(),
-                event.getTenant(), event.getVnfWorkloadContext(), event.getEnvId());
-    }
-
-    @Override
-    public AuditingGenericEvent getDbEvent() {
-        return event;
-    }
-
-    public AuditDistribNotificationEventFactory(CommonAuditData commonFields, String currentState, String currentVersion,
-                                                String did, User modifier, String resourceName,
-                                                String resourceType, String topicName, OperationalEnvAuditData opEnvFields) {
-
-       super(AuditingActionEnum.DISTRIBUTION_NOTIFY);
-       this.event = new DistributionNotificationEvent(getAction().getName(), commonFields, did, AuditBaseEventFactory.buildUserName(modifier),
-                currentState, currentVersion,resourceName, resourceType, topicName, opEnvFields);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribStatusEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribStatusEventFactory.java
deleted file mode 100644
index 3d71a200a3..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribStatusEventFactory.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.distribution;
-
-import org.openecomp.sdc.be.auditing.impl.AuditBaseEventFactory;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
-import org.openecomp.sdc.be.resources.data.auditing.DistributionStatusEvent;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-
-public class AuditDistribStatusEventFactory extends AuditBaseEventFactory {
-
-    private DistributionStatusEvent event;
-
-    private static final String LOG_STR = "ACTION = \"%s\" DID = \"%s\" CONSUMER_ID = \"%s\" " +
-            "TOPIC_NAME = \"%s\" RESOURCE_URL = \"%s\" STATUS_TIME = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
-
-    @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getDid(), event.getConsumerId(), event.getTopicName(), event.getResoureURL(),
-                event.getStatusTime(), event.getStatus(), event.getDesc());
-    }
-
-    @Override
-    public AuditingGenericEvent getDbEvent() {
-        return event;
-    }
-
-    public AuditDistribStatusEventFactory(CommonAuditData commonFields, String did, String consumerId, String topicName,
-                                          String resourceURL, String statusTime) {
-
-       super(AuditingActionEnum.DISTRIBUTION_STATUS);
-       this.event = new DistributionStatusEvent(getAction().getName(), commonFields, did, consumerId, topicName, resourceURL, statusTime);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionDeployEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionDeployEventFactory.java
new file mode 100644
index 0000000000..48d22316f6
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionDeployEventFactory.java
@@ -0,0 +1,51 @@
+package org.openecomp.sdc.be.auditing.impl.distribution;
+
+import org.openecomp.sdc.be.auditing.impl.AuditBaseEventFactory;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
+import org.openecomp.sdc.be.resources.data.auditing.DistributionDeployEvent;
+import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+
+public class AuditDistributionDeployEventFactory extends AuditBaseEventFactory {
+
+    private static final String LOG_STR = "ACTION = \"%s\" RESOURCE_NAME = \"%s\" RESOURCE_TYPE = \"%s\" " +
+            "SERVICE_INSTANCE_ID = \"%s\" CURR_VERSION = \"%s\" MODIFIER = \"%s\" DID = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
+    private final DistributionDeployEvent event;
+
+    public AuditDistributionDeployEventFactory(CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                               String did, User modifier, String currentVersion) {
+        this(commonFields, resourceCommonInfo, did, buildUserName(modifier), currentVersion);
+    }
+
+    public AuditDistributionDeployEventFactory(CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                               String did, String modifier, String currentVersion, String timestamp) {
+        this(commonFields, resourceCommonInfo, did, modifier, currentVersion);
+        this.event.setTimestamp1(timestamp);
+    }
+
+    private AuditDistributionDeployEventFactory(CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                               String did, String modifier, String currentVersion) {
+        super(AuditingActionEnum.DISTRIBUTION_DEPLOY);
+        event = new DistributionDeployEvent(getAction().getName(), commonFields, resourceCommonInfo, did, modifier,
+                currentVersion);
+    }
+
+    @Override
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getResourceName(), event.getResourceType(), event.getServiceInstanceId(),
+                event.getCurrVersion(), event.getModifier(), event.getDid(), event.getStatus(), event.getDesc()};
+    }
+
+    @Override
+    public AuditingGenericEvent getDbEvent() {
+        return event;
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribDownloadEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionDownloadEventFactory.java
index e8453b1d0b..cfc177e14e 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribDownloadEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionDownloadEventFactory.java
@@ -7,27 +7,34 @@ import org.openecomp.sdc.be.resources.data.auditing.DistributionDownloadEvent;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData;
 
-public class AuditDistribDownloadEventFactory extends AuditBaseEventFactory {
-
-    private DistributionDownloadEvent event;
+public class AuditDistributionDownloadEventFactory extends AuditBaseEventFactory {
 
     private static final String LOG_STR = "ACTION = \"%s\" CONSUMER_ID = \"%s\" RESOURCE_URL = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
+    private final DistributionDownloadEvent event;
 
-    public AuditDistribDownloadEventFactory(CommonAuditData commonFields, DistributionData distributionData) {
-
+    public AuditDistributionDownloadEventFactory(CommonAuditData commonFields, DistributionData distributionData) {
         super(AuditingActionEnum.DISTRIBUTION_ARTIFACT_DOWNLOAD);
         this.event = new DistributionDownloadEvent(getAction().getName(), commonFields, distributionData);
     }
 
+    public AuditDistributionDownloadEventFactory(CommonAuditData commonFields, DistributionData distributionData, String timestamp) {
+       this(commonFields, distributionData);
+       this.event.setTimestamp1(timestamp);
+    }
+
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getConsumerId(), event.getResourceUrl(), event.getStatus(), event.getDesc());
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getConsumerId(), event.getResourceUrl(),
+                event.getStatus(), event.getDesc()};
     }
 
     @Override
     public AuditingGenericEvent getDbEvent() {
         return event;
     }
-
-
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionEngineEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionEngineEventFactory.java
new file mode 100644
index 0000000000..f403b97eb8
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionEngineEventFactory.java
@@ -0,0 +1,36 @@
+package org.openecomp.sdc.be.auditing.impl.distribution;
+
+import org.openecomp.sdc.be.auditing.impl.AuditBaseEventFactory;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
+import org.openecomp.sdc.be.resources.data.auditing.DistributionEngineEvent;
+import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionTopicData;
+
+public abstract class AuditDistributionEngineEventFactory extends AuditBaseEventFactory{
+
+    protected final DistributionEngineEvent event;
+
+    AuditDistributionEngineEventFactory(AuditingActionEnum action, CommonAuditData commonFields,
+                                               DistributionTopicData distributionTopicData, String consumerId,
+                                               String apiKey, String envName, String role) {
+        super(action);
+        event = new DistributionEngineEvent(getAction().getName(), commonFields, consumerId, distributionTopicData, apiKey, envName, role);
+    }
+
+    AuditDistributionEngineEventFactory(AuditingActionEnum action, CommonAuditData commonFields,
+                                               DistributionTopicData distributionTopicData, String consumerId,
+                                               String apiKey, String envName, String role, String timestamp) {
+        this(action, commonFields, distributionTopicData, consumerId, apiKey, envName, role);
+        this.event.setTimestamp1(timestamp);
+    }
+
+    protected String getTopicName() {
+        return event.getDnotifTopic() != null ? event.getDnotifTopic() : event.getDstatusTopic();
+    }
+
+    @Override
+    public AuditingGenericEvent getDbEvent() {
+        return event;
+    }
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionEngineEventFactoryManager.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionEngineEventFactoryManager.java
new file mode 100644
index 0000000000..a03665e966
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionEngineEventFactoryManager.java
@@ -0,0 +1,40 @@
+package org.openecomp.sdc.be.auditing.impl.distribution;
+
+import org.openecomp.sdc.be.auditing.api.AuditEventFactory;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionTopicData;
+import org.openecomp.sdc.common.util.ThreadLocalsHolder;
+
+public class AuditDistributionEngineEventFactoryManager {
+
+    public static AuditEventFactory createDistributionEngineEventFactory(AuditingActionEnum action, String environmentName,
+                                                                         DistributionTopicData distributionTopicData, String role, String apiKey, String status) {
+        AuditEventFactory factory;
+
+        switch (action) {
+            case CREATE_DISTRIBUTION_TOPIC:
+                factory = new AuditCreateTopicDistributionEngineEventFactory(
+                        CommonAuditData.newBuilder()
+                                .status(status)
+                                .requestId(ThreadLocalsHolder.getUuid())
+                                .build(),
+                        distributionTopicData, apiKey, environmentName, role);
+                break;
+            case ADD_KEY_TO_TOPIC_ACL:
+            case REMOVE_KEY_FROM_TOPIC_ACL:
+                factory = new AuditAddRemoveKeyDistributionEngineEventFactory(action,
+                        CommonAuditData.newBuilder()
+                                .status(status)
+                                .requestId(ThreadLocalsHolder.getUuid())
+                                .build(),
+                        distributionTopicData, apiKey, environmentName, role);
+                break;
+            default:
+                throw new UnsupportedOperationException();
+
+        }
+        return factory;
+
+    }
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionEngineEventMigrationFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionEngineEventMigrationFactory.java
new file mode 100644
index 0000000000..87a4867597
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionEngineEventMigrationFactory.java
@@ -0,0 +1,24 @@
+package org.openecomp.sdc.be.auditing.impl.distribution;
+
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionTopicData;
+
+public class AuditDistributionEngineEventMigrationFactory extends AuditDistributionEngineEventFactory {
+
+    public AuditDistributionEngineEventMigrationFactory(AuditingActionEnum action, CommonAuditData commonFields,
+                                                        DistributionTopicData distributionTopicData, String consumerId,
+                                                        String apiKey, String envName, String role, String timestamp) {
+        super(action, commonFields, distributionTopicData, consumerId, apiKey, envName, role, timestamp);
+    }
+
+    @Override
+    public String getLogPattern() {
+        return "";
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[0];
+    }
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionNotificationEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionNotificationEventFactory.java
new file mode 100644
index 0000000000..7e240b10c6
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionNotificationEventFactory.java
@@ -0,0 +1,63 @@
+package org.openecomp.sdc.be.auditing.impl.distribution;
+
+import org.openecomp.sdc.be.auditing.impl.AuditBaseEventFactory;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
+import org.openecomp.sdc.be.resources.data.auditing.DistributionNotificationEvent;
+import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.OperationalEnvAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
+
+public class AuditDistributionNotificationEventFactory extends AuditBaseEventFactory {
+
+    private static final String LOG_STR = "ACTION = \"%s\" RESOURCE_NAME = \"%s\" RESOURCE_TYPE = \"%s\" " +
+            "SERVICE_INSTANCE_ID = \"%s\" CURR_VERSION = \"%s\" MODIFIER = \"%s\" CURR_STATE = \"%s\" DID = \"%s\" " +
+            "TOPIC_NAME = \"%s\" STATUS = \"%s\" DESC = \"%s\" TENANT = \"%s\" VNF_WORKLOAD_CONTEXT = \"%s\" ENV_ID = \"%s\"";
+    private final DistributionNotificationEvent event;
+
+    public AuditDistributionNotificationEventFactory(CommonAuditData commonAuditData, ResourceCommonInfo resourceCommonInfo,
+                                                     ResourceVersionInfo resourceVersionInfo,
+                                                     String did, User modifier, String topicName,
+                                                     OperationalEnvAuditData opEnvFields) {
+        this(commonAuditData, resourceCommonInfo,
+                resourceVersionInfo, did, AuditBaseEventFactory.buildUserName(modifier),
+                topicName, opEnvFields);
+    }
+
+    public AuditDistributionNotificationEventFactory(CommonAuditData commonAuditData, ResourceCommonInfo resourceCommonInfo,
+                                                     ResourceVersionInfo resourceVersionInfo,
+                                                     String did, String modifier, String topicName,
+                                                     OperationalEnvAuditData opEnvFields, String timestamp) {
+        this(commonAuditData, resourceCommonInfo, resourceVersionInfo, did, modifier, topicName, opEnvFields);
+        this.event.setTimestamp1(timestamp);
+    }
+
+    private AuditDistributionNotificationEventFactory(CommonAuditData commonAuditData, ResourceCommonInfo resourceCommonInfo,
+                                                     ResourceVersionInfo resourceVersionInfo,
+                                                     String did, String modifier, String topicName,
+                                                     OperationalEnvAuditData opEnvFields) {
+        super(AuditingActionEnum.DISTRIBUTION_NOTIFY);
+        this.event = new DistributionNotificationEvent(getAction().getName(), commonAuditData, resourceCommonInfo,
+                resourceVersionInfo, did, modifier, topicName, opEnvFields);
+    }
+
+    @Override
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getResourceName(), event.getResourceType(), event.getServiceInstanceId(),
+                event.getCurrVersion(), event.getModifier(), event.getCurrState(), event.getDid(), event.getTopicName(),
+                event.getStatus(), event.getDesc(), event.getTenant(), event.getVnfWorkloadContext(), event.getEnvId()};
+    }
+
+    @Override
+    public AuditingGenericEvent getDbEvent() {
+        return event;
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionStatusEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionStatusEventFactory.java
new file mode 100644
index 0000000000..5719fe2b73
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionStatusEventFactory.java
@@ -0,0 +1,44 @@
+package org.openecomp.sdc.be.auditing.impl.distribution;
+
+import org.openecomp.sdc.be.auditing.impl.AuditBaseEventFactory;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
+import org.openecomp.sdc.be.resources.data.auditing.DistributionStatusEvent;
+import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData;
+
+public class AuditDistributionStatusEventFactory extends AuditBaseEventFactory {
+
+    private static final String LOG_STR = "ACTION = \"%s\" DID = \"%s\" CONSUMER_ID = \"%s\" " +
+            "TOPIC_NAME = \"%s\" RESOURCE_URL = \"%s\" STATUS_TIME = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
+    private final DistributionStatusEvent event;
+
+    public AuditDistributionStatusEventFactory(CommonAuditData commonFields, DistributionData distributionData,
+                                               String did, String topicName, String statusTime) {
+        super(AuditingActionEnum.DISTRIBUTION_STATUS);
+        this.event = new DistributionStatusEvent(getAction().getName(), commonFields, distributionData, did,
+                topicName, statusTime);
+    }
+
+    public AuditDistributionStatusEventFactory(CommonAuditData commonFields, DistributionData distributionData,
+                                               String did, String topicName, String statusTime, String timestamp) {
+        this(commonFields, distributionData, did, topicName, statusTime);
+        this.event.setTimestamp1(timestamp);
+    }
+
+    @Override
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getDid(), event.getConsumerId(), event.getTopicName(),
+                event.getResoureURL(), event.getStatusTime(), event.getStatus(), event.getDesc()};
+    }
+
+    @Override
+    public AuditingGenericEvent getDbEvent() {
+        return event;
+    }
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditGetUebClusterEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditGetUebClusterEventFactory.java
deleted file mode 100644
index 79d524a0dc..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditGetUebClusterEventFactory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.distribution;
-
-import org.openecomp.sdc.be.auditing.impl.AuditBaseEventFactory;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingGetUebClusterEvent;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-
-public class AuditGetUebClusterEventFactory extends AuditBaseEventFactory {
-
-    private AuditingGetUebClusterEvent event;
-
-    private static final String LOG_STR = "ACTION = \"%s\" CONSUMER_ID = \"%s\" STATUS = \"%s\" STATUS_DESC = \"%s\"";
-
-    @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getConsumerId(), event.getStatus(), event.getDesc());
-    }
-
-    @Override
-    public AuditingGenericEvent getDbEvent() {
-        return event;
-    }
-
-    public AuditGetUebClusterEventFactory(CommonAuditData commonFields, String consumerId) {
-
-       super(AuditingActionEnum.GET_UEB_CLUSTER);
-       this.event = new AuditingGetUebClusterEvent(getAction().getName(), commonFields, consumerId);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditRegUnregDistribEngineEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditRegUnregDistribEngineEventFactory.java
deleted file mode 100644
index 2dbcde7b2c..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditRegUnregDistribEngineEventFactory.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.distribution;
-
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-
-public abstract class AuditRegUnregDistribEngineEventFactory extends AuditDistribEngineEventFactory {
-
-    private static final String LOG_STR = "ACTION = \"%s\" CONSUMER_ID = \"%s\" API_KEY = \"%s\" D_ENV = \"%s\" STATUS = \"%s\"" +
-            " DESC = \"%s\" DNOTIF_TOPIC = \"%s\" DSTATUS_TOPIC = \"%s\"";
-
-    public AuditRegUnregDistribEngineEventFactory(AuditingActionEnum action, CommonAuditData commonFields, String consumerId,
-                                                  String distStatusTopic, String distNotifTopic, String apiKey, String envName, String role) {
-        super(action, commonFields, consumerId, distStatusTopic, distNotifTopic, apiKey, envName, role);
-    }
-
-    @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getConsumerId(), event.getApiKey(), event.getEnvironmentName(),
-                event.getStatus(), event.getDesc(), event.getDnotifTopic(),event.getDstatusTopic());
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditRegUnregDistributionEngineEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditRegUnregDistributionEngineEventFactory.java
new file mode 100644
index 0000000000..2dcb902f31
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditRegUnregDistributionEngineEventFactory.java
@@ -0,0 +1,28 @@
+package org.openecomp.sdc.be.auditing.impl.distribution;
+
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionTopicData;
+
+public class AuditRegUnregDistributionEngineEventFactory extends AuditDistributionEngineEventFactory {
+
+    private static final String LOG_STR = "ACTION = \"%s\" CONSUMER_ID = \"%s\" API_KEY = \"%s\" D_ENV = \"%s\" STATUS = \"%s\"" +
+            " DESC = \"%s\" DNOTIF_TOPIC = \"%s\" DSTATUS_TOPIC = \"%s\"";
+
+    public AuditRegUnregDistributionEngineEventFactory(AuditingActionEnum action, CommonAuditData commonFields,
+                                                       DistributionTopicData distrTopicData, String consumerId, String apiKey, String envName) {
+        super(action, commonFields, distrTopicData, consumerId, apiKey, envName, null);
+    }
+
+    @Override
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getConsumerId(), event.getApiKey(),
+                event.getEnvironmentName(), event.getStatus(), event.getDesc(),
+                event.getDnotifTopic(), event.getDstatusTopic()};
+    }
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditRegisterDistribEngineEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditRegisterDistribEngineEventFactory.java
deleted file mode 100644
index e2ce0312f7..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditRegisterDistribEngineEventFactory.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.distribution;
-
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-
-public class AuditRegisterDistribEngineEventFactory extends AuditRegUnregDistribEngineEventFactory {
-
-    public AuditRegisterDistribEngineEventFactory(CommonAuditData commonFields, String consumerId, String distStatusTopic, String distNotifTopic,
-                                                  String apiKey, String envName, String role) {
-        super(AuditingActionEnum.DISTRIBUTION_REGISTER, commonFields, consumerId, distStatusTopic, distNotifTopic, apiKey, envName, role);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditRemoveKeyDistribEngineEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditRemoveKeyDistribEngineEventFactory.java
deleted file mode 100644
index fe7f335c77..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditRemoveKeyDistribEngineEventFactory.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.distribution;
-
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-
-public class AuditRemoveKeyDistribEngineEventFactory extends AuditAddRemoveKeyDistribEngineEventFactory {
-
-    public AuditRemoveKeyDistribEngineEventFactory(CommonAuditData commonFields, String consumerId, String distStatusTopic, String distNotifTopic,
-                                                   String apiKey, String envName, String role) {
-        super(AuditingActionEnum.REMOVE_KEY_FROM_TOPIC_ACL, commonFields, consumerId, distStatusTopic, distNotifTopic, apiKey, envName, role);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditUnregisterDistribEngineEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditUnregisterDistribEngineEventFactory.java
deleted file mode 100644
index d402d38e25..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditUnregisterDistribEngineEventFactory.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.distribution;
-
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-
-public class AuditUnregisterDistribEngineEventFactory extends AuditRegUnregDistribEngineEventFactory {
-
-    public AuditUnregisterDistribEngineEventFactory(CommonAuditData commonFields, String consumerId, String distStatusTopic, String distNotifTopic,
-                                                    String apiKey, String envName, String role) {
-        super(AuditingActionEnum.DISTRIBUTION_UN_REGISTER, commonFields, consumerId, distStatusTopic, distNotifTopic, apiKey, envName, role);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditActivateServiceExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditActivateServiceExternalApiEventFactory.java
index 942dae0507..f8add1dacf 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditActivateServiceExternalApiEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditActivateServiceExternalApiEventFactory.java
@@ -3,24 +3,34 @@ package org.openecomp.sdc.be.auditing.impl.externalapi;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 
 public class AuditActivateServiceExternalApiEventFactory extends AuditExternalApiEventFactory {
 
-    protected static final String LOG_STR = "ACTION = \"%s\" RESOURCE_TYPE = \"%s\" CONSUMER_ID = \"%s\"" +
+    private static final String LOG_STR = "ACTION = \"%s\" RESOURCE_TYPE = \"%s\" CONSUMER_ID = \"%s\"" +
             " RESOURCE_URL = \"%s\" MODIFIER = \"%s\" STATUS = \"%s\" SERVICE_INSTANCE_ID = \"%s\" INVARIANT_UUID = \"%s\" DESC = \"%s\"";
 
-    public AuditActivateServiceExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName,
-                                                       String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                       String invariantUuid, User modifier, String artifactData) {
-        super(AuditingActionEnum.ACTIVATE_SERVICE_BY_API, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams,
-                invariantUuid, modifier, artifactData);
+    public AuditActivateServiceExternalApiEventFactory(CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                                       DistributionData distributionData, String invariantUuid, User modifier) {
+        super(AuditingActionEnum.ACTIVATE_SERVICE_BY_API, commonFields, resourceCommonInfo, distributionData,
+                ResourceVersionInfo.newBuilder()
+                    .build(),
+                ResourceVersionInfo.newBuilder()
+                    .build(),
+                invariantUuid, modifier, null);
     }
 
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getResourceType(), event.getConsumerId(),
-                event.getResourceURL(), event.getModifier(), event.getStatus(), event.getServiceInstanceId(),
-                event.getInvariantUuid(), event.getDesc());
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getResourceType(), event.getConsumerId(),
+                event.getResourceURL(), event.getModifier(), event.getStatus(),
+                event.getServiceInstanceId(), event.getInvariantUuid(), event.getDesc()};
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetExternalApiEventFactory.java
index 5e6256368e..0199c4ff7c 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetExternalApiEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetExternalApiEventFactory.java
@@ -1,25 +1,34 @@
 package org.openecomp.sdc.be.auditing.impl.externalapi;
 
-import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 
-public abstract class AuditAssetExternalApiEventFactory extends AuditExternalApiEventFactory {
+public class AuditAssetExternalApiEventFactory extends AuditExternalApiEventFactory {
 
-    protected static final String LOG_STR = "ACTION = \"%s\" CONSUMER_ID = \"%s\" RESOURCE_URL = \"%s\" RESOURCE_NAME = \"%s\" " +
+    private static final String LOG_STR = "ACTION = \"%s\" CONSUMER_ID = \"%s\" RESOURCE_URL = \"%s\" RESOURCE_NAME = \"%s\" " +
             "RESOURCE_TYPE = \"%s\" SERVICE_INSTANCE_ID = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
 
-    public AuditAssetExternalApiEventFactory(AuditingActionEnum action, CommonAuditData commonFields, String resourceType, String resourceName,
-                                             String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                             String invariantUuid, User modifier, String artifactData) {
-        super(action, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams,
-                invariantUuid, modifier, artifactData);
+    public AuditAssetExternalApiEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                             DistributionData distributionData) {
+        super(action, commonFields, resourceCommonInfo, distributionData,
+                ResourceVersionInfo.newBuilder()
+                        .build(),
+                ResourceVersionInfo.newBuilder()
+                        .build(),
+                null, null, null);
     }
 
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getConsumerId(), event.getResourceURL(), event.getResourceName(),
-                event.getResourceType(), event.getServiceInstanceId(), event.getStatus(), event.getDesc());
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getConsumerId(), event.getResourceURL(), event.getResourceName(),
+                event.getResourceType(), event.getServiceInstanceId(), event.getStatus(), event.getDesc()};
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetGetMetadataExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetGetMetadataExternalApiEventFactory.java
deleted file mode 100644
index 1a41d7d5f8..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetGetMetadataExternalApiEventFactory.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.externalapi;
-
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
-
-public class AuditAssetGetMetadataExternalApiEventFactory extends AuditAssetExternalApiEventFactory {
-
-    public AuditAssetGetMetadataExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName,
-                                                        String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                        String invariantUuid, User modifier, String artifactData) {
-        super(AuditingActionEnum.GET_ASSET_METADATA, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams,
-                invariantUuid, modifier, artifactData);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetListExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetListExternalApiEventFactory.java
index 13558881c5..d759ca2ba1 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetListExternalApiEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetListExternalApiEventFactory.java
@@ -1,24 +1,33 @@
 package org.openecomp.sdc.be.auditing.impl.externalapi;
 
-import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 
-public abstract class AuditAssetListExternalApiEventFactory extends AuditExternalApiEventFactory {
+public class AuditAssetListExternalApiEventFactory extends AuditExternalApiEventFactory {
 
-    protected static final String LOG_STR = "ACTION = \"%s\" CONSUMER_ID = \"%s\" RESOURCE_URL = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
+    private static final String LOG_STR = "ACTION = \"%s\" CONSUMER_ID = \"%s\" RESOURCE_URL = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
 
-     public AuditAssetListExternalApiEventFactory(AuditingActionEnum action, CommonAuditData commonFields, String resourceType, String resourceName,
-                                                  String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                  String invariantUuid, User modifier, String artifactData) {
-        super(action, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams,
-                invariantUuid, modifier, artifactData);
+    public AuditAssetListExternalApiEventFactory(AuditingActionEnum action, CommonAuditData commonFields,
+                                                  DistributionData distributionData) {
+         super(action, commonFields, new ResourceCommonInfo(), distributionData,
+                 ResourceVersionInfo.newBuilder()
+                         .build(),
+                 ResourceVersionInfo.newBuilder()
+                         .build(),
+                 null, null, null);
     }
 
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getConsumerId(), event.getResourceURL(),
-                event.getStatus(), event.getDesc());
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getConsumerId(), event.getResourceURL(),
+                event.getStatus(), event.getDesc()};
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditChangeLifecycleExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditChangeLifecycleExternalApiEventFactory.java
index 060cbd395e..1306efefa7 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditChangeLifecycleExternalApiEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditChangeLifecycleExternalApiEventFactory.java
@@ -3,25 +3,33 @@ package org.openecomp.sdc.be.auditing.impl.externalapi;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 
 public class AuditChangeLifecycleExternalApiEventFactory extends AuditExternalApiEventFactory {
 
-    protected static final String LOG_STR = "ACTION = \"%s\" RESOURCE_NAME = \"%s\" RESOURCE_TYPE = \"%s\" CONSUMER_ID = \"%s\"" +
+    private static final String LOG_STR = "ACTION = \"%s\" RESOURCE_NAME = \"%s\" RESOURCE_TYPE = \"%s\" CONSUMER_ID = \"%s\"" +
             " RESOURCE_URL = \"%s\" MODIFIER = \"%s\" PREV_VERSION = \"%s\" CURR_VERSION = \"%s\"" +
             " PREV_STATE = \"%s\" CURR_STATE = \"%s\" SERVICE_INSTANCE_ID = \"%s\" INVARIANT_UUID = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
 
-    public AuditChangeLifecycleExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName,
-                                                       String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                       String invariantUuid, User modifier, String artifactData) {
-        super(AuditingActionEnum.CHANGE_LIFECYCLE_BY_API, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams,
-                invariantUuid, modifier, artifactData);
+    public AuditChangeLifecycleExternalApiEventFactory(CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                                       DistributionData distributionData, ResourceVersionInfo prevParams, ResourceVersionInfo currParams,
+                                                       String invariantUuid, User modifier) {
+        super(AuditingActionEnum.CHANGE_LIFECYCLE_BY_API, commonFields, resourceCommonInfo, distributionData, prevParams, currParams,
+                invariantUuid, modifier, null);
     }
 
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getResourceName(), event.getResourceType(), event.getConsumerId(),
-                event.getResourceURL(), event.getModifier(), event.getPrevVersion(), event.getCurrVersion(), event.getPrevState(),
-                event.getCurrState(), event.getServiceInstanceId(), event.getInvariantUuid(), event.getStatus(), event.getDesc());
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getResourceName(), event.getResourceType(), event.getConsumerId(),
+                event.getResourceURL(), event.getModifier(), event.getPrevVersion(), event.getCurrVersion(),
+                event.getPrevState(), event.getCurrState(), event.getServiceInstanceId(), event.getInvariantUuid(),
+                event.getStatus(), event.getDesc()};
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditCreateResourceExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditCreateResourceExternalApiEventFactory.java
index 07bac13495..f01d18cf22 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditCreateResourceExternalApiEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditCreateResourceExternalApiEventFactory.java
@@ -3,26 +3,37 @@ package org.openecomp.sdc.be.auditing.impl.externalapi;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 
 public class AuditCreateResourceExternalApiEventFactory extends AuditExternalApiEventFactory {
 
     private static final String LOG_STR = "ACTION = \"%s\" RESOURCE_NAME = \"%s\" RESOURCE_TYPE = \"%s\" CONSUMER_ID = \"%s\"" +
-            " RESOURCE_URL = \"%s\" MODIFIER = \"%s\" PREV_VERSION = \"%s\" CURR_VERSION = \"%s\" PREV_STATE = \"%s\" CURR_STATE = \"%s\"" +
-            " PREV_ARTIFACT_UUID = \"%s\" CURR_ARTIFACT_UUID = \"%s\" STATUS = \"%s\" SERVICE_INSTANCE_ID = \"%s\" INVARIANT_UUID =  \"%s\" DESC = \"%s\"";
+            " RESOURCE_URL = \"%s\" MODIFIER = \"%s\" CURR_VERSION = \"%s\" CURR_STATE = \"%s\" CURR_ARTIFACT_UUID = \"%s\" " +
+            "STATUS = \"%s\" SERVICE_INSTANCE_ID = \"%s\" INVARIANT_UUID = \"%s\" DESC = \"%s\"";
 
-    public AuditCreateResourceExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName,
-                                                      String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                      String invariantUuid, User modifier, String artifactData) {
-        super(AuditingActionEnum.CREATE_RESOURCE_BY_API, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams,
-                invariantUuid, modifier, artifactData);
+    public AuditCreateResourceExternalApiEventFactory(CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                                      DistributionData distributionData, ResourceVersionInfo currResourceVersionInfo,
+                                                      String invariantUuid, User modifier) {
+        super(AuditingActionEnum.CREATE_RESOURCE_BY_API, commonFields, resourceCommonInfo, distributionData,
+                ResourceVersionInfo.newBuilder()
+                        .build(),
+                currResourceVersionInfo,
+                invariantUuid, modifier, null);
     }
 
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getResourceName(), event.getResourceType(), event.getConsumerId(),
-                event.getResourceURL(), event.getModifier(), event.getPrevVersion(), event.getCurrVersion(), event.getPrevState(),
-                event.getCurrState(), event.getPrevArtifactUuid(), event.getCurrArtifactUuid(), event.getStatus(),
-                event.getServiceInstanceId(), event.getInvariantUuid(), event.getDesc());
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getResourceName(), event.getResourceType(),
+                event.getConsumerId(), event.getResourceURL(), event.getModifier(),
+                event.getCurrVersion(), event.getCurrState(), event.getCurrArtifactUuid(),
+                event.getStatus(), event.getServiceInstanceId(), event.getInvariantUuid(),
+                event.getDesc()};
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditCrudExternalApiArtifactEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditCrudExternalApiArtifactEventFactory.java
index fd8be4cc47..a519130a04 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditCrudExternalApiArtifactEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditCrudExternalApiArtifactEventFactory.java
@@ -3,25 +3,33 @@ package org.openecomp.sdc.be.auditing.impl.externalapi;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 
-public abstract class AuditCrudExternalApiArtifactEventFactory extends AuditExternalApiEventFactory {
+public class AuditCrudExternalApiArtifactEventFactory extends AuditExternalApiEventFactory {
 
     private static final String LOG_STR = "ACTION = \"%s\" RESOURCE_NAME = \"%s\" RESOURCE_TYPE = \"%s\" CONSUMER_ID = \"%s\"" +
             " RESOURCE_URL = \"%s\" MODIFIER = \"%s\" PREV_ARTIFACT_UUID = \"%s\" CURR_ARTIFACT_UUID = \"%s\" ARTIFACT_DATA = \"%s\"" +
             " STATUS = \"%s\" DESC = \"%s\"";
 
-    public AuditCrudExternalApiArtifactEventFactory(AuditingActionEnum action, CommonAuditData commonFields, String resourceType, String resourceName,
-                                                    String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams,
+    public AuditCrudExternalApiArtifactEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                                    DistributionData distributionData, ResourceVersionInfo prevParams, ResourceVersionInfo currParams,
                                                     String invariantUuid, User modifier, String artifactData) {
-        super(action, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams,
+        super(action, commonFields, resourceCommonInfo, distributionData, prevParams, currParams,
                 invariantUuid, modifier, artifactData);
     }
 
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getResourceName(), event.getResourceType(), event.getConsumerId(),
-                event.getResourceURL(), event.getModifier(), event.getPrevArtifactUuid(), event.getCurrArtifactUuid(),
-                event.getArtifactData(), event.getStatus(), event.getDesc());
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getResourceName(), event.getResourceType(),
+                event.getConsumerId(), event.getResourceURL(), event.getModifier(),
+                event.getPrevArtifactUuid(), event.getCurrArtifactUuid(), event.getArtifactData(),
+                event.getStatus(), event.getDesc()};
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditDeleteArtByApiCrudExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditDeleteArtByApiCrudExternalApiEventFactory.java
deleted file mode 100644
index c2827b1e5d..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditDeleteArtByApiCrudExternalApiEventFactory.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.externalapi;
-
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
-
-public class AuditDeleteArtByApiCrudExternalApiEventFactory extends AuditCrudExternalApiArtifactEventFactory {
-
-    public AuditDeleteArtByApiCrudExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName,
-                                                          String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                          String invariantUuid, User modifier, String artifactData) {
-        super(AuditingActionEnum.ARTIFACT_DELETE_BY_API, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams,
-                invariantUuid, modifier, artifactData);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditDownloadArtifactExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditDownloadArtifactExternalApiEventFactory.java
index 134dfd2921..b09f51c8ec 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditDownloadArtifactExternalApiEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditDownloadArtifactExternalApiEventFactory.java
@@ -3,21 +3,31 @@ package org.openecomp.sdc.be.auditing.impl.externalapi;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 
 public class AuditDownloadArtifactExternalApiEventFactory extends AuditExternalApiEventFactory {
 
-    private static final String LOG_STR = "CONSUMER_ID = \"%s\" RESOURCE_URL = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
+    private static final String LOG_STR = "ACTION = \"%s\" CONSUMER_ID = \"%s\" RESOURCE_URL = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
 
-    public AuditDownloadArtifactExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName,
-                                                        String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                        String invariantUuid, User modifier, String artifactData) {
-        super(AuditingActionEnum.DOWNLOAD_ARTIFACT, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams,
-                invariantUuid, modifier, artifactData);
+    public AuditDownloadArtifactExternalApiEventFactory(CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                                        DistributionData distributionData, ResourceVersionInfo currResourceVersionInfo,
+                                                        User modifier) {
+        super(AuditingActionEnum.DOWNLOAD_ARTIFACT, commonFields, resourceCommonInfo, distributionData,
+                ResourceVersionInfo.newBuilder()
+                        .build(),
+                currResourceVersionInfo, null, modifier, null);
     }
 
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getConsumerId(), event.getResourceURL(),event.getStatus(), event.getDesc());
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getConsumerId(), event.getResourceURL(),
+                event.getStatus(), event.getDesc()};
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditExternalApiEventFactory.java
index 4e233dee27..9974fee9a7 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditExternalApiEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditExternalApiEventFactory.java
@@ -6,17 +6,23 @@ import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
 import org.openecomp.sdc.be.resources.data.auditing.ExternalApiEvent;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
+import org.openecomp.sdc.common.util.ThreadLocalsHolder;
 
 public abstract class AuditExternalApiEventFactory extends AuditBaseEventFactory {
 
     protected final ExternalApiEvent event;
 
-    public AuditExternalApiEventFactory(AuditingActionEnum action, CommonAuditData commonFields, String resourceType, String resourceName,
-                                        String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams,
+    public AuditExternalApiEventFactory(AuditingActionEnum action, CommonAuditData commonAuditData, ResourceCommonInfo resourceCommonInfo,
+                                        DistributionData distributionData, ResourceVersionInfo prevParams, ResourceVersionInfo currParams,
                                         String invariantUuid, User modifier, String artifactData) {
         super(action);
-        event = new ExternalApiEvent(getAction().getName(), commonFields, resourceType, resourceName, consumerId, resourceUrl,
+        if (commonAuditData.getRequestId() == null) {
+            commonAuditData.setRequestId(ThreadLocalsHolder.getUuid());
+        }
+        event = new ExternalApiEvent(getAction().getName(), commonAuditData, resourceCommonInfo, distributionData,
                 prevParams, currParams, AuditBaseEventFactory.buildUserName(modifier), invariantUuid, artifactData) ;
     }
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditGetAssetListExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditGetAssetListExternalApiEventFactory.java
deleted file mode 100644
index e97614551f..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditGetAssetListExternalApiEventFactory.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.externalapi;
-
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
-
-public class AuditGetAssetListExternalApiEventFactory extends AuditAssetListExternalApiEventFactory {
-
-    public AuditGetAssetListExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName,
-                                                    String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                    String invariantUuid, User modifier, String artifactData) {
-        super(AuditingActionEnum.GET_ASSET_LIST, commonFields, resourceType, resourceName,
-                consumerId, resourceUrl, prevParams, currParams, invariantUuid, modifier, artifactData);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditGetFilteredAssetListExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditGetFilteredAssetListExternalApiEventFactory.java
deleted file mode 100644
index 379124dc4a..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditGetFilteredAssetListExternalApiEventFactory.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.externalapi;
-
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
-
-public class AuditGetFilteredAssetListExternalApiEventFactory extends AuditAssetListExternalApiEventFactory {
-
-    public AuditGetFilteredAssetListExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName,
-                                                            String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                            String invariantUuid, User modifier, String artifactData) {
-        super(AuditingActionEnum.GET_FILTERED_ASSET_LIST, commonFields, resourceType, resourceName,
-                consumerId, resourceUrl, prevParams, currParams, invariantUuid, modifier, artifactData);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditGetToscaModelExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditGetToscaModelExternalApiEventFactory.java
deleted file mode 100644
index 168cd1b150..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditGetToscaModelExternalApiEventFactory.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.externalapi;
-
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
-
-public class AuditGetToscaModelExternalApiEventFactory extends AuditAssetExternalApiEventFactory {
-
-    public AuditGetToscaModelExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName,
-                                                     String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                     String invariantUuid, User modifier, String artifactData) {
-        super(AuditingActionEnum.GET_TOSCA_MODEL, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams,
-                invariantUuid, modifier, artifactData);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditUpdateArtByApiCrudExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditUpdateArtByApiCrudExternalApiEventFactory.java
deleted file mode 100644
index 5af8ff3d0d..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditUpdateArtByApiCrudExternalApiEventFactory.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.externalapi;
-
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
-
-public class AuditUpdateArtByApiCrudExternalApiEventFactory extends AuditCrudExternalApiArtifactEventFactory {
-
-    public AuditUpdateArtByApiCrudExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName,
-                                                          String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                          String invariantUuid, User modifier, String artifactData) {
-        super(AuditingActionEnum.ARTIFACT_UPDATE_BY_API, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams,
-                invariantUuid, modifier, artifactData);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditUploadArtByApiCrudExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditUploadArtByApiCrudExternalApiEventFactory.java
deleted file mode 100644
index 02af363f46..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditUploadArtByApiCrudExternalApiEventFactory.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.externalapi;
-
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
-
-public class AuditUploadArtByApiCrudExternalApiEventFactory extends AuditCrudExternalApiArtifactEventFactory {
-
-    public AuditUploadArtByApiCrudExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName,
-                                                          String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                          String invariantUuid, User modifier, String artifactData) {
-        super(AuditingActionEnum.ARTIFACT_UPLOAD_BY_API, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams,
-                invariantUuid, modifier, artifactData);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditArtifactResourceAdminEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditArtifactResourceAdminEventFactory.java
index 9bda0d22d6..6f3336a67d 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditArtifactResourceAdminEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditArtifactResourceAdminEventFactory.java
@@ -3,31 +3,35 @@ package org.openecomp.sdc.be.auditing.impl.resourceadmin;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 import org.openecomp.sdc.common.api.Constants;
 
 public class AuditArtifactResourceAdminEventFactory extends AuditResourceAdminEventFactory {
 
-
     private static final String LOG_STR = "ACTION = \"%s\" RESOURCE_NAME = \"%s\" RESOURCE_TYPE = \"%s\" SERVICE_INSTANCE_ID = \"%s\"" +
             " INVARIANT_UUID = \"%s\" PREV_VERSION = \"%s\" CURR_VERSION = \"%s\" MODIFIER = \"%s\" PREV_STATE = \"%s\" CURR_STATE = \"%s\"" +
             " PREV_ARTIFACT_UUID = \"%s\" CURR_ARTIFACT_UUID = \"%s\" ARTIFACT_DATA = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
 
 
-    public AuditArtifactResourceAdminEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                  String resourceType, String resourceName, String invariantUuid,
-                                                  User modifier, String artifactData, String comment, String did) {
-        super(action, commonFields, prevParams, currParams, resourceType, resourceName, invariantUuid,
+    public AuditArtifactResourceAdminEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                                  ResourceVersionInfo prevParams, ResourceVersionInfo currParams,
+                                                  String invariantUuid, User modifier, String artifactData, String comment, String did) {
+        super(action, commonFields, resourceCommonInfo, prevParams, currParams, invariantUuid,
                 modifier, artifactData, comment, did, Constants.EMPTY_STRING);
     }
 
     @Override
-    public String getLogMessage() {
-        //TODO: check wheather or not "CONSUMER_ID =...RESOURCE_URL = " should be filled out - the info id not in the event
-        return String.format(LOG_STR, buildValue(event.getAction()), buildValue(event.getResourceName()), buildValue(event.getResourceType()),
-                buildValue(event.getServiceInstanceId()), buildValue(event.getInvariantUUID()), buildValue(event.getPrevVersion()),
-                buildValue(event.getCurrVersion()), buildValue(event.getModifier()), buildValue(event.getPrevState()),
-                buildValue(event.getCurrState()), buildValue(event.getPrevArtifactUUID()), buildValue(event.getCurrArtifactUUID()),
-                buildValue(event.getArtifactData()), buildValue(event.getStatus()), buildValue(event.getDesc()));
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getResourceName(), event.getResourceType(),
+                event.getServiceInstanceId(), event.getInvariantUUID(), event.getPrevVersion(),
+                event.getCurrVersion(), event.getModifier(), event.getPrevState(),
+                event.getCurrState(), event.getPrevArtifactUUID(), event.getCurrArtifactUUID(),
+                event.getArtifactData(), event.getStatus(), event.getDesc()};
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditCertificationResourceAdminEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditCertificationResourceAdminEventFactory.java
index f5302957e1..8d387c5524 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditCertificationResourceAdminEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditCertificationResourceAdminEventFactory.java
@@ -3,28 +3,32 @@ package org.openecomp.sdc.be.auditing.impl.resourceadmin;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 import org.openecomp.sdc.common.api.Constants;
 
 public class AuditCertificationResourceAdminEventFactory extends AuditResourceAdminEventFactory {
 
-
     private static final String LOG_STR = "ACTION = \"%s\" RESOURCE_NAME = \"%s\" RESOURCE_TYPE = \"%s\" SERVICE_INSTANCE_ID = \"%s\"" +
             " INVARIANT_UUID = \"%s\" PREV_VERSION = \"%s\" CURR_VERSION = \"%s\" MODIFIER = \"%s\" PREV_STATE = \"%s\" CURR_STATE = \"%s\"" +
             " COMMENT = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
 
-    public AuditCertificationResourceAdminEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                       String resourceType, String resourceName, String invariantUuid,
-                                                       User modifier, String artifactData, String comment, String did) {
-        super(action, commonFields, prevParams, currParams, resourceType, resourceName, invariantUuid,
+    public AuditCertificationResourceAdminEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo, ResourceVersionInfo prevParams, ResourceVersionInfo currParams,
+                                                       String invariantUuid, User modifier, String artifactData, String comment, String did) {
+        super(action, commonFields, resourceCommonInfo, prevParams, currParams, invariantUuid,
                 modifier, artifactData, comment, did, Constants.EMPTY_STRING);
     }
 
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, buildValue(event.getAction()), buildValue(event.getResourceName()), buildValue(event.getResourceType()),
-                buildValue(event.getServiceInstanceId()), buildValue(event.getInvariantUUID()), buildValue(event.getPrevVersion()),
-                buildValue(event.getCurrVersion()), buildValue(event.getModifier()), buildValue(event.getPrevState()),
-                buildValue(event.getCurrState()), buildValue(event.getComment()), buildValue(event.getStatus()), buildValue(event.getDesc()));
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getResourceName(), event.getResourceType(),
+                event.getServiceInstanceId(), event.getInvariantUUID(), event.getPrevVersion(),
+                event.getCurrVersion(), event.getModifier(), event.getPrevState(),
+                event.getCurrState(), event.getComment(), event.getStatus(), event.getDesc()};
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditCreateUpdateResourceAdminEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditCreateUpdateResourceAdminEventFactory.java
index db76b78106..dfad3ef2cc 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditCreateUpdateResourceAdminEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditCreateUpdateResourceAdminEventFactory.java
@@ -3,28 +3,32 @@ package org.openecomp.sdc.be.auditing.impl.resourceadmin;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 
 public class AuditCreateUpdateResourceAdminEventFactory extends AuditResourceAdminEventFactory {
 
-
     protected static final String LOG_STR = "ACTION = \"%s\" RESOURCE_NAME = \"%s\" RESOURCE_TYPE = \"%s\" SERVICE_INSTANCE_ID = \"%s\"" +
             " INVARIANT_UUID = \"%s\" PREV_VERSION = \"%s\" CURR_VERSION = \"%s\" MODIFIER = \"%s\" PREV_STATE = \"%s\" CURR_STATE = \"%s\"" +
             " STATUS = \"%s\" DESC = \"%s\"";
 
-
-    public AuditCreateUpdateResourceAdminEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                      String resourceType, String resourceName, String invariantUuid,
-                                                      User modifier, String artifactData, String comment, String did, String toscaNodeType) {
-        super(action, commonFields, prevParams, currParams, resourceType, resourceName, invariantUuid,
+    public AuditCreateUpdateResourceAdminEventFactory(AuditingActionEnum action, CommonAuditData commonAuditData, ResourceCommonInfo resourceCommonInfo,
+                                                      ResourceVersionInfo prevParams, ResourceVersionInfo currParams,
+                                                      String invariantUuid, User modifier, String artifactData, String comment, String did, String toscaNodeType) {
+        super(action, commonAuditData, resourceCommonInfo, prevParams, currParams, invariantUuid,
                 modifier, artifactData, comment, did, toscaNodeType);
     }
 
-   @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), buildValue(event.getResourceName()), buildValue(event.getResourceType()),
-                buildValue(event.getServiceInstanceId()), buildValue(event.getInvariantUUID()), buildValue(event.getPrevVersion()),
-                buildValue(event.getCurrVersion()), buildValue(event.getModifier()), buildValue(event.getPrevState()),
-                buildValue(event.getCurrState()), event.getStatus(), event.getDesc());
+    @Override
+        public String getLogPattern() {
+            return LOG_STR;
+        }
+
+        @Override
+        public String[] getLogMessageParams() {
+            return new String[] {event.getAction(), event.getResourceName(), event.getResourceType(),
+                event.getServiceInstanceId(), event.getInvariantUUID(), event.getPrevVersion(),
+                event.getCurrVersion(), event.getModifier(), event.getPrevState(),
+                event.getCurrState(), event.getStatus(), event.getDesc()};
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditDistStateChangeRequestResourceAdminEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditDistStateChangeRequestResourceAdminEventFactory.java
index 62f95de6bd..042b4a1007 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditDistStateChangeRequestResourceAdminEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditDistStateChangeRequestResourceAdminEventFactory.java
@@ -3,28 +3,33 @@ package org.openecomp.sdc.be.auditing.impl.resourceadmin;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 import org.openecomp.sdc.common.api.Constants;
 
 public class AuditDistStateChangeRequestResourceAdminEventFactory extends AuditResourceAdminEventFactory {
 
-
     private static final String LOG_STR = "ACTION = \"%s\" RESOURCE_NAME = \"%s\" RESOURCE_TYPE = \"%s\" SERVICE_INSTANCE_ID = \"%s\"" +
             " CURR_VERSION = \"%s\" MODIFIER = \"%s\" CURR_STATE = \"%s\"" +
             " DPREV_STATUS = \"%s\" DCURR_STATUS = \"%s\" DID = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
 
-    public AuditDistStateChangeRequestResourceAdminEventFactory(CommonAuditData commonFields, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                                String resourceType, String resourceName, String invariantUuid,
-                                                                User modifier, String artifactData, String comment, String did) {
-        super(AuditingActionEnum.DISTRIBUTION_STATE_CHANGE_REQUEST, commonFields, prevParams, currParams, resourceType, resourceName, invariantUuid,
+    public AuditDistStateChangeRequestResourceAdminEventFactory(CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                                                ResourceVersionInfo prevParams, ResourceVersionInfo currParams,
+                                                                String invariantUuid, User modifier, String artifactData, String comment, String did) {
+        super(AuditingActionEnum.DISTRIBUTION_STATE_CHANGE_REQUEST, commonFields, resourceCommonInfo, prevParams, currParams, invariantUuid,
                 modifier, artifactData, comment, did, Constants.EMPTY_STRING);
     }
 
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, buildValue(event.getAction()), buildValue(event.getResourceName()), buildValue(event.getResourceType()),
-                buildValue(event.getServiceInstanceId()), buildValue(event.getCurrVersion()), buildValue(event.getModifier()),
-                buildValue(event.getCurrState()), buildValue(event.getDprevStatus()), buildValue(event.getDcurrStatus()),
-                buildValue(event.getDid()), buildValue(event.getStatus()), buildValue(event.getDesc()));
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getResourceName(), event.getResourceType(),
+                event.getServiceInstanceId(), event.getCurrVersion(), event.getModifier(),
+                event.getCurrState(), event.getDprevStatus(), event.getDcurrStatus(),
+                event.getDid(), event.getStatus(), event.getDesc()};
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditDistStateChangeResourceAdminEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditDistStateChangeResourceAdminEventFactory.java
index 3fd41b9681..77fa0c90bc 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditDistStateChangeResourceAdminEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditDistStateChangeResourceAdminEventFactory.java
@@ -3,29 +3,35 @@ package org.openecomp.sdc.be.auditing.impl.resourceadmin;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 import org.openecomp.sdc.common.api.Constants;
 
 public class AuditDistStateChangeResourceAdminEventFactory extends AuditResourceAdminEventFactory {
 
-
     private static final String LOG_STR = "ACTION = \"%s\" RESOURCE_NAME = \"%s\" RESOURCE_TYPE = \"%s\" SERVICE_INSTANCE_ID = \"%s\"" +
             " CURR_VERSION = \"%s\" MODIFIER = \"%s\" CURR_STATE = \"%s\"" +
             " DPREV_STATUS = \"%s\" DCURR_STATUS = \"%s\" STATUS = \"%s\" DESC = \"%s\" COMMENT = \"%s\"";
 
 
-    public AuditDistStateChangeResourceAdminEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceAuditData prevParams,
-                                                         ResourceAuditData currParams, String resourceType, String resourceName, String invariantUuid,
+    public AuditDistStateChangeResourceAdminEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                                         ResourceVersionInfo prevParams, ResourceVersionInfo currParams, String invariantUuid,
                                                          User modifier, String artifactData, String comment, String did) {
-        super(action, commonFields, prevParams, currParams, resourceType, resourceName, invariantUuid,
+        super(action, commonFields, resourceCommonInfo, prevParams, currParams, invariantUuid,
                 modifier, artifactData, comment, did, Constants.EMPTY_STRING);
     }
 
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, buildValue(event.getAction()), buildValue(event.getResourceName()), buildValue(event.getResourceType()),
-                buildValue(event.getServiceInstanceId()), buildValue(event.getCurrVersion()), buildValue(event.getModifier()),
-                buildValue(event.getCurrState()), buildValue(event.getDprevStatus()), buildValue(event.getDcurrStatus()),
-                buildValue(event.getStatus()), buildValue(event.getDesc()), buildValue(event.getComment()));
+    public String getLogPattern() {
+        return LOG_STR;
     }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getResourceName(), event.getResourceType(),
+                event.getServiceInstanceId(), event.getCurrVersion(), event.getModifier(),
+                event.getCurrState(), event.getDprevStatus(), event.getDcurrStatus(),
+                event.getStatus(), event.getDesc(), event.getComment()};
+    }
+
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditImportResourceAdminEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditImportResourceAdminEventFactory.java
index 64da0fd6db..414e8aab4b 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditImportResourceAdminEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditImportResourceAdminEventFactory.java
@@ -3,32 +3,35 @@ package org.openecomp.sdc.be.auditing.impl.resourceadmin;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 
 public class AuditImportResourceAdminEventFactory extends AuditCreateUpdateResourceAdminEventFactory {
 
-
     private static final String LOG_STR_TOSCA = LOG_STR + " TOSCA_NODE_TYPE = \"%s\"" ;
 
-
-    public AuditImportResourceAdminEventFactory(CommonAuditData commonFields, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                String resourceType, String resourceName, String invariantUuid,
-                                                User modifier, String artifactData, String comment, String did, String toscaNodeType) {
-        super(AuditingActionEnum.IMPORT_RESOURCE, commonFields, prevParams, currParams, resourceType, resourceName, invariantUuid,
+    public AuditImportResourceAdminEventFactory(CommonAuditData commonAuditData, ResourceCommonInfo resourceCommonInfo, ResourceVersionInfo prevParams, ResourceVersionInfo currParams,
+                                                String invariantUuid, User modifier, String artifactData, String comment, String did, String toscaNodeType) {
+        super(AuditingActionEnum.IMPORT_RESOURCE, commonAuditData, resourceCommonInfo, prevParams, currParams, invariantUuid,
                 modifier, artifactData, comment, did, toscaNodeType);
     }
 
-    public AuditImportResourceAdminEventFactory(CommonAuditData commonFields, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                String resourceType, String resourceName,
+    public AuditImportResourceAdminEventFactory(CommonAuditData commonAuditData, ResourceCommonInfo resourceCommonInfo, ResourceVersionInfo prevParams, ResourceVersionInfo currParams,
                                                 String invariantUuid, User modifier, String toscaNodeType) {
-        super(AuditingActionEnum.IMPORT_RESOURCE, commonFields,  prevParams, currParams, resourceType, resourceName, invariantUuid,
+        super(AuditingActionEnum.IMPORT_RESOURCE, commonAuditData, resourceCommonInfo, prevParams, currParams, invariantUuid,
                    modifier, null, null, null, toscaNodeType);
     }
 
-    @Override    public String getLogMessage() {
-        return String.format(LOG_STR_TOSCA, event.getAction(), buildValue(event.getResourceName()), buildValue(event.getResourceType()),
-                buildValue(event.getServiceInstanceId()), buildValue(event.getInvariantUUID()), buildValue(event.getPrevVersion()),
-                buildValue(event.getCurrVersion()), buildValue(event.getModifier()), buildValue(event.getPrevState()),
-                buildValue(event.getCurrState()), buildValue(event.getStatus()), buildValue(event.getDesc()), buildValue(event.getToscaNodeType()));
+    @Override
+    public String getLogPattern() {
+        return LOG_STR_TOSCA;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getResourceName(), event.getResourceType(),
+                event.getServiceInstanceId(), event.getInvariantUUID(), event.getPrevVersion(),
+                event.getCurrVersion(), event.getModifier(), event.getPrevState(),
+                event.getCurrState(), event.getStatus(), event.getDesc(), event.getToscaNodeType()};
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditResourceAdminEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditResourceAdminEventFactory.java
index 2a188d2c1a..9d8836becd 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditResourceAdminEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditResourceAdminEventFactory.java
@@ -6,22 +6,38 @@ import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
 import org.openecomp.sdc.be.resources.data.auditing.ResourceAdminEvent;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 
 public abstract class AuditResourceAdminEventFactory extends AuditBaseEventFactory {
 
     protected final ResourceAdminEvent event;
 
-    public AuditResourceAdminEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceAuditData prevParams,
-                                          ResourceAuditData currParams, String resourceType, String resourceName, String invariantUuid,
+    AuditResourceAdminEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo, ResourceVersionInfo prevParams,
+                                          ResourceVersionInfo currParams, String invariantUuid,
                                           User modifier, String artifactData, String comment, String did, String toscaNodeType) {
-        super(action);
-
-        this.event = new ResourceAdminEvent(action.getName(), commonFields, prevParams, currParams, resourceType,
-                resourceName, invariantUuid, AuditBaseEventFactory.buildUserName(modifier),
+        this(action, commonFields, resourceCommonInfo, prevParams, currParams, invariantUuid, AuditBaseEventFactory.buildUserName(modifier),
                 artifactData, AuditBaseEventFactory.replaceNullNameWithEmpty(comment), did, toscaNodeType);
     }
 
+    AuditResourceAdminEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                          ResourceVersionInfo prevParams, ResourceVersionInfo currParams, String invariantUuid,
+                                          String modifier, String artifactData, String comment, String did,
+                                          String toscaNodeType, String timestamp) {
+        this(action, commonFields, resourceCommonInfo, prevParams, currParams, invariantUuid, modifier,
+                artifactData, comment, did, toscaNodeType);
+        this.event.setTimestamp1(timestamp);
+    }
+
+    private AuditResourceAdminEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                          ResourceVersionInfo prevParams, ResourceVersionInfo currParams, String invariantUuid,
+                                          String modifier, String artifactData, String comment, String did,
+                                          String toscaNodeType) {
+        super(action);
+        this.event = new ResourceAdminEvent(getAction().getName(), commonFields, resourceCommonInfo, prevParams, currParams, invariantUuid, modifier,
+                artifactData, comment, did, toscaNodeType);
+    }
+
     @Override
     public AuditingGenericEvent getDbEvent() {
         return event;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditResourceAdminEventMigrationFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditResourceAdminEventMigrationFactory.java
new file mode 100644
index 0000000000..3dad5259ac
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditResourceAdminEventMigrationFactory.java
@@ -0,0 +1,27 @@
+package org.openecomp.sdc.be.auditing.impl.resourceadmin;
+
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
+
+public class AuditResourceAdminEventMigrationFactory extends AuditResourceAdminEventFactory {
+
+    public AuditResourceAdminEventMigrationFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                                   ResourceVersionInfo prevParams, ResourceVersionInfo currParams, String invariantUuid,
+                                                   String modifier, String artifactData, String comment, String did,
+                                                   String toscaNodeType, String timestamp) {
+        super(action, commonFields, resourceCommonInfo, prevParams, currParams, invariantUuid, modifier,
+                artifactData, comment, did, toscaNodeType, timestamp);
+    }
+
+    @Override
+    public String getLogPattern() {
+        return "";
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[0];
+    }
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditResourceEventFactoryManager.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditResourceEventFactoryManager.java
new file mode 100644
index 0000000000..690a0464df
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditResourceEventFactoryManager.java
@@ -0,0 +1,69 @@
+package org.openecomp.sdc.be.auditing.impl.resourceadmin;
+
+import org.openecomp.sdc.be.auditing.api.AuditEventFactory;
+import org.openecomp.sdc.be.auditing.impl.AuditBaseEventFactory;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
+
+public class AuditResourceEventFactoryManager {
+
+
+    public static AuditEventFactory createResourceEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                                               ResourceVersionInfo prevParams, ResourceVersionInfo currParams, String invariantUuid,
+                                                               User modifier, String artifactData, String comment, String did, String toscaNodeType) {
+        AuditBaseEventFactory factory = null;
+
+        switch (action) {
+            case IMPORT_RESOURCE:
+                factory = new AuditImportResourceAdminEventFactory(commonFields, resourceCommonInfo, prevParams, currParams,
+                        invariantUuid, modifier, artifactData, comment, did, toscaNodeType);
+                break;
+            case CREATE_RESOURCE:
+            case CREATE_SERVICE:
+            case UPDATE_RESOURCE_METADATA:
+            case ARCHIVE_COMPONENT:
+            case RESTORE_COMPONENT:
+            case UPDATE_SERVICE_METADATA:
+                factory = new AuditCreateUpdateResourceAdminEventFactory(action, commonFields, resourceCommonInfo, prevParams, currParams,
+                        invariantUuid, modifier, artifactData, comment, did, org.openecomp.sdc.common.api.Constants.EMPTY_STRING);
+                break;
+            case CHECKIN_RESOURCE:
+            case CHECKOUT_RESOURCE:
+            case UNDO_CHECKOUT_RESOURCE:
+            case CERTIFICATION_REQUEST_RESOURCE:
+            case START_CERTIFICATION_RESOURCE:
+            case CERTIFICATION_SUCCESS_RESOURCE:
+            case FAIL_CERTIFICATION_RESOURCE:
+            case CANCEL_CERTIFICATION_RESOURCE:
+            case UPDATE_SERVICE_REFERENCE:
+            case VF_UPGRADE_SERVICES:
+                factory = new AuditCertificationResourceAdminEventFactory(action, commonFields, resourceCommonInfo, prevParams, currParams,
+                        invariantUuid, modifier, artifactData, comment, did);
+                break;
+            case ARTIFACT_UPLOAD:
+            case ARTIFACT_DELETE:
+            case ARTIFACT_METADATA_UPDATE:
+            case ARTIFACT_PAYLOAD_UPDATE:
+            case ARTIFACT_DOWNLOAD:
+                factory = new AuditArtifactResourceAdminEventFactory(action, commonFields, resourceCommonInfo, prevParams, currParams,
+                        invariantUuid, modifier, artifactData, comment, did);
+                break;
+            case DISTRIBUTION_STATE_CHANGE_REQUEST:
+                factory = new AuditDistStateChangeRequestResourceAdminEventFactory(commonFields, resourceCommonInfo, prevParams, currParams,
+                         invariantUuid, modifier, artifactData, comment, did);
+                break;
+            case DISTRIBUTION_STATE_CHANGE_APPROV:
+            case DISTRIBUTION_STATE_CHANGE_REJECT:
+                factory = new AuditDistStateChangeResourceAdminEventFactory(action, commonFields, resourceCommonInfo, prevParams, currParams,
+                         invariantUuid, modifier, artifactData, comment, did);
+                break;
+            default:
+                throw new UnsupportedOperationException();
+        }
+        return factory;
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/usersadmin/AuditGetUsersListEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/usersadmin/AuditGetUsersListEventFactory.java
index c7ea8cc428..22220dc729 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/usersadmin/AuditGetUsersListEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/usersadmin/AuditGetUsersListEventFactory.java
@@ -8,19 +8,34 @@ import org.openecomp.sdc.be.resources.data.auditing.GetUsersListEvent;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 
 public class AuditGetUsersListEventFactory extends AuditBaseEventFactory {
-    private final GetUsersListEvent event;
 
     private static final String LOG_STR = "ACTION = \"%s\" MODIFIER = \"%s\" DETAILS = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
+    private final GetUsersListEvent event;
 
     public AuditGetUsersListEventFactory(CommonAuditData commonFields, User modifier,
                                          String userDetails) {
+        this(commonFields, AuditBaseEventFactory.buildUserName(modifier), userDetails);
+    }
+
+    public AuditGetUsersListEventFactory(CommonAuditData commonFields, String modifier,
+                                         String userDetails, String timestamp) {
+        this(commonFields, modifier, userDetails);
+        this.event.setTimestamp1(timestamp);
+    }
+
+    private AuditGetUsersListEventFactory(CommonAuditData commonFields, String modifier, String userDetails) {
         super(AuditingActionEnum.GET_USERS_LIST);
-        event = new GetUsersListEvent(getAction().getName(), commonFields, AuditBaseEventFactory.buildUserName(modifier), userDetails);
+        event = new GetUsersListEvent(getAction().getName(), commonFields, modifier, userDetails);
     }
 
-   @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getModifier(), event.getDetails(), event.getStatus(), event.getDesc());
+    @Override
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getModifier(), event.getDetails(), event.getStatus(), event.getDesc()};
     }
 
     @Override
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;
+    }
 
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/usersadmin/AuditUserAdminEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/usersadmin/AuditUserAdminEventFactory.java
index 9c19c49b2d..cfe76a4c4d 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/usersadmin/AuditUserAdminEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/usersadmin/AuditUserAdminEventFactory.java
@@ -9,14 +9,37 @@ import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 
 public class AuditUserAdminEventFactory extends AuditBaseEventFactory {
 
-    final private UserAdminEvent event;
+    private static final String LOG_STR = "ACTION = \"%s\" MODIFIER = \"%s\" USER_BEFORE = \"%s\" USER_AFTER = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
+    private final UserAdminEvent event;
 
-    protected final static String LOG_STR = "ACTION = \"%s\" MODIFIER = \"%s\" USER_BEFORE = \"%s\" USER_AFTER = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
+    public AuditUserAdminEventFactory(AuditingActionEnum action, CommonAuditData commonFields, User modifier, User userBefore, User userAfter) {
+        this(action, commonFields, AuditBaseEventFactory.buildUserName(modifier),
+                AuditBaseEventFactory.buildUserNameExtended(userBefore),
+                AuditBaseEventFactory.buildUserNameExtended(userAfter));
+    }
+
+    //Used by migration util
+    public AuditUserAdminEventFactory(AuditingActionEnum action, CommonAuditData commonFields, String modifier, String userBefore,
+                                      String userAfter, String timestamp) {
+        this(action, commonFields, modifier, userBefore, userAfter);
+        this.event.setTimestamp1(timestamp);
+    }
+
+    private AuditUserAdminEventFactory(AuditingActionEnum action, CommonAuditData commonFields, String modifier, String userBefore,
+                                      String userAfter) {
+        super(action);
+        event = new UserAdminEvent(action.getName(), commonFields, modifier, userBefore, userAfter);
+    }
 
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, buildValue(event.getAction()), buildValue(event.getModifier()), buildValue(event.getUserBefore()),
-                buildValue(event.getUserAfter()), buildValue(event.getStatus()), buildValue(event.getDesc()));
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getModifier(), event.getUserBefore(),
+                event.getUserAfter(), event.getStatus(), event.getDesc()};
     }
 
     @Override
@@ -24,10 +47,5 @@ public class AuditUserAdminEventFactory extends AuditBaseEventFactory {
         return event;
     }
 
-    public AuditUserAdminEventFactory(AuditingActionEnum action, CommonAuditData commonFields, User modifier, User userBefore, User userAfter) {
-        super(action);
-        event = new UserAdminEvent(getAction().getName(), commonFields, AuditBaseEventFactory.buildUserName(modifier),
-                AuditBaseEventFactory.buildUserNameExtended(userBefore),
-                AuditBaseEventFactory.buildUserNameExtended(userAfter));
-     }
+
 }