diff options
Diffstat (limited to 'catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditArtifactResourceAdminEventFactory.java')
-rw-r--r-- | catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditArtifactResourceAdminEventFactory.java | 30 |
1 files changed, 17 insertions, 13 deletions
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()}; } } |