Revert "oasis-tcs/odata-vocabularies#286"

This reverts commit 910d724.
oasis-tcs · Jan 23, 2025 · a91a17f · a91a17f
1 parent 910d724
commit a91a17f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/tools/V4-CSDL-to-OpenAPI.xsl b/tools/V4-CSDL-to-OpenAPI.xsl
@@ -2746,7 +2746,7 @@
 
       <xsl:if test="@ContainsTarget='true' and $level&lt;$max-levels and
         not($navigation-restrictions/edm:PropertyValue[@Property='IndexableByKey' and @Bool='false'] or
-        not($navigation-restrictions/edm:PropertyValue/@Property='IndexableByKey') and
+        not($navigation-restrictions) and
         //edm:Annotation[not(@Qualifier) and @p2:Term='Org.OData.Capabilities.V1.IndexableByKey' and
         $target-path=concat(@path-to-target,@target) and @Bool='false'])">
         <xsl:call-template name="pathItem-single-entity">
@@ -4001,11 +4001,11 @@
       $navigation-path=concat(../../../../../@path-to-target,../../../../../@target,' ',@p0:NavigationPropertyPath,@p1:NavigationPropertyPath)]]" />
 
     <xsl:variable name="with-top" select="not($navigation-restrictions/edm:PropertyValue[@Property='TopSupported' and @Bool='false'] or
-      not($navigation-restrictions/edm:PropertyValue/@Property='TopSupported') and
+      not($navigation-restrictions) and
       //edm:Annotation[not(@Qualifier) and @p2:Term='Org.OData.Capabilities.V1.TopSupported' and
       $target-path=concat(@path-to-target,@target) and @Bool='false'])" />
     <xsl:variable name="with-skip" select="not($navigation-restrictions/edm:PropertyValue[@Property='SkipSupported' and @Bool='false'] or
-      not($navigation-restrictions/edm:PropertyValue/@Property='SkipSupported') and
+      not($navigation-restrictions) and
       //edm:Annotation[not(@Qualifier) and @p2:Term='Org.OData.Capabilities.V1.SkipSupported' and
       $target-path=concat(@path-to-target,@target) and @Bool='false'])" />
     <xsl:variable name="with-search" select="not($navigation-restrictions/edm:PropertyValue[@Property='SearchRestrictions']

diff --git a/tools/tests/annotations.openapi3.json b/tools/tests/annotations.openapi3.json
@@ -1981,7 +1981,14 @@
                     "ReadOnlySingleton",
                     "TwoReadOnlySet"
                 ],
-                "parameters": [],
+                "parameters": [
+                    {
+                        "$ref": "#/components/parameters/top"
+                    },
+                    {
+                        "$ref": "#/components/parameters/skip"
+                    }
+                ],
                 "responses": {
                     "200": {
                         "description": "Retrieved entities",