From f32a07c1d5f8b73e5e19f224811bfd9646f163d8 Mon Sep 17 00:00:00 2001 From: D024504 Date: Mon, 31 Jul 2023 13:58:58 +0200 Subject: [PATCH] ODATA-1491 --- docs/odata-csdl-json/odata-csdl-json.html | 369 ++++++++++---------- docs/odata-csdl-json/odata-csdl-json.md | 1 - docs/odata-csdl-xml/odata-csdl-xml.html | 2 +- docs/odata-csdl-xml/odata-csdl-xml.md | 2 +- odata-csdl/15 Identifier and Path Values.md | 3 +- 5 files changed, 187 insertions(+), 190 deletions(-) diff --git a/docs/odata-csdl-json/odata-csdl-json.html b/docs/odata-csdl-json/odata-csdl-json.html index b09e13353..5d7bbea2b 100644 --- a/docs/odata-csdl-json/odata-csdl-json.html +++ b/docs/odata-csdl-json/odata-csdl-json.html @@ -3219,191 +3219,190 @@

"@Core.DefaultNamespace": true, "Product": { "$Kind": "EntityType", - "$HasStream": true, - "$Key": [ - "ID" - ], - "ID": {}, - "Description": { - "$Nullable": true, - "@Core.IsLanguageDependent": true - }, - "ReleaseDate": { - "$Nullable": true, - "$Type": "Edm.Date" - }, - "DiscontinuedDate": { - "$Nullable": true, - "$Type": "Edm.Date" - }, - "Rating": { - "$Nullable": true, - "$Type": "Edm.Int32" - }, - "Price": { - "$Nullable": true, - "$Type": "Edm.Decimal", - "@Measures.ISOCurrency": { - "$Path": "Currency" - } - }, - "Currency": { - "$Nullable": true, - "$MaxLength": 3 - }, - "Category": { - "$Kind": "NavigationProperty", - "$Type": "self.Category", - "$Partner": "Products" - }, - "Supplier": { - "$Kind": "NavigationProperty", - "$Nullable": true, - "$Type": "self.Supplier", - "$Partner": "Products" - } - }, - "Category": { - "$Kind": "EntityType", - "$Key": [ - "ID" - ], - "ID": { - "$Type": "Edm.Int32" - }, - "Name": { - "@Core.IsLanguageDependent": true - }, - "Products": { - "$Kind": "NavigationProperty", - "$Partner": "Category", - "$Collection": true, - "$Type": "self.Product", - "$OnDelete": "Cascade" - } - }, - "Supplier": { - "$Kind": "EntityType", - "$Key": [ - "ID" - ], - "ID": {}, - "Name": { - "$Nullable": true - }, - "Address": { - "$Type": "self.Address" - }, - "Concurrency": { - "$Type": "Edm.Int32" - }, - "Products": { - "$Kind": "NavigationProperty", - "$Partner": "Supplier", - "$Collection": true, - "$Type": "self.Product" - } - }, - "Country": { - "$Kind": "EntityType", - "$Key": [ - "Code" - ], - "Code": { - "$MaxLength": 2 - }, - "Name": { - "$Nullable": true - } - }, - "Address": { - "$Kind": "ComplexType", - "Street": { - "$Nullable": true - }, - "City": { - "$Nullable": true - }, - "State": { - "$Nullable": true - }, - "ZipCode": { - "$Nullable": true - }, - "CountryName": { - "$Nullable": true - }, - "Country": { - "$Kind": "NavigationProperty", - "$Nullable": true, - "$Type": "self.Country", - "$ReferentialConstraint": { - "CountryName": "Name" - } - } - }, - "ProductsByRating": [ - { - "$Kind": "Function", - "$Parameter": [ - { - "$Name": "Rating", - "$Nullable": true, - "$Type": "Edm.Int32" - } - ], - "$ReturnType": { - "$Collection": true, - "$Type": "self.Product" - } - } - ], - "DemoService": { - "$Kind": "EntityContainer", - "Products": { - "$Collection": true, - "$Type": "self.Product", - "$NavigationPropertyBinding": { - "Category": "Categories" - } - }, - "Categories": { - "$Collection": true, - "$Type": "self.Category", - "$NavigationPropertyBinding": { - "Products": "Products" - }, - "@Core.Description": "Product Categories" - }, - "Suppliers": { - "$Collection": true, - "$Type": "self.Supplier", - "$NavigationPropertyBinding": { - "Products": "Products", - "Address/Country": "Countries" - }, - "@Core.OptimisticConcurrency": [ - "Concurrency" - ] - }, - "Countries": { - "$Collection": true, - "$Type": "self.Country" - }, - "MainSupplier": { - "$Type": "self.Supplier", - "$NavigationPropertyBinding": { - "Products": "Products" - }, - "@Core.Description": "Primary Supplier" - }, - "ProductsByRating": { - "$EntitySet": "Products", - "$Function": "self.ProductsByRating" - } - } - } -} + "$Key": [ + "ID" + ], + "ID": {}, + "Description": { + "$Nullable": true, + "@Core.IsLanguageDependent": true + }, + "ReleaseDate": { + "$Nullable": true, + "$Type": "Edm.Date" + }, + "DiscontinuedDate": { + "$Nullable": true, + "$Type": "Edm.Date" + }, + "Rating": { + "$Nullable": true, + "$Type": "Edm.Int32" + }, + "Price": { + "$Nullable": true, + "$Type": "Edm.Decimal", + "@Measures.ISOCurrency": { + "$Path": "Currency" + } + }, + "Currency": { + "$Nullable": true, + "$MaxLength": 3 + }, + "Category": { + "$Kind": "NavigationProperty", + "$Type": "self.Category", + "$Partner": "Products" + }, + "Supplier": { + "$Kind": "NavigationProperty", + "$Nullable": true, + "$Type": "self.Supplier", + "$Partner": "Products" + } + }, + "Category": { + "$Kind": "EntityType", + "$Key": [ + "ID" + ], + "ID": { + "$Type": "Edm.Int32" + }, + "Name": { + "@Core.IsLanguageDependent": true + }, + "Products": { + "$Kind": "NavigationProperty", + "$Partner": "Category", + "$Collection": true, + "$Type": "self.Product", + "$OnDelete": "Cascade" + } + }, + "Supplier": { + "$Kind": "EntityType", + "$Key": [ + "ID" + ], + "ID": {}, + "Name": { + "$Nullable": true + }, + "Address": { + "$Type": "self.Address" + }, + "Concurrency": { + "$Type": "Edm.Int32" + }, + "Products": { + "$Kind": "NavigationProperty", + "$Partner": "Supplier", + "$Collection": true, + "$Type": "self.Product" + } + }, + "Country": { + "$Kind": "EntityType", + "$Key": [ + "Code" + ], + "Code": { + "$MaxLength": 2 + }, + "Name": { + "$Nullable": true + } + }, + "Address": { + "$Kind": "ComplexType", + "Street": { + "$Nullable": true + }, + "City": { + "$Nullable": true + }, + "State": { + "$Nullable": true + }, + "ZipCode": { + "$Nullable": true + }, + "CountryName": { + "$Nullable": true + }, + "Country": { + "$Kind": "NavigationProperty", + "$Nullable": true, + "$Type": "self.Country", + "$ReferentialConstraint": { + "CountryName": "Name" + } + } + }, + "ProductsByRating": [ + { + "$Kind": "Function", + "$Parameter": [ + { + "$Name": "Rating", + "$Nullable": true, + "$Type": "Edm.Int32" + } + ], + "$ReturnType": { + "$Collection": true, + "$Type": "self.Product" + } + } + ], + "DemoService": { + "$Kind": "EntityContainer", + "Products": { + "$Collection": true, + "$Type": "self.Product", + "$NavigationPropertyBinding": { + "Category": "Categories" + } + }, + "Categories": { + "$Collection": true, + "$Type": "self.Category", + "$NavigationPropertyBinding": { + "Products": "Products" + }, + "@Core.Description": "Product Categories" + }, + "Suppliers": { + "$Collection": true, + "$Type": "self.Supplier", + "$NavigationPropertyBinding": { + "Products": "Products", + "Address/Country": "Countries" + }, + "@Core.OptimisticConcurrency": [ + "Concurrency" + ] + }, + "Countries": { + "$Collection": true, + "$Type": "self.Country" + }, + "MainSupplier": { + "$Type": "self.Supplier", + "$NavigationPropertyBinding": { + "Products": "Products" + }, + "@Core.Description": "Primary Supplier" + }, + "ProductsByRating": { + "$EntitySet": "Products", + "$Function": "self.ProductsByRating" + } + } + } +}

