ODATA-1571 (#66)

Co-authored-by: Ralf Handl <[email protected]>
oasis-tcs · Jan 10, 2024 · 626af36 · 626af36
1 parent b910898
commit 626af36
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/docs/odata-csdl-xml/odata-csdl-xml.html b/docs/odata-csdl-xml/odata-csdl-xml.html
@@ -375,6 +375,11 @@ <h2 id="11-changes-from-earlier-versions"><a name="ChangesfromEarlierVersions" h
 </thead>
 <tbody>
 <tr class="odd">
+<td><a href="#EntityContainer">Section 13</a></td>
+<td>All children of <code>edm:EntityContainer</code> are optional</td>
+<td><a href="https://issues.oasis-open.org/browse/ODATA-1571">ODATA-1571</a></td>
+</tr>
+<tr class="even">
 <td><a href="#PathEvaluation">Section 14.4.1.2</a></td>
 <td>New path evaluation rules for annotations targeting annotations and external targeting via container</td>
 <td><a href="https://issues.oasis-open.org/browse/ODATA-1420">ODATA-1420</a></td>
@@ -1633,7 +1638,7 @@ <h1 id="13-entity-container"><a name="EntityContainer" href="#EntityContainer">1
 <p>A <a href="#FunctionImport"><em>function import</em></a> or an <a href="#ActionImport"><em>action import</em></a> is used to expose a function or action defined in an entity model as a top level resource.</p>
 <div class="varxml rep">
 <h3 id="element-edmentitycontainer"><a name="ElementedmEntityContainer.24" href="#ElementedmEntityContainer.24">Element <code>edm:EntityContainer</code></a></h3>
-<p>The <code>edm:EntityContainer</code> MUST contain one or more <a href="#EntitySet"><code>edm:EntitySet</code></a>, <a href="#Singleton"><code>edm:Singleton</code></a>, <a href="#ActionImport"><code>edm:ActionImport</code></a>, or <a href="#FunctionImport"><code>edm:FunctionImport</code></a> elements.</p>
+<p>The <code>edm:EntityContainer</code> MAY contain <a href="#EntitySet"><code>edm:EntitySet</code></a>, <a href="#Singleton"><code>edm:Singleton</code></a>, <a href="#ActionImport"><code>edm:ActionImport</code></a>, and <a href="#FunctionImport"><code>edm:FunctionImport</code></a> elements.</p>
 <p>It MAY contain <a href="#Annotation"><code>edm:Annotation</code></a> elements.</p>
 <h3 id="attribute-name-11"><a name="AttributeName.24.1" href="#AttributeName.24.1">Attribute <code>Name</code></a></h3>
 <p>The value of <code>Name</code> is the entity container’s name.</p>

diff --git a/docs/odata-csdl-xml/odata-csdl-xml.md b/docs/odata-csdl-xml/odata-csdl-xml.md
@@ -257,6 +257,7 @@ Schema Definition Language (XSD) 1.1 as described in
 
 Section | Feature / Change | Issue
 --------|------------------|------
+[Section 13](#EntityContainer)| All children of `edm:EntityContainer` are optional| [ODATA-1571](https://issues.oasis-open.org/browse/ODATA-1571)
 [Section 14.4.1.2](#PathEvaluation)| New path evaluation rules for annotations targeting annotations and external targeting via container| [ODATA-1420](https://issues.oasis-open.org/browse/ODATA-1420)
 
 ## <a name="Glossary" href="#Glossary">1.2 Glossary</a>
@@ -2879,9 +2880,9 @@ in an entity model as a top level resource.
 ::: {.varxml .rep}
 ### <a name="ElementedmEntityContainer.24" href="#ElementedmEntityContainer.24">Element `edm:EntityContainer`</a>
 
-The `edm:EntityContainer` MUST contain one or more
+The `edm:EntityContainer` MAY contain
 [`edm:EntitySet`](#EntitySet), [`edm:Singleton`](#Singleton),
-[`edm:ActionImport`](#ActionImport), or
+[`edm:ActionImport`](#ActionImport), and
 [`edm:FunctionImport`](#FunctionImport) elements.
 
 It MAY contain [`edm:Annotation`](#Annotation) elements.

diff --git a/odata-csdl/1 Introduction.md b/odata-csdl/1 Introduction.md
@@ -29,6 +29,11 @@ Schema Definition Language (XSD) 1.1 as described in
 
 Section | Feature / Change | Issue
 --------|------------------|------
+: varxml
+[Section ##EntityContainer]| 
+All children of `edm:EntityContainer` are optional| 
+[ODATA-1571](https://issues.oasis-open.org/browse/ODATA-1571)
+:
 [Section ##PathEvaluation]| 
 New path evaluation rules for annotations targeting annotations and external targeting via container| 
 [ODATA-1420](https://issues.oasis-open.org/browse/ODATA-1420)

diff --git a/odata-csdl/13 Entity Container.md b/odata-csdl/13 Entity Container.md
@@ -162,9 +162,9 @@ action imports, and function imports.
 ::: {.varxml .rep}
 ### ##isec Element `edm:EntityContainer`
 
-The `edm:EntityContainer` MUST contain one or more
+The `edm:EntityContainer` MAY contain
 [`edm:EntitySet`](#EntitySet), [`edm:Singleton`](#Singleton),
-[`edm:ActionImport`](#ActionImport), or
+[`edm:ActionImport`](#ActionImport), and
 [`edm:FunctionImport`](#FunctionImport) elements.
 
 It MAY contain [`edm:Annotation`](#Annotation) elements.