diff options
Diffstat (limited to 'catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data')
48 files changed, 2319 insertions, 1583 deletions
diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/AdditionalInfoParameterData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/AdditionalInfoParameterData.java index a5a6e6df76..8c3742e474 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/AdditionalInfoParameterData.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/AdditionalInfoParameterData.java @@ -20,16 +20,15 @@ package org.openecomp.sdc.be.resources.data; -import java.lang.reflect.Type; -import java.util.HashMap; -import java.util.Map; - +import com.google.gson.reflect.TypeToken; import org.openecomp.sdc.be.dao.graph.datatype.GraphNode; import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary; import org.openecomp.sdc.be.datatypes.elements.AdditionalInfoParameterDataDefinition; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; -import com.google.gson.reflect.TypeToken; +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.Map; public class AdditionalInfoParameterData extends GraphNode { @@ -118,7 +117,7 @@ public class AdditionalInfoParameterData extends GraphNode { } @Override - public Object getUniqueId() { + public String getUniqueId() { return additionalInfoParameterDataDefinition.getUniqueId(); } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/ArtifactData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/ArtifactData.java index 84d9663e59..7114413f41 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/ArtifactData.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/ArtifactData.java @@ -20,18 +20,17 @@ package org.openecomp.sdc.be.resources.data; -import java.lang.reflect.Type; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import com.google.gson.reflect.TypeToken; import org.openecomp.sdc.be.dao.graph.datatype.GraphNode; import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary; import org.openecomp.sdc.be.datatypes.elements.ArtifactDataDefinition; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum; -import com.google.gson.reflect.TypeToken; +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class ArtifactData extends GraphNode { @@ -104,7 +103,7 @@ public class ArtifactData extends GraphNode { } @Override - public Object getUniqueId() { + public String getUniqueId() { return artifactDataDefinition.getUniqueId(); } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/CapabilityData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/CapabilityData.java index 9f04c56be2..d2b1336ce1 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/CapabilityData.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/CapabilityData.java @@ -20,17 +20,16 @@ package org.openecomp.sdc.be.resources.data; -import java.lang.reflect.Type; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import com.google.gson.reflect.TypeToken; import org.openecomp.sdc.be.dao.graph.datatype.GraphNode; import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary; import org.openecomp.sdc.be.datatypes.elements.CapabilityDataDefinition; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; -import com.google.gson.reflect.TypeToken; +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class CapabilityData extends GraphNode { @@ -76,6 +75,7 @@ public class CapabilityData extends GraphNode { private String minOccurrences = CapabilityDataDefinition.MIN_OCCURRENCES; private String maxOccurrences = CapabilityDataDefinition.MAX_OCCURRENCES; + @Override public String getUniqueId() { return uniqueId; } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/CapabilityInstData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/CapabilityInstData.java index 0b5da1217d..1e456d3490 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/CapabilityInstData.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/CapabilityInstData.java @@ -20,16 +20,15 @@ package org.openecomp.sdc.be.resources.data; -import java.lang.reflect.Type; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import com.google.gson.reflect.TypeToken; import org.openecomp.sdc.be.dao.graph.datatype.GraphNode; import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; -import com.google.gson.reflect.TypeToken; +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class CapabilityInstData extends GraphNode { @@ -65,6 +64,7 @@ public class CapabilityInstData extends GraphNode { private Long modificationTime; + @Override public String getUniqueId() { return uniqueId; } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/CategoryData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/CategoryData.java index 4cfde8b0fa..7a2e0b5141 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/CategoryData.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/CategoryData.java @@ -20,13 +20,13 @@ package org.openecomp.sdc.be.resources.data; -import java.util.HashMap; -import java.util.Map; - import org.openecomp.sdc.be.dao.graph.datatype.GraphNode; import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; +import java.util.HashMap; +import java.util.Map; + public abstract class CategoryData extends GraphNode { private String name; @@ -107,7 +107,7 @@ public abstract class CategoryData extends GraphNode { } @Override - public Object getUniqueId() { + public String getUniqueId() { return uniqueId; } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/ComponentMetadataData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/ComponentMetadataData.java index fb58e9abff..52dd34be1b 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/ComponentMetadataData.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/ComponentMetadataData.java @@ -20,17 +20,16 @@ package org.openecomp.sdc.be.resources.data; -import java.lang.reflect.Type; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import com.google.gson.reflect.TypeToken; import org.openecomp.sdc.be.dao.graph.datatype.GraphNode; import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary; import org.openecomp.sdc.be.datatypes.components.ComponentMetadataDataDefinition; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; -import com.google.gson.reflect.TypeToken; +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public abstract class ComponentMetadataData extends GraphNode { @@ -108,7 +107,7 @@ public abstract class ComponentMetadataData extends GraphNode { } @Override - public Object getUniqueId() { + public String getUniqueId() { return metadataDataDefinition.getUniqueId(); } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/ConsumerData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/ConsumerData.java index 3fb085f3d2..88c9c7097a 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/ConsumerData.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/ConsumerData.java @@ -20,14 +20,14 @@ package org.openecomp.sdc.be.resources.data; -import java.util.HashMap; -import java.util.Map; - import org.openecomp.sdc.be.dao.graph.datatype.GraphNode; import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary; import org.openecomp.sdc.be.datatypes.elements.ConsumerDataDefinition; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; +import java.util.HashMap; +import java.util.Map; + public class ConsumerData extends GraphNode { private ConsumerDataDefinition consumerDataDefinition; @@ -67,7 +67,7 @@ public class ConsumerData extends GraphNode { } @Override - public Object getUniqueId() { + public String getUniqueId() { return consumerDataDefinition.getConsumerName(); } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/GraphNodeLock.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/GraphNodeLock.java index 200521c054..68b362b293 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/GraphNodeLock.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/GraphNodeLock.java @@ -20,13 +20,13 @@ package org.openecomp.sdc.be.resources.data; -import java.util.HashMap; -import java.util.Map; - import org.openecomp.sdc.be.dao.graph.datatype.GraphNode; import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; +import java.util.HashMap; +import java.util.Map; + public class GraphNodeLock extends GraphNode { private String uniqueId; @@ -50,7 +50,7 @@ public class GraphNodeLock extends GraphNode { } @Override - public Object getUniqueId() { + public String getUniqueId() { return uniqueId; } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/GroupData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/GroupData.java index e354e95b27..93f03e415a 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/GroupData.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/GroupData.java @@ -20,14 +20,14 @@ package org.openecomp.sdc.be.resources.data; -import java.util.HashMap; -import java.util.Map; - import org.openecomp.sdc.be.dao.graph.datatype.GraphNode; import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary; import org.openecomp.sdc.be.datatypes.elements.GroupDataDefinition; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; +import java.util.HashMap; +import java.util.Map; + public class GroupData extends GraphNode { GroupDataDefinition groupDataDefinition; @@ -63,7 +63,7 @@ public class GroupData extends GraphNode { } @Override - public Object getUniqueId() { + public String getUniqueId() { return groupDataDefinition.getUniqueId(); } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/HeatParameterData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/HeatParameterData.java index 7115a45bf3..c9dbc67b94 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/HeatParameterData.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/HeatParameterData.java @@ -20,16 +20,16 @@ package org.openecomp.sdc.be.resources.data; -import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; - import org.openecomp.sdc.be.dao.graph.datatype.GraphNode; import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary; import org.openecomp.sdc.be.dao.utils.Constants; import org.openecomp.sdc.be.datatypes.elements.HeatParameterDataDefinition; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; +import java.math.BigDecimal; +import java.util.HashMap; +import java.util.Map; + public class HeatParameterData extends GraphNode { private HeatParameterDataDefinition heatDataDefinition; @@ -134,7 +134,7 @@ public class HeatParameterData extends GraphNode { } @Override - public Object getUniqueId() { + public String getUniqueId() { return heatDataDefinition.getUniqueId(); } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/HeatParameterValueData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/HeatParameterValueData.java index ecabe22b80..a7f52a0bf3 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/HeatParameterValueData.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/HeatParameterValueData.java @@ -20,14 +20,14 @@ package org.openecomp.sdc.be.resources.data; -import java.util.HashMap; -import java.util.Map; - import org.openecomp.sdc.be.dao.graph.datatype.GraphNode; import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary; import org.openecomp.sdc.be.dao.utils.Constants; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; +import java.util.HashMap; +import java.util.Map; + public class HeatParameterValueData extends GraphNode { public HeatParameterValueData() { @@ -52,7 +52,7 @@ public class HeatParameterValueData extends GraphNode { private String value; @Override - public Object getUniqueId() { + public String getUniqueId() { return uniqueId; } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/InputValueData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/InputValueData.java index 1ed3ef1135..be45c855a4 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/InputValueData.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/InputValueData.java @@ -20,15 +20,15 @@ package org.openecomp.sdc.be.resources.data; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; - import org.openecomp.sdc.be.dao.graph.datatype.GraphNode; import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary; import org.openecomp.sdc.be.dao.utils.Constants; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + public class InputValueData extends GraphNode { private String uniqueId; @@ -68,6 +68,7 @@ public class InputValueData extends GraphNode { } + @Override public String getUniqueId() { return uniqueId; } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/InputsData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/InputsData.java index 3bb71d5bed..2152619d00 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/InputsData.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/InputsData.java @@ -20,11 +20,7 @@ package org.openecomp.sdc.be.resources.data; -import java.lang.reflect.Type; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import com.google.gson.reflect.TypeToken; import org.openecomp.sdc.be.dao.graph.datatype.GraphNode; import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary; import org.openecomp.sdc.be.dao.utils.Constants; @@ -32,7 +28,10 @@ import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition; import org.openecomp.sdc.be.datatypes.elements.SchemaDefinition; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; -import com.google.gson.reflect.TypeToken; +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class InputsData extends GraphNode { @@ -129,7 +128,7 @@ public class InputsData extends GraphNode { } @Override - public Object getUniqueId() { + public String getUniqueId() { return propertyDataDefinition.getUniqueId(); } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/OperationData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/OperationData.java index d87cfe8853..cf05ad0eb9 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/OperationData.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/OperationData.java @@ -20,14 +20,14 @@ package org.openecomp.sdc.be.resources.data; -import java.util.HashMap; -import java.util.Map; - import org.openecomp.sdc.be.dao.graph.datatype.GraphNode; import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary; import org.openecomp.sdc.be.datatypes.elements.OperationDataDefinition; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; +import java.util.HashMap; +import java.util.Map; + public class OperationData extends GraphNode { OperationDataDefinition operationDataDefinition; @@ -69,7 +69,7 @@ public class OperationData extends GraphNode { } @Override - public Object getUniqueId() { + public String getUniqueId() { return operationDataDefinition.getUniqueId(); } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/OperationalEnvironmentEntry.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/OperationalEnvironmentEntry.java new file mode 100644 index 0000000000..5b3c282bd7 --- /dev/null +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/OperationalEnvironmentEntry.java @@ -0,0 +1,137 @@ +package org.openecomp.sdc.be.resources.data; + +import com.datastax.driver.mapping.annotations.Column; +import com.datastax.driver.mapping.annotations.PartitionKey; +import com.datastax.driver.mapping.annotations.Table; +import org.openecomp.sdc.be.datatypes.enums.EnvironmentStatusEnum; + +import java.util.Date; +import java.util.HashSet; +import java.util.Set; + +@Table(keyspace = "sdcrepository", name = "operationalEnvironment") +public class OperationalEnvironmentEntry { + + @PartitionKey(0) + @Column(name = "environment_id") + private String environmentId; + + @Column(name = "tenant") + private String tenant; + + @Column(name = "is_production") + private Boolean isProduction; + + @Column(name = "ecomp_workload_context") + private String ecompWorkloadContext; + + @Column(name = "dmaap_ueb_address") + private Set<String> dmaapUebAddress; + + @Column(name = "ueb_api_key") + private String uebApikey; + + @Column(name = "ueb_secret_key") + private String uebSecretKey; + + @Column(name = "status") + private String status; + + public Date getLastModified() { + return lastModified; + } + + public void setLastModified(Date lastModified) { + this.lastModified = lastModified; + } + + @Column(name = "last_modified") + private Date lastModified; + + + public String getEnvironmentId() { + return environmentId; + } + + //must be unique, add any validation if neccessary + public void setEnvironmentId(String environmentId) { + this.environmentId = environmentId; + } + + public String getTenant() { + return tenant; + } + + public void setTenant(String tenant) { + this.tenant = tenant; + } + + public Boolean getIsProduction() { + return isProduction; + } + + public void setIsProduction(Boolean production) { + isProduction = production; + } + + public String getEcompWorkloadContext() { + return ecompWorkloadContext; + } + + public void setEcompWorkloadContext(String ecompWorkloadContext) { + this.ecompWorkloadContext = ecompWorkloadContext; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + //log if status doesn't exists in EnvironmentStatusEnum + this.status = status; + } + + public void setStatus(EnvironmentStatusEnum status) { + this.status = status.getName(); + } + + public Set<String> getDmaapUebAddress() { + return dmaapUebAddress; + } + + public void setDmaapUebAddress(Set<String> dmaapUebAddress) { + this.dmaapUebAddress = dmaapUebAddress; + } + + public void addDmaapUebAddress(String address) { + if ( this.dmaapUebAddress == null ) + this.dmaapUebAddress = new HashSet<>(); + dmaapUebAddress.add(address); + } + + public String getUebApikey() { + return uebApikey; + } + + public void setUebApikey(String uebApikey) { + this.uebApikey = uebApikey; + } + + public String getUebSecretKey() { + return uebSecretKey; + } + + public void setUebSecretKey(String uebSecretKey) { + this.uebSecretKey = uebSecretKey; + } + + @Override + public String toString() { + return "OperationalEnvironmentEntry [environmentId=" + environmentId + ", tenant=" + tenant + ", isProduction=" + + isProduction + ", ecompWorkloadContext=" + ecompWorkloadContext + ", dmaapUebAddress=" + + dmaapUebAddress + ", uebApikey=" + uebApikey + ", status=" + status + + ", lastModified=" + lastModified + "]"; + } + + +} diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/PolicyTypeData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/PolicyTypeData.java index 62f2ad5e12..8f2293aff7 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/PolicyTypeData.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/PolicyTypeData.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. @@ -20,111 +20,106 @@ package org.openecomp.sdc.be.resources.data; -import java.lang.reflect.Type; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import com.google.gson.reflect.TypeToken; import org.openecomp.sdc.be.dao.graph.datatype.GraphNode; import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary; import org.openecomp.sdc.be.datatypes.elements.PolicyTypeDataDefinition; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; -import com.google.gson.reflect.TypeToken; +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class PolicyTypeData extends GraphNode { - private PolicyTypeDataDefinition policyTypeDataDefinition; - private static final Type mapType = new TypeToken<HashMap<String, String>>() { - }.getType(); - private static final Type listType = new TypeToken<List<String>>() { - }.getType(); - - public PolicyTypeData() { - super(NodeTypeEnum.PolicyType); - policyTypeDataDefinition = new PolicyTypeDataDefinition(); - } + private PolicyTypeDataDefinition policyTypeDataDefinition; + private static final Type mapType = new TypeToken<HashMap<String, String>>() { + }.getType(); + private static final Type listType = new TypeToken<List<String>>() { + }.getType(); - public PolicyTypeData(PolicyTypeDataDefinition policyTypeDataDefinition) { - super(NodeTypeEnum.PolicyType); - this.policyTypeDataDefinition = policyTypeDataDefinition; - } + public PolicyTypeData() { + super(NodeTypeEnum.PolicyType); + policyTypeDataDefinition = new PolicyTypeDataDefinition(); + } - public PolicyTypeData(Map<String, Object> properties) { + public PolicyTypeData(PolicyTypeDataDefinition policyTypeDataDefinition) { + super(NodeTypeEnum.PolicyType); + this.policyTypeDataDefinition = policyTypeDataDefinition; + } - this(); + public PolicyTypeData(Map<String, Object> properties) { - policyTypeDataDefinition - .setUniqueId((String) properties.get(GraphPropertiesDictionary.UNIQUE_ID.getProperty())); + this(); - HashMap<String, String> metatdata = getGson() - .fromJson((String) properties.get(GraphPropertiesDictionary.METADATA.getProperty()), mapType); - policyTypeDataDefinition.setMetadata(metatdata); + policyTypeDataDefinition + .setUniqueId((String) properties.get(GraphPropertiesDictionary.UNIQUE_ID.getProperty())); - List<String> members = getGson() - .fromJson((String) properties.get(GraphPropertiesDictionary.TARGETS.getProperty()), listType); - policyTypeDataDefinition.setTargets(members); + HashMap<String, String> metatdata = getGson() + .fromJson((String) properties.get(GraphPropertiesDictionary.METADATA.getProperty()), mapType); + policyTypeDataDefinition.setMetadata(metatdata); - policyTypeDataDefinition.setType((String) properties.get(GraphPropertiesDictionary.TYPE.getProperty())); + List<String> members = getGson() + .fromJson((String) properties.get(GraphPropertiesDictionary.TARGETS.getProperty()), listType); + policyTypeDataDefinition.setTargets(members); + policyTypeDataDefinition.setType((String) properties.get(GraphPropertiesDictionary.TYPE.getProperty())); - policyTypeDataDefinition - .setDescription((String) properties.get(GraphPropertiesDictionary.DESCRIPTION.getProperty())); + policyTypeDataDefinition + .setDescription((String) properties.get(GraphPropertiesDictionary.DESCRIPTION.getProperty())); - policyTypeDataDefinition.setHighestVersion( - (boolean) properties.get(GraphPropertiesDictionary.IS_HIGHEST_VERSION.getProperty())); + policyTypeDataDefinition.setHighestVersion( + (boolean) properties.get(GraphPropertiesDictionary.IS_HIGHEST_VERSION.getProperty())); - policyTypeDataDefinition.setVersion((String) properties.get(GraphPropertiesDictionary.VERSION.getProperty())); + policyTypeDataDefinition.setVersion((String) properties.get(GraphPropertiesDictionary.VERSION.getProperty())); - policyTypeDataDefinition - .setCreationTime((Long) properties.get(GraphPropertiesDictionary.CREATION_DATE.getProperty())); + policyTypeDataDefinition + .setCreationTime((Long) properties.get(GraphPropertiesDictionary.CREATION_DATE.getProperty())); - policyTypeDataDefinition - .setModificationTime((Long) properties.get(GraphPropertiesDictionary.LAST_UPDATE_DATE.getProperty())); + policyTypeDataDefinition + .setModificationTime((Long) properties.get(GraphPropertiesDictionary.LAST_UPDATE_DATE.getProperty())); - } + } - @Override - public Map<String, Object> toGraphMap() { + @Override + public Map<String, Object> toGraphMap() { - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<String, Object>(); - addIfExists(map, GraphPropertiesDictionary.UNIQUE_ID, policyTypeDataDefinition.getUniqueId()); + addIfExists(map, GraphPropertiesDictionary.UNIQUE_ID, policyTypeDataDefinition.getUniqueId()); - addIfExists(map, GraphPropertiesDictionary.TYPE, policyTypeDataDefinition.getType()); + addIfExists(map, GraphPropertiesDictionary.TYPE, policyTypeDataDefinition.getType()); - addIfExists(map, GraphPropertiesDictionary.VERSION, policyTypeDataDefinition.getVersion()); + addIfExists(map, GraphPropertiesDictionary.VERSION, policyTypeDataDefinition.getVersion()); - addIfExists(map, GraphPropertiesDictionary.IS_HIGHEST_VERSION, policyTypeDataDefinition.isHighestVersion()); + addIfExists(map, GraphPropertiesDictionary.IS_HIGHEST_VERSION, policyTypeDataDefinition.isHighestVersion()); - addIfExists(map, GraphPropertiesDictionary.DESCRIPTION, policyTypeDataDefinition.getDescription()); + addIfExists(map, GraphPropertiesDictionary.DESCRIPTION, policyTypeDataDefinition.getDescription()); - addIfExists(map, GraphPropertiesDictionary.METADATA, policyTypeDataDefinition.getMetadata()); + addIfExists(map, GraphPropertiesDictionary.METADATA, policyTypeDataDefinition.getMetadata()); - addIfExists(map, GraphPropertiesDictionary.TARGETS, policyTypeDataDefinition.getTargets()); + addIfExists(map, GraphPropertiesDictionary.TARGETS, policyTypeDataDefinition.getTargets()); - addIfExists(map, GraphPropertiesDictionary.CREATION_DATE, policyTypeDataDefinition.getCreationTime()); + addIfExists(map, GraphPropertiesDictionary.CREATION_DATE, policyTypeDataDefinition.getCreationTime()); - addIfExists(map, GraphPropertiesDictionary.LAST_UPDATE_DATE, policyTypeDataDefinition.getModificationTime()); + addIfExists(map, GraphPropertiesDictionary.LAST_UPDATE_DATE, policyTypeDataDefinition.getModificationTime()); - return map; - } + return map; + } - @Override - public String toString() { - return "PolicyTypeData [policyTypeDataDefinition=" + policyTypeDataDefinition + "]"; - } + @Override + public String toString() { + return "PolicyTypeData [policyTypeDataDefinition=" + policyTypeDataDefinition + "]"; + } - @Override - public String getUniqueId() { - return this.policyTypeDataDefinition.getUniqueId(); - } + @Override + public String getUniqueId() { + return this.policyTypeDataDefinition.getUniqueId(); + } - public PolicyTypeDataDefinition getPolicyTypeDataDefinition() { - return policyTypeDataDefinition; - } + public PolicyTypeDataDefinition getPolicyTypeDataDefinition() { + return policyTypeDataDefinition; + } - public void setPolicyTypeDataDefinition(PolicyTypeDataDefinition policyTypeDataDefinition) { - this.policyTypeDataDefinition = policyTypeDataDefinition; - } } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/PropertyData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/PropertyData.java index a72ec9465b..403e27db1a 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/PropertyData.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/PropertyData.java @@ -20,11 +20,7 @@ package org.openecomp.sdc.be.resources.data; -import java.lang.reflect.Type; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import com.google.gson.reflect.TypeToken; import org.openecomp.sdc.be.dao.graph.datatype.GraphNode; import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary; import org.openecomp.sdc.be.dao.utils.Constants; @@ -32,7 +28,10 @@ import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition; import org.openecomp.sdc.be.datatypes.elements.SchemaDefinition; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; -import com.google.gson.reflect.TypeToken; +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class PropertyData extends GraphNode { @@ -129,7 +128,7 @@ public class PropertyData extends GraphNode { } @Override - public Object getUniqueId() { + public String getUniqueId() { return propertyDataDefinition.getUniqueId(); } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/PropertyValueData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/PropertyValueData.java index 7577e57a7e..80044e288d 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/PropertyValueData.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/PropertyValueData.java @@ -20,18 +20,17 @@ package org.openecomp.sdc.be.resources.data; -import java.lang.reflect.Type; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import com.google.gson.reflect.TypeToken; import org.openecomp.sdc.be.dao.graph.datatype.GraphNode; import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary; import org.openecomp.sdc.be.dao.utils.Constants; import org.openecomp.sdc.be.datatypes.elements.PropertyRule; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; -import com.google.gson.reflect.TypeToken; +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class PropertyValueData extends GraphNode { @@ -77,6 +76,7 @@ public class PropertyValueData extends GraphNode { private List<PropertyRule> rules; + @Override public String getUniqueId() { return uniqueId; } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/TagData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/TagData.java index de2412d7ed..92b8323e0d 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/TagData.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/TagData.java @@ -20,13 +20,13 @@ package org.openecomp.sdc.be.resources.data; -import java.util.HashMap; -import java.util.Map; - import org.openecomp.sdc.be.dao.graph.datatype.GraphNode; import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; +import java.util.HashMap; +import java.util.Map; + public class TagData extends GraphNode { private String name; @@ -105,7 +105,7 @@ public class TagData extends GraphNode { } @Override - public Object getUniqueId() { + public String getUniqueId() { return name; } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/UniqueIdData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/UniqueIdData.java index 30f9a66d79..fd3b8659a1 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/UniqueIdData.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/UniqueIdData.java @@ -20,11 +20,11 @@ package org.openecomp.sdc.be.resources.data; -import java.util.Map; - import org.openecomp.sdc.be.dao.graph.datatype.GraphNode; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; +import java.util.Map; + public class UniqueIdData extends GraphNode { private String uniqueId; @@ -35,7 +35,7 @@ public class UniqueIdData extends GraphNode { } @Override - public Object getUniqueId() { + public String getUniqueId() { return uniqueId; } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/UserData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/UserData.java index 78974c4a77..dc4522fef9 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/UserData.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/UserData.java @@ -20,15 +20,15 @@ package org.openecomp.sdc.be.resources.data; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - import org.openecomp.sdc.be.dao.graph.datatype.GraphNode; import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary; import org.openecomp.sdc.be.dao.utils.DaoUtils; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + public class UserData extends GraphNode { private String firstName; @@ -213,7 +213,7 @@ public class UserData extends GraphNode { } @Override - public Object getUniqueId() { + public String getUniqueId() { return userId; } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/UserFunctionalMenuData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/UserFunctionalMenuData.java index 2a31f4bb68..263cc89bba 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/UserFunctionalMenuData.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/UserFunctionalMenuData.java @@ -20,14 +20,14 @@ package org.openecomp.sdc.be.resources.data; -import java.util.HashMap; -import java.util.Map; - import org.openecomp.sdc.be.dao.graph.datatype.GraphNode; import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary; import org.openecomp.sdc.be.dao.utils.DaoUtils; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; +import java.util.HashMap; +import java.util.Map; + public class UserFunctionalMenuData extends GraphNode { private String uniqueId; @@ -88,7 +88,7 @@ public class UserFunctionalMenuData extends GraphNode { } @Override - public Object getUniqueId() { + public String getUniqueId() { return uniqueId; } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/AuditRecordFactory.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/AuditRecordFactory.java index 9e9836049f..09d37ac03d 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/AuditRecordFactory.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/AuditRecordFactory.java @@ -20,12 +20,12 @@ package org.openecomp.sdc.be.resources.data.auditing; -import java.util.EnumMap; +import java.util.Map; import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum; public final class AuditRecordFactory { - public static AuditingGenericEvent createAuditRecord(EnumMap<AuditingFieldsKeysEnum, Object> auditingFields) { + public static AuditingGenericEvent createAuditRecord(Map<AuditingFieldsKeysEnum, Object> auditingFields) { AuditingActionEnum actionEnum = AuditingActionEnum .getActionByName((String) auditingFields.get(AuditingFieldsKeysEnum.AUDIT_ACTION)); String tableName = actionEnum.getAuditingEsType(); @@ -76,9 +76,12 @@ public final class AuditRecordFactory { case AuditingTypesConstants.EXTERNAL_API_EVENT_TYPE: event = new ExternalApiEvent(auditingFields); break; + case AuditingTypesConstants.ECOMP_OPERATIONAL_ENV_EVENT_TYPE: + event = new EcompOperationalEnvironmentEvent(auditingFields); + break; } - return event; - } + return event; + } } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/AuditingActionEnum.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/AuditingActionEnum.java index cfc37f19e2..e810925fcd 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/AuditingActionEnum.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/AuditingActionEnum.java @@ -23,6 +23,7 @@ package org.openecomp.sdc.be.resources.data.auditing; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +//TODO rename to AuditAction public enum AuditingActionEnum { // User admininstration @@ -53,6 +54,7 @@ public enum AuditingActionEnum { DOWNLOAD_ARTIFACT("DownloadArtifact",AuditingTypesConstants.EXTERNAL_API_EVENT_TYPE), CREATE_RESOURCE_BY_API("CreateResourceByAPI", AuditingTypesConstants.EXTERNAL_API_EVENT_TYPE), CHANGE_LIFECYCLE_BY_API("ChangeLifecycleByAPI", AuditingTypesConstants.EXTERNAL_API_EVENT_TYPE), + ACTIVATE_SERVICE_BY_API("ActivateServiceByAPI", AuditingTypesConstants.EXTERNAL_API_EVENT_TYPE), ARTIFACT_PAYLOAD_UPDATE("ArtifactPayloadUpdate", AuditingTypesConstants.RESOURCE_ADMIN_EVENT_TYPE), @@ -76,7 +78,14 @@ public enum AuditingActionEnum { DISTRIBUTION_DEPLOY("DResult",AuditingTypesConstants.DISTRIBUTION_DEPLOY_EVENT_TYPE), GET_UEB_CLUSTER("GetUebCluster", AuditingTypesConstants.DISTRIBUTION_GET_UEB_CLUSTER_EVENT_TYPE), GET_VALID_ARTIFACT_TYPES("GetValidArtifactTypes", AuditingTypesConstants.DISTRIBUTION_GET_VALID_ARTIFACT_TYPES_EVENT_TYPE), - // .... + + //Environment + CREATE_ENVIRONMENT("CreateEnvironment", AuditingTypesConstants.ECOMP_OPERATIONAL_ENV_EVENT_TYPE), + UPDATE_ENVIRONMENT("UpdateEnvironment", AuditingTypesConstants.ECOMP_OPERATIONAL_ENV_EVENT_TYPE), + DELETE_ENVIRONMENT("DeleteEnvironment", AuditingTypesConstants.ECOMP_OPERATIONAL_ENV_EVENT_TYPE), + UNKNOWN_ENVIRONMENT_NOTIFICATION("UnknownEnvironmentNotification", AuditingTypesConstants.ECOMP_OPERATIONAL_ENV_EVENT_TYPE), + UNSUPPORTED_ENVIRONMENT_TYPE("UnsupportedEnvironmentType", AuditingTypesConstants.ECOMP_OPERATIONAL_ENV_EVENT_TYPE), + // .... AUTH_REQUEST("HttpAuthentication", AuditingTypesConstants.AUTH_EVENT_TYPE), ADD_ECOMP_USER_CREDENTIALS("AddECOMPUserCredentials", AuditingTypesConstants.CONSUMER_EVENT_TYPE), GET_ECOMP_USER_CREDENTIALS("GetECOMPUserCredentials", AuditingTypesConstants.CONSUMER_EVENT_TYPE), diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGetUebClusterEvent.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGetUebClusterEvent.java index bd8c032390..b5b99bf709 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGetUebClusterEvent.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGetUebClusterEvent.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; @@ -36,156 +34,167 @@ import com.datastax.driver.mapping.annotations.Table; @Table(keyspace = AuditingTypesConstants.AUDIT_KEYSPACE, name = AuditingTypesConstants.DISTRIBUTION_GET_UEB_CLUSTER_EVENT_TYPE) public class AuditingGetUebClusterEvent extends AuditingGenericEvent { - private static String DISTRIBUTION_GET_UEB_CLUSTER_EVENT_TEMPLATE = "action=\"%s\" " - + " consumerId=\"%s\" statusTime=\"%s\" status=\"%s\" status_desc=\"%s\" "; - - @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(name = "consumer_id") - private String consumerId; - - public AuditingGetUebClusterEvent() { - super(); - timestamp1 = new Date(); - timebaseduuid = UUIDs.timeBased(); - } - - public AuditingGetUebClusterEvent(EnumMap<AuditingFieldsKeysEnum, Object> auditingFields) { - this(); - Object value; - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID); - if (value != null) { - setRequestId((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID); - if (value != null) { - setServiceInstanceId((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_ACTION); - if (value != null) { - setAction((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_STATUS); - if (value != null) { - setStatus((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DESC); - if (value != null) { - setDesc((String) value); - } else { - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_STATUS_DESC); - if (value != null) { - setDesc((String) value); - } - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID); - if (value != null) { - setConsumerId((String) value); - } - - } - - @Override - public void fillFields() { - fields.put(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID.getDisplayName(), getRequestId()); - - fields.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID.getDisplayName(), getServiceInstanceId()); - fields.put(AuditingFieldsKeysEnum.AUDIT_ACTION.getDisplayName(), getAction()); - fields.put(AuditingFieldsKeysEnum.AUDIT_STATUS.getDisplayName(), getStatus()); - fields.put(AuditingFieldsKeysEnum.AUDIT_DESC.getDisplayName(), getDesc()); - fields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID.getDisplayName(), getConsumerId()); - SimpleDateFormat simpleDateFormat = new SimpleDateFormat(dateFormatPattern); - simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - fields.put(AuditingFieldsKeysEnum.AUDIT_TIMESTAMP.getDisplayName(), simpleDateFormat.format(timestamp1)); - - } - - public String getConsumerId() { - return consumerId; - } - - public void setConsumerId(String consumerId) { - this.consumerId = consumerId; - } - - public UUID getTimebaseduuid() { - return timebaseduuid; - } - - public void setTimebaseduuid(UUID timebaseduuid) { - this.timebaseduuid = timebaseduuid; - } - - public Date getTimestamp1() { - return timestamp1; - } - - public void setTimestamp1(Date timestamp1) { - this.timestamp1 = timestamp1; - } - - public String getRequestId() { - return requestId; - } - - public void setRequestId(String requestId) { - this.requestId = requestId; - } - - public String getServiceInstanceId() { - return serviceInstanceId; - } - - public void setServiceInstanceId(String serviceInstanceId) { - this.serviceInstanceId = serviceInstanceId; - } - - public String getAction() { - return action; - } - - public void setAction(String action) { - this.action = action; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getDesc() { - return desc; - } - - public void setDesc(String desc) { - this.desc = desc; - } - - @Override - public String toString() { - return "AuditingGetUebClusterEvent [timebaseduuid=" + timebaseduuid + ", timestamp1=" + timestamp1 - + ", requestId=" + requestId + ", serviceInstanceId=" + serviceInstanceId + ", action=" + action - + ", status=" + status + ", desc=" + desc + ", consumerId=" + consumerId + "]"; - } + private static String DISTRIBUTION_GET_UEB_CLUSTER_EVENT_TEMPLATE = "action=\"%s\" " + + " consumerId=\"%s\" statusTime=\"%s\" status=\"%s\" status_desc=\"%s\" "; + + @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(name = "consumer_id") + private String consumerId; + + public AuditingGetUebClusterEvent() { + super(); + timestamp1 = new Date(); + timebaseduuid = UUIDs.timeBased(); + } + + public AuditingGetUebClusterEvent(Map<AuditingFieldsKeysEnum, Object> auditingFields) { + this(); + Object value; + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID); + if (value != null) { + setRequestId((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID); + if (value != null) { + setServiceInstanceId((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_ACTION); + if (value != null) { + setAction((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_STATUS); + if (value != null) { + setStatus((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DESC); + if (value != null) { + setDesc((String) value); + } else { + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_STATUS_DESC); + if (value != null) { + setDesc((String) value); + } + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID); + if (value != null) { + setConsumerId((String) value); + } + + } + + public AuditingGetUebClusterEvent(String action, CommonAuditData commonAuditData, String consumerId) { + this(); + this.action = action; + this.requestId = commonAuditData.getRequestId(); + this.serviceInstanceId = commonAuditData.getServiceInstanceId(); + this.status = commonAuditData.getStatus(); + //if no desc, keep distr desc + this.desc = commonAuditData.getDescription(); + this.consumerId = consumerId; + } + + @Override + public void fillFields() { + fields.put(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID.getDisplayName(), getRequestId()); + + fields.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID.getDisplayName(), getServiceInstanceId()); + fields.put(AuditingFieldsKeysEnum.AUDIT_ACTION.getDisplayName(), getAction()); + fields.put(AuditingFieldsKeysEnum.AUDIT_STATUS.getDisplayName(), getStatus()); + fields.put(AuditingFieldsKeysEnum.AUDIT_DESC.getDisplayName(), getDesc()); + fields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID.getDisplayName(), getConsumerId()); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat(dateFormatPattern); + simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + fields.put(AuditingFieldsKeysEnum.AUDIT_TIMESTAMP.getDisplayName(), simpleDateFormat.format(timestamp1)); + + } + + public String getConsumerId() { + return consumerId; + } + + public void setConsumerId(String consumerId) { + this.consumerId = consumerId; + } + + public UUID getTimebaseduuid() { + return timebaseduuid; + } + + public void setTimebaseduuid(UUID timebaseduuid) { + this.timebaseduuid = timebaseduuid; + } + + public Date getTimestamp1() { + return timestamp1; + } + + public void setTimestamp1(Date timestamp1) { + this.timestamp1 = timestamp1; + } + + public String getRequestId() { + return requestId; + } + + public void setRequestId(String requestId) { + this.requestId = requestId; + } + + public String getServiceInstanceId() { + return serviceInstanceId; + } + + public void setServiceInstanceId(String serviceInstanceId) { + this.serviceInstanceId = serviceInstanceId; + } + + public String getAction() { + return action; + } + + public void setAction(String action) { + this.action = action; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getDesc() { + return desc; + } + + public void setDesc(String desc) { + this.desc = desc; + } + + @Override + public String toString() { + return "AuditingGetUebClusterEvent [timebaseduuid=" + timebaseduuid + ", timestamp1=" + timestamp1 + + ", requestId=" + requestId + ", serviceInstanceId=" + serviceInstanceId + ", action=" + action + + ", status=" + status + ", desc=" + desc + ", consumerId=" + consumerId + "]"; + } } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/AuditingTypesConstants.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/AuditingTypesConstants.java index 9f25932b37..26cc463725 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/AuditingTypesConstants.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/AuditingTypesConstants.java @@ -40,11 +40,13 @@ public interface AuditingTypesConstants { String DISTRIBUTION_GET_UEB_CLUSTER_EVENT_TYPE = "auditinggetuebclusterevent"; String DISTRIBUTION_GET_VALID_ARTIFACT_TYPES_EVENT_TYPE = "auditinggetvalidartifacttypesevent"; + String ECOMP_OPERATIONAL_ENV_EVENT_TYPE = "ecompopenvironmentevent"; String AUTH_EVENT_TYPE = "authevent"; String CONSUMER_EVENT_TYPE = "consumerevent"; String CATEGORY_EVENT_TYPE = "categoryevent"; String GET_USERS_LIST_EVENT_TYPE = "getuserslistevent"; String GET_CATEGORY_HIERARCHY_EVENT_TYPE = "getcategoryhierarchyevent"; String EXTERNAL_API_EVENT_TYPE = "externalapievent"; + String ENVIRONMENT_ENGINE_EVENT_TYPE = "environmentengineevent"; } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/AuthEvent.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/AuthEvent.java index 5c8cded0db..8e8a42310e 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/AuthEvent.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/AuthEvent.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; @@ -153,7 +151,7 @@ public class AuthEvent extends AuditingGenericEvent { this.requestId = requestId; } - public AuthEvent(EnumMap<AuditingFieldsKeysEnum, Object> auditingFields) { + public AuthEvent(Map<AuditingFieldsKeysEnum, Object> auditingFields) { this(); Object value; value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_AUTH_URL); @@ -191,6 +189,18 @@ public class AuthEvent extends AuditingGenericEvent { } + public AuthEvent(String action, CommonAuditData commonAuditData, String user, String authUrl, String realm, String authStatus) { + this(); + this.action = action; + this.requestId = commonAuditData.getRequestId(); + this.desc = commonAuditData.getDescription(); + this.status = commonAuditData.getStatus(); + this.authStatus = authStatus; + this.url = authUrl; + this.realm = realm; + this.user = user; + } + @Override public void fillFields() { fields.put(AuditingFieldsKeysEnum.AUDIT_AUTH_URL.getDisplayName(), getUrl()); diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/CategoryEvent.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/CategoryEvent.java index a970c84847..f85f67aa86 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/CategoryEvent.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/CategoryEvent.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; @@ -76,7 +74,7 @@ public class CategoryEvent extends AuditingGenericEvent { timebaseduuid = UUIDs.timeBased(); } - public CategoryEvent(EnumMap<AuditingFieldsKeysEnum, Object> auditingFields) { + public CategoryEvent(Map<AuditingFieldsKeysEnum, Object> auditingFields) { this(); Object value; value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_ACTION); @@ -122,6 +120,21 @@ public class CategoryEvent extends AuditingGenericEvent { } + public CategoryEvent(String action, CommonAuditData commonAuditData, String modifier, String categoryName, String subCategoryName, + String groupingName, String resourceType) { + this(); + this.action = action; + this.requestId = commonAuditData.getRequestId(); + this.status = commonAuditData.getStatus(); + this.desc = commonAuditData.getDescription(); + this.serviceInstanceId = commonAuditData.getServiceInstanceId(); + this.resourceType = resourceType; + this.modifier = modifier; + this.categoryName = categoryName; + this.subCategoryName = subCategoryName; + this.groupingName = groupingName; + } + @Override public void fillFields() { diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/ConsumerEvent.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/ConsumerEvent.java index 6c5bc3140d..81d27cae53 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/ConsumerEvent.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/ConsumerEvent.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; @@ -36,149 +34,159 @@ import com.datastax.driver.mapping.annotations.Table; @Table(keyspace = AuditingTypesConstants.AUDIT_KEYSPACE, name = AuditingTypesConstants.CONSUMER_EVENT_TYPE) public class ConsumerEvent extends AuditingGenericEvent { - private static String CONSUMER_EVENT_TEMPLATE = "action=\"%s\" timestamp=\"%s\" " - + "modifier=\"%s\" ecompUser=\"%s\" status=\"%s\" desc=\"%s\""; - - @PartitionKey - protected UUID timebaseduuid; - - @ClusteringColumn - protected Date timestamp1; - - @Column(name = "request_id") - protected String requestId; - @Column - protected String action; - @Column - protected String status; - - @Column(name = "description") - protected String desc; - - @Column - private String modifier; - - @Column(name = "ecomp_user") - private String ecompUser; - - public ConsumerEvent() { - super(); - timestamp1 = new Date(); - timebaseduuid = UUIDs.timeBased(); - } - - public ConsumerEvent(EnumMap<AuditingFieldsKeysEnum, Object> auditingFields) { - this(); - Object value; - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID); - if (value != null) { - setRequestId((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_ACTION); - if (value != null) { - setAction((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_STATUS); - if (value != null) { - setStatus((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DESC); - if (value != null) { - setDesc((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID); - if (value != null) { - setModifier((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_ECOMP_USER); - if (value != null) { - setEcompUser((String) value); - } - } - - @Override - public void fillFields() { - fields.put(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID.getDisplayName(), getRequestId()); - - fields.put(AuditingFieldsKeysEnum.AUDIT_ACTION.getDisplayName(), getAction()); - fields.put(AuditingFieldsKeysEnum.AUDIT_STATUS.getDisplayName(), getStatus()); - fields.put(AuditingFieldsKeysEnum.AUDIT_DESC.getDisplayName(), getDesc()); - fields.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID.getDisplayName(), getModifier()); - fields.put(AuditingFieldsKeysEnum.AUDIT_ECOMP_USER.getDisplayName(), getEcompUser()); - SimpleDateFormat simpleDateFormat = new SimpleDateFormat(dateFormatPattern); - simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - fields.put(AuditingFieldsKeysEnum.AUDIT_TIMESTAMP.getDisplayName(), simpleDateFormat.format(timestamp1)); - } - - public String getModifier() { - return modifier; - } - - public void setModifier(String modifier) { - this.modifier = modifier; - } - - public String getEcompUser() { - return ecompUser; - } - - public void setEcompUser(String ecompUser) { - this.ecompUser = ecompUser; - } - - public UUID getTimebaseduuid() { - return timebaseduuid; - } - - public void setTimebaseduuid(UUID timebaseduuid) { - this.timebaseduuid = timebaseduuid; - } - - public Date getTimestamp1() { - return timestamp1; - } - - public void setTimestamp1(Date timestamp1) { - this.timestamp1 = timestamp1; - } - - public String getRequestId() { - return requestId; - } - - public void setRequestId(String requestId) { - this.requestId = requestId; - } - - public String getAction() { - return action; - } - - public void setAction(String action) { - this.action = action; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getDesc() { - return desc; - } - - public void setDesc(String desc) { - this.desc = desc; - } - - @Override - public String toString() { - return "ConsumerEvent [timebaseduuid=" + timebaseduuid + ", timestamp1=" + timestamp1 + ", requestId=" - + requestId + ", action=" + action + ", status=" + status + ", desc=" + desc + ", modifier=" + modifier - + ", ecompUser=" + ecompUser + "]"; - } + private static String CONSUMER_EVENT_TEMPLATE = "action=\"%s\" timestamp=\"%s\" " + + "modifier=\"%s\" ecompUser=\"%s\" status=\"%s\" desc=\"%s\""; + + @PartitionKey + protected UUID timebaseduuid; + + @ClusteringColumn + protected Date timestamp1; + + @Column(name = "request_id") + protected String requestId; + @Column + protected String action; + @Column + protected String status; + + @Column(name = "description") + protected String desc; + + @Column + private String modifier; + + @Column(name = "ecomp_user") + private String ecompUser; + + public ConsumerEvent() { + super(); + timestamp1 = new Date(); + timebaseduuid = UUIDs.timeBased(); + } + + public ConsumerEvent(Map<AuditingFieldsKeysEnum, Object> auditingFields) { + this(); + Object value; + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID); + if (value != null) { + setRequestId((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_ACTION); + if (value != null) { + setAction((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_STATUS); + if (value != null) { + setStatus((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DESC); + if (value != null) { + setDesc((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID); + if (value != null) { + setModifier((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_ECOMP_USER); + if (value != null) { + setEcompUser((String) value); + } + } + + public ConsumerEvent(String action, CommonAuditData commonAuditData, String ecompUser, String modifier) { + this(); + this.action = action; + this.requestId = commonAuditData.getRequestId(); + this.status = commonAuditData.getStatus(); + this.desc = commonAuditData.getDescription(); + this.modifier = modifier; + this.ecompUser = ecompUser; + } + + @Override + public void fillFields() { + fields.put(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID.getDisplayName(), getRequestId()); + + fields.put(AuditingFieldsKeysEnum.AUDIT_ACTION.getDisplayName(), getAction()); + fields.put(AuditingFieldsKeysEnum.AUDIT_STATUS.getDisplayName(), getStatus()); + fields.put(AuditingFieldsKeysEnum.AUDIT_DESC.getDisplayName(), getDesc()); + fields.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID.getDisplayName(), getModifier()); + fields.put(AuditingFieldsKeysEnum.AUDIT_ECOMP_USER.getDisplayName(), getEcompUser()); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat(dateFormatPattern); + simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + fields.put(AuditingFieldsKeysEnum.AUDIT_TIMESTAMP.getDisplayName(), simpleDateFormat.format(timestamp1)); + } + + public String getModifier() { + return modifier; + } + + public void setModifier(String modifier) { + this.modifier = modifier; + } + + public String getEcompUser() { + return ecompUser; + } + + public void setEcompUser(String ecompUser) { + this.ecompUser = ecompUser; + } + + public UUID getTimebaseduuid() { + return timebaseduuid; + } + + public void setTimebaseduuid(UUID timebaseduuid) { + this.timebaseduuid = timebaseduuid; + } + + public Date getTimestamp1() { + return timestamp1; + } + + public void setTimestamp1(Date timestamp1) { + this.timestamp1 = timestamp1; + } + + public String getRequestId() { + return requestId; + } + + public void setRequestId(String requestId) { + this.requestId = requestId; + } + + public String getAction() { + return action; + } + + public void setAction(String action) { + this.action = action; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getDesc() { + return desc; + } + + public void setDesc(String desc) { + this.desc = desc; + } + + @Override + public String toString() { + return "ConsumerEvent [timebaseduuid=" + timebaseduuid + ", timestamp1=" + timestamp1 + ", requestId=" + + requestId + ", action=" + action + ", status=" + status + ", desc=" + desc + ", modifier=" + modifier + + ", ecompUser=" + ecompUser + "]"; + } } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/DistributionDeployEvent.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/DistributionDeployEvent.java index 6ee320575c..045263d645 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/DistributionDeployEvent.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/DistributionDeployEvent.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; @@ -37,51 +35,51 @@ import com.datastax.driver.mapping.annotations.Table; @Table(keyspace = AuditingTypesConstants.AUDIT_KEYSPACE, name = AuditingTypesConstants.DISTRIBUTION_DEPLOY_EVENT_TYPE) public class DistributionDeployEvent extends AuditingGenericEvent { - private static String DISTRIBUTION_DEPLOY_EVENT_TEMPLATE = "action=\"%s\" timestamp=\"%s\" " - + "resourceName=\"%s\" resourceType=\"%s\" currVersion=\"%s\" " - + "modifierName=\"%s\" modifierUid=\"%s\" did=\"%s\" " + "status=\"%s\" desc=\"%s\""; + private static String DISTRIBUTION_DEPLOY_EVENT_TEMPLATE = "action=\"%s\" timestamp=\"%s\" " + + "resourceName=\"%s\" resourceType=\"%s\" currVersion=\"%s\" " + + "modifierName=\"%s\" modifierUid=\"%s\" did=\"%s\" " + "status=\"%s\" desc=\"%s\""; - @PartitionKey - protected UUID timebaseduuid; + @PartitionKey + protected UUID timebaseduuid; - @ClusteringColumn - protected Date timestamp1; + @ClusteringColumn + protected Date timestamp1; - @Column(name = "request_id") - protected String requestId; + @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 = "service_instance_id") + protected String serviceInstanceId; + @Column + protected String action; + @Column + protected String status; - @Column(name = "description") - protected String desc; + @Column(name = "description") + protected String desc; - @Column(name = "resource_name") - private String resourceName; + @Column(name = "resource_name") + private String resourceName; - @Column(name = "resource_type") - private String resourceType; + @Column(name = "resource_type") + private String resourceType; - @Column(name = "curr_version") - private String currVersion; + @Column(name = "curr_version") + private String currVersion; - @Column - private String modifier; + @Column + private String modifier; - @Column - private String did; + @Column + private String did; - public DistributionDeployEvent() { + public DistributionDeployEvent() { super(); timestamp1 = new Date(); timebaseduuid = UUIDs.timeBased(); } - public DistributionDeployEvent(EnumMap<AuditingFieldsKeysEnum, Object> auditingFields) { + public DistributionDeployEvent(Map<AuditingFieldsKeysEnum, Object> auditingFields) { this(); Object value; value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID); @@ -124,19 +122,33 @@ public class DistributionDeployEvent extends AuditingGenericEvent { if (value != null) { setResourceType((String) value); } - - } - - @Override + } + + + public DistributionDeployEvent(String action, CommonAuditData commonAuditData, String did, String modifier, + String currVersion, String resourceName, String resourceType) { + this(); + this.action = action; + this.requestId = commonAuditData.getRequestId(); + this.serviceInstanceId = commonAuditData.getServiceInstanceId(); + this.status = commonAuditData.getStatus(); + this.desc = commonAuditData.getDescription(); + this.did = did; + this.modifier = modifier; + this.currVersion = currVersion; + this.resourceName = resourceName; + this.resourceType = resourceType; + } + + @Override public void fillFields() { fields.put(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID.getDisplayName(), getRequestId()); - fields.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID.getDisplayName(), getServiceInstanceId()); fields.put(AuditingFieldsKeysEnum.AUDIT_ACTION.getDisplayName(), getAction()); fields.put(AuditingFieldsKeysEnum.AUDIT_STATUS.getDisplayName(), getStatus()); fields.put(AuditingFieldsKeysEnum.AUDIT_DESC.getDisplayName(), getDesc()); - fields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ID.getDisplayName(), getDid()); + fields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ID.getDisplayName(), getDid()); fields.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID.getDisplayName(), getModifier()); fields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION.getDisplayName(), getCurrVersion()); fields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME.getDisplayName(), getResourceName()); @@ -146,103 +158,103 @@ public class DistributionDeployEvent extends AuditingGenericEvent { fields.put(AuditingFieldsKeysEnum.AUDIT_TIMESTAMP.getDisplayName(), simpleDateFormat.format(timestamp1)); } - public String getResourceName() { - return resourceName; - } + public String getResourceName() { + return resourceName; + } - public void setResourceName(String resourceName) { - this.resourceName = resourceName; - } + public void setResourceName(String resourceName) { + this.resourceName = resourceName; + } - public String getResourceType() { - return resourceType; - } + public String getResourceType() { + return resourceType; + } - public void setResourceType(String resourceType) { - this.resourceType = resourceType; - } + public void setResourceType(String resourceType) { + this.resourceType = resourceType; + } - public String getCurrVersion() { - return currVersion; - } + public String getCurrVersion() { + return currVersion; + } - public void setCurrVersion(String currVersion) { - this.currVersion = currVersion; - } + public void setCurrVersion(String currVersion) { + this.currVersion = currVersion; + } - public UUID getTimebaseduuid() { - return timebaseduuid; - } + public UUID getTimebaseduuid() { + return timebaseduuid; + } - public void setTimebaseduuid(UUID timebaseduuid) { - this.timebaseduuid = timebaseduuid; - } + public void setTimebaseduuid(UUID timebaseduuid) { + this.timebaseduuid = timebaseduuid; + } - public Date getTimestamp1() { - return timestamp1; - } + public Date getTimestamp1() { + return timestamp1; + } - public void setTimestamp1(Date timestamp1) { - this.timestamp1 = timestamp1; - } + public void setTimestamp1(Date timestamp1) { + this.timestamp1 = timestamp1; + } - public String getRequestId() { - return requestId; - } + public String getRequestId() { + return requestId; + } - public void setRequestId(String requestId) { - this.requestId = requestId; - } + public void setRequestId(String requestId) { + this.requestId = requestId; + } - public String getServiceInstanceId() { - return serviceInstanceId; - } + public String getServiceInstanceId() { + return serviceInstanceId; + } - public void setServiceInstanceId(String serviceInstanceId) { - this.serviceInstanceId = serviceInstanceId; - } + public void setServiceInstanceId(String serviceInstanceId) { + this.serviceInstanceId = serviceInstanceId; + } - public String getAction() { - return action; - } + public String getAction() { + return action; + } - public void setAction(String action) { - this.action = action; - } + public void setAction(String action) { + this.action = action; + } - public String getStatus() { - return status; - } + public String getStatus() { + return status; + } - public void setStatus(String status) { - this.status = status; - } + public void setStatus(String status) { + this.status = status; + } - public String getDesc() { - return desc; - } + public String getDesc() { + return desc; + } - public void setDesc(String desc) { - this.desc = desc; - } + public void setDesc(String desc) { + this.desc = desc; + } - public String getModifier() { - return modifier; - } + public String getModifier() { + return modifier; + } - public void setModifier(String modifier) { - this.modifier = modifier; - } + public void setModifier(String modifier) { + this.modifier = modifier; + } - public String getDid() { - return did; - } + public String getDid() { + return did; + } - public void setDid(String did) { - this.did = did; - } + public void setDid(String did) { + this.did = did; + } - @Override + @Override public String toString() { return "DistributionDeployEvent [timebaseduuid=" + timebaseduuid + ", timestamp1=" + timestamp1 + ", requestId=" + requestId + ", serviceInstanceId=" + serviceInstanceId + ", action=" + action + ", status=" + status diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/DistributionDownloadEvent.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/DistributionDownloadEvent.java index 4b9fc0318f..474b713b9e 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/DistributionDownloadEvent.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/DistributionDownloadEvent.java @@ -21,11 +21,10 @@ 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.be.resources.data.auditing.model.DistributionData; import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum; import com.datastax.driver.core.utils.UUIDs; @@ -37,43 +36,43 @@ import com.datastax.driver.mapping.annotations.Table; @Table(keyspace = AuditingTypesConstants.AUDIT_KEYSPACE, name = AuditingTypesConstants.DISTRIBUTION_DOWNLOAD_EVENT_TYPE) public class DistributionDownloadEvent extends AuditingGenericEvent { - private static String DISTRIBUTION_DOWNLOAD_EVENT_TEMPLATE = "action=\"%s\" timestamp=\"%s\" " - + "consumerId=\"%s\" resourceUrl=\"%s\" status=\"%s\" desc=\"%s\""; + private static String DISTRIBUTION_DOWNLOAD_EVENT_TEMPLATE = "action=\"%s\" timestamp=\"%s\" " + + "consumerId=\"%s\" resourceUrl=\"%s\" status=\"%s\" desc=\"%s\""; - @PartitionKey - protected UUID timebaseduuid; + @PartitionKey + protected UUID timebaseduuid; - @ClusteringColumn - protected Date timestamp1; + @ClusteringColumn + protected Date timestamp1; - @Column(name = "request_id") - protected String requestId; + @Column(name = "request_id") + protected String requestId; - @Column(name = "service_instance_id") - protected String serviceInstanceId; + @Column(name = "service_instance_id") + protected String serviceInstanceId; - @Column - protected String action; - @Column - protected String status; + @Column + protected String action; + @Column + protected String status; - @Column(name = "description") - protected String desc; + @Column(name = "description") + protected String desc; - @Column(name = "consumer_id") - private String consumerId; + @Column(name = "consumer_id") + private String consumerId; - @Column(name = "resource_url") - private String resourceUrl; + @Column(name = "resource_url") + private String resourceUrl; - public DistributionDownloadEvent() { + public DistributionDownloadEvent() { super(); - timestamp1 = new Date(); - timebaseduuid = UUIDs.timeBased(); - } + timestamp1 = new Date(); + timebaseduuid = UUIDs.timeBased(); + } - public DistributionDownloadEvent(EnumMap<AuditingFieldsKeysEnum, Object> auditingFields) { + public DistributionDownloadEvent(Map<AuditingFieldsKeysEnum, Object> auditingFields) { this(); Object value; value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID); @@ -104,17 +103,27 @@ public class DistributionDownloadEvent extends AuditingGenericEvent { if (value != null) { setResourceUrl((String) value); } - } + public DistributionDownloadEvent(String action, CommonAuditData commonAuditData, DistributionData distributionData) { + this(); + this.action = action; + this.requestId = commonAuditData.getRequestId(); + this.serviceInstanceId = commonAuditData.getServiceInstanceId(); + this.status = commonAuditData.getStatus(); + this.desc = commonAuditData.getDescription(); + this.consumerId = distributionData.getConsumerId(); + this.resourceUrl = distributionData.getResourceUrl(); + } + @Override public void fillFields() { fields.put(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID.getDisplayName(), getRequestId()); - fields.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID.getDisplayName(), getServiceInstanceId()); fields.put(AuditingFieldsKeysEnum.AUDIT_ACTION.getDisplayName(), getAction()); fields.put(AuditingFieldsKeysEnum.AUDIT_STATUS.getDisplayName(), getStatus()); fields.put(AuditingFieldsKeysEnum.AUDIT_DESC.getDisplayName(), getDesc()); + fields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID.getDisplayName(), getConsumerId()); fields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL.getDisplayName(), getResourceUrl()); SimpleDateFormat simpleDateFormat = new SimpleDateFormat(dateFormatPattern); @@ -122,84 +131,83 @@ public class DistributionDownloadEvent extends AuditingGenericEvent { fields.put(AuditingFieldsKeysEnum.AUDIT_TIMESTAMP.getDisplayName(), simpleDateFormat.format(timestamp1)); } - public String getConsumerId() { - return consumerId; - } + public String getConsumerId() { + return consumerId; + } - public void setConsumerId(String consumerId) { - this.consumerId = consumerId; - } + public void setConsumerId(String consumerId) { + this.consumerId = consumerId; + } - public String getResourceUrl() { - return resourceUrl; - } + public String getResourceUrl() { + return resourceUrl; + } - public void setResourceUrl(String resourceUrl) { - this.resourceUrl = resourceUrl; - } + public void setResourceUrl(String resourceUrl) { + this.resourceUrl = resourceUrl; + } - public UUID getTimebaseduuid() { - return timebaseduuid; - } + public UUID getTimebaseduuid() { + return timebaseduuid; + } - public void setTimebaseduuid(UUID timebaseduuid) { - this.timebaseduuid = timebaseduuid; - } + public void setTimebaseduuid(UUID timebaseduuid) { + this.timebaseduuid = timebaseduuid; + } - public Date getTimestamp1() { - return timestamp1; - } + public Date getTimestamp1() { + return timestamp1; + } - public void setTimestamp1(Date timestamp1) { - this.timestamp1 = timestamp1; - } + public void setTimestamp1(Date timestamp1) { + this.timestamp1 = timestamp1; + } - public String getRequestId() { - return requestId; - } + public String getRequestId() { + return requestId; + } - public void setRequestId(String requestId) { - this.requestId = requestId; - } + public void setRequestId(String requestId) { + this.requestId = requestId; + } - public String getServiceInstanceId() { - return serviceInstanceId; - } + public String getServiceInstanceId() { + return serviceInstanceId; + } - public void setServiceInstanceId(String serviceInstanceId) { - this.serviceInstanceId = serviceInstanceId; - } + public void setServiceInstanceId(String serviceInstanceId) { + this.serviceInstanceId = serviceInstanceId; + } - public String getAction() { - return action; - } + public String getAction() { + return action; + } - public void setAction(String action) { - this.action = action; - } + public void setAction(String action) { + this.action = action; + } - public String getStatus() { - return status; - } + public String getStatus() { + return status; + } - public void setStatus(String status) { - this.status = status; - } + public void setStatus(String status) { + this.status = status; + } - public String getDesc() { - return desc; - } + public String getDesc() { + return desc; + } - public void setDesc(String desc) { - this.desc = desc; - } + public void setDesc(String desc) { + this.desc = desc; + } - @Override + @Override public String toString() { return "DistributionDownloadEvent [timebaseduuid=" + timebaseduuid + ", timestamp1=" + timestamp1 + ", requestId=" + requestId + ", serviceInstanceId=" + serviceInstanceId + ", action=" + action - + ", status=" + status + ", desc=" + desc + ", consumerId=" + consumerId + ", resourceUrl=" - + resourceUrl + "]"; + + ", status=" + status + ", desc=" + desc + ", consumerId=" + consumerId + ", resourceUrl=" + resourceUrl + "]"; } } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/DistributionEngineEvent.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/DistributionEngineEvent.java index b125e7a712..70b2d4e7b1 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/DistributionEngineEvent.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/DistributionEngineEvent.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; @@ -37,115 +35,133 @@ import com.datastax.driver.mapping.annotations.Table; @Table(keyspace = AuditingTypesConstants.AUDIT_KEYSPACE, name = AuditingTypesConstants.DISTRIBUTION_ENGINE_EVENT_TYPE) public class DistributionEngineEvent extends AuditingGenericEvent { - private static String DISTRIBUTION_ENGINE_EVENT_TEMPLATE = "action=\"%s\" timestamp=\"%s\" " - + "environmentName=\"%s\" topicName=\"%s\" role=\"%s\" apiKey=\"%s\" " + "status=\"%s\" "; - - @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(name = "consumer_id") - private String consumerId; - - @Column(name = "DSTATUS_TOPIC") - private String dstatusTopic; - - @Column(name = "DNOTIF_TOPIC") - private String dnotifTopic; - - @Column(name = "d_env") - private String environmentName; - - @Column - private String role; - - @Column(name = "api_key") - private String apiKey; - - public DistributionEngineEvent() { - super(); - timestamp1 = new Date(); - timebaseduuid = UUIDs.timeBased(); - } - - public DistributionEngineEvent(EnumMap<AuditingFieldsKeysEnum, Object> auditingFields) { - this(); - Object value; - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID); - if (value != null) { - setRequestId((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID); - if (value != null) { - setServiceInstanceId((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_ACTION); - if (value != null) { - setAction((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_STATUS); - if (value != null) { - setStatus((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DESC); - if (value != null) { - setDesc((String) value); - } else { - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_STATUS_DESC); - if (value != null) { - setDesc((String) value); - } - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID); - if (value != null) { - setConsumerId((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_STATUS_TOPIC_NAME); - if (value != null) { - setDstatusTopic((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_NOTIFICATION_TOPIC_NAME); - if (value != null) { - setDnotifTopic((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_API_KEY); - if (value != null) { - setApiKey((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ENVRIONMENT_NAME); - if (value != null) { - setEnvironmentName((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ROLE); - if (value != null) { - setRole((String) value); - } - } - - @Override - public void fillFields() { - fields.put(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID.getDisplayName(), getRequestId()); + private static String DISTRIBUTION_ENGINE_EVENT_TEMPLATE = "action=\"%s\" timestamp=\"%s\" " + + "environmentName=\"%s\" topicName=\"%s\" role=\"%s\" apiKey=\"%s\" " + "status=\"%s\" "; + + @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(name = "consumer_id") + private String consumerId; + + @Column(name = "DSTATUS_TOPIC") + private String dstatusTopic; + + @Column(name = "DNOTIF_TOPIC") + private String dnotifTopic; + + @Column(name = "d_env") + private String environmentName; + + @Column + private String role; + + @Column(name = "api_key") + private String apiKey; + + public DistributionEngineEvent() { + super(); + timestamp1 = new Date(); + timebaseduuid = UUIDs.timeBased(); + } + + public DistributionEngineEvent(Map<AuditingFieldsKeysEnum, Object> auditingFields) { + this(); + Object value; + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID); + if (value != null) { + setRequestId((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID); + if (value != null) { + setServiceInstanceId((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_ACTION); + if (value != null) { + setAction((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_STATUS); + if (value != null) { + setStatus((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DESC); + if (value != null) { + setDesc((String) value); + } else { + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_STATUS_DESC); + if (value != null) { + setDesc((String) value); + } + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID); + if (value != null) { + setConsumerId((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_STATUS_TOPIC_NAME); + if (value != null) { + setDstatusTopic((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_NOTIFICATION_TOPIC_NAME); + if (value != null) { + setDnotifTopic((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_API_KEY); + if (value != null) { + setApiKey((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ENVRIONMENT_NAME); + if (value != null) { + setEnvironmentName((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ROLE); + if (value != null) { + setRole((String) value); + } + } + + public DistributionEngineEvent(String action, CommonAuditData commonAuditData, String consumerId, String distStatusTopic, String distNotifTopic, + String apiKey, String envName, String role) { + this(); + this.action = action; + this.requestId = commonAuditData.getRequestId(); + this.serviceInstanceId = commonAuditData.getServiceInstanceId(); + this.status = commonAuditData.getStatus(); + //if no desc, keep distr desc + this.desc = commonAuditData.getDescription(); + this.consumerId = consumerId; + this.dstatusTopic = distStatusTopic; + this.dnotifTopic = distNotifTopic; + this.apiKey = apiKey; + this.environmentName = envName; + this.role = role; + } + + @Override + public void fillFields() { + fields.put(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID.getDisplayName(), getRequestId()); fields.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID.getDisplayName(), getServiceInstanceId()); fields.put(AuditingFieldsKeysEnum.AUDIT_ACTION.getDisplayName(), getAction()); fields.put(AuditingFieldsKeysEnum.AUDIT_STATUS.getDisplayName(), getStatus()); fields.put(AuditingFieldsKeysEnum.AUDIT_DESC.getDisplayName(), getDesc()); + fields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID.getDisplayName(), getConsumerId()); fields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_API_KEY.getDisplayName(), getApiKey()); fields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ENVRIONMENT_NAME.getDisplayName(), getEnvironmentName()); @@ -158,116 +174,116 @@ public class DistributionEngineEvent extends AuditingGenericEvent { fields.put(AuditingFieldsKeysEnum.AUDIT_TIMESTAMP.getDisplayName(), simpleDateFormat.format(timestamp1)); } - public String getDstatusTopic() { - return dstatusTopic; - } + public String getDstatusTopic() { + return dstatusTopic; + } - public void setDstatusTopic(String dstatusTopic) { - this.dstatusTopic = dstatusTopic; - } + public void setDstatusTopic(String dstatusTopic) { + this.dstatusTopic = dstatusTopic; + } - public String getDnotifTopic() { - return dnotifTopic; - } - - public void setDnotifTopic(String dnotifTopic) { - this.dnotifTopic = dnotifTopic; - } - - public String getEnvironmentName() { - return environmentName; - } - - public void setEnvironmentName(String environmentName) { - this.environmentName = environmentName; - } - - public String getRole() { - return role; - } - - public void setRole(String role) { - this.role = role; - } - - public String getApiKey() { - return apiKey; - } - - public void setApiKey(String apiKey) { - this.apiKey = apiKey; - } - - public UUID getTimebaseduuid() { - return timebaseduuid; - } - - public void setTimebaseduuid(UUID timebaseduuid) { - this.timebaseduuid = timebaseduuid; - } - - public Date getTimestamp1() { - return timestamp1; - } - - public void setTimestamp1(Date timestamp1) { - this.timestamp1 = timestamp1; - } - - public String getRequestId() { - return requestId; - } - - public void setRequestId(String requestId) { - this.requestId = requestId; - } - - public String getServiceInstanceId() { - return serviceInstanceId; - } - - public void setServiceInstanceId(String serviceInstanceId) { - this.serviceInstanceId = serviceInstanceId; - } - - public String getAction() { - return action; - } - - public void setAction(String action) { - this.action = action; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getDesc() { - return desc; - } - - public void setDesc(String desc) { - this.desc = desc; - } - - public String getConsumerId() { - return consumerId; - } - - public void setConsumerId(String consumerId) { - this.consumerId = consumerId; - } - - @Override - public String toString() { - return "DistributionEngineEvent [timebaseduuid=" + timebaseduuid + ", timestamp1=" + timestamp1 + ", requestId=" - + requestId + ", serviceInstanceId=" + serviceInstanceId + ", action=" + action + ", status=" + status - + ", desc=" + desc + ", consumerId=" + consumerId + ", dstatusTopic=" + dstatusTopic + ", dnotifTopic=" - + dnotifTopic + ", environmentName=" + environmentName + ", role=" + role + ", apiKey=" + apiKey + "]"; - } + public String getDnotifTopic() { + return dnotifTopic; + } + + public void setDnotifTopic(String dnotifTopic) { + this.dnotifTopic = dnotifTopic; + } + + public String getEnvironmentName() { + return environmentName; + } + + public void setEnvironmentName(String environmentName) { + this.environmentName = environmentName; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getApiKey() { + return apiKey; + } + + public void setApiKey(String apiKey) { + this.apiKey = apiKey; + } + + public UUID getTimebaseduuid() { + return timebaseduuid; + } + + public void setTimebaseduuid(UUID timebaseduuid) { + this.timebaseduuid = timebaseduuid; + } + + public Date getTimestamp1() { + return timestamp1; + } + + public void setTimestamp1(Date timestamp1) { + this.timestamp1 = timestamp1; + } + + public String getRequestId() { + return requestId; + } + + public void setRequestId(String requestId) { + this.requestId = requestId; + } + + public String getServiceInstanceId() { + return serviceInstanceId; + } + + public void setServiceInstanceId(String serviceInstanceId) { + this.serviceInstanceId = serviceInstanceId; + } + + public String getAction() { + return action; + } + + public void setAction(String action) { + this.action = action; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getDesc() { + return desc; + } + + public void setDesc(String desc) { + this.desc = desc; + } + + public String getConsumerId() { + return consumerId; + } + + public void setConsumerId(String consumerId) { + this.consumerId = consumerId; + } + + @Override + public String toString() { + return "DistributionEngineEvent [timebaseduuid=" + timebaseduuid + ", timestamp1=" + timestamp1 + ", requestId=" + + requestId + ", serviceInstanceId=" + serviceInstanceId + ", action=" + action + ", status=" + status + + ", desc=" + desc + ", consumerId=" + consumerId + ", dstatusTopic=" + dstatusTopic + ", dnotifTopic=" + + dnotifTopic + ", environmentName=" + environmentName + ", role=" + role + ", apiKey=" + apiKey + "]"; + } } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/DistributionNotificationEvent.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/DistributionNotificationEvent.java index 6420f08fb5..db48364f0f 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/DistributionNotificationEvent.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/DistributionNotificationEvent.java @@ -21,11 +21,10 @@ 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.be.resources.data.auditing.model.OperationalEnvAuditData; import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum; import com.datastax.driver.core.utils.UUIDs; @@ -81,13 +80,22 @@ public class DistributionNotificationEvent extends AuditingGenericEvent { @Column private String did; + @Column(name = "env_id") + private String envId; + + @Column(name = "vnf_workload_context") + private String vnfWorkloadContext; + + @Column(name = "tenant") + private String tenant; + public DistributionNotificationEvent() { super(); timestamp1 = new Date(); timebaseduuid = UUIDs.timeBased(); } - public DistributionNotificationEvent(EnumMap<AuditingFieldsKeysEnum, Object> auditingFields) { + public DistributionNotificationEvent(Map<AuditingFieldsKeysEnum, Object> auditingFields) { this(); Object value; value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID); @@ -138,6 +146,40 @@ public class DistributionNotificationEvent extends AuditingGenericEvent { if (value != null) { setTopicName((String) value); } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ENVIRONMENT_ID); + if (value != null) { + setEnvId((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_VNF_WORKLOAD_CONTEXT); + if (value != null) { + setVnfWorkloadContext((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_TENANT); + if (value != null) { + setTenant((String) value); + } + + } + + public DistributionNotificationEvent(String action, CommonAuditData commonAuditData, String did, String modifier, String resourceCurrState, + String resourceCurrVersion, String resourceName, String resourceType, String topicName, + OperationalEnvAuditData opEnvFields) { + this(); + this.action = action; + this.requestId = commonAuditData.getRequestId(); + this.serviceInstanceId = commonAuditData.getServiceInstanceId(); + this.status = commonAuditData.getStatus(); + this.desc = commonAuditData.getDescription(); + this.did = did; + this.modifier = modifier; + this.currState = resourceCurrState; + this.currVersion = resourceCurrVersion; + this.resourceName = resourceName; + this.resourceType = resourceType; + this.topicName = topicName; + this.envId = opEnvFields.getEnvId(); + this.vnfWorkloadContext = opEnvFields.getVnfWorkloadContext(); + this.tenant = opEnvFields.getTenant(); } @@ -149,6 +191,9 @@ public class DistributionNotificationEvent extends AuditingGenericEvent { fields.put(AuditingFieldsKeysEnum.AUDIT_ACTION.getDisplayName(), getAction()); fields.put(AuditingFieldsKeysEnum.AUDIT_STATUS.getDisplayName(), getStatus()); fields.put(AuditingFieldsKeysEnum.AUDIT_DESC.getDisplayName(), getDesc()); + fields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ENVIRONMENT_ID.getDisplayName(), getEnvId()); + fields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_VNF_WORKLOAD_CONTEXT.getDisplayName(), getVnfWorkloadContext()); + fields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_TENANT.getDisplayName(), getTenant()); fields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ID.getDisplayName(), getDid()); fields.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID.getDisplayName(), getModifier()); @@ -274,13 +319,38 @@ public class DistributionNotificationEvent extends AuditingGenericEvent { this.did = did; } + public String getVnfWorkloadContext() { + return vnfWorkloadContext; + } + + public void setVnfWorkloadContext(String vnfWorkloadContext) { + this.vnfWorkloadContext = vnfWorkloadContext; + } + + public String getEnvId() { + return envId; + } + + public void setEnvId(String envId) { + this.envId = envId; + } + + public String getTenant() { + return tenant; + } + + public void setTenant(String tenant) { + this.tenant = tenant; + } + @Override public String toString() { return "DistributionNotificationEvent [timebaseduuid=" + timebaseduuid + ", timestamp1=" + timestamp1 + ", requestId=" + requestId + ", serviceInstanceId=" + serviceInstanceId + ", action=" + action + ", status=" + status + ", desc=" + desc + ", resourceName=" + resourceName + ", resourceType=" + resourceType + ", currVersion=" + currVersion + ", modifier=" + modifier + ", currState=" + currState - + ", topicName=" + topicName + ", did=" + did + "]"; + + ", topicName=" + topicName + ", did=" + did + + ", envId=" + envId + ", vnfWorkloadContext=" + vnfWorkloadContext + ", tenant=" + tenant + "]"; } } 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 6565b824ac..c05631ec74 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 @@ -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; @@ -82,7 +80,7 @@ public class DistributionStatusEvent extends AuditingGenericEvent { } - public DistributionStatusEvent(EnumMap<AuditingFieldsKeysEnum, Object> auditingFields) { + public DistributionStatusEvent(Map<AuditingFieldsKeysEnum, Object> auditingFields) { this(); Object value; value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID); @@ -125,6 +123,21 @@ public class DistributionStatusEvent extends AuditingGenericEvent { if (value != null) { setStatusTime((String) value); } + } + + public DistributionStatusEvent(String action, CommonAuditData commonAuditData, String did, String consumerId, String topicName, + String resourceURL, String statusTime) { + this(); + this.action = action; + this.requestId = commonAuditData.getRequestId(); + this.serviceInstanceId = commonAuditData.getServiceInstanceId(); + this.status = commonAuditData.getStatus(); + this.desc = commonAuditData.getDescription(); + this.did = did; + this.consumerId = consumerId; + this.topicName = topicName; + this.resoureURL = resourceURL; + this.statusTime = statusTime; } @Override @@ -243,7 +256,7 @@ public class DistributionStatusEvent extends AuditingGenericEvent { this.statusTime = statusTime; } - @Override + @Override public String toString() { return "DistributionStatusEvent [timebaseduuid=" + timebaseduuid + ", timestamp1=" + timestamp1 + ", requestId=" + requestId + ", serviceInstanceId=" + serviceInstanceId + ", action=" + action + ", status=" + status diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/EcompOperationalEnvironmentEvent.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/EcompOperationalEnvironmentEvent.java new file mode 100644 index 0000000000..0ead1ff989 --- /dev/null +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/EcompOperationalEnvironmentEvent.java @@ -0,0 +1,164 @@ +package org.openecomp.sdc.be.resources.data.auditing; + +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 org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Map; +import java.util.TimeZone; + +@Table(keyspace = AuditingTypesConstants.AUDIT_KEYSPACE, name = AuditingTypesConstants.ECOMP_OPERATIONAL_ENV_EVENT_TYPE) +public class EcompOperationalEnvironmentEvent extends AuditingGenericEvent { + + @PartitionKey + protected String operationalEnvironmentId; + + @ClusteringColumn + protected Date timestamp1; + + @Column + protected String action; + + @Column(name = "operational_environment_action") + protected String operationalEnvironmentAction; + + @Column(name = "operational_environment_name") + protected String operationalEnvironmentName; + + @Column(name = "operational_environment_type") + protected String operationalEnvironmentType; + + @Column(name = "tenant_context") + protected String tenantContext; + + + public EcompOperationalEnvironmentEvent() { + super(); + timestamp1 = new Date(); + } + + public EcompOperationalEnvironmentEvent(Map<AuditingFieldsKeysEnum, Object> auditingFields) { + this(); + Object value; + + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_ACTION); + if (value != null) { + setAction((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_OPERATIONAL_ENVIRONMENT_ID); + if (value != null) { + setOperationalEnvironmentId((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_OPERATIONAL_ENVIRONMENT_NAME); + if (value != null) { + setOperationalEnvironmentName((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_OPERATIONAL_ENVIRONMENT_TYPE); + if (value != null) { + setOperational_environment_type((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_OPERATIONAL_ENVIRONMENT_ACTION); + if (value != null) { + setOperationalEnvironmentAction((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_TENANT_CONTEXT); + if (value != null) { + setTenantContext((String) value); + } + } + + public EcompOperationalEnvironmentEvent(String action, String operationalEnvironmentId, String operationalEnvironmentName, + String operationalEnvironmentType, String operationalEnvironmentAction, String tenantContext) { + this(); + this.action = action; + this.operationalEnvironmentId = operationalEnvironmentId; + this.operationalEnvironmentType = operationalEnvironmentType; + this.operationalEnvironmentName = operationalEnvironmentName; + this.operationalEnvironmentAction = operationalEnvironmentAction; + this.tenantContext = tenantContext; + } + + public String getOperationalEnvironmentId() { + return operationalEnvironmentId; + } + + public void setOperationalEnvironmentId(String operationalEnvironmentId) { + this.operationalEnvironmentId = operationalEnvironmentId; + } + + public String getOperationalEnvironmentAction() { + return operationalEnvironmentAction; + } + + public void setOperationalEnvironmentAction(String operationalEnvironmentAction) { + this.operationalEnvironmentAction = operationalEnvironmentAction; + } + + public String getOperationalEnvironmentName() { + return operationalEnvironmentName; + } + + public void setOperationalEnvironmentName(String operationalEnvironmentName) { + this.operationalEnvironmentName = operationalEnvironmentName; + } + + public String getOperationalEnvironmentType() { + return operationalEnvironmentType; + } + + public void setOperational_environment_type(String operationalEnvironmentType) { + this.operationalEnvironmentType = operationalEnvironmentType; + } + + public String getTenantContext() { + return tenantContext; + } + + public void setTenantContext(String tenantContext) { + this.tenantContext = tenantContext; + } + + public Date getTimestamp1() { + return timestamp1; + } + + public void setTimestamp1(Date timestamp) { + this.timestamp1 = timestamp; + } + + @Override + public String getAction() { + return action; + } + + @Override + public void setAction(String action) { + this.action = action; + } + + @Override + public void fillFields() { + fields.put(AuditingFieldsKeysEnum.AUDIT_ACTION.getDisplayName(), getAction()); + fields.put(AuditingFieldsKeysEnum.AUDIT_OPERATIONAL_ENVIRONMENT_ID.getDisplayName(), getOperationalEnvironmentId()); + fields.put(AuditingFieldsKeysEnum.AUDIT_OPERATIONAL_ENVIRONMENT_NAME.getDisplayName(), getOperationalEnvironmentName()); + fields.put(AuditingFieldsKeysEnum.AUDIT_OPERATIONAL_ENVIRONMENT_TYPE.getDisplayName(), getOperationalEnvironmentType()); + fields.put(AuditingFieldsKeysEnum.AUDIT_OPERATIONAL_ENVIRONMENT_ACTION.getDisplayName(), getOperationalEnvironmentAction()); + fields.put(AuditingFieldsKeysEnum.AUDIT_TENANT_CONTEXT.getDisplayName(), getTenantContext()); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat(dateFormatPattern); + simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + fields.put(AuditingFieldsKeysEnum.AUDIT_TIMESTAMP.getDisplayName(), simpleDateFormat.format(timestamp1)); + } + + @Override + public String toString() { + return "EcompOperationalEnvironmentEvent [timestamp1=" + timestamp1 + ", action = " + action + + ", operational_environment_id=" + operationalEnvironmentId + ", operational_environment_name=" + operationalEnvironmentName + + ", operational_environment_type=" + operationalEnvironmentType + ", operational_environment_action=" + operationalEnvironmentAction + + ", tenant_context=" + tenantContext + "]"; + } + +} diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/ExternalApiEvent.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/ExternalApiEvent.java index f32acc81c4..ed546301fc 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/ExternalApiEvent.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/ExternalApiEvent.java @@ -21,11 +21,10 @@ 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.be.resources.data.auditing.model.ResourceAuditData; import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum; import com.datastax.driver.core.utils.UUIDs; @@ -40,334 +39,358 @@ import com.datastax.driver.mapping.annotations.Table; */ @Table(keyspace = AuditingTypesConstants.AUDIT_KEYSPACE, name = AuditingTypesConstants.EXTERNAL_API_EVENT_TYPE) public class ExternalApiEvent extends AuditingGenericEvent { - @PartitionKey - protected UUID timebaseduuid; - - @ClusteringColumn() - protected Date timestamp1; - - @Column - protected String action; - @Column - protected String status; - - @Column(name = "description") - protected String desc; - - @Column(name = "consumer_id") - private String consumerId; - - @Column(name = "resource_url") - private String resourceURL; - - @Column(name = "resource_name") - private String resourceName; - - @Column(name = "resource_type") - private String resourceType; - - @Column(name = "service_instance_id") - protected String serviceInstanceId; - - @Column(name = "invariant_uuid") - protected String invariantUuid; - - @Column(name = "modifier") - private String modifier; - - @Column(name = "prev_version") - protected String prevVersion; - - @Column(name = "curr_version") - private String currVersion; - - @Column(name = "prev_state") - protected String prevState; - - @Column(name = "curr_state") - protected String currState; - - @Column(name = "prev_artifact_uuid") - private String prevArtifactUuid; - - @Column(name = "curr_artifact_uuid") - private String currArtifactUuid; - - @Column(name = "artifact_data") - private String artifactData; - - public ExternalApiEvent() { - super(); - timestamp1 = new Date(); - timebaseduuid = UUIDs.timeBased(); - } - - public ExternalApiEvent(EnumMap<AuditingFieldsKeysEnum, Object> auditingFields) { - this(); - Object value; - - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_ACTION); - if (value != null) { - setAction((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_STATUS); - if (value != null) { - setStatus((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DESC); - if (value != null) { - setDesc((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID); - if (value != null) { - setConsumerId((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL); - if (value != null) { - setResourceURL((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME); - if (value != null) { - setResourceName((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE); - if (value != null) { - setResourceType((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID); - if (value != null) { - setServiceInstanceId((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_INVARIANT_UUID); - if (value != null) { - setInvariantUuid((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID); - if (value != null) { - setModifier((String) value); - } - - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_VERSION); - if (value != null) { - setPrevVersion((String) value); - } - - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION); - if (value != null) { - setCurrVersion((String) value); - } - - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_STATE); - if (value != null) { - setPrevState((String) value); - } - - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE); - if (value != null) { - setCurrState((String) value); - } - - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_PREV_ARTIFACT_UUID); - if (value != null) { - setPrevArtifactUuid((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_CURR_ARTIFACT_UUID); - if (value != null) { - setCurrArtifactUuid((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_ARTIFACT_DATA); - if (value != null) { - setArtifactData((String) value); - } - } - - @Override - public void fillFields() { - fields.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID.getDisplayName(), getServiceInstanceId()); - fields.put(AuditingFieldsKeysEnum.AUDIT_INVARIANT_UUID.getDisplayName(), getInvariantUuid()); - fields.put(AuditingFieldsKeysEnum.AUDIT_ACTION.getDisplayName(), getAction()); - fields.put(AuditingFieldsKeysEnum.AUDIT_STATUS.getDisplayName(), getStatus()); - fields.put(AuditingFieldsKeysEnum.AUDIT_DESC.getDisplayName(), getDesc()); - SimpleDateFormat simpleDateFormat = new SimpleDateFormat(dateFormatPattern); - simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - fields.put(AuditingFieldsKeysEnum.AUDIT_TIMESTAMP.getDisplayName(), simpleDateFormat.format(timestamp1)); - fields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID.getDisplayName(), getConsumerId()); - fields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL.getDisplayName(), getResourceURL()); - fields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME.getDisplayName(), getResourceName()); - fields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE.getDisplayName(), getResourceType()); - fields.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID.getDisplayName(), getModifier()); - - fields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_VERSION.getDisplayName(), getPrevVersion()); - fields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION.getDisplayName(), getCurrVersion()); - fields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_STATE.getDisplayName(), getPrevState()); - fields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE.getDisplayName(), getCurrState()); - - fields.put(AuditingFieldsKeysEnum.AUDIT_PREV_ARTIFACT_UUID.getDisplayName(), getPrevArtifactUuid()); - fields.put(AuditingFieldsKeysEnum.AUDIT_CURR_ARTIFACT_UUID.getDisplayName(), getCurrArtifactUuid()); - fields.put(AuditingFieldsKeysEnum.AUDIT_ARTIFACT_DATA.getDisplayName(), getArtifactData()); - } - - public UUID getTimebaseduuid() { - return timebaseduuid; - } - - public void setTimebaseduuid(UUID timebaseduuid) { - this.timebaseduuid = timebaseduuid; - } - - public Date getTimestamp1() { - return timestamp1; - } - - public void setTimestamp1(Date timestamp1) { - this.timestamp1 = timestamp1; - } - - public String getAction() { - return action; - } - - public void setAction(String action) { - this.action = action; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getDesc() { - return desc; - } - - public void setDesc(String desc) { - this.desc = desc; - } - - public String getConsumerId() { - return consumerId; - } - - public void setConsumerId(String consumerId) { - this.consumerId = consumerId; - } - - public String getResourceURL() { - return resourceURL; - } - - public void setResourceURL(String resourceURL) { - this.resourceURL = resourceURL; - } - - public String getResourceName() { - return resourceName; - } - - public void setResourceName(String resourceName) { - this.resourceName = resourceName; - } - - public String getResourceType() { - return resourceType; - } - - public void setResourceType(String resourceType) { - this.resourceType = resourceType; - } - - public String getServiceInstanceId() { - return serviceInstanceId; - } - - public void setServiceInstanceId(String serviceInstanceId) { - this.serviceInstanceId = serviceInstanceId; - } - - public String getInvariantUuid() { - return invariantUuid; - } - - public void setInvariantUuid(String invariantUuid) { - this.invariantUuid = invariantUuid; - } - - public String getModifier() { - return modifier; - } - - public void setModifier(String modifier) { - this.modifier = modifier; - } - - public String getPrevArtifactUuid() { - return prevArtifactUuid; - } - - public void setPrevArtifactUuid(String prevArtifactUuid) { - this.prevArtifactUuid = prevArtifactUuid; - } - - public String getCurrArtifactUuid() { - return currArtifactUuid; - } - - public void setCurrArtifactUuid(String currArtifactUuid) { - this.currArtifactUuid = currArtifactUuid; - } - - public String getArtifactData() { - return artifactData; - } - - public void setArtifactData(String artifactData) { - this.artifactData = artifactData; - } - - @Override - public String toString() { - return "ExternalApiEvent [timebaseduuid=" + timebaseduuid + ", timestamp1=" + timestamp1 + ", action=" + action - + ", status=" + status + ", desc=" + desc + ", consumerId=" + consumerId + ", resourceURL=" - + resourceURL + ", resourceName=" + resourceName + ", resourceType=" + resourceType - + ", serviceInstanceId=" + serviceInstanceId + ", invariantUuid=" + invariantUuid + ", modifier=" + modifier - + ", prevVersion=" + prevVersion+ ", currVersion=" + currVersion - + ", prevState=" + prevState + ", currState=" + currState - + ", prevArtifactUuid=" - + prevArtifactUuid + ", currArtifactUuid=" + currArtifactUuid + ", artifactData=" + artifactData + "]"; - } - - public String getPrevVersion() { - return prevVersion; - } - - public void setPrevVersion(String prevVersion) { - this.prevVersion = prevVersion; - } - - public String getCurrVersion() { - return currVersion; - } - - public void setCurrVersion(String currVersion) { - this.currVersion = currVersion; - } - - public String getPrevState() { - return prevState; - } - - public void setPrevState(String prevState) { - this.prevState = prevState; - } - - public String getCurrState() { - return currState; - } - - public void setCurrState(String currState) { - this.currState = currState; - } + @PartitionKey + protected UUID timebaseduuid; + + @ClusteringColumn() + protected Date timestamp1; + + @Column + protected String action; + @Column + protected String status; + + @Column(name = "description") + protected String desc; + + @Column(name = "consumer_id") + private String consumerId; + + @Column(name = "resource_url") + private String resourceURL; + + @Column(name = "resource_name") + private String resourceName; + + @Column(name = "resource_type") + private String resourceType; + + @Column(name = "service_instance_id") + protected String serviceInstanceId; + + @Column(name = "invariant_uuid") + protected String invariantUuid; + + @Column(name = "modifier") + private String modifier; + + @Column(name = "prev_version") + protected String prevVersion; + + @Column(name = "curr_version") + private String currVersion; + + @Column(name = "prev_state") + protected String prevState; + + @Column(name = "curr_state") + protected String currState; + + @Column(name = "prev_artifact_uuid") + private String prevArtifactUuid; + + @Column(name = "curr_artifact_uuid") + private String currArtifactUuid; + + @Column(name = "artifact_data") + private String artifactData; + + public ExternalApiEvent() { + super(); + timestamp1 = new Date(); + timebaseduuid = UUIDs.timeBased(); + } + + public ExternalApiEvent(Map<AuditingFieldsKeysEnum, Object> auditingFields) { + this(); + Object value; + + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_ACTION); + if (value != null) { + setAction((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_STATUS); + if (value != null) { + setStatus((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DESC); + if (value != null) { + setDesc((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID); + if (value != null) { + setConsumerId((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL); + if (value != null) { + setResourceURL((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME); + if (value != null) { + setResourceName((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE); + if (value != null) { + setResourceType((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID); + if (value != null) { + setServiceInstanceId((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_INVARIANT_UUID); + if (value != null) { + setInvariantUuid((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID); + if (value != null) { + setModifier((String) value); + } + + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_VERSION); + if (value != null) { + setPrevVersion((String) value); + } + + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION); + if (value != null) { + setCurrVersion((String) value); + } + + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_STATE); + if (value != null) { + setPrevState((String) value); + } + + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE); + if (value != null) { + setCurrState((String) value); + } + + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_PREV_ARTIFACT_UUID); + if (value != null) { + setPrevArtifactUuid((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_CURR_ARTIFACT_UUID); + if (value != null) { + setCurrArtifactUuid((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_ARTIFACT_DATA); + if (value != null) { + setArtifactData((String) value); + } + } + + public ExternalApiEvent(String action, CommonAuditData commonAuditData, String resourceType, String resourceName, + String distConsumerId, String distResourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams, + String modifier, String invariantUuid, String artifactData) { + this(); + this.action = action; + this.status = commonAuditData.getStatus(); + this.desc = commonAuditData.getDescription(); + this.requestId = commonAuditData.getRequestId(); + this.consumerId = distConsumerId; + this.resourceURL = distResourceUrl; + this.resourceName = resourceName; + this.resourceType = resourceType; + this.serviceInstanceId = commonAuditData.getServiceInstanceId(); + this.invariantUuid = invariantUuid; + this.modifier = modifier; + this.prevVersion = prevParams.getVersion(); + this.prevState = prevParams.getState(); + this.prevArtifactUuid = prevParams.getArtifactUuid(); + this.currVersion = currParams.getVersion(); + this.currState = currParams.getState(); + this.currArtifactUuid = currParams.getArtifactUuid(); + this.artifactData = artifactData; + } + + @Override + public void fillFields() { + fields.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID.getDisplayName(), getServiceInstanceId()); + fields.put(AuditingFieldsKeysEnum.AUDIT_INVARIANT_UUID.getDisplayName(), getInvariantUuid()); + fields.put(AuditingFieldsKeysEnum.AUDIT_ACTION.getDisplayName(), getAction()); + fields.put(AuditingFieldsKeysEnum.AUDIT_STATUS.getDisplayName(), getStatus()); + fields.put(AuditingFieldsKeysEnum.AUDIT_DESC.getDisplayName(), getDesc()); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat(dateFormatPattern); + simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + fields.put(AuditingFieldsKeysEnum.AUDIT_TIMESTAMP.getDisplayName(), simpleDateFormat.format(timestamp1)); + fields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID.getDisplayName(), getConsumerId()); + fields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL.getDisplayName(), getResourceURL()); + fields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME.getDisplayName(), getResourceName()); + fields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE.getDisplayName(), getResourceType()); + fields.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID.getDisplayName(), getModifier()); + + fields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_VERSION.getDisplayName(), getPrevVersion()); + fields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION.getDisplayName(), getCurrVersion()); + fields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_STATE.getDisplayName(), getPrevState()); + fields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE.getDisplayName(), getCurrState()); + + fields.put(AuditingFieldsKeysEnum.AUDIT_PREV_ARTIFACT_UUID.getDisplayName(), getPrevArtifactUuid()); + fields.put(AuditingFieldsKeysEnum.AUDIT_CURR_ARTIFACT_UUID.getDisplayName(), getCurrArtifactUuid()); + fields.put(AuditingFieldsKeysEnum.AUDIT_ARTIFACT_DATA.getDisplayName(), getArtifactData()); + } + + public UUID getTimebaseduuid() { + return timebaseduuid; + } + + public void setTimebaseduuid(UUID timebaseduuid) { + this.timebaseduuid = timebaseduuid; + } + + public Date getTimestamp1() { + return timestamp1; + } + + public void setTimestamp1(Date timestamp1) { + this.timestamp1 = timestamp1; + } + + public String getAction() { + return action; + } + + public void setAction(String action) { + this.action = action; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getDesc() { + return desc; + } + + public void setDesc(String desc) { + this.desc = desc; + } + + public String getConsumerId() { + return consumerId; + } + + public void setConsumerId(String consumerId) { + this.consumerId = consumerId; + } + + public String getResourceURL() { + return resourceURL; + } + + public void setResourceURL(String resourceURL) { + this.resourceURL = resourceURL; + } + + public String getResourceName() { + return resourceName; + } + + public void setResourceName(String resourceName) { + this.resourceName = resourceName; + } + + public String getResourceType() { + return resourceType; + } + + public void setResourceType(String resourceType) { + this.resourceType = resourceType; + } + + public String getServiceInstanceId() { + return serviceInstanceId; + } + + public void setServiceInstanceId(String serviceInstanceId) { + this.serviceInstanceId = serviceInstanceId; + } + + public String getInvariantUuid() { + return invariantUuid; + } + + public void setInvariantUuid(String invariantUuid) { + this.invariantUuid = invariantUuid; + } + + public String getModifier() { + return modifier; + } + + public void setModifier(String modifier) { + this.modifier = modifier; + } + + public String getPrevArtifactUuid() { + return prevArtifactUuid; + } + + public void setPrevArtifactUuid(String prevArtifactUuid) { + this.prevArtifactUuid = prevArtifactUuid; + } + + public String getCurrArtifactUuid() { + return currArtifactUuid; + } + + public void setCurrArtifactUuid(String currArtifactUuid) { + this.currArtifactUuid = currArtifactUuid; + } + + public String getArtifactData() { + return artifactData; + } + + public void setArtifactData(String artifactData) { + this.artifactData = artifactData; + } + + @Override + public String toString() { + return "ExternalApiEvent [timebaseduuid=" + timebaseduuid + ", timestamp1=" + timestamp1 + ", action=" + action + + ", status=" + status + ", desc=" + desc + ", consumerId=" + consumerId + ", resourceURL=" + + resourceURL + ", resourceName=" + resourceName + ", resourceType=" + resourceType + + ", serviceInstanceId=" + serviceInstanceId + ", invariantUuid=" + invariantUuid + ", modifier=" + modifier + + ", prevVersion=" + prevVersion+ ", currVersion=" + currVersion + + ", prevState=" + prevState + ", currState=" + currState + + ", prevArtifactUuid=" + + prevArtifactUuid + ", currArtifactUuid=" + currArtifactUuid + ", artifactData=" + artifactData + "]"; + } + + public String getPrevVersion() { + return prevVersion; + } + + public void setPrevVersion(String prevVersion) { + this.prevVersion = prevVersion; + } + + public String getCurrVersion() { + return currVersion; + } + + public void setCurrVersion(String currVersion) { + this.currVersion = currVersion; + } + + public String getPrevState() { + return prevState; + } + + public void setPrevState(String prevState) { + this.prevState = prevState; + } + + public String getCurrState() { + return currState; + } + + public void setCurrState(String currState) { + this.currState = currState; + } } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/GetCategoryHierarchyEvent.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/GetCategoryHierarchyEvent.java index 0b86651b8a..f80db7ef6e 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/GetCategoryHierarchyEvent.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/GetCategoryHierarchyEvent.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; @@ -36,147 +34,157 @@ import com.datastax.driver.mapping.annotations.Table; @Table(keyspace = AuditingTypesConstants.AUDIT_KEYSPACE, name = AuditingTypesConstants.GET_CATEGORY_HIERARCHY_EVENT_TYPE) public class GetCategoryHierarchyEvent extends AuditingGenericEvent { - @PartitionKey - protected UUID timebaseduuid; - - @ClusteringColumn() - // @Column(name="timestamp") - protected Date timestamp1; - - @Column(name = "request_id") - protected String requestId; - @Column - protected String action; - @Column - protected String status; - - @Column(name = "description") - protected String desc; - - @Column - private String modifier; - - @Column - private String details; - - public GetCategoryHierarchyEvent() { - super(); - timestamp1 = new Date(); - timebaseduuid = UUIDs.timeBased(); - } - - public GetCategoryHierarchyEvent(EnumMap<AuditingFieldsKeysEnum, Object> auditingFields) { - this(); - Object value; - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID); - if (value != null) { - setRequestId((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_ACTION); - if (value != null) { - setAction((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_STATUS); - if (value != null) { - setStatus((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DESC); - if (value != null) { - setDesc((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID); - if (value != null) { - setModifier((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DETAILS); - if (value != null) { - setDetails((String) value); - } - } - - @Override - public void fillFields() { - fields.put(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID.getDisplayName(), getRequestId()); - - fields.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID.getDisplayName(), getServiceInstanceId()); - fields.put(AuditingFieldsKeysEnum.AUDIT_ACTION.getDisplayName(), getAction()); - fields.put(AuditingFieldsKeysEnum.AUDIT_STATUS.getDisplayName(), getStatus()); - fields.put(AuditingFieldsKeysEnum.AUDIT_DESC.getDisplayName(), getDesc()); - fields.put(AuditingFieldsKeysEnum.AUDIT_DETAILS.getDisplayName(), getDetails()); - SimpleDateFormat simpleDateFormat = new SimpleDateFormat(dateFormatPattern); - simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - fields.put(AuditingFieldsKeysEnum.AUDIT_TIMESTAMP.getDisplayName(), simpleDateFormat.format(timestamp1)); - } - - public UUID getTimebaseduuid() { - return timebaseduuid; - } - - public void setTimebaseduuid(UUID timebaseduuid) { - this.timebaseduuid = timebaseduuid; - } - - public Date getTimestamp1() { - return timestamp1; - } - - public void setTimestamp1(Date timestamp1) { - this.timestamp1 = timestamp1; - } - - public String getRequestId() { - return requestId; - } - - public void setRequestId(String requestId) { - this.requestId = requestId; - } - - public String getAction() { - return action; - } - - public void setAction(String action) { - this.action = action; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getDesc() { - return desc; - } - - public void setDesc(String desc) { - this.desc = desc; - } - - public String getModifier() { - return modifier; - } - - public void setModifier(String modifier) { - this.modifier = modifier; - } - - public String getDetails() { - return details; - } - - public void setDetails(String details) { - this.details = details; - } - - @Override - public String toString() { - return "GetCategoryHierarchyEvent [timebaseduuid=" + timebaseduuid + ", timestamp1=" + timestamp1 - + ", requestId=" + requestId + ", action=" + action + ", status=" + status + ", desc=" + desc - + ", modifier=" + modifier + ", details=" + details + "]"; - } + @PartitionKey + protected UUID timebaseduuid; + + @ClusteringColumn() + // @Column(name="timestamp") + protected Date timestamp1; + + @Column(name = "request_id") + protected String requestId; + @Column + protected String action; + @Column + protected String status; + + @Column(name = "description") + protected String desc; + + @Column + private String modifier; + + @Column + private String details; + + public GetCategoryHierarchyEvent() { + super(); + timestamp1 = new Date(); + timebaseduuid = UUIDs.timeBased(); + } + + public GetCategoryHierarchyEvent(Map<AuditingFieldsKeysEnum, Object> auditingFields) { + this(); + Object value; + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID); + if (value != null) { + setRequestId((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_ACTION); + if (value != null) { + setAction((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_STATUS); + if (value != null) { + setStatus((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DESC); + if (value != null) { + setDesc((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID); + if (value != null) { + setModifier((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DETAILS); + if (value != null) { + setDetails((String) value); + } + } + + public GetCategoryHierarchyEvent(String action, CommonAuditData commonAuditData, String modifier, String details) { + this(); + this.action = action; + this.requestId = commonAuditData.getRequestId(); + this.desc = commonAuditData.getDescription(); + this.status = commonAuditData.getStatus(); + this.modifier = modifier; + this.details = details; + } + + @Override + public void fillFields() { + fields.put(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID.getDisplayName(), getRequestId()); + + fields.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID.getDisplayName(), getServiceInstanceId()); + fields.put(AuditingFieldsKeysEnum.AUDIT_ACTION.getDisplayName(), getAction()); + fields.put(AuditingFieldsKeysEnum.AUDIT_STATUS.getDisplayName(), getStatus()); + fields.put(AuditingFieldsKeysEnum.AUDIT_DESC.getDisplayName(), getDesc()); + fields.put(AuditingFieldsKeysEnum.AUDIT_DETAILS.getDisplayName(), getDetails()); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat(dateFormatPattern); + simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + fields.put(AuditingFieldsKeysEnum.AUDIT_TIMESTAMP.getDisplayName(), simpleDateFormat.format(timestamp1)); + } + + public UUID getTimebaseduuid() { + return timebaseduuid; + } + + public void setTimebaseduuid(UUID timebaseduuid) { + this.timebaseduuid = timebaseduuid; + } + + public Date getTimestamp1() { + return timestamp1; + } + + public void setTimestamp1(Date timestamp1) { + this.timestamp1 = timestamp1; + } + + public String getRequestId() { + return requestId; + } + + public void setRequestId(String requestId) { + this.requestId = requestId; + } + + public String getAction() { + return action; + } + + public void setAction(String action) { + this.action = action; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getDesc() { + return desc; + } + + public void setDesc(String desc) { + this.desc = desc; + } + + public String getModifier() { + return modifier; + } + + public void setModifier(String modifier) { + this.modifier = modifier; + } + + public String getDetails() { + return details; + } + + public void setDetails(String details) { + this.details = details; + } + + @Override + public String toString() { + return "GetCategoryHierarchyEvent [timebaseduuid=" + timebaseduuid + ", timestamp1=" + timestamp1 + + ", requestId=" + requestId + ", action=" + action + ", status=" + status + ", desc=" + desc + + ", modifier=" + modifier + ", details=" + details + "]"; + } } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/GetUsersListEvent.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/GetUsersListEvent.java index 728a0430b0..41f7f05079 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/GetUsersListEvent.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/GetUsersListEvent.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; @@ -36,151 +34,162 @@ import com.datastax.driver.mapping.annotations.Table; @Table(keyspace = AuditingTypesConstants.AUDIT_KEYSPACE, name = AuditingTypesConstants.GET_USERS_LIST_EVENT_TYPE) public class GetUsersListEvent extends AuditingGenericEvent { - @PartitionKey - protected UUID timebaseduuid; - - @ClusteringColumn - protected Date timestamp1; - - @Column(name = "request_id") - protected String requestId; - @Column - protected String action; - @Column - protected String status; - - @Column(name = "description") - protected String desc; - - @Column - private String modifier; - - @Column - private String details; - - public GetUsersListEvent() { - super(); - timestamp1 = new Date(); - timebaseduuid = UUIDs.timeBased(); - } - - public GetUsersListEvent(EnumMap<AuditingFieldsKeysEnum, Object> auditingFields) { - this(); - Object value; - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID); - if (value != null) { - setRequestId((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_ACTION); - if (value != null) { - setAction((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_STATUS); - if (value != null) { - setStatus((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DESC); - if (value != null) { - setDesc((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID); - if (value != null) { - setModifier((String) value); - } - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_USER_DETAILS); - if (value != null) { - setDetails((String) value); - } else { - value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DETAILS); - if (value != null) { - setDetails((String) value); - } - } - } - - @Override - public void fillFields() { - fields.put(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID.getDisplayName(), getRequestId()); - - fields.put(AuditingFieldsKeysEnum.AUDIT_ACTION.getDisplayName(), getAction()); - fields.put(AuditingFieldsKeysEnum.AUDIT_STATUS.getDisplayName(), getStatus()); - fields.put(AuditingFieldsKeysEnum.AUDIT_DESC.getDisplayName(), getDesc()); - fields.put(AuditingFieldsKeysEnum.AUDIT_USER_DETAILS.getDisplayName(), getDetails()); - fields.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID.getDisplayName(), getModifier()); - SimpleDateFormat simpleDateFormat = new SimpleDateFormat(dateFormatPattern); - simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - fields.put(AuditingFieldsKeysEnum.AUDIT_TIMESTAMP.getDisplayName(), simpleDateFormat.format(timestamp1)); - } - - public UUID getTimebaseduuid() { - return timebaseduuid; - } - - public void setTimebaseduuid(UUID timebaseduuid) { - this.timebaseduuid = timebaseduuid; - } - - public Date getTimestamp1() { - return timestamp1; - } - - public void setTimestamp1(Date timestamp1) { - this.timestamp1 = timestamp1; - } - - public String getRequestId() { - return requestId; - } - - public void setRequestId(String requestId) { - this.requestId = requestId; - } - - public String getAction() { - return action; - } - - public void setAction(String action) { - this.action = action; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getDesc() { - return desc; - } - - public void setDesc(String desc) { - this.desc = desc; - } - - public String getModifier() { - return modifier; - } - - public void setModifier(String modifier) { - this.modifier = modifier; - } - - public String getDetails() { - return details; - } - - public void setDetails(String details) { - this.details = details; - } - - @Override - public String toString() { - return "GetUsersListEvent [timebaseduuid=" + timebaseduuid + ", timestamp1=" + timestamp1 + ", requestId=" - + requestId + ", action=" + action + ", status=" + status + ", desc=" + desc + ", modifier=" + modifier - + ", details=" + details + "]"; - } + @PartitionKey + protected UUID timebaseduuid; + + @ClusteringColumn + protected Date timestamp1; + + @Column(name = "request_id") + protected String requestId; + @Column + protected String action; + @Column + protected String status; + + @Column(name = "description") + protected String desc; + + @Column + private String modifier; + + @Column + private String details; + + public GetUsersListEvent() { + super(); + timestamp1 = new Date(); + timebaseduuid = UUIDs.timeBased(); + } + + public GetUsersListEvent(Map<AuditingFieldsKeysEnum, Object> auditingFields) { + this(); + Object value; + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID); + if (value != null) { + setRequestId((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_ACTION); + if (value != null) { + setAction((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_STATUS); + if (value != null) { + setStatus((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DESC); + if (value != null) { + setDesc((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID); + if (value != null) { + setModifier((String) value); + } + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_USER_DETAILS); + if (value != null) { + setDetails((String) value); + } else { + value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DETAILS); + if (value != null) { + setDetails((String) value); + } + } + } + + public GetUsersListEvent(String action, CommonAuditData commonAuditData, String modifier, String userDetails) { + this(); + this.action = action; + this.requestId = commonAuditData.getRequestId(); + this.status = commonAuditData.getStatus(); + this.desc = commonAuditData.getDescription(); + this.modifier = modifier; + this.details = userDetails; + } + + + @Override + public void fillFields() { + fields.put(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID.getDisplayName(), getRequestId()); + + fields.put(AuditingFieldsKeysEnum.AUDIT_ACTION.getDisplayName(), getAction()); + fields.put(AuditingFieldsKeysEnum.AUDIT_STATUS.getDisplayName(), getStatus()); + fields.put(AuditingFieldsKeysEnum.AUDIT_DESC.getDisplayName(), getDesc()); + fields.put(AuditingFieldsKeysEnum.AUDIT_USER_DETAILS.getDisplayName(), getDetails()); + fields.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID.getDisplayName(), getModifier()); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat(dateFormatPattern); + simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + fields.put(AuditingFieldsKeysEnum.AUDIT_TIMESTAMP.getDisplayName(), simpleDateFormat.format(timestamp1)); + } + + public UUID getTimebaseduuid() { + return timebaseduuid; + } + + public void setTimebaseduuid(UUID timebaseduuid) { + this.timebaseduuid = timebaseduuid; + } + + public Date getTimestamp1() { + return timestamp1; + } + + public void setTimestamp1(Date timestamp1) { + this.timestamp1 = timestamp1; + } + + public String getRequestId() { + return requestId; + } + + public void setRequestId(String requestId) { + this.requestId = requestId; + } + + public String getAction() { + return action; + } + + public void setAction(String action) { + this.action = action; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getDesc() { + return desc; + } + + public void setDesc(String desc) { + this.desc = desc; + } + + public String getModifier() { + return modifier; + } + + public void setModifier(String modifier) { + this.modifier = modifier; + } + + public String getDetails() { + return details; + } + + public void setDetails(String details) { + this.details = details; + } + + @Override + public String toString() { + return "GetUsersListEvent [timebaseduuid=" + timebaseduuid + ", timestamp1=" + timestamp1 + ", requestId=" + + requestId + ", action=" + action + ", status=" + status + ", desc=" + desc + ", modifier=" + modifier + + ", details=" + details + "]"; + } } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/ResourceAdminEvent.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/ResourceAdminEvent.java index 21a84751da..214f2187af 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/ResourceAdminEvent.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/ResourceAdminEvent.java @@ -21,11 +21,10 @@ 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.be.resources.data.auditing.model.ResourceAuditData; import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum; import com.datastax.driver.core.utils.UUIDs; @@ -118,7 +117,33 @@ public class ResourceAdminEvent extends AuditingGenericEvent { timebaseduuid = UUIDs.timeBased(); } - public ResourceAdminEvent(EnumMap<AuditingFieldsKeysEnum, Object> auditingFields) { + public ResourceAdminEvent(String action, CommonAuditData commonAuditData, ResourceAuditData prevParams, ResourceAuditData currParams, String resourceType, + String resourceName, String invariantUuid, String modifier, String artifactData, String comment, String did, String toscaNodeType) { + this(); + this.action = action; + this.requestId = commonAuditData.getRequestId(); + this.desc = commonAuditData.getDescription(); + this.status = commonAuditData.getStatus(); + this.serviceInstanceId = commonAuditData.getServiceInstanceId(); + this.currState = currParams.getState(); + this.currVersion = currParams.getVersion(); + this.currArtifactUUID = currParams.getArtifactUuid(); + this.prevState = prevParams.getState(); + this.prevVersion = prevParams.getVersion(); + this.prevArtifactUUID = prevParams.getArtifactUuid(); + this.resourceName = resourceName; + this.resourceType = resourceType; + this.comment = comment; + this.dcurrStatus = currParams.getDistributionStatus(); + this.dprevStatus = prevParams.getDistributionStatus(); + this.artifactData = artifactData; + this.modifier = modifier; + this.invariantUUID = invariantUuid; + this.did = did; + this.toscaNodeType = toscaNodeType; + } + + public ResourceAdminEvent(Map<AuditingFieldsKeysEnum, Object> auditingFields) { this(); Object value; value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID); @@ -209,6 +234,7 @@ public class ResourceAdminEvent extends AuditingGenericEvent { } + @Override public void fillFields() { fields.put(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID.getDisplayName(), getRequestId()); 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; } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/UserAdminEvent.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/UserAdminEvent.java index 72d7d2ff6d..1ab3ae783b 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/UserAdminEvent.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/UserAdminEvent.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; @@ -76,10 +74,9 @@ public class UserAdminEvent extends AuditingGenericEvent { super(); timestamp1 = new Date(); timebaseduuid = UUIDs.timeBased(); - } - public UserAdminEvent(EnumMap<AuditingFieldsKeysEnum, Object> auditingFields) { + public UserAdminEvent(Map<AuditingFieldsKeysEnum, Object> auditingFields) { this(); Object value; value = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID); @@ -117,6 +114,18 @@ public class UserAdminEvent extends AuditingGenericEvent { } + public UserAdminEvent(String action, CommonAuditData commonAuditData, String modifier, String userBefore, String userAfter) { + this(); + this.action = action; + this.requestId = commonAuditData.getRequestId(); + this.status = commonAuditData.getStatus(); + this.modifier = modifier; + this.serviceInstanceId = commonAuditData.getServiceInstanceId(); + this.desc = commonAuditData.getDescription(); + this.userBefore = userBefore; + this.userAfter = userAfter; + } + @Override public void fillFields() { fields.put(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID.getDisplayName(), getRequestId()); diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/model/CommonAuditData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/model/CommonAuditData.java new file mode 100644 index 0000000000..ae5a02ee75 --- /dev/null +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/model/CommonAuditData.java @@ -0,0 +1,75 @@ +package org.openecomp.sdc.be.resources.data.auditing.model; + +public class CommonAuditData { + private String description; + private String requestId; + private String serviceInstanceId; + private String status; + + private CommonAuditData() { + //for builder + } + + public String getStatus() { + return status; + } + + public String getDescription() { + return description; + } + + public String getRequestId() { + return requestId; + } + + public String getServiceInstanceId() { + return serviceInstanceId; + } + + public void setServiceInstanceId(String serviceInstanceId) { + this.serviceInstanceId = serviceInstanceId ; + } + + public static Builder newBuilder() { + return new Builder(); + } + + public static class Builder { + private final CommonAuditData instance; + + private Builder() { + instance = new CommonAuditData(); + } + + public Builder description(String description) { + instance.description = description; + return this; + } + + public Builder status(int status) { + instance.status = String.valueOf(status); + return this; + } + + public Builder status(String status) { + instance.status = status; + return this; + } + + public Builder requestId(String requestId) { + instance.requestId = requestId; + return this; + } + + public Builder serviceInstanceId(String serviceInstanceId) { + instance.serviceInstanceId = serviceInstanceId; + return this; + } + + public CommonAuditData build() { + return instance; + } + + } + +} diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/model/DistributionData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/model/DistributionData.java new file mode 100644 index 0000000000..fe45050e07 --- /dev/null +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/model/DistributionData.java @@ -0,0 +1,20 @@ +package org.openecomp.sdc.be.resources.data.auditing.model; + +public class DistributionData { + + private final String consumerId; + private final String resourceUrl; + + public DistributionData(String consumerId, String resourceUrl) { + this.consumerId = consumerId; + this.resourceUrl = resourceUrl; + } + + public String getConsumerId() { + return consumerId; + } + + public String getResourceUrl() { + return resourceUrl; + } +} diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/model/OperationalEnvAuditData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/model/OperationalEnvAuditData.java new file mode 100644 index 0000000000..968b41c74a --- /dev/null +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/model/OperationalEnvAuditData.java @@ -0,0 +1,26 @@ +package org.openecomp.sdc.be.resources.data.auditing.model; + +public class OperationalEnvAuditData { + private String envId; + private String vnfWorkloadContext; + private String tenant; + + public String getEnvId() { + return envId; + } + + public String getVnfWorkloadContext() { + return vnfWorkloadContext; + } + + public String getTenant() { + return tenant; + } + + public OperationalEnvAuditData(String envId, String vnfWorkloadContext, String tenant) { + this.envId = envId; + this.vnfWorkloadContext = vnfWorkloadContext; + this.tenant = tenant; + } + +} diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/model/ResourceAuditData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/model/ResourceAuditData.java new file mode 100644 index 0000000000..d66050a5f9 --- /dev/null +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/model/ResourceAuditData.java @@ -0,0 +1,60 @@ +package org.openecomp.sdc.be.resources.data.auditing.model; + +public class ResourceAuditData { + private String artifactUuid; + private String state; + private String version; + private String distributionStatus; + + private ResourceAuditData() { + //for builder + } + + public static Builder newBuilder() { + return new Builder(); + } + + public String getArtifactUuid() { + return artifactUuid; + } + public String getState() { + return state; + } + public String getVersion() { + return version; + } + public String getDistributionStatus() { return distributionStatus; } + + + public static class Builder { + private final ResourceAuditData instance; + + private Builder() { + instance = new ResourceAuditData(); + } + + public Builder artifactUuid(String artifactUuid) { + instance.artifactUuid = artifactUuid; + return this; + } + + public Builder state(String state) { + instance.state = state; + return this; + } + + public Builder version(String version) { + instance.version = version; + return this; + } + + public Builder distributionStatus(String distributionStatus) { + instance.distributionStatus = distributionStatus; + return this; + } + + public ResourceAuditData build() { + return instance; + } + } +} diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/category/CategoryData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/category/CategoryData.java index d42eb78ed3..27f5674558 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/category/CategoryData.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/category/CategoryData.java @@ -20,17 +20,16 @@ package org.openecomp.sdc.be.resources.data.category; -import java.lang.reflect.Type; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import com.google.gson.reflect.TypeToken; import org.openecomp.sdc.be.dao.graph.datatype.GraphNode; import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary; import org.openecomp.sdc.be.datatypes.category.CategoryDataDefinition; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; -import com.google.gson.reflect.TypeToken; +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class CategoryData extends GraphNode { private CategoryDataDefinition categoryDataDefinition; @@ -61,7 +60,7 @@ public class CategoryData extends GraphNode { } @Override - public Object getUniqueId() { + public String getUniqueId() { return categoryDataDefinition.getUniqueId(); } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/category/GroupingData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/category/GroupingData.java index ca40ae986b..ba451cb930 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/category/GroupingData.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/category/GroupingData.java @@ -20,14 +20,14 @@ package org.openecomp.sdc.be.resources.data.category; -import java.util.HashMap; -import java.util.Map; - import org.openecomp.sdc.be.dao.graph.datatype.GraphNode; import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary; import org.openecomp.sdc.be.datatypes.category.GroupingDataDefinition; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; +import java.util.HashMap; +import java.util.Map; + public class GroupingData extends GraphNode { private GroupingDataDefinition groupingDataDefinition; @@ -56,7 +56,7 @@ public class GroupingData extends GraphNode { } @Override - public Object getUniqueId() { + public String getUniqueId() { return groupingDataDefinition.getUniqueId(); } diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/category/SubCategoryData.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/category/SubCategoryData.java index 1112b4514d..5011992c61 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/category/SubCategoryData.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/category/SubCategoryData.java @@ -20,17 +20,16 @@ package org.openecomp.sdc.be.resources.data.category; -import java.lang.reflect.Type; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import com.google.gson.reflect.TypeToken; import org.openecomp.sdc.be.dao.graph.datatype.GraphNode; import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary; import org.openecomp.sdc.be.datatypes.category.SubCategoryDataDefinition; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; -import com.google.gson.reflect.TypeToken; +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class SubCategoryData extends GraphNode { @@ -67,7 +66,7 @@ public class SubCategoryData extends GraphNode { } @Override - public Object getUniqueId() { + public String getUniqueId() { return subCategoryDataDefinition.getUniqueId(); } |