Sync Integ to Master

[sdc.git] / catalog-dao / src / main / java / org / openecomp / sdc / be / dao / cassandra / schema / tables / DistribNotifEventTableDesc.java

diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribNotifEventTableDesc.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribNotifEventTableDesc.java
index 371b5c4..7db070f 100644 (file)
--- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribNotifEventTableDesc.java
+++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribNotifEventTableDesc.java
@@ -20,46 +20,23 @@
 
 package org.openecomp.sdc.be.dao.cassandra.schema.tables;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.openecomp.sdc.be.dao.cassandra.schema.ITableDescription;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingTypesConstants;
 
 import com.datastax.driver.core.DataType;
 
-public class DistribNotifEventTableDesc implements ITableDescription {
-       @Override
-       public List<ImmutablePair<String, DataType>> primaryKeys() {
-               List<ImmutablePair<String, DataType>> keys = new ArrayList<>();
-               keys.add(new ImmutablePair<String, DataType>(TIMEBASED_UUID_FIELD, DataType.timeuuid()));
-               return keys;
-       }
-
-       @Override
-       public List<ImmutablePair<String, DataType>> clusteringKeys() {
-               List<ImmutablePair<String, DataType>> keys = new ArrayList<>();
-               keys.add(new ImmutablePair<String, DataType>(TIMESTAMP_FIELD, DataType.timestamp()));
-               return keys;
-       }
+public class DistribNotifEventTableDesc extends DistribBaseEventTableDesc {
 
        @Override
-       public Map<String, ImmutablePair<DataType, Boolean>> getColumnDescription() {
-               Map<String, ImmutablePair<DataType, Boolean>> columns = new HashMap<>();
-
+       protected void updateColumnDistribDescription(Map<String, ImmutablePair<DataType, Boolean>> columns) {
                for (DNEFieldsDescription field : DNEFieldsDescription.values()) {
                        columns.put(field.getName(), new ImmutablePair<DataType, Boolean>(field.type, field.indexed));
                }
-
-               return columns;
-       }
-
-       @Override
-       public String getKeyspace() {
-               return AuditingTypesConstants.AUDIT_KEYSPACE;
+        //replace the base indexed flag value with the correct one for a given table:
+        columns.put(DistFieldsDescription.SERVICE_INST_ID.getName(),
+                new ImmutablePair<DataType, Boolean>(DistFieldsDescription.SERVICE_INST_ID.getType(), true));
        }
 
        @Override
@@ -68,18 +45,16 @@ public class DistribNotifEventTableDesc implements ITableDescription {
        }
 
        enum DNEFieldsDescription {
-               ACTION("action", DataType.varchar(), true), 
-               STATUS("status", DataType.varchar(), false), 
-               DESCRIPTION("description", DataType.varchar(), false), 
-               REQUEST_ID("request_id", DataType.varchar(), false), 
-               SERVICE_INST_ID("service_instance_id", DataType.varchar(), true), 
-               TOPIC_NAME("topic_name", DataType.varchar(), false), 
+               TOPIC_NAME("topic_name", DataType.varchar(), false),
                MODIFIER("modifier", DataType.varchar(), false), 
                CURR_STATE("curr_state", DataType.varchar(), false), 
                CURR_VERSION("curr_version", DataType.varchar(), false), 
                DID("did", DataType.varchar(), true), 
                RESOURCE_NAME("resource_name", DataType.varchar(), false), 
-               RESOURCE_TYPE("resource_type", DataType.varchar(), false);
+               RESOURCE_TYPE("resource_type", DataType.varchar(), false),
+               ENV_ID("env_id", DataType.varchar(), false),
+               VNF_WORKLOAD_CONTEXT("vnf_workload_context", DataType.varchar(), false),
+               TENANT("tenant", DataType.varchar(), false);
 
                private String name;
                private DataType type;