diff options
Diffstat (limited to 'catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin')
9 files changed, 218 insertions, 80 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()}; } } 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; + } + +} |