OData Version 4.02 Release Candidate

examples/Org.OData.JSON.V1.Schema-sample.json

@@ -19,6 +19,27 @@
         }
     },
     "json.schema.sample": {
+        "$Alias": "this",
+        "container": {
+            "$Kind": "EntityContainer",
+            "Employees": {
+                "$Collection": true,
+                "$Type": "this.Employee"
+            }
+        },
+        "Employee": {
+            "$Kind": "EntityType",
+            "$Key": [
+                "empid"
+            ],
+            "empid": {
+                "$Type": "Edm.Int32"
+            },
+            "resume": {
+                "$Type": "JSON.JSON",
+                "$Nullable": true
+            }
+        },
         "example": {
             "$Kind": "ComplexType",
             "CodeDictionary": {
@@ -37,5 +58,6 @@
                 }
             }
         }
-    }
+    },
+    "$EntityContainer": "json.schema.sample.container"
 }

examples/Org.OData.JSON.V1.Schema-sample.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx">
   <edmx:Reference Uri="https://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Core.V1.xml">
     <edmx:Include Namespace="Org.OData.Core.V1" Alias="Core" />
@@ -7,7 +7,19 @@
     <edmx:Include Namespace="Org.OData.JSON.V1" Alias="JSON" />
   </edmx:Reference>
   <edmx:DataServices>
-    <Schema Namespace="json.schema.sample" xmlns="http://docs.oasis-open.org/odata/ns/edm">
+    <Schema Namespace="json.schema.sample" Alias="this" xmlns="http://docs.oasis-open.org/odata/ns/edm">
+
+      <EntityContainer Name="container">
+        <EntitySet Name="Employees" EntityType="this.Employee" />
+      </EntityContainer>
+
+      <EntityType Name="Employee">
+        <Key>
+          <PropertyRef Name="empid" />
+        </Key>
+        <Property Name="empid" Type="Edm.Int32" Nullable="false" />
+        <Property Name="resume" Type="JSON.JSON" Nullable="true" />
+      </EntityType>
 
       <ComplexType Name="example">
         <Property Name="CodeDictionary" Type="JSON.JSON" Nullable="false">
@@ -22,4 +34,4 @@
 
     </Schema>
   </edmx:DataServices>
-</edmx:Edmx>
+</edmx:Edmx>

vocabularies/Org.OData.Capabilities.V1.json

@@ -43,7 +43,7 @@
                 "href": "https://github.com/oasis-tcs/odata-vocabularies/blob/main/vocabularies/Org.OData.Capabilities.V1.md"
             }
         ],
