summaryrefslogtreecommitdiffstats
path: root/aai-core/src/main/java
diff options
context:
space:
mode:
authorThreefoot, Jane (jt6620) <jt6620@att.com>2017-11-28 14:02:53 -0500
committerThreefoot, Jane (jt6620) <jt6620@att.com>2017-11-28 15:06:53 -0500
commit8dcb9900cae95a17ca6d029a665d512b3e7b11a2 (patch)
tree49de3c6bda8582b24ccf708bc05405256cd71669 /aai-core/src/main/java
parentd65ec2eb24496c2eb901e7c18826c48041ca2c74 (diff)
contains-other-v no longer implies delete-other-v
Deletion of other vertices is now only determined by the delete-other-v property. For containment relationships, this property is now explicitly set instead of being implied by the containment property. ie Deletion now only checks delete-other-v not containment, and containment relationships have been updated to still function the same as before. Issue-ID: AAI-517 Change-Id: I808752c286c621f82b521590b1a51cf996031557 Signed-off-by: Threefoot, Jane (jt6620) <jt6620@att.com>
Diffstat (limited to 'aai-core/src/main/java')
-rw-r--r--aai-core/src/main/java/org/onap/aai/serialization/engines/query/GraphTraversalQueryEngine.java10
1 files changed, 2 insertions, 8 deletions
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/engines/query/GraphTraversalQueryEngine.java b/aai-core/src/main/java/org/onap/aai/serialization/engines/query/GraphTraversalQueryEngine.java
index 872b0c5f..692fd531 100644
--- a/aai-core/src/main/java/org/onap/aai/serialization/engines/query/GraphTraversalQueryEngine.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/engines/query/GraphTraversalQueryEngine.java
@@ -113,14 +113,8 @@ public class GraphTraversalQueryEngine extends QueryEngine {
GraphTraversal<Vertex, Vertex> pipe = this.g
.V(start).emit(v -> true).repeat(
__.union(
- __.outE().or(
- __.has(CONTAINS.toString(), OUT.toString()),
- __.has(DELETE_OTHER_V.toString(), OUT.toString())
- ).inV(),
- __.inE().or(
- __.has(CONTAINS.toString(), IN.toString()),
- __.has(DELETE_OTHER_V.toString(), IN.toString())
- ).outV()
+ __.outE().has(DELETE_OTHER_V.toString(), OUT.toString()).inV(),
+ __.inE().has(DELETE_OTHER_V.toString(), IN.toString()).outV()
)
);