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

@@ -631,10 +631,13 @@
                     "Value": "SearchExpression",
                     "@Core.Description": "String property can be used as first operand in `startswith`, `endswith`, and `contains` clauses"
                 },
+                {
+                    "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",
-                    "@Core.LongDescription": "The filter expression for this property consists of one or more interval expressions or string comparison functions combined by `or`. See MultiRange for a definition of an interval expression. See SearchExpression for the allowed string comparison functions."
+                    "@Core.Description": "String property can be used like in `MultiRange` and like in `SearchExpression`, combined with `or`"
                 }
             ]
         },
@@ -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,