From 8af3f4620d65e50bf6ad9de8a4658092ab0b0887 Mon Sep 17 00:00:00 2001 From: Ralf Handl Date: Thu, 7 Dec 2023 19:31:55 +0100 Subject: [PATCH] Back out changed to conformance --- docs/odata-protocol/odata-protocol.html | 13 ++++--------- docs/odata-protocol/odata-protocol.md | 15 +++++++-------- odata-protocol/12 Conformance.md | 14 +++++++------- 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/docs/odata-protocol/odata-protocol.html b/docs/odata-protocol/odata-protocol.html index dff98d4b5..4aa67b28f 100644 --- a/docs/odata-protocol/odata-protocol.html +++ b/docs/odata-protocol/odata-protocol.html @@ -497,11 +497,6 @@

Response code 204 No Content after successful data modification if requested response could not be constructed ODATA-1609 - -Section 12 -Allow 400 Bad Request for unrecognized (“future”) functionality in addition to 501 Not Implemented for unsupported functionality -ODATA-1618 -

1.2 Glossary

@@ -2620,7 +2615,7 @@

section 8.2.7)
  • MUST follow OData guidelines for extensibility (section 6 and all subsections)
    • -
  • MUST successfully parse the request according to OData-ABNF for any supported system query options and either follow the specification or fail the request, in which case it SHOULD return 501 Not Implemented for any recognized unsupported functionality (section 9.3.1)
    • +
  • MUST successfully parse the request according to OData-ABNF for any supported system query options and either follow the specification or return 501 Not Implemented for any unsupported functionality (section 9.3.1)
  • MUST expose only data types defined in OData-CSDLXML
  • MUST NOT require clients to understand any metadata or instance annotations (section 6.4), custom headers (section 6.5), or custom content (section 6.2) in the payload in order to correctly consume the service
  • MUST NOT violate any OData update semantics (section 11.4 and all subsections)
    • @@ -2658,7 +2653,7 @@

  • MUST conform to the OData 4.0 Minimal Conformance Level
    • -
  • MUST successfully parse the request according to OData-ABNF and either follow the specification or fail the request, in which case it SHOULD return 501 Not Implemented for any recognized unsupported functionality (section 9.3.1)
    • +
  • MUST successfully parse the OData-ABNF and either follow the specification or return 501 Not Implemented for any unsupported functionality (section 9.3.1)
  • MUST support $select (section 11.2.5.1)
  • MUST support casting to a derived type according to OData-URL if derived types are present in the model
  • MUST support $top (section 11.2.6.3)
    • @@ -2667,8 +2662,8 @@

  • MUST support eq, ne filter operations on properties of entities in the requested entity set (section 11.2.6.1.1)
  • MUST support aliases in $filter expressions (section 11.2.6.1.3)
    • -
  • SHOULD support additional filter operations (section 11.2.6.1.1) and MUST return 501 Not Implemented for any unsupported or 400 Bad Request for any unrecognized filter operations (section 9.3.1)
    • -
  • SHOULD support the canonical functions (section 11.2.6.1.2) and MUST return 501 Not Implemented for any unsupported or 400 Bad Request for any unrecognized functions (section 9.3.1)
    • +
  • SHOULD support additional filter operations (section 11.2.6.1.1) and MUST return 501 Not Implemented for any unsupported filter operations (section 9.3.1)
    • +
  • SHOULD support the canonical functions (section 11.2.6.1.2) and MUST return 501 Not Implemented for any unsupported canonical functions (section 9.3.1)
  • SHOULD support $filter on expanded entities (section 11.2.5.2.1)
  • SHOULD publish metadata at $metadata according to OData-CSDLXML (section 11.1.2)
    • diff --git a/docs/odata-protocol/odata-protocol.md b/docs/odata-protocol/odata-protocol.md index 704140d02..f867627c1 100644 --- a/docs/odata-protocol/odata-protocol.md +++ b/docs/odata-protocol/odata-protocol.md @@ -347,7 +347,6 @@ resource representations that are exchanged using OData. Section | Feature / Change | Issue --------|------------------|------ [Section 11.4](#DataModification)| Response code `204 No Content` after successful data modification if requested response could not be constructed| [ODATA-1609](https://issues.oasis-open.org/browse/ODATA-1609) -[Section 12](#Conformance)| Allow `400 Bad Request` for unrecognized ("future") functionality in addition to `501 Not Implemented` for unsupported functionality| [ODATA-1618](https://issues.oasis-open.org/browse/ODATA-1618) ## 1.2 Glossary @@ -6359,8 +6358,8 @@ request ([section 6](#Extensibility) and all subsections) 7. MUST successfully parse the request according to [OData-ABNF](#ODataABNF) for any supported system query options and -either follow the specification or fail the request, in which case it SHOULD return -`501 Not Implemented` for any recognized +either follow the specification or return +`501 Not Implemented` for any unsupported functionality ([section 9.3.1](#ResponseCode501NotImplemented)) 8. MUST expose only data types defined in [OData-CSDLXML](#ODataCSDL) 9. MUST NOT require clients to understand any metadata or instance @@ -6427,9 +6426,9 @@ service: 1. MUST conform to the [OData 4.0 Minimal Conformance Level](#OData40MinimalConformanceLevel) -2. MUST successfully parse the request according to [OData-ABNF](#ODataABNF) and either -follow the specification or fail the request, in which case it SHOULD return `501 Not Implemented` for any -recognized unsupported functionality ([section 9.3.1](#ResponseCode501NotImplemented)) +2. MUST successfully parse the [OData-ABNF](#ODataABNF) and either +follow the specification or return `501 Not Implemented` for any +unsupported functionality ([section 9.3.1](#ResponseCode501NotImplemented)) 3. MUST support `$select` ([section 11.2.5.1](#SystemQueryOptionselect)) 4. MUST support casting to a derived type according to [OData-URL](#ODataURL) if derived types are present in the model @@ -6440,10 +6439,10 @@ recognized unsupported functionality ([section 9.3.1](#ResponseCode501NotImpleme in the requested entity set ([section 11.2.6.1.1](#BuiltinFilterOperations)) 2. MUST support aliases in `$filter` expressions ([section 11.2.6.1.3](#ParameterAliases)) 3. SHOULD support additional filter operations ([section 11.2.6.1.1](#BuiltinFilterOperations)) -and MUST return `501 Not Implemented` for any unsupported or `400 Bad Request` for any unrecognized filter +and MUST return `501 Not Implemented` for any unsupported filter operations ([section 9.3.1](#ResponseCode501NotImplemented)) 4. SHOULD support the canonical functions ([section 11.2.6.1.2](#BuiltinQueryFunctions)) and -MUST return `501 Not Implemented` for any unsupported or `400 Bad Request` for any unrecognized +MUST return `501 Not Implemented` for any unsupported canonical functions ([section 9.3.1](#ResponseCode501NotImplemented)) 5. SHOULD support `$filter` on expanded entities ([section 11.2.5.2.1](#ExpandOptions)) 8. SHOULD publish metadata at `$metadata` according to diff --git a/odata-protocol/12 Conformance.md b/odata-protocol/12 Conformance.md index 25f644809..5a8c06149 100644 --- a/odata-protocol/12 Conformance.md +++ b/odata-protocol/12 Conformance.md @@ -59,8 +59,8 @@ request ([section ##Extensibility] and all subsections) 7. MUST successfully parse the request according to [OData-ABNF](#ODataABNF) for any supported system query options and -either follow the specification or fail the request, in which case it SHOULD return -`501 Not Implemented` for any recognized +either follow the specification or return +`501 Not Implemented` for any unsupported functionality ([section ##ResponseCode501NotImplemented]) 8. MUST expose only data types defined in [OData-CSDLXML](#ODataCSDL) 9. MUST NOT require clients to understand any metadata or instance @@ -127,9 +127,9 @@ service: 1. MUST conform to the [OData 4.0 Minimal Conformance Level](#OData40MinimalConformanceLevel) -2. MUST successfully parse the request according to [OData-ABNF](#ODataABNF) and either -follow the specification or fail the request, in which case it SHOULD return `501 Not Implemented` for any -recognized unsupported functionality ([section ##ResponseCode501NotImplemented]) +2. MUST successfully parse the [OData-ABNF](#ODataABNF) and either +follow the specification or return `501 Not Implemented` for any +unsupported functionality ([section ##ResponseCode501NotImplemented]) 3. MUST support `$select` ([section ##SystemQueryOptionselect]) 4. MUST support casting to a derived type according to [OData-URL](#ODataURL) if derived types are present in the model @@ -140,10 +140,10 @@ recognized unsupported functionality ([section ##ResponseCode501NotImplemented]) in the requested entity set ([section ##BuiltinFilterOperations]) 2. MUST support aliases in `$filter` expressions ([section ##ParameterAliases]) 3. SHOULD support additional filter operations ([section ##BuiltinFilterOperations]) -and MUST return `501 Not Implemented` for any unsupported or `400 Bad Request` for any unrecognized filter +and MUST return `501 Not Implemented` for any unsupported filter operations ([section ##ResponseCode501NotImplemented]) 4. SHOULD support the canonical functions ([section ##BuiltinQueryFunctions]) and -MUST return `501 Not Implemented` for any unsupported or `400 Bad Request` for any unrecognized +MUST return `501 Not Implemented` for any unsupported canonical functions ([section ##ResponseCode501NotImplemented]) 5. SHOULD support `$filter` on expanded entities ([section ##ExpandOptions]) 8. SHOULD publish metadata at `$metadata` according to