-        "@Core.LongDescription": "\nThere are some capabilities which are strongly recommended for services to support even\nthough they are optional. Support for $top and $skip is a good example as\nsupporting these query options helps with performance of a service and are essential. Such\ncapabilities are assumed to be default capabilities of an OData service even in\nthe case that a capabilities annotation doesn’t exist. Capabilities annotations are\nmainly expected to be used to explicitly specify that a service doesn’t support such\ncapabilities. Capabilities annotations can as well be used to declaratively\nspecify the support of such capabilities.\n\nOn the other hand, there are some capabilities that a service may choose to support or\nnot support and in varying degrees. $filter and $orderby are such good examples.\nThis vocabulary aims to define terms to specify support or no support for such\ncapabilities.\n\nA service is assumed to support by default the following capabilities even though an\nannotation doesn’t exist:\n- Countability ($count)\n- Client pageability ($top, $skip)\n- Expandability ($expand)\n- Indexability by key\n- Batch support ($batch)\n- Navigability of navigation properties\n\nA service is expected to support the following capabilities. If not supported, the\nservice is expected to call out the restrictions using annotations:\n- Filterability ($filter)\n- Sortability ($orderby)\n- Queryability of top level entity sets\n- Query functions\n\nA client cannot assume that a service supports certain capabilities. A client can try, but\nit needs to be prepared to handle an error in case the following capabilities are not\nsupported:\n- Insertability\n- Updatability\n- Deletability\n        ",
+        "@Core.LongDescription": "\nThere are some capabilities which are strongly recommended for services to support even\nthough they are optional. Support for $top and $skip is a good example as\nsupporting these query options helps with performance of a service and are essential. Such\ncapabilities are assumed to be default capabilities of an OData service even in\nthe case that a capabilities annotation doesn’t exist. Capabilities annotations are\nmainly expected to be used to explicitly specify that a service doesn’t support such\ncapabilities. Capabilities annotations can as well be used to declaratively\nspecify the support of such capabilities.\n\nOn the other hand, there are some capabilities that a service may choose to support or\nnot support and in varying degrees. $filter and $orderby are such good examples.\nThis vocabulary aims to define terms to specify support or no support for such\ncapabilities.\n\nA service is assumed to support by default the following capabilities even though an\nannotation doesn’t exist:\n- Countability ($count)\n- Client pageability ($top, $skip)\n- Expandability ($expand)\n- Indexability by key\n- Batch support ($batch)\n- Navigability of navigation properties\n\nA service is expected to support the following capabilities. If not supported, the\nservice is expected to call out the restrictions using annotations:\n- Filterability ($filter)\n- Sortability ($orderby)\n- Queryability of top level entity sets\n- Query functions\n\nA client cannot assume that a service supports certain capabilities. A client can try, but\nit needs to be prepared to handle an error in case the following capabilities are not\nsupported:\n- Insertability\n- Updatability\n- Deletability\n\nCapabilities annotations whose external target path is a canonical collection (in the\nsense of [OData-Protocol, section 10](https://oasis-tcs.github.io/odata-specs/odata-protocol/odata-protocol.html#ContextURL))\napply to every entity in that collection, even if it is addressed via a non-canonical path.\n(Likewise for canonical singletons.)\nFor example, restrictions specified on an entity set are valid whether the request is\ndirectly to the entity set or through a navigation property bound to that entity set.\nServices can specify a different set of restrictions specific to a path, in which case the more specific restrictions take precedence.\n        ",
         "ConformanceLevel": {
             "$Kind": "Term",
             "$Type": "Capabilities.ConformanceLevelType",
@@ -239,8 +239,7 @@
                 "Collection"
             ],
             "@Core.AppliesViaContainer": true,
-            "@Core.Description": "Restrictions on navigating properties according to OData URL conventions",
-            "@Core.LongDescription": "Restrictions specified on an entity set are valid whether the request is directly to the entity set or through a navigation property bound to that entity set. Services can specify a different set of restrictions specific to a path, in which case the more specific restrictions take precedence."
+            "@Core.Description": "Restrictions on navigating properties according to OData URL conventions"
         },
         "NavigationRestrictionsType": {
             "$Kind": "ComplexType",
@@ -632,6 +631,10 @@
                     "Value": "SearchExpression",
                     "@Core.Description": "String property can be used as first operand in one or more `startswith`, `endswith`, and `contains` clauses, combined by `or`"
                 },
+                {
+                    "Value": "MultiValueOrSearchExpression",
+                    "@Core.Description": "String property can be used like in `MultiValue` and like in `SearchExpression`, combined with `or`"
+                },
                 {
                     "Value": "MultiRangeOrSearchExpression",
                     "@Core.Description": "Property can be compared to a union of zero or more closed, half-open, or open intervals plus zero or more simple string patterns",
@@ -748,14 +751,20 @@
             "UnsupportedExpressions": {
                 "$Type": "Capabilities.SearchExpressions",
                 "$DefaultValue": "none",
-                "@Core.Description": "Expressions not supported in $search"
+                "@Core.Description": "Expressions not supported in $search as specified by the standard syntax [OData-URL, section 5.1.8.1](https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part2-url-conventions.html#SearchExpressions)",
+                "@Core.LongDescription": "An unsupported expression may be treated as a term to be matched even if the\n            standard syntax treats it as a keyword."
+            },
+            "SearchSyntax": {
+                "$Nullable": true,
+                "@Core.IsURL": true,
+                "@Core.Description": "URL of the $search syntax supported by the service (null means the standard syntax [OData-URL, section 5.1.8.1](https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part2-url-conventions.html#SearchExpressions))"
             }
         },
         "SearchExpressions": {
             "$Kind": "EnumType",
             "$IsFlags": true,
             "none": 0,
-            "[email protected]": "Single search term",
+            "[email protected]": "No unsupported expressions",
             "AND": 1,
             "[email protected]": "Multiple search terms, optionally separated by `AND`",
             "OR": 2,