diff options
author | 2018-03-04 14:53:33 +0200 | |
---|---|---|
committer | 2018-03-07 13:19:05 +0000 | |
commit | a5445100050e49e83f73424198d73cd72d672a4d (patch) | |
tree | cacf4df817df31be23e4e790d1dda857bdae061e /catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/UserAccessEvent.java | |
parent | 51157f92c21976cba4914c378aaa3cba49826931 (diff) |
Sync Integ to Master
Change-Id: I71e3acc26fa612127756ac04073a522b9cc6cd74
Issue-ID: SDC-977
Signed-off-by: Gitelman, Tal (tg851x) <tg851x@intl.att.com>
Diffstat (limited to 'catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/UserAccessEvent.java')
-rw-r--r-- | catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/UserAccessEvent.java | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/UserAccessEvent.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/UserAccessEvent.java index a1ae1e2df1..80a370dc62 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/UserAccessEvent.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/UserAccessEvent.java @@ -21,11 +21,9 @@ package org.openecomp.sdc.be.resources.data.auditing; import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.EnumMap; -import java.util.TimeZone; -import java.util.UUID; +import java.util.*; +import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData; import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum; import com.datastax.driver.core.utils.UUIDs; @@ -69,7 +67,7 @@ public class UserAccessEvent extends AuditingGenericEvent { timebaseduuid = UUIDs.timeBased(); } - public UserAccessEvent(EnumMap<AuditingFieldsKeysEnum, Object> auditingFields) { + public UserAccessEvent(Map<AuditingFieldsKeysEnum, Object> auditingFields) { this(); Object value; value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID); @@ -99,6 +97,17 @@ public class UserAccessEvent extends AuditingGenericEvent { } + public UserAccessEvent(String action, CommonAuditData commonAuditData, String user) { + this(); + this.action = action; + this.requestId = commonAuditData.getRequestId(); + this.userUid = user; + this.status = commonAuditData.getStatus(); + this.desc = commonAuditData.getDescription(); + this.serviceInstanceId = commonAuditData.getServiceInstanceId(); + } + + @Override public void fillFields() { fields.put(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID.getDisplayName(), getRequestId()); @@ -137,6 +146,14 @@ public class UserAccessEvent extends AuditingGenericEvent { this.requestId = requestId; } + @Override + public String getServiceInstanceId() { return serviceInstanceId; } + + @Override + public void setServiceInstanceId(String serviceInstanceId) { + this.serviceInstanceId = serviceInstanceId; + } + public String getStatus() { return status; } |