re base code

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

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 db76b78..dfad3ef 100644 (file)
--- 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()};
     }
 }