From 9220f729873a7be6455f832468f5090ccd2a25cb Mon Sep 17 00:00:00 2001 From: "Kajur, Harish (vk250x)" Date: Mon, 13 Aug 2018 02:44:43 -0400 Subject: Update traversal to use schema ingest library Update the traversal microservice to use the ingest library to make the application more model driven Issue-ID: AAI-1465 Change-Id: Ifcf56b5d0e7f25ce2bc735b3186e09bc28234100 Signed-off-by: Kajur, Harish (vk250x) --- .../src/main/resources/antlr4/org/onap/aai/AAIDsl.g4 | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'aai-traversal/src/main/resources/antlr4') diff --git a/aai-traversal/src/main/resources/antlr4/org/onap/aai/AAIDsl.g4 b/aai-traversal/src/main/resources/antlr4/org/onap/aai/AAIDsl.g4 index 2713677..f0c866a 100644 --- a/aai-traversal/src/main/resources/antlr4/org/onap/aai/AAIDsl.g4 +++ b/aai-traversal/src/main/resources/antlr4/org/onap/aai/AAIDsl.g4 @@ -6,21 +6,15 @@ grammar AAIDsl; aaiquery: dslStatement; -dslStatement: (queryStep) (traverseStep | unionTraverseStep)* limitStep*; - -queryStep : (singleNodeStep |singleQueryStep | multiQueryStep); +dslStatement: (singleNodeStep ) (traverseStep )* limitStep*; unionQueryStep: LBRACKET dslStatement ( COMMA (dslStatement))* RBRACKET; -traverseStep: (TRAVERSE ( queryStep | unionQueryStep)); - -unionTraverseStep: TRAVERSE unionQueryStep; +traverseStep: (TRAVERSE ( singleNodeStep | unionQueryStep)); -singleNodeStep: NODE STORE? ; -singleQueryStep: NODE STORE? (filterStep | filterTraverseStep); -multiQueryStep: NODE STORE? (filterStep | filterTraverseStep) (filterStep)+; +singleNodeStep: NODE STORE? (filterStep | filterTraverseStep)*; -filterStep: NOT? (LPAREN KEY COMMA KEY (COMMA KEY)*RPAREN); +filterStep: NOT? (LPAREN KEY (COMMA KEY)* RPAREN); filterTraverseStep: (LPAREN traverseStep* RPAREN); limitStep: LIMIT NODE; @@ -28,7 +22,8 @@ limitStep: LIMIT NODE; LIMIT: 'LIMIT'; NODE: ID; -KEY: ['] ID ['] ; +KEY: ['] (ID | ' ')* ['] ; + AND: [&]; -- cgit 1.2.3-korg