Sync Integ to Master

[sdc.git] / catalog-dao / src / main / java / org / openecomp / sdc / be / resources / data / auditing / UserAccessEvent.java

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 a1ae1e2..80a370d 100644 (file)
--- 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;
        }