new unit tests for sdc-dao 81/49281/1
authorTal Gitelman <tg851x@intl.att.com>
Sun, 27 May 2018 17:19:36 +0000 (20:19 +0300)
committerTal Gitelman <tg851x@intl.att.com>
Sun, 27 May 2018 17:19:36 +0000 (20:19 +0300)
Change-Id: I2f754832fd4557ba1aa7375ac036aa777d199c3e
Issue-ID: SDC-1333
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
69 files changed:
catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/CassandraClient.java
catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/OperationalEnvironmentsAccessor.java
catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaUtils.java
catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribBaseEventTableDesc.java
catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/EcompOperationalEnvironmentEventTableDesc.java
catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/OperationalEnvironmentsTableDescription.java
catalog-dao/src/main/java/org/openecomp/sdc/be/dao/graph/datatype/GraphNode.java
catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/GraphVertex.java
catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/types/VertexTypeEnum.java
catalog-dao/src/main/java/org/openecomp/sdc/be/dao/jsongraph/utils/JsonParserUtils.java
catalog-dao/src/main/java/org/openecomp/sdc/be/dao/titan/TitanGenericDao.java
catalog-dao/src/main/java/org/openecomp/sdc/be/dao/titan/TitanUtils.java
catalog-dao/src/main/java/org/openecomp/sdc/be/dao/utils/MapUtil.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/AdditionalInfoParameterData.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/ArtifactData.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/CapabilityData.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/CapabilityInstData.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/CategoryData.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/ComponentMetadataData.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/ConsumerData.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/GraphNodeLock.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/GroupData.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/HeatParameterData.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/HeatParameterValueData.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/InputValueData.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/InputsData.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/OperationData.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/OperationalEnvironmentEntry.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/PolicyTypeData.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/PropertyData.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/PropertyValueData.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/TagData.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/UniqueIdData.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/UserData.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/UserFunctionalMenuData.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/AuditingGetUebClusterEvent.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/AuthEvent.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/CategoryEvent.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/ConsumerEvent.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/DistributionDeployEvent.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/DistributionDownloadEvent.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/DistributionEngineEvent.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/DistributionNotificationEvent.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/DistributionStatusEvent.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/EcompOperationalEnvironmentEvent.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/ExternalApiEvent.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/GetCategoryHierarchyEvent.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/GetUsersListEvent.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/ResourceAdminEvent.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/UserAccessEvent.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/auditing/UserAdminEvent.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/category/CategoryData.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/category/GroupingData.java
catalog-dao/src/main/java/org/openecomp/sdc/be/resources/data/category/SubCategoryData.java
catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/ArtifactCassandraDaoTest.java
catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaBuilderTest.java [new file with mode: 0644]
catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaUtilsTest.java
catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/CategoryEventTableDescriptionTest.java
catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/DistribStatusEventTableDescTest.java
catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/EcompOperationalEnvironmentEventTableDescTest.java [new file with mode: 0644]
catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/OperationalEnvironmentsTableDescriptionTest.java [new file with mode: 0644]
catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/ResAdminEventTableDescriptionTest.java
catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/UserAdminEventTableDescriptionTest.java
catalog-dao/src/test/java/org/openecomp/sdc/be/dao/titan/TitanUtilsTest.java
catalog-dao/src/test/java/org/openecomp/sdc/be/resources/JsonParserUtilsTests.java
catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/category/CategoryDataTest.java
catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/category/GroupingDataTest.java
catalog-dao/src/test/java/org/openecomp/sdc/be/resources/data/category/SubCategoryDataTest.java
catalog-dao/src/test/java/org/openecomp/sdc/be/utils/JsonTester.java

index 10b9b05..38606d0 100644 (file)
@@ -24,7 +24,6 @@ import java.util.List;
 
 import javax.annotation.PreDestroy;
 
-import com.datastax.driver.core.policies.*;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.slf4j.Logger;
@@ -33,6 +32,11 @@ import org.springframework.stereotype.Component;
 
 import com.datastax.driver.core.Cluster;
 import com.datastax.driver.core.Session;
+import com.datastax.driver.core.policies.ConstantReconnectionPolicy;
+import com.datastax.driver.core.policies.DCAwareRoundRobinPolicy;
+import com.datastax.driver.core.policies.DefaultRetryPolicy;
+import com.datastax.driver.core.policies.LoadBalancingPolicy;
+import com.datastax.driver.core.policies.TokenAwarePolicy;
 import com.datastax.driver.mapping.Mapper;
 import com.datastax.driver.mapping.MappingManager;
 
index e72df9b..74fcdf5 100644 (file)
@@ -1,10 +1,11 @@
 package org.openecomp.sdc.be.dao.cassandra;
 
