diff --git a/vocabularies/Org.OData.Validation.V1.json b/vocabularies/Org.OData.Validation.V1.json index 6b401cc1..b3bfe696 100644 --- a/vocabularies/Org.OData.Validation.V1.json +++ b/vocabularies/Org.OData.Validation.V1.json @@ -123,6 +123,11 @@ "@Core.IsLanguageDependent": true, "@Core.Description": "Human-readable message that can be shown to end users if the constraint is not fulfilled" }, + "MessageSeverity": { + "$Type": "Core.MessageSeverity", + "$Nullable": true, + "@Core.Description": "Severity of a non-fulfilment of the constraint" + }, "Condition": { "$Type": "Edm.Boolean", "@Core.Description": "Value MUST be a dynamic expression that evaluates to true if and only if the constraint is fulfilled" diff --git a/vocabularies/Org.OData.Validation.V1.md b/vocabularies/Org.OData.Validation.V1.md index ce94dca1..838bd037 100644 --- a/vocabularies/Org.OData.Validation.V1.md +++ b/vocabularies/Org.OData.Validation.V1.md @@ -15,13 +15,13 @@ Term|Type|Description [AllowedValues](Org.OData.Validation.V1.xml#L94)|\[[AllowedValue](#AllowedValue)\]|A collection of valid values for the annotated property, parameter, or type definition [MultipleOf](Org.OData.Validation.V1.xml#L108)|Decimal|The value of the annotated property, parameter, or term must be an integer multiple of this positive value. For temporal types, the value is measured in seconds. [Constraint](Org.OData.Validation.V1.xml#L112)|[ConstraintType](#ConstraintType)|Condition that the annotation target has to fulfill -[ItemsOf](Org.OData.Validation.V1.xml#L125)|\[[ItemsOfType](#ItemsOfType)\]|A list of constraints describing that entities related via one navigation property MUST also be related via another, collection-valued navigation property. The same `path` value MUST NOT occur more than once.
Example: entity type `Customer` has navigation properties `AllOrders`, `OpenOrders`, and `ClosedOrders`. The term allows to express that items of `OpenOrders` and `ClosedOrders` are also items of the `AllOrders` navigation property, even though they are defined in an `Orders` entity set. -[OpenPropertyTypeConstraint](Org.OData.Validation.V1.xml#L143)|\[[SingleOrCollectionType](#SingleOrCollectionType)\]|Dynamic properties added to the annotated open structured type are restricted to the listed types. -[DerivedTypeConstraint](Org.OData.Validation.V1.xml#L147)|\[[SingleOrCollectionType](#SingleOrCollectionType)\]|Values are restricted to types that are both identical to or derived from the declared type and a type listed in this collection.
This allows restricting values to certain sub-trees of an inheritance hierarchy, including hierarchies starting at the [Built-In Abstract Types](https://docs.oasis-open.org/odata/odata-csdl-json/v4.01/odata-csdl-json-v4.01.html#sec_BuiltInAbstractTypes). Types listed in this collection are ignored if they are not derived from the declared type of the annotated model element or would not be allowed as declared type of the annotated model element.
When applied to a collection-valued element, this annotation specifies the types allowed for members of the collection without mentioning the `Collection()` wrapper. The SingleOrCollectionType may only include the `Collection()` wrapper if the annotation is applied to an element with declared type `Edm.Untyped`. -[AllowedTerms](Org.OData.Validation.V1.xml#L166)|\[[QualifiedTermName](Org.OData.Core.V1.md#QualifiedTermName)\]|Annotate a term of type Edm.AnnotationPath, or a property of type Edm.AnnotationPath that is used within a structured term, to restrict the terms that can be targeted by the path.
The annotation path expression is intended to end in a path segment with one of the listed terms. For forward compatibility, clients should be prepared for the annotation to reference terms besides those listed. -[ApplicableTerms](Org.OData.Validation.V1.xml#L172)|\[[QualifiedTermName](Org.OData.Core.V1.md#QualifiedTermName)\]|Names of specific terms that are applicable and may be applied in the current context. This annotation does not restrict the use of other terms. -[MaxItems](Org.OData.Validation.V1.xml#L176)|Int64|The annotated collection must have at most the specified number of items. -[MinItems](Org.OData.Validation.V1.xml#L180)|Int64|The annotated collection must have at least the specified number of items. +[ItemsOf](Org.OData.Validation.V1.xml#L128)|\[[ItemsOfType](#ItemsOfType)\]|A list of constraints describing that entities related via one navigation property MUST also be related via another, collection-valued navigation property. The same `path` value MUST NOT occur more than once.
Example: entity type `Customer` has navigation properties `AllOrders`, `OpenOrders`, and `ClosedOrders`. The term allows to express that items of `OpenOrders` and `ClosedOrders` are also items of the `AllOrders` navigation property, even though they are defined in an `Orders` entity set. +[OpenPropertyTypeConstraint](Org.OData.Validation.V1.xml#L146)|\[[SingleOrCollectionType](#SingleOrCollectionType)\]|Dynamic properties added to the annotated open structured type are restricted to the listed types. +[DerivedTypeConstraint](Org.OData.Validation.V1.xml#L150)|\[[SingleOrCollectionType](#SingleOrCollectionType)\]|Values are restricted to types that are both identical to or derived from the declared type and a type listed in this collection.
This allows restricting values to certain sub-trees of an inheritance hierarchy, including hierarchies starting at the [Built-In Abstract Types](https://docs.oasis-open.org/odata/odata-csdl-json/v4.01/odata-csdl-json-v4.01.html#sec_BuiltInAbstractTypes). Types listed in this collection are ignored if they are not derived from the declared type of the annotated model element or would not be allowed as declared type of the annotated model element.
When applied to a collection-valued element, this annotation specifies the types allowed for members of the collection without mentioning the `Collection()` wrapper. The SingleOrCollectionType may only include the `Collection()` wrapper if the annotation is applied to an element with declared type `Edm.Untyped`. +[AllowedTerms](Org.OData.Validation.V1.xml#L169)|\[[QualifiedTermName](Org.OData.Core.V1.md#QualifiedTermName)\]|Annotate a term of type Edm.AnnotationPath, or a property of type Edm.AnnotationPath that is used within a structured term, to restrict the terms that can be targeted by the path.
The annotation path expression is intended to end in a path segment with one of the listed terms. For forward compatibility, clients should be prepared for the annotation to reference terms besides those listed. +[ApplicableTerms](Org.OData.Validation.V1.xml#L175)|\[[QualifiedTermName](Org.OData.Core.V1.md#QualifiedTermName)\]|Names of specific terms that are applicable and may be applied in the current context. This annotation does not restrict the use of other terms. +[MaxItems](Org.OData.Validation.V1.xml#L179)|Int64|The annotated collection must have at most the specified number of items. +[MinItems](Org.OData.Validation.V1.xml#L183)|Int64|The annotated collection must have at least the specified number of items. ## [AllowedValue](Org.OData.Validation.V1.xml#L97) @@ -42,19 +42,20 @@ Property|Type|Description Property|Type|Description :-------|:---|:---------- [FailureMessage](Org.OData.Validation.V1.xml#L116)|String?|Human-readable message that can be shown to end users if the constraint is not fulfilled -[Condition](Org.OData.Validation.V1.xml#L120)|Boolean|Value MUST be a dynamic expression that evaluates to true if and only if the constraint is fulfilled +[MessageSeverity](Org.OData.Validation.V1.xml#L120)|[MessageSeverity?](Org.OData.Core.V1.md#MessageSeverity)|Severity of a non-fulfilment of the constraint +[Condition](Org.OData.Validation.V1.xml#L123)|Boolean|Value MUST be a dynamic expression that evaluates to true if and only if the constraint is fulfilled -## [ItemsOfType](Org.OData.Validation.V1.xml#L133) +## [ItemsOfType](Org.OData.Validation.V1.xml#L136) Entities related via the single- or collection-valued navigation property identified by `path` are also related via the collection-valued navigation property identified by `target`. Property|Type|Description :-------|:---|:---------- -[path](Org.OData.Validation.V1.xml#L135)|NavigationPropertyPath|A path to a single- or collection-valued navigation property -[target](Org.OData.Validation.V1.xml#L138)|NavigationPropertyPath|A path to a collection-valued navigation property +[path](Org.OData.Validation.V1.xml#L138)|NavigationPropertyPath|A path to a single- or collection-valued navigation property +[target](Org.OData.Validation.V1.xml#L141)|NavigationPropertyPath|A path to a collection-valued navigation property -## [SingleOrCollectionType](Org.OData.Validation.V1.xml#L162) +## [SingleOrCollectionType](Org.OData.Validation.V1.xml#L165) **Type:** String The qualified name of a type in scope, optionally wrapped in `Collection()` to denote a collection of instances of the type diff --git a/vocabularies/Org.OData.Validation.V1.xml b/vocabularies/Org.OData.Validation.V1.xml index e100e4aa..761edcd6 100644 --- a/vocabularies/Org.OData.Validation.V1.xml +++ b/vocabularies/Org.OData.Validation.V1.xml @@ -117,6 +117,9 @@ + + +