update bnf and json schema to be consistent with security spec

Author: Martin187187

documentation/IDTA-01002-3/modules/ROOT/pages/json-grammar.txt

@@ -129,17 +129,15 @@
                                                              | "," <ws> "\"USEOBJECTS\":" <ws> <string_array> )
                                                          ( "," <ws> "\"FORMULA\":" <ws> <logical_expression>
                                                              | "," <ws> "\"USEFORMULA\":" <ws> <StringLiteral> )
-                                                         ( "," <ws> "\"FRAGMENT\":" <ws> <FieldIdentifierFragment>
-                                                             "," <ws> ( "\"FILTER\":" <ws> <logical_expression>
-                                                                         | "\"USEFILTER\":" <ws> <StringLiteral> ) )?
+                                                         "," <ws> "\"FILTER\":" <ws> <security_query_filter>
                                                          ( "," <ws> "\"FILTERLIST\":" <ws> <security_query_filter_array> )?
                                                          <ws> "}"
 
 <security_query_filter_array> ::= "[" <ws> <security_query_filter> <ws> ( "," <ws> <security_query_filter> <ws> )* "]"
 <security_query_filter> ::= "{" <ws>
                                                         "\"FRAGMENT\":" <ws> <FieldIdentifierFragment>
-                                                        "," <ws> ( "\"FILTER\":" <ws> <logical_expression>
-                                                                    | "\"USEFILTER\":" <ws> <StringLiteral> )
+                                                        "," <ws> ( "\"CONDITION\":" <ws> <logical_expression>
+                                                                    | "\"USEFORMULA\":" <ws> <StringLiteral> )
                                                         <ws> "}"
 
 <acl> ::= "{" <ws>

documentation/IDTA-01002-3/modules/ROOT/pages/schema.adoc

@@ -683,24 +683,20 @@
         "USEFORMULA": {
           "type": "string"
         },
-        "FRAGMENT": {
-          "$ref": "#/definitions/fieldIdentifierFragment"
-        },
         "FILTER": {
-          "$ref": "#/definitions/logicalExpression",
+          "$ref": "#/definitions/SecurityQueryFilter",
           "additionalProperties": false
         },
-        "USEFILTER": {
-          "type": "string"
-        },
         "FILTERLIST": {
           "type": "array",
-          "minItems": 1,
           "items": {
             "$ref": "#/definitions/SecurityQueryFilter"
           }
         }
       },
+      "required": [
+        "FILTER"
+      ],
       "allOf": [
         {
           "oneOf": [
@@ -743,43 +739,6 @@
               ]
             }
           ]
-        },
-        {
-          "oneOf": [
-            {
-              "required": [
-                "FRAGMENT",
-                "FILTER"
-              ]
-            },
-            {
-              "required": [
-                "FRAGMENT",
-                "USEFILTER"
-              ]
-            },
-            {
-              "not": {
-                "anyOf": [
-                  {
-                    "required": [
-                      "FRAGMENT"
-                    ]
-                  },
-                  {
-                    "required": [
-                      "FILTER"
-                    ]
-                  },
-                  {
-                    "required": [
-                      "USEFILTER"
-                    ]
-                  }
-                ]
-              }
-            }
-          ]
         }
       ],
       "additionalProperties": false
@@ -790,10 +749,10 @@
         "FRAGMENT": {
           "$ref": "#/definitions/fieldIdentifierFragment"
         },
-        "FILTER": {
+        "CONDITION": {
           "$ref": "#/definitions/logicalExpression"
         },
-        "USEFILTER": {
+        "USEFORMULA": {
           "type": "string"
         }
       },
@@ -803,12 +762,12 @@
       "oneOf": [
         {
           "required": [
-            "FILTER"
+            "CONDITION"
           ]
         },
         {
           "required": [
-            "USEFILTER"
+            "USEFORMULA"
           ]
         }
       ],

documentation/IDTA-01002-3/modules/ROOT/partials/bnf/grammar.bnf

@@ -101,14 +101,17 @@
     ( <SingleObject> <ws> )* 
     ( <UseObjectGroup> <ws> )* 
     ( ( "FORMULA:" <ws> <Condition> ) | ("USEFORMULA" <ws> <StringLiteral>) <ws> ) <ws>
-    ( "FRAGMENT:" <ws> <FieldIdentifierFragment> <ws> ( ( "FILTER:" <ws> <Condition> ) | ("USEFILTER" <ws> <StringLiteral>) <ws> ) <ws> )?
+    ( <Filter> <ws> )
     ( <FilterList> <ws> )?
 
+<Filter> ::= 
+    "FILTER:" <ws> ( <SecurityQueryFilter> <ws> )
+
 <FilterList> ::= 
-    "FILTERLIST:" <ws> ( <SecurityQueryFilter> <ws> )+
+    "FILTERLIST:" <ws> ( <SecurityQueryFilter> <ws> )*
 
 <SecurityQueryFilter> ::= 
-    "FRAGMENT:" <ws> <FieldIdentifierFragment> <ws> ( ( "FILTER:" <ws> <Condition> ) | ("USEFILTER" <ws> <StringLiteral>) <ws> ) <ws>
+    "FRAGMENT:" <ws> <FieldIdentifierFragment> <ws> ( ( "CONDITION:" <ws> <Condition> ) | ("USEFORMULA" <ws> <StringLiteral>) <ws> ) <ws>
 
 <ACL> ::= 
     "ATTRIBUTES:" <ws>