16.2 Annotations for Products and Categories Example

diff --git a/docs/odata-csdl-json/odata-csdl-json.md b/docs/odata-csdl-json/odata-csdl-json.md index 5823778b5..da187ee93 100644 --- a/docs/odata-csdl-json/odata-csdl-json.md +++ b/docs/odata-csdl-json/odata-csdl-json.md @@ -5520,7 +5520,6 @@ Example 89: "@Core.DefaultNamespace": true, "Product": { "$Kind": "EntityType", - "$HasStream": true, "$Key": [ "ID" ], diff --git a/docs/odata-csdl-xml/odata-csdl-xml.html b/docs/odata-csdl-xml/odata-csdl-xml.html index 887de6ab0..6c1aa244b 100644 --- a/docs/odata-csdl-xml/odata-csdl-xml.html +++ b/docs/odata-csdl-xml/odata-csdl-xml.html @@ -2990,7 +2990,7 @@

</edmx:Reference> <edmx:DataServices> <Schema Namespace="ODataDemo"> - <EntityType Name="Product" HasStream="true"> + <EntityType Name="Product"> <Key> <PropertyRef Name="ID" /> </Key> diff --git a/docs/odata-csdl-xml/odata-csdl-xml.md b/docs/odata-csdl-xml/odata-csdl-xml.md index 6fb1e8943..91e541e3b 100644 --- a/docs/odata-csdl-xml/odata-csdl-xml.md +++ b/docs/odata-csdl-xml/odata-csdl-xml.md @@ -5335,7 +5335,7 @@ Example 89: - + diff --git a/odata-csdl/15 Identifier and Path Values.md b/odata-csdl/15 Identifier and Path Values.md index 243dc8dd1..a01332689 100644 --- a/odata-csdl/15 Identifier and Path Values.md +++ b/odata-csdl/15 Identifier and Path Values.md @@ -107,7 +107,6 @@ Example ##ex: "@Core.DefaultNamespace": true, "Product": { "$Kind": "EntityType", - "$HasStream": true, "$Key": [ "ID" ], @@ -310,7 +309,7 @@ Example ##ex: - +