aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvasraz <vasyl.razinkov@est.tech>2023-01-11 19:19:05 +0000
committerVasyl Razinkov <vasyl.razinkov@est.tech>2023-01-17 10:44:23 +0000
commit035ad742f60bdb375ee4e2da4345d404949a19b4 (patch)
tree7d40e43a0d6422036403cf1f0d3bbfd3248fa61a
parentc29a4519545ff509c038c9a19781ef210b2ee14f (diff)
Improve test coverage
- extract duplicated code - remove redundant and unused code Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Change-Id: I7ae3592951f53bbebf10a80f7cce22d54b2940b6 Issue-ID: SDC-4317
-rw-r--r--catalog-be/src/test/java/org/openecomp/sdc/be/components/path/utils/GraphTestUtils.java2
-rw-r--r--catalog-dao/src/main/java/org/openecomp/sdc/be/dao/janusgraph/JanusGraphDao.java406
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/dao/janusgraph/JanusGraphDaoMockTest.java12
-rw-r--r--catalog-dao/src/test/java/org/openecomp/sdc/be/dao/janusgraph/JanusGraphDaoTest.java15
-rw-r--r--catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaElementOperation.java11
-rw-r--r--catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/NodeTemplateOperationGraphTest.java2
-rw-r--r--catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaElementOperationCatalogTest.java5
-rw-r--r--catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/GraphTestUtils.java2
-rw-r--r--catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ToscaElementLifecycleOperationTest.java2
9 files changed, 192 insertions, 265 deletions
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/utils/GraphTestUtils.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/utils/GraphTestUtils.java
index 0c1399bc51..66c5510591 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/utils/GraphTestUtils.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/path/utils/GraphTestUtils.java
@@ -102,7 +102,7 @@ public final class GraphTestUtils {
}
public static void clearGraph(JanusGraphDao janusGraphDao) {
- Either<JanusGraph, JanusGraphOperationStatus> graphResult = janusGraphDao.getGraph();
+ Either<JanusGraph, JanusGraphOperationStatus> graphResult = janusGraphDao.getJanusGraphClient().getGraph();
JanusGraph graph = graphResult.left().value();
Iterable<JanusGraphVertex> vertices = graph.query().vertices();
diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/janusgraph/JanusGraphDao.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/janusgraph/JanusGraphDao.java
index ed69992715..38dc522247 100644
--- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/janusgraph/JanusGraphDao.java
+++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/janusgraph/JanusGraphDao.java
@@ -31,11 +31,13 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Optional;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
-import java.util.Optional;
+import lombok.Getter;
import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.tinkerpop.gremlin.structure.Direction;
@@ -72,7 +74,9 @@ import org.springframework.beans.factory.annotation.Qualifier;
public class JanusGraphDao {
private static final Logger logger = Logger.getLogger(JanusGraphDao.class);
- JanusGraphClient janusGraphClient;
+ private static final String FAILED_TO_GET_BY_CRITERIA_FOR_TYPE_AND_PROPERTIES = "Failed to get by criteria for type '{}' and properties '{}'";
+ @Getter
+ private final JanusGraphClient janusGraphClient;
public JanusGraphDao(@Qualifier("janusgraph-client") JanusGraphClient janusGraphClient) {
this.janusGraphClient = janusGraphClient;
@@ -89,10 +93,6 @@ public class JanusGraphDao {
return janusGraphClient.rollback();
}
- public Either<JanusGraph, JanusGraphOperationStatus> getGraph() {
- return janusGraphClient.getGraph();
- }
-
/**
* @param graphVertex
* @return
@@ -157,28 +157,22 @@ public class JanusGraphDao {
if (graph.isLeft()) {
try {
JanusGraph tGraph = graph.left().value();
- @SuppressWarnings("unchecked") Iterable<JanusGraphVertex> vertecies = tGraph.query().has(name.getProperty(), value)
+ @SuppressWarnings("unchecked") Iterable<JanusGraphVertex> vertices = tGraph.query().has(name.getProperty(), value)
.has(GraphPropertyEnum.LABEL.getProperty(), label.getName()).vertices();
- java.util.Iterator<JanusGraphVertex> iterator = vertecies.iterator();
+ java.util.Iterator<JanusGraphVertex> iterator = vertices.iterator();
if (iterator.hasNext()) {
JanusGraphVertex vertex = iterator.next();
GraphVertex graphVertex = createAndFill(vertex, parseFlag);
return Either.left(graphVertex);
}
- if (logger.isDebugEnabled()) {
- logger.debug("No vertex in graph for key = {} and value = {} label = {}", name, value, label);
- }
+ logger.debug("No vertex in graph for key = {} and value = {} label = {}", name, value, label);
return Either.right(JanusGraphOperationStatus.NOT_FOUND);
} catch (Exception e) {
- if (logger.isDebugEnabled()) {
- logger.debug("Failed to get vertex in graph for key ={} and value = {} label = {}", name, value, label);
- }
+ logger.debug("Failed to get vertex in graph for key ={} and value = {} label = {}", name, value, label);
return Either.right(JanusGraphClient.handleJanusGraphException(e));
}
} else {
- if (logger.isDebugEnabled()) {
- logger.debug("No vertex in graph for key ={} and value = {} label = {} error :{}", name, value, label, graph.right().value());
- }
+ logger.debug("No vertex in graph for key ={} and value = {} label = {} error :{}", name, value, label, graph.right().value());
return Either.right(graph.right().value());
}
}
@@ -199,37 +193,29 @@ public class JanusGraphDao {
public Either<GraphVertex, JanusGraphOperationStatus> getVertexById(String id, JsonParseFlagEnum parseFlag) {
Either<JanusGraph, JanusGraphOperationStatus> graph = janusGraphClient.getGraph();
if (id == null) {
- if (logger.isDebugEnabled()) {
- logger.debug("No vertex in graph for id = {} ", id);
- }
+ logger.debug("No vertex in graph for id = {} ", id);
return Either.right(JanusGraphOperationStatus.NOT_FOUND);
}
if (graph.isLeft()) {
try {
JanusGraph tGraph = graph.left().value();
- @SuppressWarnings("unchecked") Iterable<JanusGraphVertex> vertecies = tGraph.query()
+ @SuppressWarnings("unchecked") Iterable<JanusGraphVertex> vertices = tGraph.query()
.has(GraphPropertyEnum.UNIQUE_ID.getProperty(), id).vertices();
- java.util.Iterator<JanusGraphVertex> iterator = vertecies.iterator();
+ java.util.Iterator<JanusGraphVertex> iterator = vertices.iterator();
if (iterator.hasNext()) {
JanusGraphVertex vertex = iterator.next();
GraphVertex graphVertex = createAndFill(vertex, parseFlag);
return Either.left(graphVertex);
} else {
- if (logger.isDebugEnabled()) {
- logger.debug("No vertex in graph for id = {}", id);
- }
+ logger.debug("No vertex in graph for id = {}", id);
return Either.right(JanusGraphOperationStatus.NOT_FOUND);
}
} catch (Exception e) {
- if (logger.isDebugEnabled()) {
- logger.debug("Failed to get vertex in graph for id {} ", id);
- }
+ logger.debug("Failed to get vertex in graph for id {} ", id);
return Either.right(JanusGraphClient.handleJanusGraphException(e));
}
} else {
- if (logger.isDebugEnabled()) {
- logger.debug("No vertex in graph for id {} error : {}", id, graph.right().value());
- }
+ logger.debug("No vertex in graph for id {} error : {}", id, graph.right().value());
return Either.right(graph.right().value());
}
}
@@ -255,7 +241,7 @@ public class JanusGraphDao {
}
}
- public void setVertexProperties(Vertex vertex, Map<String, Object> properties) throws IOException {
+ public void setVertexProperties(Vertex vertex, Map<String, Object> properties) {
for (Map.Entry<String, Object> entry : properties.entrySet()) {
if (entry.getValue() != null) {
vertex.property(entry.getKey(), entry.getValue());
@@ -315,11 +301,9 @@ public class JanusGraphDao {
}
public JanusGraphOperationStatus createEdge(Vertex from, Vertex to, EdgeLabelEnum label, Map<EdgePropertyEnum, Object> properties) {
- if (logger.isTraceEnabled()) {
- logger.trace("Try to connect {} with {} label {} properties {}",
- from == null ? "NULL" : from.property(GraphPropertyEnum.UNIQUE_ID.getProperty()),
- to == null ? "NULL" : to.property(GraphPropertyEnum.UNIQUE_ID.getProperty()), label, properties);
- }
+ logger.trace("Try to connect {} with {} label {} properties {}",
+ from == null ? "NULL" : from.property(GraphPropertyEnum.UNIQUE_ID.getProperty()),
+ to == null ? "NULL" : to.property(GraphPropertyEnum.UNIQUE_ID.getProperty()), label, properties);
if (from == null || to == null) {
logger.trace("No JanusGraph vertex for id from {} or id to {}",
from == null ? "NULL" : from.property(GraphPropertyEnum.UNIQUE_ID.getProperty()),
@@ -340,7 +324,7 @@ public class JanusGraphDao {
public Map<GraphPropertyEnum, Object> getVertexProperties(Element element) {
Map<GraphPropertyEnum, Object> result = new HashMap<>();
- if (element != null && element.keys() != null && element.keys().size() > 0) {
+ if (element != null && CollectionUtils.isNotEmpty(element.keys())) {
Map<String, Property> propertyMap = ElementHelper.propertyMap(element, element.keys().toArray(new String[element.keys().size()]));
for (Entry<String, Property> entry : propertyMap.entrySet()) {
String key = entry.getKey();
@@ -357,7 +341,7 @@ public class JanusGraphDao {
public Map<EdgePropertyEnum, Object> getEdgeProperties(Element element) {
Map<EdgePropertyEnum, Object> result = new HashMap<>();
- if (element != null && element.keys() != null && element.keys().size() > 0) {
+ if (element != null && CollectionUtils.isNotEmpty(element.keys())) {
Map<String, Property> propertyMap = ElementHelper.propertyMap(element, element.keys().toArray(new String[element.keys().size()]));
for (Entry<String, Property> entry : propertyMap.entrySet()) {
String key = entry.getKey();
@@ -421,36 +405,29 @@ public class JanusGraphDao {
List<GraphVertex> result = new ArrayList<>();
while (iterator.hasNext()) {
JanusGraphVertex vertex = iterator.next();
- Map<GraphPropertyEnum, Object> newProp = getVertexProperties(vertex);
+ getVertexProperties(vertex);
GraphVertex graphVertex = createAndFill(vertex, parseFlag);
result.add(graphVertex);
}
- if (logger.isDebugEnabled()) {
- logger
- .debug("Number of fetced nodes in graph for criteria : from type = {} and properties = {} is {}", type, props, result.size());
- }
+ logger.debug("Number of fetched nodes in graph for criteria : from type = {} and properties = {} is {}", type, props, result.size());
if (result.size() == 0) {
return Either.right(JanusGraphOperationStatus.NOT_FOUND);
}
return Either.left(result);
} catch (Exception e) {
- if (logger.isDebugEnabled()) {
- logger.debug("Failed get by criteria for type = {} and properties = {}", type, props, e);
- }
+ logger.debug("Failed get by criteria for type = {} and properties = {}", type, props, e);
return Either.right(JanusGraphClient.handleJanusGraphException(e));
}
} else {
- if (logger.isDebugEnabled()) {
- logger.debug("Failed get by criteria for type ={} and properties = {} error : {}", type, props, graph.right().value());
- }
+ logger.debug("Failed get by criteria for type ={} and properties = {} error : {}", type, props, graph.right().value());
return Either.right(graph.right().value());
}
}
-
+
public Either<List<GraphVertex>, JanusGraphOperationStatus> getByCriteria(final VertexTypeEnum type, final Map<GraphPropertyEnum, Object> props,
- final Map<GraphPropertyEnum, Object> hasNotProps,
- final JsonParseFlagEnum parseFlag,
- final String model) {
+ final Map<GraphPropertyEnum, Object> hasNotProps,
+ final JsonParseFlagEnum parseFlag,
+ final String model) {
return getByCriteria(type, props, hasNotProps, null, parseFlag, model, false);
}
@@ -461,14 +438,14 @@ public class JanusGraphDao {
final boolean includeNormativeExtensionModels) {
return getByCriteria(type, props, hasNotProps, null, parseFlag, model, includeNormativeExtensionModels);
}
-
+
public Either<List<GraphVertex>, JanusGraphOperationStatus> getByCriteria(final VertexTypeEnum type,
- final Map<GraphPropertyEnum, Object> hasProps,
- final Map<GraphPropertyEnum, Object> hasNotProps,
- final Map<String, Entry<JanusGraphPredicate, Object>> predicates,
- final JsonParseFlagEnum parseFlag,
- final String model) {
- return getByCriteria(type, hasProps, hasNotProps, predicates, parseFlag, model, false);
+ final Map<GraphPropertyEnum, Object> hasProps,
+ final Map<GraphPropertyEnum, Object> hasNotProps,
+ final Map<String, Entry<JanusGraphPredicate, Object>> predicates,
+ final JsonParseFlagEnum parseFlag,
+ final String model) {
+ return getByCriteria(type, hasProps, hasNotProps, predicates, parseFlag, model, false);
}
public Either<List<GraphVertex>, JanusGraphOperationStatus> getByCriteria(final VertexTypeEnum type,
@@ -481,137 +458,74 @@ public class JanusGraphDao {
Either<JanusGraph, JanusGraphOperationStatus> graph = janusGraphClient.getGraph();
if (graph.isLeft()) {
try {
- JanusGraph tGraph = graph.left().value();
- JanusGraphQuery<? extends JanusGraphQuery> query = tGraph.query();
-
- if (type != null) {
- query = query.has(GraphPropertyEnum.LABEL.getProperty(), type.getName());
- }
- if (hasProps != null && !hasProps.isEmpty()) {
- for (Map.Entry<GraphPropertyEnum, Object> entry : hasProps.entrySet()) {
- query = query.has(entry.getKey().getProperty(), entry.getValue());
- }
- }
- if (hasNotProps != null && !hasNotProps.isEmpty()) {
- for (Map.Entry<GraphPropertyEnum, Object> entry : hasNotProps.entrySet()) {
- if (entry.getValue() instanceof List) {
- buildMultipleNegateQueryFromList(entry, query);
- } else {
- query = query.hasNot(entry.getKey().getProperty(), entry.getValue());
- }
- }
- }
- if (predicates != null && !predicates.isEmpty()) {
- for (Map.Entry<String, Entry<JanusGraphPredicate, Object>> entry : predicates.entrySet()) {
- JanusGraphPredicate predicate = entry.getValue().getKey();
- Object object = entry.getValue().getValue();
- query = query.has(entry.getKey(), predicate, object);
- }
- }
- Iterable<JanusGraphVertex> vertices = query.vertices();
+ JanusGraphQuery<? extends JanusGraphQuery> query = getJanusGraphQuery(type, hasProps, hasNotProps, predicates, graph.left().value());
+ final Iterable<JanusGraphVertex> vertices = query.vertices();
if (vertices == null || !vertices.iterator().hasNext()) {
return Either.right(JanusGraphOperationStatus.NOT_FOUND);
}
- List<GraphVertex> result = new ArrayList<>();
- final Predicate<? super JanusGraphVertex> filterPredicate = StringUtils.isEmpty(model) ? this::vertexNotConnectedToAnyModel : vertex -> vertexValidForModel(vertex, model, includeNormativeExtensionModels);
- final List<JanusGraphVertex> verticesForModel = StreamSupport.stream(vertices.spliterator(), false).filter(filterPredicate).collect(Collectors.toList());
- if (verticesForModel == null || verticesForModel.size() == 0) {
+ final Predicate<? super JanusGraphVertex> filterPredicate = StringUtils.isEmpty(model) ? this::vertexNotConnectedToAnyModel
+ : vertex -> vertexValidForModel(vertex, model, includeNormativeExtensionModels);
+ final List<JanusGraphVertex> verticesForModel = StreamSupport.stream(vertices.spliterator(), false).filter(filterPredicate)
+ .collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(verticesForModel)) {
return Either.right(JanusGraphOperationStatus.NOT_FOUND);
}
-
- verticesForModel.forEach(vertex -> result.add(createAndFill(vertex, parseFlag)));
- if (logger.isDebugEnabled()) {
- logger.debug("Number of fetched nodes in graph for criteria : from type '{}' and properties '{}' is '{}'", type, hasProps,
- result.size());
- }
+
+ final List<GraphVertex> result = new ArrayList<>();
+ verticesForModel.forEach(vertex -> result.add(createAndFill(vertex, parseFlag)));
+ logger.debug("Number of fetched nodes in graph for criteria : from type '{}' and properties '{}' is '{}'", type, hasProps,
+ result.size());
return Either.left(result);
} catch (Exception e) {
- if (logger.isDebugEnabled()) {
- logger.debug("Failed to get by criteria for type '{}' and properties '{}'", type, hasProps, e);
- }
+ logger.debug(FAILED_TO_GET_BY_CRITERIA_FOR_TYPE_AND_PROPERTIES, type, hasProps, e);
return Either.right(JanusGraphClient.handleJanusGraphException(e));
}
} else {
- if (logger.isDebugEnabled()) {
- logger.debug("Failed to get by criteria for type '{}' and properties '{}'. Error : '{}'", type, hasProps, graph.right().value());
- }
+ logger.debug("Failed to get by criteria for type '{}' and properties '{}'. Error : '{}'", type, hasProps, graph.right().value());
return Either.right(graph.right().value());
}
}
-
+
public Either<List<GraphVertex>, JanusGraphOperationStatus> getByCriteria(VertexTypeEnum type,
- Map<GraphPropertyEnum, Object> props, Map<GraphPropertyEnum, Object> hasNotProps,
- JsonParseFlagEnum parseFlag) {
+ Map<GraphPropertyEnum, Object> props,
+ Map<GraphPropertyEnum, Object> hasNotProps,
+ JsonParseFlagEnum parseFlag) {
return getByCriteria(type, props, hasNotProps, null, parseFlag);
}
public Either<List<GraphVertex>, JanusGraphOperationStatus> getByCriteria(final VertexTypeEnum type,
- final Map<GraphPropertyEnum, Object> hasProps, final Map<GraphPropertyEnum, Object> hasNotProps,
- final Map<String, Entry<JanusGraphPredicate, Object>> predicates, final JsonParseFlagEnum parseFlag) {
- Either<JanusGraph, JanusGraphOperationStatus> graph = janusGraphClient.getGraph();
+ final Map<GraphPropertyEnum, Object> hasProps,
+ final Map<GraphPropertyEnum, Object> hasNotProps,
+ final Map<String, Entry<JanusGraphPredicate, Object>> predicates,
+ final JsonParseFlagEnum parseFlag) {
+ final Either<JanusGraph, JanusGraphOperationStatus> graph = janusGraphClient.getGraph();
if (graph.isLeft()) {
try {
- JanusGraph tGraph = graph.left().value();
- JanusGraphQuery<? extends JanusGraphQuery> query = tGraph.query();
-
- if (type != null) {
- query = query.has(GraphPropertyEnum.LABEL.getProperty(), type.getName());
- }
- if (hasProps != null && !hasProps.isEmpty()) {
- for (Map.Entry<GraphPropertyEnum, Object> entry : hasProps.entrySet()) {
- query = query.has(entry.getKey().getProperty(), entry.getValue());
- }
- }
- if (hasNotProps != null && !hasNotProps.isEmpty()) {
- for (Map.Entry<GraphPropertyEnum, Object> entry : hasNotProps.entrySet()) {
- if (entry.getValue() instanceof List) {
- buildMultipleNegateQueryFromList(entry, query);
- } else {
- query = query.hasNot(entry.getKey().getProperty(), entry.getValue());
- }
- }
- }
- if (predicates != null && !predicates.isEmpty()) {
- for (Map.Entry<String, Entry<JanusGraphPredicate, Object>> entry : predicates.entrySet()) {
- JanusGraphPredicate predicate = entry.getValue().getKey();
- Object object = entry.getValue().getValue();
- query = query.has(entry.getKey(), predicate, object);
- }
- }
+ JanusGraphQuery<? extends JanusGraphQuery> query = getJanusGraphQuery(type, hasProps, hasNotProps, predicates, graph.left().value());
Iterable<JanusGraphVertex> vertices = query.vertices();
if (vertices == null || !vertices.iterator().hasNext()) {
return Either.right(JanusGraphOperationStatus.NOT_FOUND);
}
List<GraphVertex> result = new ArrayList<>();
-
vertices.forEach(vertex -> result.add(createAndFill(vertex, parseFlag)));
- if (logger.isDebugEnabled()) {
- logger.debug(
- "Number of fetched nodes in graph for criteria : from type '{}' and properties '{}' is '{}'",
- type, hasProps, result.size());
- }
+ logger.debug("Number of fetched nodes in graph for criteria : from type '{}' and properties '{}' is '{}'", type, hasProps,
+ result.size());
return Either.left(result);
} catch (Exception e) {
- if (logger.isDebugEnabled()) {
- logger.debug("Failed to get by criteria for type '{}' and properties '{}'", type, hasProps, e);
- }
+ logger.debug(FAILED_TO_GET_BY_CRITERIA_FOR_TYPE_AND_PROPERTIES, type, hasProps, e);
return Either.right(JanusGraphClient.handleJanusGraphException(e));
}
} else {
- if (logger.isDebugEnabled()) {
- logger.debug("Failed to get by criteria for type '{}' and properties '{}'. Error : '{}'", type,
- hasProps, graph.right().value());
- }
+ logger.debug("Failed to get by criteria for type '{}' and properties '{}'. Error : '{}'", type, hasProps, graph.right().value());
return Either.right(graph.right().value());
}
}
-
/**
* Finds the vertices that have the given invariant id and any additional property provided.
*
- * @param invariantUuid the invariant uuid
+ * @param invariantUuid the invariant uuid
* @param additionalPropertiesToMatch any additional property to match along with the {@link GraphPropertyEnum#INVARIANT_UUID}
* @return the list of vertex that has the given invariant uuid
* @throws JanusGraphException if the find operation was returned an error status
@@ -624,7 +538,7 @@ public class JanusGraphDao {
}
propertiesToMatch.put(GraphPropertyEnum.INVARIANT_UUID, invariantUuid);
final Either<List<GraphVertex>, JanusGraphOperationStatus> vertexEither =
- getByCriteria(null, propertiesToMatch, JsonParseFlagEnum.ParseMetadata);
+ getByCriteria(null, propertiesToMatch, JsonParseFlagEnum.ParseMetadata);
if (vertexEither.isRight()) {
final JanusGraphOperationStatus status = vertexEither.right().value();
if (status == JanusGraphOperationStatus.NOT_FOUND) {
@@ -641,49 +555,52 @@ public class JanusGraphDao {
}
private boolean vertexValidForModel(final JanusGraphVertex vertex, final String model, final boolean includeNormativeExtensions) {
- final String vertexLabel = (String)vertex.property(GraphPropertyEnum.LABEL.getProperty()).value();
+ final String vertexLabel = (String) vertex.property(GraphPropertyEnum.LABEL.getProperty()).value();
final VertexTypeEnum vertexType = VertexTypeEnum.getByName(vertexLabel);
- final GraphEdgeLabels edgeLabel = vertexType.equals(VertexTypeEnum.TOPOLOGY_TEMPLATE) ? GraphEdgeLabels.MODEL : GraphEdgeLabels.MODEL_ELEMENT;
- final Either<List<ImmutablePair<JanusGraphVertex, Edge>>, JanusGraphOperationStatus> modelVertices = getParentVerticies(vertex, edgeLabel);
+ final GraphEdgeLabels edgeLabel = VertexTypeEnum.TOPOLOGY_TEMPLATE.equals(vertexType) ? GraphEdgeLabels.MODEL : GraphEdgeLabels.MODEL_ELEMENT;
+ final Either<List<ImmutablePair<JanusGraphVertex, Edge>>, JanusGraphOperationStatus> modelVertices = getParentVertices(vertex, edgeLabel);
- return modelVertices.isLeft() && modelVertices.left().value().stream().anyMatch(vertexPair -> modelVertexMatchesModel(vertexPair.getLeft(), model, includeNormativeExtensions));
+ return modelVertices.isLeft() && modelVertices.left().value().stream()
+ .anyMatch(vertexPair -> modelVertexMatchesModel(vertexPair.getLeft(), model, includeNormativeExtensions));
}
-
+
private boolean modelVertexMatchesModel(final JanusGraphVertex modelVertex, final String model, final boolean includeNormativeExtensions) {
- if (model.equals((String)modelVertex.property("name").value())) {
+ if (model.equals((String) modelVertex.property("name").value())) {
return true;
}
final Either<List<ImmutablePair<JanusGraphVertex, Edge>>, JanusGraphOperationStatus> derivedModels =
- getParentVerticies(modelVertex, GraphEdgeLabels.DERIVED_FROM);
- if (derivedModels.isLeft() && derivedModels.left().value().stream().anyMatch(derivedModel ->modelVertexMatchesModel(derivedModel.left, model, includeNormativeExtensions))) {
+ getParentVertices(modelVertex, GraphEdgeLabels.DERIVED_FROM);
+ if (derivedModels.isLeft() && derivedModels.left().value().stream()
+ .anyMatch(derivedModel -> modelVertexMatchesModel(derivedModel.left, model, includeNormativeExtensions))) {
return true;
}
-
+
if (includeNormativeExtensions && isANormativeExtension(modelVertex)) {
- final Either<List<Vertex>,JanusGraphOperationStatus> derivedFromModels =
- getChildrenVertices(modelVertex, EdgeLabelEnum.DERIVED_FROM, JsonParseFlagEnum.ParseAll);
- return derivedFromModels.isLeft() && derivedFromModels.left().value().stream().anyMatch(derivedFromModel -> model.equals((String)derivedFromModel.property("name").value()));
+ final Either<List<Vertex>, JanusGraphOperationStatus> derivedFromModels =
+ getChildrenVertices(modelVertex, EdgeLabelEnum.DERIVED_FROM);
+ return derivedFromModels.isLeft() && derivedFromModels.left().value().stream()
+ .anyMatch(derivedFromModel -> model.equals((String) derivedFromModel.property("name").value()));
}
return false;
}
-
+
private boolean isANormativeExtension(final JanusGraphVertex modelVertex) {
- return ModelTypeEnum.NORMATIVE_EXTENSION.getValue().equals((String)modelVertex.property(GraphPropertyEnum.MODEL_TYPE.getProperty()).value());
+ return ModelTypeEnum.NORMATIVE_EXTENSION.getValue().equals((String) modelVertex.property(GraphPropertyEnum.MODEL_TYPE.getProperty()).value());
}
-
- private Either<List<ImmutablePair<JanusGraphVertex, Edge>>, JanusGraphOperationStatus> getParentVerticies(
- final JanusGraphVertex rootVertex, final GraphEdgeLabels edgeType) {
- return getEdgeVerticies(rootVertex, Direction.IN, edgeType);
+
+ private Either<List<ImmutablePair<JanusGraphVertex, Edge>>, JanusGraphOperationStatus> getParentVertices(
+ final JanusGraphVertex rootVertex, final GraphEdgeLabels edgeType) {
+ return getEdgeVertices(rootVertex, Direction.IN, edgeType);
}
-
- private Either<List<ImmutablePair<JanusGraphVertex, Edge>>, JanusGraphOperationStatus> getEdgeVerticies(
- final JanusGraphVertex rootVertex, final Direction direction, final GraphEdgeLabels edgeType) {
+
+ private Either<List<ImmutablePair<JanusGraphVertex, Edge>>, JanusGraphOperationStatus> getEdgeVertices(
+ final JanusGraphVertex rootVertex, final Direction direction, final GraphEdgeLabels edgeType) {
final List<ImmutablePair<JanusGraphVertex, Edge>> immutablePairs = new ArrayList<>();
final Iterator<Edge> edgesCreatorIterator = rootVertex.edges(direction, edgeType.getProperty());
if (edgesCreatorIterator != null) {
while (edgesCreatorIterator.hasNext()) {
Edge edge = edgesCreatorIterator.next();
- JanusGraphVertex vertex = Direction.OUT.equals(direction)? (JanusGraphVertex) edge.inVertex() : (JanusGraphVertex) edge.outVertex();
+ JanusGraphVertex vertex = Direction.OUT.equals(direction) ? (JanusGraphVertex) edge.inVertex() : (JanusGraphVertex) edge.outVertex();
ImmutablePair<JanusGraphVertex, Edge> immutablePair = new ImmutablePair<>(vertex, edge);
immutablePairs.add(immutablePair);
}
@@ -693,15 +610,15 @@ public class JanusGraphDao {
}
return Either.left(immutablePairs);
}
-
+
private boolean vertexNotConnectedToAnyModel(final JanusGraphVertex vertex) {
- String vt = (String)vertex.property(GraphPropertyEnum.LABEL.getProperty()).value();
+ String vt = (String) vertex.property(GraphPropertyEnum.LABEL.getProperty()).value();
VertexTypeEnum vertexType = VertexTypeEnum.getByName(vt);
- EdgeLabelEnum edgeLabel = vertexType.equals(VertexTypeEnum.TOPOLOGY_TEMPLATE) ? EdgeLabelEnum.MODEL : EdgeLabelEnum.MODEL_ELEMENT;
+ EdgeLabelEnum edgeLabel = VertexTypeEnum.TOPOLOGY_TEMPLATE.equals(vertexType) ? EdgeLabelEnum.MODEL : EdgeLabelEnum.MODEL_ELEMENT;
return !vertex.edges(Direction.IN, edgeLabel.name()).hasNext();
}
- public Either<Iterator<Vertex>, JanusGraphOperationStatus> getCatalogOrArchiveVerticies(boolean isCatalog) {
+ public Either<Iterator<Vertex>, JanusGraphOperationStatus> getCatalogOrArchiveVertices(boolean isCatalog) {
Either<JanusGraph, JanusGraphOperationStatus> graph = janusGraphClient.getGraph();
if (graph.isLeft()) {
try {
@@ -721,22 +638,17 @@ public class JanusGraphDao {
Iterator<Vertex> vertices = catalogV.vertices(Direction.OUT, edgeLabel);
return Either.left(vertices);
} catch (Exception e) {
- if (logger.isDebugEnabled()) {
- logger.debug("Failed get by criteria: ", e);
- }
+ logger.debug("Failed get by criteria: ", e);
return Either.right(JanusGraphClient.handleJanusGraphException(e));
}
} else {
- if (logger.isDebugEnabled()) {
- logger.debug("Failed get by criteria : ", graph.right().value());
- }
+ logger.debug("Failed get by criteria : {}", graph.right().value());
return Either.right(graph.right().value());
}
}
private void buildMultipleNegateQueryFromList(Map.Entry<GraphPropertyEnum, Object> entry, JanusGraphQuery query) {
- List<Object> negateList = (List<Object>) entry.getValue();
- for (Object listItem : negateList) {
+ for (Object listItem : (List<Object>) entry.getValue()) {
query.hasNot(entry.getKey().getProperty(), listItem);
}
}
@@ -749,48 +661,47 @@ public class JanusGraphDao {
*/
public Either<GraphVertex, JanusGraphOperationStatus> getChildVertex(GraphVertex parentVertex, EdgeLabelEnum edgeLabel,
JsonParseFlagEnum parseFlag) {
- Either<List<GraphVertex>, JanusGraphOperationStatus> childrenVertecies = getChildrenVertices(parentVertex, edgeLabel, parseFlag);
- if (childrenVertecies.isRight()) {
- return Either.right(childrenVertecies.right().value());
+ Either<List<GraphVertex>, JanusGraphOperationStatus> childrenVertices = getChildrenVertices(parentVertex, edgeLabel, parseFlag);
+ if (childrenVertices.isRight()) {
+ return Either.right(childrenVertices.right().value());
}
- return Either.left(childrenVertecies.left().value().get(0));
+ return Either.left(childrenVertices.left().value().get(0));
}
/**
* @param parentVertex
* @param edgeLabel
- * @param parseFlag
* @return
*/
- public Either<Vertex, JanusGraphOperationStatus> getChildVertex(Vertex parentVertex, EdgeLabelEnum edgeLabel, JsonParseFlagEnum parseFlag) {
- Either<List<Vertex>, JanusGraphOperationStatus> childrenVertecies = getChildrenVertices(parentVertex, edgeLabel, parseFlag);
- if (childrenVertecies.isRight()) {
- return Either.right(childrenVertecies.right().value());
+ public Either<Vertex, JanusGraphOperationStatus> getChildVertex(Vertex parentVertex, EdgeLabelEnum edgeLabel) {
+ Either<List<Vertex>, JanusGraphOperationStatus> childrenVertices = getChildrenVertices(parentVertex, edgeLabel);
+ if (childrenVertices.isRight()) {
+ return Either.right(childrenVertices.right().value());
}
- return Either.left(childrenVertecies.left().value().get(0));
+ return Either.left(childrenVertices.left().value().get(0));
}
public Either<GraphVertex, JanusGraphOperationStatus> getParentVertex(GraphVertex parentVertex, EdgeLabelEnum edgeLabel,
JsonParseFlagEnum parseFlag) {
- Either<List<GraphVertex>, JanusGraphOperationStatus> childrenVertecies = getParentVertices(parentVertex, edgeLabel, parseFlag);
- if (childrenVertecies.isRight()) {
- return Either.right(childrenVertecies.right().value());
+ Either<List<GraphVertex>, JanusGraphOperationStatus> childrenVertices = getParentVertices(parentVertex, edgeLabel, parseFlag);
+ if (childrenVertices.isRight()) {
+ return Either.right(childrenVertices.right().value());
}
- if (isEmpty(childrenVertecies.left().value())) {
+ if (isEmpty(childrenVertices.left().value())) {
return Either.right(JanusGraphOperationStatus.NOT_FOUND);
}
- return Either.left(childrenVertecies.left().value().get(0));
+ return Either.left(childrenVertices.left().value().get(0));
}
- public Either<Vertex, JanusGraphOperationStatus> getParentVertex(Vertex parentVertex, EdgeLabelEnum edgeLabel, JsonParseFlagEnum parseFlag) {
- Either<List<Vertex>, JanusGraphOperationStatus> childrenVertecies = getParentVertices(parentVertex, edgeLabel, parseFlag);
- if (childrenVertecies.isRight()) {
- return Either.right(childrenVertecies.right().value());
+ public Either<Vertex, JanusGraphOperationStatus> getParentVertex(Vertex parentVertex, EdgeLabelEnum edgeLabel) {
+ Either<List<Vertex>, JanusGraphOperationStatus> childrenVertices = getParentVertices(parentVertex, edgeLabel);
+ if (childrenVertices.isRight()) {
+ return Either.right(childrenVertices.right().value());
}
- if (isEmpty(childrenVertecies.left().value())) {
+ if (isEmpty(childrenVertices.left().value())) {
return Either.right(JanusGraphOperationStatus.NOT_FOUND);
}
- return Either.left(childrenVertecies.left().value().get(0));
+ return Either.left(childrenVertices.left().value().get(0));
}
/**
@@ -809,13 +720,11 @@ public class JanusGraphDao {
return getAdjacentVertices(parentVertex, edgeLabel, parseFlag, Direction.IN);
}
- public Either<List<Vertex>, JanusGraphOperationStatus> getParentVertices(Vertex parentVertex, EdgeLabelEnum edgeLabel,
- JsonParseFlagEnum parseFlag) {
- return getAdjacentVertices(parentVertex, edgeLabel, parseFlag, Direction.IN);
+ public Either<List<Vertex>, JanusGraphOperationStatus> getParentVertices(Vertex parentVertex, EdgeLabelEnum edgeLabel) {
+ return getAdjacentVertices(parentVertex, edgeLabel, Direction.IN);
}
- private Either<List<Vertex>, JanusGraphOperationStatus> getAdjacentVertices(Vertex parentVertex, EdgeLabelEnum edgeLabel,
- JsonParseFlagEnum parseFlag, Direction direction) {
+ private Either<List<Vertex>, JanusGraphOperationStatus> getAdjacentVertices(Vertex parentVertex, EdgeLabelEnum edgeLabel, Direction direction) {
List<Vertex> list = new ArrayList<>();
try {
Either<JanusGraph, JanusGraphOperationStatus> graphRes = janusGraphClient.getGraph();
@@ -833,7 +742,6 @@ public class JanusGraphDao {
} else {
vertex = (JanusGraphVertex) edge.inVertex();
}
- // GraphVertex graphVertex = createAndFill(vertex, parseFlag);
list.add(vertex);
}
}
@@ -850,25 +758,21 @@ public class JanusGraphDao {
/**
* @param parentVertex
* @param edgeLabel
- * @param parseFlag
* @return
*/
- public Either<List<Vertex>, JanusGraphOperationStatus> getChildrenVertices(Vertex parentVertex, EdgeLabelEnum edgeLabel,
- JsonParseFlagEnum parseFlag) {
- return getAdjacentVertices(parentVertex, edgeLabel, parseFlag, Direction.OUT);
+ public Either<List<Vertex>, JanusGraphOperationStatus> getChildrenVertices(Vertex parentVertex, EdgeLabelEnum edgeLabel) {
+ return getAdjacentVertices(parentVertex, edgeLabel, Direction.OUT);
}
private Either<List<GraphVertex>, JanusGraphOperationStatus> getAdjacentVertices(GraphVertex parentVertex, EdgeLabelEnum edgeLabel,
JsonParseFlagEnum parseFlag, Direction direction) {
List<GraphVertex> list = new ArrayList<>();
- Either<List<Vertex>, JanusGraphOperationStatus> adjacentVerticies = getAdjacentVertices(parentVertex.getVertex(), edgeLabel, parseFlag,
+ Either<List<Vertex>, JanusGraphOperationStatus> adjacentVertices = getAdjacentVertices(parentVertex.getVertex(), edgeLabel,
direction);
- if (adjacentVerticies.isRight()) {
- return Either.right(adjacentVerticies.right().value());
+ if (adjacentVertices.isRight()) {
+ return Either.right(adjacentVertices.right().value());
}
- adjacentVerticies.left().value().stream().forEach(vertex -> {
- list.add(createAndFill((JanusGraphVertex) vertex, parseFlag));
- });
+ adjacentVertices.left().value().stream().forEach(vertex -> list.add(createAndFill((JanusGraphVertex) vertex, parseFlag)));
return Either.left(list);
}
@@ -990,15 +894,15 @@ public class JanusGraphDao {
* @return
*/
public Either<Edge, JanusGraphOperationStatus> deleteEdge(GraphVertex fromVertex, GraphVertex toVertex, EdgeLabelEnum label) {
- return deleteEdge(fromVertex.getVertex(), toVertex.getVertex(), label, fromVertex.getUniqueId(), toVertex.getUniqueId(), false);
+ return deleteEdge(fromVertex.getVertex(), label, fromVertex.getUniqueId(), toVertex.getUniqueId(), false);
}
public Either<Edge, JanusGraphOperationStatus> deleteAllEdges(GraphVertex fromVertex, GraphVertex toVertex, EdgeLabelEnum label) {
- return deleteEdge(fromVertex.getVertex(), toVertex.getVertex(), label, fromVertex.getUniqueId(), toVertex.getUniqueId(), true);
+ return deleteEdge(fromVertex.getVertex(), label, fromVertex.getUniqueId(), toVertex.getUniqueId(), true);
}
- public Either<Edge, JanusGraphOperationStatus> deleteEdge(JanusGraphVertex fromVertex, JanusGraphVertex toVertex, EdgeLabelEnum label,
- String uniqueIdFrom, String uniqueIdTo, boolean deleteAll) {
+ private Either<Edge, JanusGraphOperationStatus> deleteEdge(JanusGraphVertex fromVertex, EdgeLabelEnum label,
+ String uniqueIdFrom, String uniqueIdTo, boolean deleteAll) {
Either<Edge, JanusGraphOperationStatus> result = null;
Vertex problemV = null;
try {
@@ -1012,16 +916,15 @@ public class JanusGraphDao {
currVertexUniqueId = edge.inVertex().value(GraphPropertyEnum.UNIQUE_ID.getProperty());
} catch (Exception e) {
// AutoHealing procedure
- logger.info("Corrupted vertex and edge were found and deleted {}", e);
+ logger.info("Corrupted vertex and edge were found and deleted ", e);
if (problemV != null) {
Map<GraphPropertyEnum, Object> props = getVertexProperties(problemV);
logger.debug("problematic Vertex properties:");
logger.debug("props size: {}", props.size());
for (Map.Entry<GraphPropertyEnum, Object> entry : props.entrySet()) {
- logger.debug("{}{}", entry.getKey() + ":" + entry.getValue());
+ logger.debug("{}:{}", entry.getKey(), entry.getValue());
}
- Either<List<Vertex>, JanusGraphOperationStatus> childrenVertices = getChildrenVertices(problemV, EdgeLabelEnum.VERSION,
- JsonParseFlagEnum.NoParse);
+ Either<List<Vertex>, JanusGraphOperationStatus> childrenVertices = getChildrenVertices(problemV, EdgeLabelEnum.VERSION);
if (childrenVertices.isLeft()) {
childrenVertices.left().value().size();
logger.debug("number of children that problematic Vertex has: {}", props.size());
@@ -1029,12 +932,12 @@ public class JanusGraphDao {
try {
edge.remove();
} catch (Exception e1) {
- logger.debug("failed to remove problematic edge. {}", e1);
+ logger.debug("failed to remove problematic edge.", e1);
}
try {
problemV.remove();
} catch (Exception e2) {
- logger.debug("failed to remove problematic vertex . {}", e2);
+ logger.debug("failed to remove problematic vertex.", e2);
}
}
continue;
@@ -1275,7 +1178,7 @@ public class JanusGraphDao {
public JanusGraphOperationStatus moveEdge(GraphVertex vertexA, GraphVertex vertexB, EdgeLabelEnum label, Direction direction) {
JanusGraphOperationStatus result = deleteEdgeByDirection(vertexA, direction, label);
if (result != JanusGraphOperationStatus.OK) {
- logger.error("Failed to diassociate {} from element {}. error {} ", label, vertexA.getUniqueId(), result);
+ logger.error("Failed to disassociate {} from element {}. error {} ", label, vertexA.getUniqueId(), result);
return result;
}
JanusGraphOperationStatus createRelation;
@@ -1298,4 +1201,35 @@ public class JanusGraphDao {
}
return getBelongingEdgeByCriteria(getVertexRes.left().value(), label, properties);
}
+
+ private JanusGraphQuery<? extends JanusGraphQuery> getJanusGraphQuery(final VertexTypeEnum type, final Map<GraphPropertyEnum, Object> hasProps,
+ final Map<GraphPropertyEnum, Object> hasNotProps,
+ final Map<String, Entry<JanusGraphPredicate, Object>> predicates,
+ final JanusGraph graph) {
+ JanusGraphQuery<? extends JanusGraphQuery> query = graph.query();
+
+ if (type != null) {
+ query = query.has(GraphPropertyEnum.LABEL.getProperty(), type.getName());
+ }
+ if (hasProps != null && !hasProps.isEmpty()) {
+ for (Entry<GraphPropertyEnum, Object> entry : hasProps.entrySet()) {
+ query = query.has(entry.getKey().getProperty(), entry.getValue());
+ }
+ }
+ if (hasNotProps != null && !hasNotProps.isEmpty()) {
+ for (Entry<GraphPropertyEnum, Object> entry : hasNotProps.entrySet()) {
+ if (entry.getValue() instanceof List) {
+ buildMultipleNegateQueryFromList(entry, query);
+ } else {
+ query = query.hasNot(entry.getKey().getProperty(), entry.getValue());
+ }
+ }
+ }
+ if (predicates != null && !predicates.isEmpty()) {
+ for (Entry<String, Entry<JanusGraphPredicate, Object>> entry : predicates.entrySet()) {
+ query = query.has(entry.getKey(), entry.getValue().getKey(), entry.getValue().getValue());
+ }
+ }
+ return query;
+ }
}
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/janusgraph/JanusGraphDaoMockTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/janusgraph/JanusGraphDaoMockTest.java
index 7a0152df60..c896db6a45 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/janusgraph/JanusGraphDaoMockTest.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/janusgraph/JanusGraphDaoMockTest.java
@@ -82,7 +82,7 @@ class JanusGraphDaoMockTest extends DAOConfDependentTest {
// default test
- result = testSubject.getGraph();
+ result = testSubject.getJanusGraphClient().getGraph();
}
@Test
@@ -268,7 +268,7 @@ class JanusGraphDaoMockTest extends DAOConfDependentTest {
Mockito.when(janusGraphClient.getGraph()).thenReturn(value);
// default test
- result = testSubject.getCatalogOrArchiveVerticies(true);
+ result = testSubject.getCatalogOrArchiveVertices(true);
}
@Test
@@ -300,7 +300,7 @@ class JanusGraphDaoMockTest extends DAOConfDependentTest {
Mockito.when(janusGraphClient.getGraph()).thenReturn(value);
// default test
- result = testSubject.getChildVertex(parentVertex, edgeLabel, parseFlag);
+ result = testSubject.getChildVertex(parentVertex, edgeLabel);
}
@Test
@@ -313,7 +313,7 @@ class JanusGraphDaoMockTest extends DAOConfDependentTest {
// default test
- result = testSubject.getParentVertex(parentVertex, edgeLabel, parseFlag);
+ result = testSubject.getParentVertex(parentVertex, edgeLabel);
}
@Test
@@ -326,7 +326,7 @@ class JanusGraphDaoMockTest extends DAOConfDependentTest {
// default test
- result = testSubject.getParentVertices(parentVertex, edgeLabel, parseFlag);
+ result = testSubject.getParentVertices(parentVertex, edgeLabel);
}
@Test
@@ -339,7 +339,7 @@ class JanusGraphDaoMockTest extends DAOConfDependentTest {
// default test
- result = testSubject.getChildrenVertices(parentVertex, edgeLabel, parseFlag);
+ result = testSubject.getChildrenVertices(parentVertex, edgeLabel);
}
@Test
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/janusgraph/JanusGraphDaoTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/janusgraph/JanusGraphDaoTest.java
index fae514a2df..9faee6c390 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/janusgraph/JanusGraphDaoTest.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/janusgraph/JanusGraphDaoTest.java
@@ -41,22 +41,19 @@ import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
import org.openecomp.sdc.be.datatypes.enums.GraphPropertyEnum;
import org.openecomp.sdc.be.utils.DAOConfDependentTest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
class JanusGraphDaoTest extends DAOConfDependentTest {
- private static final Logger logger = LoggerFactory.getLogger(JanusGraphDaoTest.class);
private final JanusGraphDao dao = new JanusGraphDao(new JanusGraphClient(new DAOJanusGraphStrategy()));
@BeforeEach
void init() {
- dao.janusGraphClient.createGraph();
+ dao.getJanusGraphClient().createGraph();
}
@AfterEach
void end() {
- dao.janusGraphClient.cleanupGraph();
+ dao.getJanusGraphClient().cleanupGraph();
}
@Test
@@ -106,7 +103,7 @@ class JanusGraphDaoTest extends DAOConfDependentTest {
// default test
- result = dao.getGraph();
+ result = dao.getJanusGraphClient().getGraph();
}
@Test
@@ -237,7 +234,7 @@ class JanusGraphDaoTest extends DAOConfDependentTest {
// default test
- result = dao.getCatalogOrArchiveVerticies(true);
+ result = dao.getCatalogOrArchiveVertices(true);
}
@Test
@@ -250,7 +247,7 @@ class JanusGraphDaoTest extends DAOConfDependentTest {
// default test
- result = dao.getParentVertices(parentVertex, edgeLabel, parseFlag);
+ result = dao.getParentVertices(parentVertex, edgeLabel);
}
@Test
@@ -263,7 +260,7 @@ class JanusGraphDaoTest extends DAOConfDependentTest {
// default test
- result = dao.getChildrenVertices(parentVertex, edgeLabel, parseFlag);
+ result = dao.getChildrenVertices(parentVertex, edgeLabel);
}
@Test
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaElementOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaElementOperation.java
index 65c109c3f6..910d7ae1b6 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaElementOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaElementOperation.java
@@ -1021,8 +1021,7 @@ public abstract class ToscaElementOperation extends BaseOperation {
protected JanusGraphOperationStatus setResourceCategoryFromGraphV(Vertex vertex, CatalogComponent catalogComponent) {
List<CategoryDefinition> categories = new ArrayList<>();
SubCategoryDefinition subcategory;
- Either<Vertex, JanusGraphOperationStatus> childVertex = janusGraphDao
- .getChildVertex(vertex, EdgeLabelEnum.CATEGORY, JsonParseFlagEnum.NoParse);
+ Either<Vertex, JanusGraphOperationStatus> childVertex = janusGraphDao.getChildVertex(vertex, EdgeLabelEnum.CATEGORY);
if (childVertex.isRight()) {
log.debug(FAILED_TO_FETCH_FOR_TOSCA_ELEMENT_WITH_ID_ERROR, EdgeLabelEnum.CATEGORY, catalogComponent.getUniqueId(),
childVertex.right().value());
@@ -1041,8 +1040,7 @@ public abstract class ToscaElementOperation extends BaseOperation {
.fromJson((String) subCategoryV.property(GraphPropertyEnum.METADATA_KEYS.getProperty()).value(), listTypeSubcat)
: Collections.emptyList();
subcategory.setMetadataKeys(metadataKeys);
- Either<Vertex, JanusGraphOperationStatus> parentVertex = janusGraphDao
- .getParentVertex(subCategoryV, EdgeLabelEnum.SUB_CATEGORY, JsonParseFlagEnum.NoParse);
+ Either<Vertex, JanusGraphOperationStatus> parentVertex = janusGraphDao.getParentVertex(subCategoryV, EdgeLabelEnum.SUB_CATEGORY);
Vertex categoryV = parentVertex.left().value();
String categoryNormalizedName = (String) categoryV.property(GraphPropertyEnum.NORMALIZED_NAME.getProperty()).value();
catalogComponent.setCategoryNormalizedName(categoryNormalizedName);
@@ -1058,8 +1056,7 @@ public abstract class ToscaElementOperation extends BaseOperation {
protected JanusGraphOperationStatus setServiceCategoryFromGraphV(Vertex vertex, CatalogComponent catalogComponent) {
List<CategoryDefinition> categories = new ArrayList<>();
- Either<Vertex, JanusGraphOperationStatus> childVertex = janusGraphDao
- .getChildVertex(vertex, EdgeLabelEnum.CATEGORY, JsonParseFlagEnum.NoParse);
+ Either<Vertex, JanusGraphOperationStatus> childVertex = janusGraphDao.getChildVertex(vertex, EdgeLabelEnum.CATEGORY);
if (childVertex.isRight()) {
log.debug(FAILED_TO_FETCH_FOR_TOSCA_ELEMENT_WITH_ID_ERROR, EdgeLabelEnum.CATEGORY, catalogComponent.getUniqueId(),
childVertex.right().value());
@@ -1338,7 +1335,7 @@ public abstract class ToscaElementOperation extends BaseOperation {
StopWatch stopWatch = new StopWatch();
stopWatch.start();
Map<String, CatalogComponent> existInCatalog = new HashMap<>();
- Either<Iterator<Vertex>, JanusGraphOperationStatus> verticesEither = janusGraphDao.getCatalogOrArchiveVerticies(isCatalog);
+ Either<Iterator<Vertex>, JanusGraphOperationStatus> verticesEither = janusGraphDao.getCatalogOrArchiveVertices(isCatalog);
if (verticesEither.isRight()) {
return Either.right(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(verticesEither.right().value()));
}
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/NodeTemplateOperationGraphTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/NodeTemplateOperationGraphTest.java
index b2db75933a..45cb5efb62 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/NodeTemplateOperationGraphTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/NodeTemplateOperationGraphTest.java
@@ -81,7 +81,7 @@ public class NodeTemplateOperationGraphTest extends ModelTestBase {
@BeforeEach
public void before() {
- Either<JanusGraph, JanusGraphOperationStatus> graph = janusGraphDao.getGraph();
+ Either<JanusGraph, JanusGraphOperationStatus> graph = janusGraphDao.getJanusGraphClient().getGraph();
graphT = graph.left().value();
containerVertex = new GraphVertex(VertexTypeEnum.TOPOLOGY_TEMPLATE);
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaElementOperationCatalogTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaElementOperationCatalogTest.java
index 29fbd755f5..28f9fc8652 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaElementOperationCatalogTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ToscaElementOperationCatalogTest.java
@@ -34,7 +34,6 @@ import org.mockito.junit.MockitoJUnitRunner;
import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
import org.openecomp.sdc.be.dao.janusgraph.JanusGraphDao;
import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
-import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
import org.openecomp.sdc.be.model.catalog.CatalogComponent;
@@ -73,8 +72,8 @@ public class ToscaElementOperationCatalogTest {
@Before
public void setUp() {
vertexList.add(vertex);
- when(janusGraphDao.getCatalogOrArchiveVerticies(true)).thenReturn(Either.left(vertexList.iterator()));
- when(janusGraphDao.getChildVertex(vertex, EdgeLabelEnum.CATEGORY, JsonParseFlagEnum.NoParse))
+ when(janusGraphDao.getCatalogOrArchiveVertices(true)).thenReturn(Either.left(vertexList.iterator()));
+ when(janusGraphDao.getChildVertex(vertex, EdgeLabelEnum.CATEGORY))
.thenReturn(Either.right(JanusGraphOperationStatus.NOT_FOUND));
when(vertex.property(GraphPropertiesDictionary.METADATA.getProperty())).thenReturn(property);
}
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/GraphTestUtils.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/GraphTestUtils.java
index c5c01bba02..afe2dcc254 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/GraphTestUtils.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/GraphTestUtils.java
@@ -97,7 +97,7 @@ public final class GraphTestUtils {
}
public static void clearGraph(JanusGraphDao janusGraphDao) {
- Either<JanusGraph, JanusGraphOperationStatus> graphResult = janusGraphDao.getGraph();
+ Either<JanusGraph, JanusGraphOperationStatus> graphResult = janusGraphDao.getJanusGraphClient().getGraph();
JanusGraph graph = graphResult.left().value();
Iterable<JanusGraphVertex> vertices = graph.query().vertices();
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ToscaElementLifecycleOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ToscaElementLifecycleOperationTest.java
index abb5a1888b..ce7d7d49df 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ToscaElementLifecycleOperationTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ToscaElementLifecycleOperationTest.java
@@ -616,7 +616,7 @@ public class ToscaElementLifecycleOperationTest extends ModelTestBase {
}
private void clearGraph() {
- Either<JanusGraph, JanusGraphOperationStatus> graphResult = janusGraphDao.getGraph();
+ Either<JanusGraph, JanusGraphOperationStatus> graphResult = janusGraphDao.getJanusGraphClient().getGraph();
JanusGraph graph = graphResult.left().value();
Iterable<JanusGraphVertex> vertices = graph.query().vertices();