X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog-be%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fsdc%2Fbe%2Fauditing%2Fimpl%2Fresourceadmin%2FAuditDistStateChangeResourceAdminEventFactory.java;h=77fa0c90bce309115ca2ecfbc79e5c7e76fde4dd;hb=5b593496b8f1b8e8be8d7d2dbcc223332e65a49b;hp=3fd41b96817a23fca0240cf23e71c746e56b1377;hpb=9200382f2ce7b4bb729aa287d0878004b2d2b4f9;p=sdc.git

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()};
+    }
+
 }