Merge remote-tracking branch 'origin/main' into

2000/single-navprop-context

docs/odata-csdl-json/styles/odata.css

@@ -1,3 +1,7 @@
+:root {
+  --indent: 40px;
+}
+
 a:target,
 span:target {
   background-color: yellow;
@@ -168,11 +172,31 @@ td > code {
 
 .example pre,
 .rep {
-  margin-left: 40px;
+  margin-left: var(--indent);
+}
+
+.caption p {
+  margin-left: var(--indent);
+  margin-bottom: -1em;
+}
+
+.side-by-side {
+  margin: -1em 0;
+}
+
+.side-by-side:after {
+  content: "";
+  display: block;
+  clear: both;
+}
+
+.side-by-side > div {
+  width: 50%;
+  float: left;
 }
 
 .indent {
-  margin-left: 40px;
+  margin-left: var(--indent);
 }
 
 td pre {
@@ -195,7 +219,7 @@ mjx-container {
 
 mjx-container[display="true"] {
   text-align: left !important;
-  margin-left: 40px !important;
+  margin-left: var(--indent) !important;
 }
 
 code .er {
@@ -247,6 +271,7 @@ h6 {
   page-break-after: avoid;
 }
 
+.side-by-side,
 td {
   page-break-inside: avoid;
 }

docs/odata-csdl-xml/styles/odata.css

@@ -1,3 +1,7 @@
+:root {
+  --indent: 40px;
+}
+
 a:target,
 span:target {
   background-color: yellow;
@@ -168,11 +172,31 @@ td > code {
 
 .example pre,
 .rep {
-  margin-left: 40px;
+  margin-left: var(--indent);
+}
+
+.caption p {
+  margin-left: var(--indent);
+  margin-bottom: -1em;
+}
+
+.side-by-side {
+  margin: -1em 0;
+}
+
+.side-by-side:after {
+  content: "";
+  display: block;
+  clear: both;
+}
+
+.side-by-side > div {
+  width: 50%;
+  float: left;
 }
 
 .indent {
-  margin-left: 40px;
+  margin-left: var(--indent);
 }
 
 td pre {
@@ -195,7 +219,7 @@ mjx-container {
 
 mjx-container[display="true"] {
   text-align: left !important;
-  margin-left: 40px !important;
+  margin-left: var(--indent) !important;
 }
 
 code .er {
@@ -247,6 +271,7 @@ h6 {
   page-break-after: avoid;
 }
 
+.side-by-side,
 td {
   page-break-inside: avoid;
 }

docs/odata-data-aggregation-ext/styles/odata.css

@@ -1,3 +1,7 @@
+:root {
+  --indent: 40px;
+}
+
 a:target,
 span:target {
   background-color: yellow;
@@ -168,11 +172,31 @@ td > code {
 
 .example pre,
 .rep {
-  margin-left: 40px;
+  margin-left: var(--indent);
+}
+
+.caption p {
+  margin-left: var(--indent);
+  margin-bottom: -1em;
+}
+
+.side-by-side {
+  margin: -1em 0;
+}
+
+.side-by-side:after {
+  content: "";
+  display: block;
+  clear: both;
+}
+
+.side-by-side > div {
+  width: 50%;
+  float: left;
 }
 
 .indent {
-  margin-left: 40px;
+  margin-left: var(--indent);
 }
 
 td pre {
@@ -195,7 +219,7 @@ mjx-container {
 
 mjx-container[display="true"] {
   text-align: left !important;
-  margin-left: 40px !important;
+  margin-left: var(--indent) !important;
 }
 
 code .er {
@@ -247,6 +271,7 @@ h6 {
   page-break-after: avoid;
 }
 
+.side-by-side,
 td {
   page-break-inside: avoid;
 }

docs/odata-json-format/odata-json-format.html

@@ -399,12 +399,13 @@ <h2 id="11-changes-from-earlier-versions"><a id="ChangesfromEarlierVersions" hre
 <td><a href="https://github.com/oasis-tcs/odata-specs/issues/456">456</a></td>
 </tr>
 <tr class="odd">
-<td><a href="#ActionInvocation">Section 18</a></td>
-<td>Allow common expressions in action payloads</td>
-<td><a href="https://github.com/oasis-tcs/odata-specs/issues/341">341</a></td>
+<td><a href="#DeletedEntity">Section 15.3</a></td>
+<td><code>type</code> control information, if present, must come immediately after <code>removed</code></td>
+<td></td>
 </tr>
 </tbody>
 </table>
+<p><a href="https://github.com/oasis-tcs/odata-specs/issues/1985">1985</a> <a href="#ActionInvocation">Section 18</a>| Allow common expressions in action payloads| <a href="https://github.com/oasis-tcs/odata-specs/issues/341">341</a></p>
 </details>
 <details open><summary>
 <h2 id="12-glossary"><a id="Glossary" href="#Glossary">1.2 Glossary</a></h2>
@@ -634,6 +635,7 @@ <h2 id="45-payload-ordering-constraints"><a id="PayloadOrderingConstraints" href
 <p>To support streaming scenarios the following payload ordering constraints have to be met:</p>
 <ul>
 <li>If present, the <code>context</code> control information MUST be the first property in the JSON object.</li>
+<li>For 4.01 deleted entities, the <code>removed</code> control information MUST appear after <code>context</code>, if present, and before any other property or control information.</li>
 <li>The <code>type</code> control information, if present, MUST appear next in the JSON object.</li>
 <li>The <code>id</code> and <code>etag</code> control information MUST appear before any property, property annotation, or property control information.</li>
 <li>All annotations or control information for a structural or navigation property MUST appear as a group immediately before the property itself. The one exception is the <a href="#ControlInformationnextLinkodatanextLink"><code>nextLink</code></a> of a collection which MAY appear after the collection it annotates.</li>
@@ -1166,7 +1168,7 @@ <h2 id="85-bind-operation"><a id="BindOperation" href="#BindOperation">8.5 Bind
 <span id="cb23-6"><a href="#cb23-6" aria-hidden="true" tabindex="-1"></a><span class="fu">}</span></span></code></pre></div>
 </div>
 <div class="example">
-<p>Example 22: submit a partial update request to:</p>
+<p>Example <a id="deepupdate" href="#deepupdate">22</a>: submit a partial update request to:</p>
 <ul>
 <li>modify the name of an existing category</li>
 <li>assign an existing product with the id 42 to the category</li>
@@ -1474,10 +1476,10 @@ <h2 id="153-deleted-entity"><a id="DeletedEntity" href="#DeletedEntity">15.3 Del
 <span id="cb38-4"><a href="#cb38-4" aria-hidden="true" tabindex="-1"></a>  <span class="dt">&quot;id&quot;</span><span class="fu">:</span> <span class="st">&quot;Customers(&#39;ANTON&#39;)&quot;</span></span>
 <span id="cb38-5"><a href="#cb38-5" aria-hidden="true" tabindex="-1"></a><span class="fu">}</span></span></code></pre></div>
 </div>
-<p>In OData 4.01 payloads the deleted-entity object MUST include the following properties, regardless of the specified <a href="#ControllingtheAmountofControlInformationinResponses"><code>metadata</code></a> value:</p>
+<p>In OData 4.01 payloads the deleted-entity object MUST include the following properties, regardless of the specified <a href="#ControllingtheAmountofControlInformationinResponses"><code>metadata</code></a> value. For ordered payloads, this control information MUST follow the <a href="#PayloadOrderingConstraints">payload ordering constraints</a>.</p>
 <ul>
-<li><p>Control information <a href="#ControlInformationremovedodataremoved"><code>removed</code></a>, whose value is an object that MAY contain a property named <code>reason</code>. If present, the value of <code>reason</code> MUST be either <code>deleted</code> if the entity was deleted (destroyed), or <code>changed</code> if the entity was removed from membership in the result either due to change in value such that the entity no longer matches the defining query or because the entity was removed from the collection. The object MAY include <a href="#InstanceAnnotations">annotations</a>, and clients SHOULD NOT error due to the presence of additional properties that MAY be defined by future versions of this specification. For <a href="#PayloadOrderingConstraints">ordered payloads</a>, the control information <a href="#ControlInformationremovedodataremoved"><code>removed</code></a> MUST immediately follow the <a href="#ControlInformationcontextodatacontext"><code>context</code></a> control information, if present, otherwise it MUST be the first property in the deleted entity.</p></li>
-<li><p>Control information <a href="#ControlInformationidodataid"><code>id</code></a> or all of the entity’s primary key fields. The <code>id</code> control information MUST appear if any of the entity’s primary key fields are omitted from the response <em>or</em> the entity-id is not identical to the canonical URL of the entity. When using a delta payload in an <a href="#UpdateaCollectionofEntities">update request</a>, an <a href="https://github.com/oasis-tcs/odata-vocabularies/blob/main/vocabularies/Org.OData.Core.V1.md#AlternateKeys">alternate key</a> (see <em>Alternate Keys</em> in <a href="#ODataURL">OData-URL</a>) MAY be used in place of the entity’s primary key. A delta response from an update request using alternate keys SHOULD include all fields of the alternate key used in the request, in which case it MAY omit the <code>id</code> control information and other primary key fields. For <a href="#PayloadOrderingConstraints">ordered payloads</a>, the control information <code>id</code>, if present, MUST immediately follow the control information <a href="#ControlInformationremovedodataremoved"><code>removed</code></a>.</p></li>
+<li><p>Control information <a href="#ControlInformationremovedodataremoved"><code>removed</code></a>, whose value is an object that MAY contain a property named <code>reason</code>. If present, the value of <code>reason</code> MUST be either <code>deleted</code> if the entity was deleted (destroyed), or <code>changed</code> if the entity was removed from membership in the result either due to change in value such that the entity no longer matches the defining query or because the entity was removed from the collection. The object MAY include <a href="#InstanceAnnotations">annotations</a>, and clients SHOULD NOT error due to the presence of additional properties that MAY be defined by future versions of this specification.</p></li>
+<li><p>Control information <a href="#ControlInformationidodataid"><code>id</code></a> or all of the entity’s primary key fields. The <code>id</code> control information MUST appear if any of the entity’s primary key fields are omitted from the response <em>or</em> the entity-id is not identical to the canonical URL of the entity. When using a delta payload in an <a href="#UpdateaCollectionofEntities">update request</a>, an <a href="https://github.com/oasis-tcs/odata-vocabularies/blob/main/vocabularies/Org.OData.Core.V1.md#AlternateKeys">alternate key</a> (see <em>Alternate Keys</em> in <a href="#ODataURL">OData-URL</a>) MAY be used in place of the entity’s primary key. A delta response from an update request using alternate keys SHOULD include all fields of the alternate key used in the request, in which case it MAY omit the <code>id</code> control information and other primary key fields.</p></li>
 </ul>
 <p>For full metadata the <a href="#ControlInformationcontextodatacontext"><code>context</code></a> control information MUST be included. It also MUST be included if the entity set of the deleted entity cannot be determined from the surrounding context.</p>
 <p>The deleted-entity object MAY include additional properties of the entity, as well as <a href="#InstanceAnnotations">annotations</a>, and MAY include related entities, related deleted entities, or a delta or full representation of a related collection of entities, to represent related entities that have been modified or deleted.</p>

docs/odata-json-format/odata-json-format.md

@@ -220,6 +220,8 @@ Section | Feature / Change | Issue
 [Section 4.6.8](#ControlInformationidodataid)| Transient entities can be identifiable| [1928](https://github.com/oasis-tcs/odata-specs/issues/1928)
 [Section 4.6.12](#ControlInformationmediaodatamedia)| `mediaContentType` can be `null`| [536](https://github.com/oasis-tcs/odata-specs/issues/536)
 [Section 7](#StructuralProperty), [Section A.2](#InformativeReferences)| Removed reference to obsolete version of GeoJSON| [456](https://github.com/oasis-tcs/odata-specs/issues/456)
+[Section 15.3](#DeletedEntity) | `type` control information, if present, must come immediately after `removed` |
+[1985](https://github.com/oasis-tcs/odata-specs/issues/1985)
 [Section 18](#ActionInvocation)| Allow common expressions in action payloads| [341](https://github.com/oasis-tcs/odata-specs/issues/341)
 
 ## <a id="Glossary" href="#Glossary">1.2 Glossary</a>
@@ -711,6 +713,7 @@ constraints have to be met:
 
 - If present, the `context` control information MUST be the first
   property in the JSON object.
+- For 4.01 deleted entities, the `removed` control information MUST appear   after `context`, if present, and before any other property or control information.
 - The
   `type` control information, if present, MUST appear next in
   the JSON object.
@@ -1734,7 +1737,7 @@ Content-Type: application/json
 :::
 
 ::: example
-Example 22: submit a partial update request to:
+Example <a id="deepupdate" href="#deepupdate">22</a>: submit a partial update request to:
 - modify the name of an existing category
 - assign an existing product with the id 42 to the category
 - assign an existing product 57 to the category and update its name
@@ -2271,7 +2274,8 @@ a property, not control information
 
 In OData 4.01 payloads the deleted-entity object MUST include the
 following properties, regardless of the specified
-[`metadata`](#ControllingtheAmountofControlInformationinResponses) value:
+[`metadata`](#ControllingtheAmountofControlInformationinResponses) value.
+For ordered payloads, this control information MUST follow the [payload ordering constraints](#PayloadOrderingConstraints).
 
 - Control information
   [`removed`](#ControlInformationremovedodataremoved),
@@ -2284,12 +2288,7 @@ following properties, regardless of the specified
   collection. The object MAY include
   [annotations](#InstanceAnnotations), and clients SHOULD NOT error
   due to the presence of additional properties that MAY be defined by
-  future versions of this specification. For [ordered
-  payloads](#PayloadOrderingConstraints), the control information
-  [`removed`](#ControlInformationremovedodataremoved) MUST immediately
-  follow the [`context`](#ControlInformationcontextodatacontext) control
-  information, if present, otherwise it MUST be the first property in the
-  deleted entity.
+  future versions of this specification.
 
 - Control information
   [`id`](#ControlInformationidodataid)
@@ -2298,11 +2297,7 @@ following properties, regardless of the specified
   from the response _or_ the entity-id is not identical to the canonical
   URL of the entity. When using a delta payload in an   [update request](#UpdateaCollectionofEntities), an [alternate key](https://github.com/oasis-tcs/odata-vocabularies/blob/main/vocabularies/Org.OData.Core.V1.md#AlternateKeys) (see _Alternate Keys_ in [OData-URL](#ODataURL))
   MAY be used in place of the entity's primary key. A delta response from an update request using alternate keys SHOULD include all fields of the alternate key used in the request, in which case it
-  MAY omit the `id` control information and other primary key fields. For [ordered
-  payloads](#PayloadOrderingConstraints), the control information
-  `id`, if present, MUST immediately follow the control
-  information
-  [`removed`](#ControlInformationremovedodataremoved).
+  MAY omit the `id` control information and other primary key fields.
 
 For full metadata the
 [`context`](#ControlInformationcontextodatacontext)

docs/odata-json-format/styles/odata.css

@@ -1,3 +1,7 @@
+:root {
+  --indent: 40px;
+}
+
 a:target,
 span:target {
   background-color: yellow;
@@ -168,11 +172,31 @@ td > code {
 
 .example pre,
 .rep {
-  margin-left: 40px;
+  margin-left: var(--indent);
+}
+
+.caption p {
+  margin-left: var(--indent);
+  margin-bottom: -1em;
+}
+
+.side-by-side {
+  margin: -1em 0;
+}
+
+.side-by-side:after {
+  content: "";
+  display: block;
+  clear: both;
+}
+
+.side-by-side > div {
+  width: 50%;
+  float: left;
 }
 
 .indent {
-  margin-left: 40px;
+  margin-left: var(--indent);
 }
 
 td pre {
@@ -195,7 +219,7 @@ mjx-container {
 
 mjx-container[display="true"] {
   text-align: left !important;
-  margin-left: 40px !important;
+  margin-left: var(--indent) !important;
 }
 
 code .er {
@@ -247,6 +271,7 @@ h6 {
   page-break-after: avoid;
 }
 
+.side-by-side,
 td {
   page-break-inside: avoid;
 }