+import org.openecomp.sdc.be.resources.data.OperationalEnvironmentEntry;
+
 import com.datastax.driver.mapping.Result;
 import com.datastax.driver.mapping.annotations.Accessor;
 import com.datastax.driver.mapping.annotations.Param;
 import com.datastax.driver.mapping.annotations.Query;
-import org.openecomp.sdc.be.resources.data.OperationalEnvironmentEntry;
 
 @Accessor
 public interface OperationalEnvironmentsAccessor {
index 56cf32a..e1e3387 100644 (file)
 
 package org.openecomp.sdc.be.dao.cassandra.schema;
 
-import com.datastax.driver.core.*;
+import java.util.List;
+
 import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.List;
+import com.datastax.driver.core.Cluster;
+import com.datastax.driver.core.Session;
 
 public class SdcSchemaUtils {
 
index cbd70ca..d28140e 100644 (file)
@@ -1,15 +1,16 @@
 package org.openecomp.sdc.be.dao.cassandra.schema.tables;
 
-import com.datastax.driver.core.DataType;
-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 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 abstract class DistribBaseEventTableDesc implements ITableDescription {
     @Override
     public List<ImmutablePair<String, DataType>> primaryKeys() {
index 6c8fcb4..556824f 100644 (file)
@@ -1,11 +1,16 @@
 package org.openecomp.sdc.be.dao.cassandra.schema.tables;
 
-import com.datastax.driver.core.DataType;
+import java.util.ArrayList;
+import java.util.Arrays;
+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 java.util.*;
+import com.datastax.driver.core.DataType;
 
 public class EcompOperationalEnvironmentEventTableDesc implements ITableDescription {
 
index f14e50b..e054eaf 100644 (file)
@@ -1,11 +1,17 @@
 package org.openecomp.sdc.be.dao.cassandra.schema.tables;
 
-import com.datastax.driver.core.DataType;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedList;
+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 java.util.*;
+import com.datastax.driver.core.DataType;
 
 
 public class OperationalEnvironmentsTableDescription implements ITableDescription {
index 968381d..42a55c2 100644 (file)
 
 package org.openecomp.sdc.be.dao.graph.datatype;
 
-import com.google.gson.Gson;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 
-import java.util.List;
-import java.util.Map;
+import com.google.gson.Gson;
 
 public abstract class GraphNode extends GraphElement {
 
index c55902a..d38e9c0 100644 (file)
 
 package org.openecomp.sdc.be.dao.jsongraph;
 
-import com.thinkaurelius.titan.core.TitanVertex;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.StringUtils;
 import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
@@ -29,9 +32,7 @@ import org.openecomp.sdc.be.datatypes.enums.GraphPropertyEnum;
 import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
 import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
+import com.thinkaurelius.titan.core.TitanVertex;
 
 public class GraphVertex {
        private String uniqueId;
index 1bc9df5..92880c1 100644 (file)
 
 package org.openecomp.sdc.be.dao.jsongraph.types;
 
-import org.openecomp.sdc.be.datatypes.elements.*;
+import org.openecomp.sdc.be.datatypes.elements.AdditionalInfoParameterDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.ArtifactDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.CompositionDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.ForwardingPathDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.GroupDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.InterfaceDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.ListCapabilityDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.ListRequirementDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.MapArtifactDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.MapCapabiltyProperty;
+import org.openecomp.sdc.be.datatypes.elements.MapComponentInstanceExternalRefs;
+import org.openecomp.sdc.be.datatypes.elements.MapGroupsDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.MapListCapabiltyDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.MapListRequirementDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.MapPropertiesDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.PolicyDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 
 
 public enum VertexTypeEnum {
index b2530e8..198d3b4 100644 (file)
 
 package org.openecomp.sdc.be.dao.jsongraph.utils;
 
+import java.io.IOException;
+import java.util.Map;
+
+import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
@@ -27,12 +34,6 @@ import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.google.common.base.Strings;
-import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.util.Map;
 
 public class JsonParserUtils {
     private static final Logger log = LoggerFactory.getLogger(JsonParserUtils.class.getName());
index 9b9fa9c..d065a67 100644 (file)
 
 package org.openecomp.sdc.be.dao.titan;
 
-import com.thinkaurelius.titan.core.PropertyKey;
-import com.thinkaurelius.titan.core.TitanEdge;
-import com.thinkaurelius.titan.core.TitanGraph;
-import com.thinkaurelius.titan.core.TitanGraphQuery;
-import com.thinkaurelius.titan.core.TitanVertex;
-import com.thinkaurelius.titan.core.TitanVertexQuery;
-import com.thinkaurelius.titan.graphdb.query.TitanPredicate;
-import fj.data.Either;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.ImmutableTriple;
 import org.apache.tinkerpop.gremlin.structure.Direction;
@@ -51,14 +52,15 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.stream.Collectors;
-import java.util.stream.StreamSupport;
+import com.thinkaurelius.titan.core.PropertyKey;
+import com.thinkaurelius.titan.core.TitanEdge;
+import com.thinkaurelius.titan.core.TitanGraph;
+import com.thinkaurelius.titan.core.TitanGraphQuery;
+import com.thinkaurelius.titan.core.TitanVertex;
+import com.thinkaurelius.titan.core.TitanVertexQuery;
+import com.thinkaurelius.titan.graphdb.query.TitanPredicate;
+
+import fj.data.Either;
 @Component("titan-generic-dao")
 public class TitanGenericDao {
 
index 163ef80..25a12ed 100644 (file)
@@ -1,15 +1,15 @@
 package org.openecomp.sdc.be.dao.titan;
 
-import com.thinkaurelius.titan.graphdb.query.TitanPredicate;
+import static com.thinkaurelius.titan.core.attribute.Contain.NOT_IN;
+import static java.util.Collections.emptyMap;
+import static org.apache.commons.collections.CollectionUtils.isEmpty;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import static com.thinkaurelius.titan.core.attribute.Contain.NOT_IN;
-import static java.util.Collections.emptyMap;
-import static org.apache.commons.collections.CollectionUtils.isEmpty;
+import com.thinkaurelius.titan.graphdb.query.TitanPredicate;
 
 public class TitanUtils {
 
index cd4cf38..e8b2e0c 100644 (file)
 
 package org.openecomp.sdc.be.dao.utils;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
index 8c3742e..95f88ca 100644 (file)
 
 package org.openecomp.sdc.be.resources.data;
 
-import com.google.gson.reflect.TypeToken;
+import java.lang.reflect.Type;
+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.AdditionalInfoParameterDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.Map;
+import com.google.gson.reflect.TypeToken;
 
 public class AdditionalInfoParameterData extends GraphNode {
 
index 7114413..a5eca2e 100644 (file)
 
 package org.openecomp.sdc.be.resources.data;
 
-import com.google.gson.reflect.TypeToken;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.List;
+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.ArtifactDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
 
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import com.google.gson.reflect.TypeToken;
 
 public class ArtifactData extends GraphNode {
 
index d2b1336..6ccf365 100644 (file)
 
 package org.openecomp.sdc.be.resources.data;
 
-import com.google.gson.reflect.TypeToken;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.List;
+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.CapabilityDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import com.google.gson.reflect.TypeToken;
 
 public class CapabilityData extends GraphNode {
 
index 1e456d3..feadf73 100644 (file)
 
 package org.openecomp.sdc.be.resources.data;
 
-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 java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.List;
 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 com.google.gson.reflect.TypeToken;
+
 public class CapabilityInstData extends GraphNode {
 
        public CapabilityInstData() {
index 7a2e0b5..5c2a1b6 100644 (file)
 
 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;
index 52dd34b..018949e 100644 (file)
 
 package org.openecomp.sdc.be.resources.data;
 
-import com.google.gson.reflect.TypeToken;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.List;
+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.components.ComponentMetadataDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import com.google.gson.reflect.TypeToken;
 
 public abstract class ComponentMetadataData extends GraphNode {
 
index 88c9c70..32402e2 100644 (file)
 
 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;
index 68b362b..d412487 100644 (file)
 
 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;
index 93f03e4..9c9276e 100644 (file)
 
 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;
index c9dbc67..50b9fa9 100644 (file)
 
 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;
index a7f52a0..6862323 100644 (file)
 
 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() {
index be45c85..2847291 100644 (file)
 
 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;
 
index 2152619..d48b794 100644 (file)
 
 package org.openecomp.sdc.be.resources.data;
 
-import com.google.gson.reflect.TypeToken;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.List;
+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;
@@ -28,10 +32,7 @@ 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 java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import com.google.gson.reflect.TypeToken;
 
 public class InputsData extends GraphNode {
 
index cf05ad0..df3a100 100644 (file)
 
 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;
index 5b3c282..f3ecc7b 100644 (file)
@@ -1,14 +1,15 @@
 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;
 
+import org.openecomp.sdc.be.datatypes.enums.EnvironmentStatusEnum;
+
+import com.datastax.driver.mapping.annotations.Column;
+import com.datastax.driver.mapping.annotations.PartitionKey;
+import com.datastax.driver.mapping.annotations.Table;
+
 @Table(keyspace = "sdcrepository", name = "operationalEnvironment")
 public class OperationalEnvironmentEntry {
 
index 8f2293a..28081cc 100644 (file)
 
 package org.openecomp.sdc.be.resources.data;
 
-import com.google.gson.reflect.TypeToken;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.List;
+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.PolicyTypeDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import com.google.gson.reflect.TypeToken;
 
 public class PolicyTypeData extends GraphNode {
 
index 403e27d..abaf061 100644 (file)
 
 package org.openecomp.sdc.be.resources.data;
 
-import com.google.gson.reflect.TypeToken;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.List;
+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;
@@ -28,10 +32,7 @@ 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 java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import com.google.gson.reflect.TypeToken;
 
 public class PropertyData extends GraphNode {
 
index 80044e2..fcc75e7 100644 (file)
 
 package org.openecomp.sdc.be.resources.data;
 
-import com.google.gson.reflect.TypeToken;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.List;
+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.PropertyRule;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import com.google.gson.reflect.TypeToken;
 
 public class PropertyValueData extends GraphNode {
 
index 92b8323..0f798c1 100644 (file)
 
 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;
index fd3b865..e194f58 100644 (file)
 
 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;
index dc4522f..b484f45 100644 (file)
 
 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;
index 263cc89..08b4870 100644 (file)
 
 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;
index b5b99bf..d293bd8 100644 (file)
 package org.openecomp.sdc.be.resources.data.auditing;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.UUID;
 
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
index 8e8a423..a684a00 100644 (file)
 package org.openecomp.sdc.be.resources.data.auditing;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.UUID;
 
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
index f85f67a..2e4f6c8 100644 (file)
 package org.openecomp.sdc.be.resources.data.auditing;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.UUID;
 
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
index 81d27ca..3fceb8b 100644 (file)
 package org.openecomp.sdc.be.resources.data.auditing;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.UUID;
 
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
index 045263d..f3bd870 100644 (file)
 package org.openecomp.sdc.be.resources.data.auditing;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.UUID;
 
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
index 474b713..1a205cb 100644 (file)
 package org.openecomp.sdc.be.resources.data.auditing;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.UUID;
 
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData;
index 70b2d4e..46bff73 100644 (file)
 package org.openecomp.sdc.be.resources.data.auditing;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.UUID;
 
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
index db48364..4b783fb 100644 (file)
 package org.openecomp.sdc.be.resources.data.auditing;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.UUID;
 
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 import org.openecomp.sdc.be.resources.data.auditing.model.OperationalEnvAuditData;
index c05631e..dd429c4 100644 (file)
 package org.openecomp.sdc.be.resources.data.auditing;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.UUID;
 
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
index 0ead1ff..854a7ac 100644 (file)
@@ -1,16 +1,17 @@
 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;
 
+import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
+
+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;
+
 @Table(keyspace = AuditingTypesConstants.AUDIT_KEYSPACE, name = AuditingTypesConstants.ECOMP_OPERATIONAL_ENV_EVENT_TYPE)
 public class EcompOperationalEnvironmentEvent  extends AuditingGenericEvent {
 
index ed54630..6f4abb1 100644 (file)
 package org.openecomp.sdc.be.resources.data.auditing;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.UUID;
 
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
index f80db7e..09f45c6 100644 (file)
 package org.openecomp.sdc.be.resources.data.auditing;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.UUID;
 
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
index 41f7f05..ef5abcf 100644 (file)
 package org.openecomp.sdc.be.resources.data.auditing;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.UUID;
 
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
index 214f218..f07cb21 100644 (file)
 package org.openecomp.sdc.be.resources.data.auditing;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.UUID;
 
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
index 80a370d..7ead342 100644 (file)
 package org.openecomp.sdc.be.resources.data.auditing;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.UUID;
 
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
index 1ab3ae7..eb0d8db 100644 (file)
 package org.openecomp.sdc.be.resources.data.auditing;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.UUID;
 
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
index 27f5674..d84f0dd 100644 (file)
 
 package org.openecomp.sdc.be.resources.data.category;
 
-import com.google.gson.reflect.TypeToken;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.List;
+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.CategoryDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import com.google.gson.reflect.TypeToken;
 
 public class CategoryData extends GraphNode {
        private CategoryDataDefinition categoryDataDefinition;
index ba451cb..9283295 100644 (file)
 
 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;
index 5011992..a860530 100644 (file)
 
 package org.openecomp.sdc.be.resources.data.category;
 
-import com.google.gson.reflect.TypeToken;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.List;
+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.SubCategoryDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import com.google.gson.reflect.TypeToken;
 
 public class SubCategoryData extends GraphNode {
 
index 250459f..661a599 100644 (file)
@@ -1,15 +1,5 @@
 package org.openecomp.sdc.be.dao.cassandra;
 
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.InetAddress;
-import java.nio.ByteBuffer;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.junit.Before;
 import org.junit.Test;
@@ -19,17 +9,10 @@ import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.openecomp.sdc.be.resources.data.ESArtifactData;
 
-import com.datastax.driver.core.ColumnDefinitions;
-import com.datastax.driver.core.LocalDate;
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Row;
 import com.datastax.driver.core.Session;
-import com.datastax.driver.core.Token;
-import com.datastax.driver.core.TupleValue;
-import com.datastax.driver.core.TypeCodec;
-import com.datastax.driver.core.UDTValue;
 import com.datastax.driver.mapping.MappingManager;
-import com.google.common.reflect.TypeToken;
 
 import fj.data.Either;
 
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaBuilderTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/SdcSchemaBuilderTest.java
new file mode 100644 (file)
index 0000000..e4d7e84
--- /dev/null
@@ -0,0 +1,137 @@
+package org.openecomp.sdc.be.dao.cassandra.schema;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.openecomp.sdc.be.config.Configuration.CassandrConfig.KeyspaceConfig;
+import org.openecomp.sdc.be.dao.cassandra.schema.SdcSchemaBuilder.ReplicationStrategy;
+import org.openecomp.sdc.be.utils.DAOConfDependentTest;
+
+import com.datastax.driver.core.Session;
+
+import mockit.Deencapsulation;
+
+public class SdcSchemaBuilderTest extends DAOConfDependentTest{
+
+       private SdcSchemaBuilder createTestSubject() {
+               return new SdcSchemaBuilder();
+       }
+
+       @Test
+       public void testHandle1707OSMigration() throws Exception {
+               Map<String, Map<String, List<String>>> cassndraMetadata = new HashMap<>();
+               Map<String, List<ITableDescription>> schemeData = new HashMap<>();
+
+               // default test
+               Deencapsulation.invoke(SdcSchemaBuilder.class, "handle1707OSMigration", cassndraMetadata, schemeData);
+       }
+
+       @Test
+       public void testCreateSchema() throws Exception {
+               boolean result;
+
+               // default test
+               result = SdcSchemaBuilder.createSchema();
+       }
+
+       @Test
+       public void testDeleteSchema() throws Exception {
+               boolean result;
+
+               // default test
+               result = SdcSchemaBuilder.deleteSchema();
+       }
+
+       /*@Test
+       public void testParseKeyspaceMetadata() throws Exception {
+               List<KeyspaceMetadata> keyspacesMetadata = new LinkedList<>();
+               Map<String, Map<String, List<String>>> result;
+
+               // default test
+               result = Deencapsulation.invoke(SdcSchemaBuilder.class, "parseKeyspaceMetadata", keyspacesMetadata);
+       }*/
+
+       /*@Test
+       public void testGetMetadataTablesStructure() throws Exception {
+               List<KeyspaceMetadata> keyspacesMetadata = new LinkedList<>();
+               Map<String, Map<String, List<String>>> result;
+
+               // default test
+               result = Deencapsulation.invoke(SdcSchemaBuilder.class, "getMetadataTablesStructure", keyspacesMetadata);
+       }*/
+
+       @Test
+       public void testCreateIndexName() throws Exception {
+               String table = "";
+               String column = "";
+               String result;
+
+               // default test
+               result = Deencapsulation.invoke(SdcSchemaBuilder.class, "createIndexName", table, column);
+       }
+
+       /*@Test
+       public void testAlterTable() throws Exception {
+               Session session = null;
+               Map<String, List<String>> existingTablesMetadata = null;
+               ITableDescription tableDescription = null;
+               String tableName = "";
+               Map<String, ImmutablePair<DataType, Boolean>> columnDescription = null;
+
+               // default test
+               Deencapsulation.invoke(SdcSchemaBuilder.class, "alterTable",
+                               new Object[] { Session.class, Map.class, ITableDescription.class, tableName, Map.class });
+       }*/
+
+       @Test
+       public void testCreateKeyspace() throws Exception {
+               String keyspace = "mock";
+               Map<String, Map<String, List<String>>> cassndraMetadata = new HashMap<>();
+               Session session = Mockito.mock(Session.class);
+               boolean result;
+
+               // default test
+               result = Deencapsulation.invoke(SdcSchemaBuilder.class, "createKeyspace",
+                               keyspace, cassndraMetadata, session);
+               
+               cassndraMetadata.put(keyspace, new HashMap<>());
+               result = Deencapsulation.invoke(SdcSchemaBuilder.class, "createKeyspace",
+                               keyspace, cassndraMetadata, session);
+       }
+
+       @Test
+       public void testGetSchemeData() throws Exception {
+               Map<String, List<ITableDescription>> result;
+
+               // default test
+               result = Deencapsulation.invoke(SdcSchemaBuilder.class, "getSchemeData");
+       }
+
+       @Test
+       public void testCreateKeyspaceQuereyString() throws Exception {
+               String keyspace = "mock";
+               KeyspaceConfig keyspaceInfo = new KeyspaceConfig();
+               String result;
+
+               // default test
+               result = Deencapsulation.invoke(SdcSchemaBuilder.class, "createKeyspaceQuereyString", keyspace, keyspaceInfo);
+               
+               keyspaceInfo.setReplicationStrategy(ReplicationStrategy.NETWORK_TOPOLOGY_STRATEGY.getName());
+               LinkedList<String> replicationInfo = new LinkedList<>();
+               keyspaceInfo.setReplicationInfo(replicationInfo);
+               //Test1
+               result = Deencapsulation.invoke(SdcSchemaBuilder.class, "createKeyspaceQuereyString", keyspace, keyspaceInfo);
+               replicationInfo.add("mock1");
+               replicationInfo.add("mock2");
+               
+               result = Deencapsulation.invoke(SdcSchemaBuilder.class, "createKeyspaceQuereyString", keyspace, keyspaceInfo);
+               
+               //Test2
+               keyspaceInfo.setReplicationStrategy(ReplicationStrategy.SIMPLE_STRATEGY.getName());
+               result = Deencapsulation.invoke(SdcSchemaBuilder.class, "createKeyspaceQuereyString", keyspace, keyspaceInfo);
+       }
+}
\ No newline at end of file
index b3cb75f..47d3107 100644 (file)
@@ -1,17 +1,14 @@
 package org.openecomp.sdc.be.dao.cassandra.schema;
 
-import org.junit.Test;
-
-
-public class SdcSchemaUtilsTest {
-
-       private SdcSchemaUtils createTestSubject() {
-               return new SdcSchemaUtils();
-       }
+import java.util.LinkedList;
+import java.util.List;
 
-       
+import org.junit.Test;
+import org.openecomp.sdc.be.config.ConfigurationManager;
+import org.openecomp.sdc.be.utils.DAOConfDependentTest;
 
 
+public class SdcSchemaUtilsTest extends DAOConfDependentTest{
        
        @Test
        public void testExecuteStatement() throws Exception {
@@ -20,6 +17,13 @@ public class SdcSchemaUtilsTest {
 
                // default test
                result = SdcSchemaUtils.executeStatement(statement);
+               
+               List<String> cassandraHosts = new LinkedList<>();
+               ConfigurationManager.getConfigurationManager().getConfiguration().getCassandraConfig().setCassandraHosts(cassandraHosts);
+               ConfigurationManager.getConfigurationManager().getConfiguration().getCassandraConfig().setAuthenticate(true);
+               ConfigurationManager.getConfigurationManager().getConfiguration().getCassandraConfig().setSsl(true);
+               
+               result = SdcSchemaUtils.executeStatement(statement);
        }
 
        
index d5e5f8f..81030ca 100644 (file)
@@ -1,6 +1,7 @@
 package org.openecomp.sdc.be.dao.cassandra.schema.tables;
 
 import java.util.List;
+import java.util.Map;
 
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.junit.Test;
@@ -59,4 +60,17 @@ public class CategoryEventTableDescriptionTest {
                testSubject = createTestSubject();
                result = testSubject.getTableName();
        }
+       
+       @Test
+       public void testGetColumnDescription() throws Exception {
+               CategoryEventTableDescription testSubject;
+               Map<String, ImmutablePair<DataType, Boolean>> result;
+
+               // default test
+               testSubject = createTestSubject();
+               result = testSubject.getColumnDescription();
+               
+               CategoryEventTableDescription.CEFieldsDescription.ACTION.getType();
+               CategoryEventTableDescription.CEFieldsDescription.ACTION.isIndexed();
+       }
 }
\ No newline at end of file
index 9cb7950..2d49638 100644 (file)
@@ -1,12 +1,15 @@
 package org.openecomp.sdc.be.dao.cassandra.schema.tables;
 
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.junit.Test;
+import org.openecomp.sdc.be.dao.cassandra.schema.tables.DistribStatusEventTableDesc.DSEFieldsDescription;
 
 import com.datastax.driver.core.DataType;
 
+import mockit.Deencapsulation;
 
 public class DistribStatusEventTableDescTest {
 
@@ -14,50 +17,32 @@ public class DistribStatusEventTableDescTest {
                return new DistribStatusEventTableDesc();
        }
 
-       
        @Test
-       public void testPrimaryKeys() throws Exception {
+       public void testUpdateColumnDistribDescription() throws Exception {
                DistribStatusEventTableDesc testSubject;
-               List<ImmutablePair<String, DataType>> result;
+               Map<String, ImmutablePair<DataType, Boolean>> columns = new HashMap<>();
 
                // default test
                testSubject = createTestSubject();
-               result = testSubject.primaryKeys();
+               Deencapsulation.invoke(testSubject, "updateColumnDistribDescription", columns);
        }
 
-       
        @Test
-       public void testClusteringKeys() throws Exception {
-               DistribStatusEventTableDesc testSubject;
-               List<ImmutablePair<String, DataType>> result;
-
-               // default test
-               testSubject = createTestSubject();
-               result = testSubject.clusteringKeys();
-       }
-
-       
-
-
-       
-       @Test
-       public void testGetKeyspace() throws Exception {
+       public void testGetTableName() throws Exception {
                DistribStatusEventTableDesc testSubject;
                String result;
 
                // default test
                testSubject = createTestSubject();
-               result = testSubject.getKeyspace();
+               result = testSubject.getTableName();
        }
-
        
        @Test
-       public void testGetTableName() throws Exception {
-               DistribStatusEventTableDesc testSubject;
-               String result;
-
-               // default test
-               testSubject = createTestSubject();
-               result = testSubject.getTableName();
+       public void testDSEFieldsDescription() throws Exception {
+               DSEFieldsDescription testSubject = DistribStatusEventTableDesc.DSEFieldsDescription.CONSUMER_ID;
+               
+               testSubject.getName();
+               testSubject.getType();
+               testSubject.isIndexed();
        }
 }
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/EcompOperationalEnvironmentEventTableDescTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/EcompOperationalEnvironmentEventTableDescTest.java
new file mode 100644 (file)
index 0000000..906ee88
--- /dev/null
@@ -0,0 +1,66 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+public class EcompOperationalEnvironmentEventTableDescTest {
+
+       private EcompOperationalEnvironmentEventTableDesc createTestSubject() {
+               return new EcompOperationalEnvironmentEventTableDesc();
+       }
+
+       @Test
+       public void testPrimaryKeys() throws Exception {
+               EcompOperationalEnvironmentEventTableDesc testSubject;
+               List<ImmutablePair<String, DataType>> result;
+
+               // default test
+               testSubject = createTestSubject();
+               result = testSubject.primaryKeys();
+       }
+
+       @Test
+       public void testClusteringKeys() throws Exception {
+               EcompOperationalEnvironmentEventTableDesc testSubject;
+               List<ImmutablePair<String, DataType>> result;
+
+               // default test
+               testSubject = createTestSubject();
+               result = testSubject.clusteringKeys();
+       }
+
+       @Test
+       public void testGetKeyspace() throws Exception {
+               EcompOperationalEnvironmentEventTableDesc testSubject;
+               String result;
+
+               // default test
+               testSubject = createTestSubject();
+               result = testSubject.getKeyspace();
+       }
+
+       @Test
+       public void testGetColumnDescription() throws Exception {
+               EcompOperationalEnvironmentEventTableDesc testSubject;
+               Map<String, ImmutablePair<DataType, Boolean>> result;
+
+               // default test
+               testSubject = createTestSubject();
+               result = testSubject.getColumnDescription();
+       }
+
+       @Test
+       public void testGetTableName() throws Exception {
+               EcompOperationalEnvironmentEventTableDesc testSubject;
+               String result;
+
+               // default test
+               testSubject = createTestSubject();
+               result = testSubject.getTableName();
+       }
+}
\ No newline at end of file
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/OperationalEnvironmentsTableDescriptionTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/schema/tables/OperationalEnvironmentsTableDescriptionTest.java
new file mode 100644 (file)
index 0000000..ccdb391
--- /dev/null
@@ -0,0 +1,66 @@
+package org.openecomp.sdc.be.dao.cassandra.schema.tables;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.junit.Test;
+
+import com.datastax.driver.core.DataType;
+
+public class OperationalEnvironmentsTableDescriptionTest {
+
+       private OperationalEnvironmentsTableDescription createTestSubject() {
+               return new OperationalEnvironmentsTableDescription();
+       }
+
+       @Test
+       public void testPrimaryKeys() throws Exception {
+               OperationalEnvironmentsTableDescription testSubject;
+               List<ImmutablePair<String, DataType>> result;
+
+               // default test
+               testSubject = createTestSubject();
+               result = testSubject.primaryKeys();
+       }
+
+       @Test
+       public void testClusteringKeys() throws Exception {
+               OperationalEnvironmentsTableDescription testSubject;
+               List<ImmutablePair<String, DataType>> result;
+
+               // default test
+               testSubject = createTestSubject();
+               result = testSubject.clusteringKeys();
+       }
+
+       @Test
+       public void testGetColumnDescription() throws Exception {
+               OperationalEnvironmentsTableDescription testSubject;
+               Map<String, ImmutablePair<DataType, Boolean>> result;
+
+               // default test
+               testSubject = createTestSubject();
+               result = testSubject.getColumnDescription();
+       }
+
+       @Test
+       public void testGetKeyspace() throws Exception {
+               OperationalEnvironmentsTableDescription testSubject;
+               String result;
+
+               // default test
+               testSubject = createTestSubject();
+               result = testSubject.getKeyspace();
+       }
+
+       @Test
+       public void testGetTableName() throws Exception {
+               OperationalEnvironmentsTableDescription testSubject;
+               String result;
+
+               // default test
+               testSubject = createTestSubject();
+               result = testSubject.getTableName();
+       }
+}
\ No newline at end of file
index 0d9a4c2..ed1774e 100644 (file)
@@ -1,6 +1,7 @@
 package org.openecomp.sdc.be.dao.cassandra.schema.tables;
 
 import java.util.List;
+import java.util.Map;
 
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.junit.Test;
@@ -60,4 +61,17 @@ public class ResAdminEventTableDescriptionTest {
                testSubject = createTestSubject();
                result = testSubject.getTableName();
        }
+       
+       @Test
+       public void testGetColumnDescription() throws Exception {
+               ResAdminEventTableDescription testSubject;
+               Map<String, ImmutablePair<DataType, Boolean>> result;
+
+               // default test
+               testSubject = createTestSubject();
+               result = testSubject.getColumnDescription();
+               
+               ResAdminEventTableDescription.AEFieldsDescription.ACTION.getType();
+               ResAdminEventTableDescription.AEFieldsDescription.ACTION.isIndexed();
+       }
 }
\ No newline at end of file
index 2144e00..4a8c211 100644 (file)
@@ -1,6 +1,7 @@
 package org.openecomp.sdc.be.dao.cassandra.schema.tables;
 
 import java.util.List;
+import java.util.Map;
 
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.junit.Test;
@@ -59,4 +60,17 @@ public class UserAdminEventTableDescriptionTest {
                testSubject = createTestSubject();
                result = testSubject.getTableName();
        }
+       
+       @Test
+       public void testGetColumnDescription() throws Exception {
+               UserAdminEventTableDescription testSubject;
+               Map<String, ImmutablePair<DataType, Boolean>> result;
+
+               // default test
+               testSubject = createTestSubject();
+               result = testSubject.getColumnDescription();
+               
+               UserAdminEventTableDescription.UAEFieldsDescription.ACTION.getType();
+               UserAdminEventTableDescription.UAEFieldsDescription.ACTION.isIndexed();
+       }
 }
\ No newline at end of file
index d40a64e..5ada930 100644 (file)
@@ -2,15 +2,12 @@ package org.openecomp.sdc.be.dao.titan;
 
 import java.util.Collection;
 import java.util.Map;
-
-import javax.annotation.Generated;
+import java.util.Map.Entry;
 
 import org.apache.tinkerpop.gremlin.structure.T;
 import org.junit.Test;
 
 import com.thinkaurelius.titan.graphdb.query.TitanPredicate;
-
-import java.util.Map.Entry;
 public class TitanUtilsTest {
 
        @Test
index e02611a..508fb0c 100644 (file)
 
 package org.openecomp.sdc.be.resources;
 
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.google.common.collect.ImmutableList;
-import org.junit.Test;
-import org.openecomp.sdc.be.dao.jsongraph.utils.JsonParserUtils;
-import org.openecomp.sdc.be.datatypes.elements.CapabilityDataDefinition;
-import org.openecomp.sdc.be.datatypes.elements.ListCapabilityDataDefinition;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.openecomp.sdc.be.utils.FixtureHelpers.fixture;
+import static org.openecomp.sdc.be.utils.JsonTester.testJsonMap;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatCode;
-import static org.openecomp.sdc.be.utils.FixtureHelpers.fixture;
-import static org.openecomp.sdc.be.utils.JsonTester.testJsonMap;
+import org.junit.Test;
+import org.openecomp.sdc.be.dao.jsongraph.utils.JsonParserUtils;
+import org.openecomp.sdc.be.datatypes.elements.CapabilityDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.ListCapabilityDataDefinition;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.google.common.collect.ImmutableList;
 
 public class JsonParserUtilsTests {
 
index 1072635..f6f8a90 100644 (file)
@@ -2,8 +2,6 @@ package org.openecomp.sdc.be.resources.data.category;
 
 import java.util.Map;
 
-import javax.annotation.Generated;
-
 import org.junit.Test;
 import org.openecomp.sdc.be.datatypes.category.CategoryDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
index c79db7a..89e35d0 100644 (file)
@@ -2,8 +2,6 @@ package org.openecomp.sdc.be.resources.data.category;
 
 import java.util.Map;
 
-import javax.annotation.Generated;
-
 import org.junit.Test;
 import org.openecomp.sdc.be.datatypes.category.GroupingDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
index de9752f..c02c479 100644 (file)
@@ -2,8 +2,6 @@ package org.openecomp.sdc.be.resources.data.category;
 
 import java.util.Map;
 
-import javax.annotation.Generated;
-
 import org.junit.Test;
 import org.openecomp.sdc.be.datatypes.category.SubCategoryDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
index 4f1b2f2..53cc8f9 100644 (file)
@@ -1,13 +1,13 @@
 package org.openecomp.sdc.be.utils;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.type.MapType;
-import com.fasterxml.jackson.databind.type.TypeFactory;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.openecomp.sdc.be.utils.FixtureHelpers.fixture;
 
 import java.util.Map;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.openecomp.sdc.be.utils.FixtureHelpers.fixture;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.type.MapType;
+import com.fasterxml.jackson.databind.type.TypeFactory;
 
 public class JsonTester {
     private static final ObjectMapper MAPPER = new ObjectMapper();