From 8dcb9900cae95a17ca6d029a665d512b3e7b11a2 Mon Sep 17 00:00:00 2001 From: "Threefoot, Jane (jt6620)" Date: Tue, 28 Nov 2017 14:02:53 -0500 Subject: 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) --- .../serialization/engines/query/GraphTraversalQueryEngine.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'aai-core/src/main/java') 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 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() ) ); -- cgit 1.2.3-korg