Skip to content

Commit

Permalink
Clarify wording for overloading -- parameters for functions are part …
Browse files Browse the repository at this point in the history
…of the QualifiedBoundOperationName.
  • Loading branch information
mikepizzo committed Feb 8, 2023
1 parent fc5332a commit 1211546
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions vocabularies/Org.OData.Core.V1.json
Original file line number Diff line number Diff line change
Expand Up @@ -574,10 +574,10 @@
"$UnderlyingType": "Edm.String",
"@Core.Description": "The qualified name of an action in scope."
},
"QualifiedOperationName": {
"QualifiedBoundOperationName": {
"$Kind": "TypeDefinition",
"$UnderlyingType": "Edm.String",
"@Core.Description": "The qualified name of an action or function in scope. For a Function, the qualified function name may optionally be followed by parentheses containing the comma-separated list of parameter types, in the order of their definition, to identify a single function overload."
"@Core.Description": "The qualified name of a bound action or function in scope. The qualified function name may include trailing parentheses containing the comma-separated list of parameter types, in the order of their definition, to identify a single function overload."
},
"Ordered": {
"$Kind": "Term",
Expand Down Expand Up @@ -681,7 +681,7 @@
"ExplicitOperationBindings": {
"$Kind": "Term",
"$Collection": true,
"$Type": "Core.QualifiedOperationName",
"$Type": "Core.QualifiedBoundOperationName",
"@Core.Description": "The qualified names of explicitly bound operations that are supported on the target model element. These operations are in addition to any operations not annotated with RequiresExplicitBinding that are bound to the type of the target model element."
},
"LocalDateTime": {
Expand Down
8 changes: 4 additions & 4 deletions vocabularies/Org.OData.Core.V1.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Term|Type|Description
[OptionalParameter](./Org.OData.Core.V1.xml#L500:~:text=<Term%20Name="-,OptionalParameter,-")|[OptionalParameterType](#OptionalParameterType)|<a name="OptionalParameter"></a>Supplying a value for the action or function parameter is optional.<br>All parameters marked as optional must come after any parameters not marked as optional. The binding parameter must not be marked as optional.
[OperationAvailable](./Org.OData.Core.V1.xml#L511:~:text=<Term%20Name="-,OperationAvailable,-")|Boolean?|<a name="OperationAvailable"></a>Action or function is available<br>The annotation value will usually be an expression, e.g. using properties of the binding parameter type for instance-dependent availability, or using properties of a singleton for global availability. The static value `null` means that availability cannot be determined upfront and is instead expressed as an operation advertisement.
[RequiresExplicitBinding](./Org.OData.Core.V1.xml#L516:~:text=<Term%20Name="-,RequiresExplicitBinding,-")|[Tag?](#Tag)|<a name="RequiresExplicitBinding"></a>This bound action or function is only available on model elements annotated with the ExplicitOperationBindings term.
[ExplicitOperationBindings](./Org.OData.Core.V1.xml#L520:~:text=<Term%20Name="-,ExplicitOperationBindings,-")|\[[QualifiedOperationName](#QualifiedOperationName)\]|<a name="ExplicitOperationBindings"></a>The qualified names of explicitly bound operations that are supported on the target model element. These operations are in addition to any operations not annotated with RequiresExplicitBinding that are bound to the type of the target model element.
[ExplicitOperationBindings](./Org.OData.Core.V1.xml#L520:~:text=<Term%20Name="-,ExplicitOperationBindings,-")|\[[QualifiedBoundOperationName](#QualifiedBoundOperationName)\]|<a name="ExplicitOperationBindings"></a>The qualified names of explicitly bound operations that are supported on the target model element. These operations are in addition to any operations not annotated with RequiresExplicitBinding that are bound to the type of the target model element.
[SymbolicName](./Org.OData.Core.V1.xml#L529:~:text=<Term%20Name="-,SymbolicName,-")|[SimpleIdentifier](#SimpleIdentifier)|<a name="SymbolicName"></a>A symbolic name for a model element
[GeometryFeature](./Org.OData.Core.V1.xml#L538:~:text=<Term%20Name="-,GeometryFeature,-")|[GeometryFeatureType?](#GeometryFeatureType)|<a name="GeometryFeature"></a>A [Feature Object](https://datatracker.ietf.org/doc/html/rfc7946#section-3.2) represents a spatially bounded thing

Expand Down Expand Up @@ -255,11 +255,11 @@ The qualified name of a type in scope.

The qualified name of an action in scope.

<a name="QualifiedOperationName"></a>
## [QualifiedOperationName](./Org.OData.Core.V1.xml#L460:~:text=<TypeDefinition%20Name="-,QualifiedOperationName,-")
<a name="QualifiedBoundOperationName"></a>
## [QualifiedBoundOperationName](./Org.OData.Core.V1.xml#L460:~:text=<TypeDefinition%20Name="-,QualifiedBoundOperationName,-")
**Type:** String

The qualified name of an action or function in scope. For a Function, the qualified function name may optionally be followed by parentheses containing the comma-separated list of parameter types, in the order of their definition, to identify a single function overload.
The qualified name of a bound action or function in scope. The qualified function name may include trailing parentheses containing the comma-separated list of parameter types, in the order of their definition, to identify a single function overload.

<a name="AlternateKey"></a>
## [AlternateKey](./Org.OData.Core.V1.xml#L475:~:text=<ComplexType%20Name="-,AlternateKey,-")
Expand Down
6 changes: 3 additions & 3 deletions vocabularies/Org.OData.Core.V1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -457,8 +457,8 @@
<Annotation Term="Core.Description" String="The qualified name of an action in scope." />
</TypeDefinition>

<TypeDefinition Name="QualifiedOperationName" UnderlyingType="Edm.String">
<Annotation Term="Core.Description" String="The qualified name of an action or function in scope. For a Function, the qualified function name may optionally be followed by parentheses containing the comma-separated list of parameter types, in the order of their definition, to identify a single function overload." />
<TypeDefinition Name="QualifiedBoundOperationName" UnderlyingType="Edm.String">
<Annotation Term="Core.Description" String="The qualified name of a bound action or function in scope. The qualified function name may include trailing parentheses containing the comma-separated list of parameter types, in the order of their definition, to identify a single function overload." />
</TypeDefinition>

<Term Name="Ordered" Type="Core.Tag" Nullable="false" DefaultValue="true" AppliesTo="Property NavigationProperty EntitySet ReturnType Term">
Expand Down Expand Up @@ -517,7 +517,7 @@ Any simple identifier | Any type listed in `Validation.OpenPropertyTypeConstrain
<Annotation Term="Core.Description" String="This bound action or function is only available on model elements annotated with the ExplicitOperationBindings term." />
</Term>

<Term Name="ExplicitOperationBindings" Type="Collection(Core.QualifiedOperationName)">
<Term Name="ExplicitOperationBindings" Type="Collection(Core.QualifiedBoundOperationName)">
<Annotation Term="Core.Description" String="The qualified names of explicitly bound operations that are supported on the target model element. These operations are in addition to any operations not annotated with RequiresExplicitBinding that are bound to the type of the target model element." />
</Term>

Expand Down

0 comments on commit 1211546

Please sign in to comment.