traversal support for v20

Issue-ID: AAI-2933
Change-Id: I76f970d15ef911a3dd14d97f2fa050c8b6e29e96
Signed-off-by: LaMont, William(wl2432) <wl2432@att.com>

2 files changed, 7 insertions, 6 deletions

diff --git a/aai-traversal/src/main/resources/antlr4/org/onap/aai/dsl/v1/AAIDsl.g4 b/aai-traversal/src/main/resources/antlr4/org/onap/aai/dsl/v1/AAIDsl.g4
index 3ba370c..29f6e3f 100644
--- a/aai-traversal/src/main/resources/antlr4/org/onap/aai/dsl/v1/AAIDsl.g4
+++ b/aai-traversal/src/main/resources/antlr4/org/onap/aai/dsl/v1/AAIDsl.g4
@@ -5,14 +5,14 @@ grammar AAIDsl;
 
 aaiquery: startStatement limit?;
 
-startStatement: (vertex ) (traversal)* ;
+startStatement: (vertex|unionVertex ) (traversal)* ;
 nestedStatement: (vertex|unionVertex ) (traversal)* ;
 
 vertex: label store? (filter)?;
 
 traversal:  (edge (vertex|unionVertex));
 
-filter:  (propertyFilter)* whereFilter?;
+filter:  (propertyFilter)* whereFilter*;
 propertyFilter: (not? '(' key (',' (key | num | bool))* ')');
 bool: BOOL;
 
diff --git a/aai-traversal/src/main/resources/antlr4/org/onap/aai/dsl/v2/AAIDsl.g4 b/aai-traversal/src/main/resources/antlr4/org/onap/aai/dsl/v2/AAIDsl.g4
index 453c0fe..5d923e1 100644
--- a/aai-traversal/src/main/resources/antlr4/org/onap/aai/dsl/v2/AAIDsl.g4
+++ b/aai-traversal/src/main/resources/antlr4/org/onap/aai/dsl/v2/AAIDsl.g4
@@ -5,7 +5,7 @@ grammar AAIDsl;
 
 aaiquery: startStatement limit?;
 
-startStatement: (vertex  ) (traversal)* ;
+startStatement: (vertex|unionVertex  ) (traversal)* ;
 nestedStatement:  (traversal)+ ;
 
 vertex: label store? (filter)?;
@@ -13,14 +13,15 @@ vertex: label store? (filter)?;
 //traversal:  (  vertex|unionVertex edge);
 traversal:  (edge* (vertex|unionVertex));
 
-filter:  (selectFilter)* (propertyFilter)* whereFilter?;
+filter:  (selectFilter)* (propertyFilter)* whereFilter*;
 propertyFilter: (not? '(' key (',' (key | num | bool))* ')');
-selectFilter: (not? '{' key (',' key)* '}');
+selectFilter: ( '{' key (',' key)* '}');
 bool: BOOL;
 
 whereFilter: (not? '('  nestedStatement ')' );
 
-unionVertex: '[' ( nestedStatement ( comma (nestedStatement))*) ']' store?;
+//unionVertex: '[' ( nestedStatement ( comma (nestedStatement))*) ']' store?;
+unionVertex: '[' ( (edgeFilter)* nestedStatement ( comma ( (edgeFilter)* nestedStatement))*) ']' store?;
 
 comma: ',';
 edge: ( TRAVERSE|DIRTRAVERSE) (edgeFilter)?;