Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ODATA-1496 #228

Merged
merged 17 commits into from
Jan 31, 2024
Merged

ODATA-1496 #228

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1872bd2
First try
ralfhandl Dec 13, 2023
9486fe2
Heiko's suggestion
ralfhandl Dec 14, 2023
08f91d5
Defined the term "type instance"
HeikoTheissen Dec 15, 2023
8cfe7a2
enum types are primitive types
ralfhandl Dec 15, 2023
d82e8c5
Merge branch 'main' into ODATA-1496
ralfhandl Jan 11, 2024
f7394f1
Update 14 Vocabulary and Annotation.md
ralfhandl Jan 17, 2024
5b75c31
Rebuilt
ralfhandl Jan 17, 2024
09e8f34
Align with V4.0
ralfhandl Jan 18, 2024
02b6e8a
Aligned wording
ralfhandl Jan 18, 2024
8ab0916
Trailing space
ralfhandl Jan 18, 2024
a574e15
Merge branch 'main' into ODATA-1496
ralfhandl Jan 18, 2024
f516c14
Revert change that was moved to ODATA-1630
ralfhandl Jan 18, 2024
708491b
Adjusted
ralfhandl Jan 18, 2024
3b8cc2f
Adjust text
ralfhandl Jan 18, 2024
876a08d
Rephrased "value of XxxPath"
ralfhandl Jan 19, 2024
77bf581
Partially reverted change
ralfhandl Jan 19, 2024
fc28934
Backed out another change
ralfhandl Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/odata-csdl-json/odata-csdl-json.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2679,7 +2679,7 @@ <h4 id="14414-model-element-path"><a name="ModelElementPath" href="#ModelElement
<h4 id="14415-navigation-property-path"><a name="NavigationPropertyPath" href="#NavigationPropertyPath">14.4.1.5 Navigation Property Path</a></h4>
<p>The navigation property path expression provides a value for terms or term properties that specify the <a href="#BuiltInTypesfordefiningVocabularyTerms">built-in types</a> <code>Edm.NavigationPropertyPath</code>, <code>Edm.AnyPropertyPath</code>, or <code>Edm.ModelElementPath</code>. Its argument is a <a href="#PathExpressions">model path</a> with the following restriction:</p>
<ul>
<li>A non-null path MUST resolve to a <a href="#NavigationProperty">navigation property</a>.</li>
<li>A non-null path MUST end with a <a href="#NavigationProperty">navigation property</a> or a term cast to a term whose type is an entity type or a collection of entity types.</li>
</ul>
<p>The value of the navigation property path expression is the navigation property, not its instances.</p>
<div class="varjson rep">
Expand All @@ -2698,7 +2698,7 @@ <h4 id="14415-navigation-property-path"><a name="NavigationPropertyPath" href="#
<h4 id="14416-property-path"><a name="PropertyPath" href="#PropertyPath">14.4.1.6 Property Path</a></h4>
<p>The property path expression provides a value for terms or term properties that specify one of the <a href="#BuiltInTypesfordefiningVocabularyTerms">built-in types</a> <code>Edm.PropertyPath</code>, <code>Edm.AnyPropertyPath</code>, or <code>Edm.ModelElementPath</code>. Its argument is a <a href="#PathExpressions">model path</a> with the following restriction:</p>
<ul>
<li>A non-null path MUST resolve to a <a href="#StructuralProperty">structural property</a>.</li>
<li>A non-null path MUST end with a <a href="#StructuralProperty">structural property</a> or a term cast to a term whose type is a primitive or complex type, an enumeration type, a type definition, or a collection of one of these types.</li>
</ul>
<p>The value of the property path expression is the structural property, not its instances.</p>
<div class="varjson rep">
Expand Down
6 changes: 4 additions & 2 deletions docs/odata-csdl-json/odata-csdl-json.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4536,7 +4536,8 @@ types](#BuiltInTypesfordefiningVocabularyTerms)
`Edm.NavigationPropertyPath`, `Edm.AnyPropertyPath`, or `Edm.ModelElementPath`.
Its argument is a [model path](#PathExpressions) with the following
restriction:
- A non-null path MUST resolve to a [navigation property](#NavigationProperty).
- A non-null path MUST end with a [navigation property](#NavigationProperty)
or a term cast to a term whose type is an entity type or a collection of entity types.

The value of the navigation property path expression is the navigation property, not its instances.

Expand Down Expand Up @@ -4568,7 +4569,8 @@ types](#BuiltInTypesfordefiningVocabularyTerms)
`Edm.PropertyPath`, `Edm.AnyPropertyPath`, or `Edm.ModelElementPath`. Its
argument is a [model path](#PathExpressions) with the following
restriction:
- A non-null path MUST resolve to a [structural property](#StructuralProperty).
- A non-null path MUST end with a [structural property](#StructuralProperty)
or a term cast to a term whose type is a primitive or complex type, an enumeration type, a type definition, or a collection of one of these types.

The value of the property path expression is the structural property, not its instances.

Expand Down
4 changes: 2 additions & 2 deletions docs/odata-csdl-xml/odata-csdl-xml.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2560,7 +2560,7 @@ <h3><a name="ExpressionedmModelElementPath.45" href="#ExpressionedmModelElementP
<h4 id="14415-navigation-property-path"><a name="NavigationPropertyPath" href="#NavigationPropertyPath">14.4.1.5 Navigation Property Path</a></h4>
<p>The navigation property path expression provides a value for terms or term properties that specify the <a href="#BuiltInTypesfordefiningVocabularyTerms">built-in types</a> <code>Edm.NavigationPropertyPath</code>, <code>Edm.AnyPropertyPath</code>, or <code>Edm.ModelElementPath</code>. Its argument is a <a href="#PathExpressions">model path</a> with the following restriction:</p>
<ul>
<li>A non-null path MUST resolve to a <a href="#NavigationProperty">navigation property</a>.</li>
<li>A non-null path MUST end with a <a href="#NavigationProperty">navigation property</a> or a term cast to a term whose type is an entity type or a collection of entity types.</li>
</ul>
<p>The value of the navigation property path expression is the navigation property, not its instances.</p>
<section id="expression-edmnavigationpropertypath" class="varxml rep">
Expand All @@ -2585,7 +2585,7 @@ <h3><a name="ExpressionedmNavigationPropertyPath.46" href="#ExpressionedmNavigat
<h4 id="14416-property-path"><a name="PropertyPath" href="#PropertyPath">14.4.1.6 Property Path</a></h4>
<p>The property path expression provides a value for terms or term properties that specify one of the <a href="#BuiltInTypesfordefiningVocabularyTerms">built-in types</a> <code>Edm.PropertyPath</code>, <code>Edm.AnyPropertyPath</code>, or <code>Edm.ModelElementPath</code>. Its argument is a <a href="#PathExpressions">model path</a> with the following restriction:</p>
<ul>
<li>A non-null path MUST resolve to a <a href="#StructuralProperty">structural property</a>.</li>
<li>A non-null path MUST end with a <a href="#StructuralProperty">structural property</a> or a term cast to a term whose type is a primitive or complex type, an enumeration type, a type definition, or a collection of one of these types.</li>
</ul>
<p>The value of the property path expression is the structural property, not its instances.</p>
<section id="expression-edmpropertypath" class="varxml rep">
Expand Down
6 changes: 4 additions & 2 deletions docs/odata-csdl-xml/odata-csdl-xml.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4454,7 +4454,8 @@ types](#BuiltInTypesfordefiningVocabularyTerms)
`Edm.NavigationPropertyPath`, `Edm.AnyPropertyPath`, or `Edm.ModelElementPath`.
Its argument is a [model path](#PathExpressions) with the following
restriction:
- A non-null path MUST resolve to a [navigation property](#NavigationProperty).
- A non-null path MUST end with a [navigation property](#NavigationProperty)
or a term cast to a term whose type is an entity type or a collection of entity types.

The value of the navigation property path expression is the navigation property, not its instances.

Expand Down Expand Up @@ -4493,7 +4494,8 @@ types](#BuiltInTypesfordefiningVocabularyTerms)
`Edm.PropertyPath`, `Edm.AnyPropertyPath`, or `Edm.ModelElementPath`. Its
argument is a [model path](#PathExpressions) with the following
restriction:
- A non-null path MUST resolve to a [structural property](#StructuralProperty).
- A non-null path MUST end with a [structural property](#StructuralProperty)
or a term cast to a term whose type is a primitive or complex type, an enumeration type, a type definition, or a collection of one of these types.

The value of the property path expression is the structural property, not its instances.

Expand Down
7 changes: 5 additions & 2 deletions odata-csdl/14 Vocabulary and Annotation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1699,7 +1699,8 @@ types](#BuiltInTypesfordefiningVocabularyTerms)
`Edm.NavigationPropertyPath`, `Edm.AnyPropertyPath`, or `Edm.ModelElementPath`.
Its argument is a [model path](#PathExpressions) with the following
restriction:
- A non-null path MUST resolve to a [navigation property](#NavigationProperty).
- A non-null path MUST end with a [navigation property](#NavigationProperty)
or a term cast to a term whose type is an entity type or a collection of entity types.
HeikoTheissen marked this conversation as resolved.
Show resolved Hide resolved

The value of the navigation property path expression is the navigation property, not its instances.

Expand Down Expand Up @@ -1754,7 +1755,9 @@ types](#BuiltInTypesfordefiningVocabularyTerms)
`Edm.PropertyPath`, `Edm.AnyPropertyPath`, or `Edm.ModelElementPath`. Its
argument is a [model path](#PathExpressions) with the following
restriction:
- A non-null path MUST resolve to a [structural property](#StructuralProperty).
- A non-null path MUST end with a [structural property](#StructuralProperty)
or a term cast to a term whose type is a primitive or complex type, an enumeration type,
a type definition, or a collection of one of these types.

The value of the property path expression is the structural property, not its instances.

Expand Down