aboutsummaryrefslogtreecommitdiffstats
path: root/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/DistributionStatusEvent.java
diff options
context:
space:
mode:
Diffstat (limited to 'catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/DistributionStatusEvent.java')
-rw-r--r--catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/DistributionStatusEvent.java32
1 files changed, 8 insertions, 24 deletions
diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/DistributionStatusEvent.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/DistributionStatusEvent.java
index 3c82a33f33..50ba39bf52 100644
--- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/DistributionStatusEvent.java
+++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/DistributionStatusEvent.java
@@ -7,9 +7,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,6 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
-
package org.openecomp.sdc.be.resources.data.auditing;
import com.datastax.driver.core.utils.UUIDs;
@@ -25,6 +24,10 @@ import com.datastax.driver.mapping.annotations.ClusteringColumn;
import com.datastax.driver.mapping.annotations.Column;
import com.datastax.driver.mapping.annotations.PartitionKey;
import com.datastax.driver.mapping.annotations.Table;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.TimeZone;
+import java.util.UUID;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
@@ -32,11 +35,6 @@ import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData;
import org.openecomp.sdc.common.datastructure.AuditingFieldsKey;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.TimeZone;
-import java.util.UUID;
-
@Getter
@Setter
@ToString
@@ -45,36 +43,26 @@ public class DistributionStatusEvent extends AuditingGenericEvent {
@PartitionKey
protected UUID timebaseduuid;
-
@ClusteringColumn
protected Date timestamp1;
-
@Column(name = "request_id")
protected String requestId;
-
@Column(name = "service_instance_id")
protected String serviceInstanceId;
-
@Column
protected String action;
@Column
protected String status;
-
@Column(name = "description")
protected String desc;
-
@Column
private String did;
-
@Column(name = "consumer_id")
private String consumerId;
-
@Column(name = "topic_name")
private String topicName;
-
@Column(name = "resoure_url")
private String resoureURL;
-
@Column(name = "status_time")
private String statusTime;
@@ -82,11 +70,10 @@ public class DistributionStatusEvent extends AuditingGenericEvent {
public DistributionStatusEvent() {
timestamp1 = new Date();
timebaseduuid = UUIDs.timeBased();
-
}
- public DistributionStatusEvent(String action, CommonAuditData commonAuditData, DistributionData distributionData,
- String did, String topicName, String statusTime) {
+ public DistributionStatusEvent(String action, CommonAuditData commonAuditData, DistributionData distributionData, String did, String topicName,
+ String statusTime) {
this();
this.action = action;
this.requestId = commonAuditData.getRequestId();
@@ -111,13 +98,11 @@ public class DistributionStatusEvent extends AuditingGenericEvent {
@Override
public void fillFields() {
fields.put(AuditingFieldsKey.AUDIT_REQUEST_ID.getDisplayName(), getRequestId());
-
fields.put(AuditingFieldsKey.AUDIT_SERVICE_INSTANCE_ID.getDisplayName(), getServiceInstanceId());
fields.put(AuditingFieldsKey.AUDIT_ACTION.getDisplayName(), getAction());
fields.put(AuditingFieldsKey.AUDIT_STATUS.getDisplayName(), getStatus());
fields.put(AuditingFieldsKey.AUDIT_DESC.getDisplayName(), getDesc());
fields.put(AuditingFieldsKey.AUDIT_DISTRIBUTION_CONSUMER_ID.getDisplayName(), getConsumerId());
-
fields.put(AuditingFieldsKey.AUDIT_DISTRIBUTION_ID.getDisplayName(), getDid());
fields.put(AuditingFieldsKey.AUDIT_DISTRIBUTION_STATUS_TIME.getDisplayName(), getStatusTime());
fields.put(AuditingFieldsKey.AUDIT_DISTRIBUTION_TOPIC_NAME.getDisplayName(), getTopicName());
@@ -125,6 +110,5 @@ public class DistributionStatusEvent extends AuditingGenericEvent {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(dateFormatPattern);
simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
fields.put(AuditingFieldsKey.AUDIT_TIMESTAMP.getDisplayName(), simpleDateFormat.format(timestamp1));
-
}
}