Merge branch 'main' into feat/keep

oasis-tcs · Dec 14, 2023 · 82f5f7b · 82f5f7b
2 parents d97770e + 1d2c52a
commit 82f5f7b
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 2 deletions.
diff --git a/tools/V4-CSDL-to-OpenAPI.xsl b/tools/V4-CSDL-to-OpenAPI.xsl
@@ -197,6 +197,8 @@
   <xsl:variable name="odmEntityNameAliased" select="concat($odmAlias,'.entityName')" />
   <xsl:variable name="odmOid" select="concat($odmNamespace,'.oid')" />
   <xsl:variable name="odmOidAliased" select="concat($odmAlias,'.oid')" />
+  <xsl:variable name="odmOidReference" select="concat($odmNamespace,'.oidReference')" />
+  <xsl:variable name="odmOidReferenceAliased" select="concat($odmAlias,'.oidReference')" />
 
   <xsl:variable name="defaultResponse">
     <xsl:text>"</xsl:text>
@@ -2226,6 +2228,9 @@
       <xsl:call-template name="Common.SAPObjectNodeTypeReference">
         <xsl:with-param name="annos" select="$annos" />
       </xsl:call-template>
+      <xsl:call-template name="ODM.oidReference">
+        <xsl:with-param name="annos" select="$annos" />
+      </xsl:call-template>
     </xsl:if>
   </xsl:template>
 
@@ -2349,6 +2354,17 @@
     </xsl:if>
   </xsl:template>
 
+  <xsl:template name="ODM.oidReference">
+    <xsl:param name="annos" />
+    <xsl:variable name="anno" select="$annos/edm:Annotation[not(@Qualifier) and (@Term=$odmOidReference or @Term=$odmOidReferenceAliased)]" />
+    <xsl:if test="$anno/edm:Record">
+      <xsl:variable name="name" select="$anno/edm:Record/edm:PropertyValue[@Property='entityName']" />
+      <xsl:text>,"x-sap-odm-oid-reference-entity-name":"</xsl:text>
+      <xsl:value-of select="$name/@String|$name/edm:String" />
+      <xsl:text>"</xsl:text>
+    </xsl:if>
+  </xsl:template>
+
   <xsl:template name="ref">
     <xsl:param name="qualifier" />
     <xsl:param name="name" />
@@ -3317,6 +3333,7 @@
         <xsl:with-param name="node" select="$target" />
       </xsl:call-template>
     </xsl:variable>
+
     <xsl:variable name="target-path-aliased">
       <xsl:call-template name="annotation-target">
         <xsl:with-param name="node" select="$target" />

diff --git a/tools/tests/annotations.openapi3.json b/tools/tests/annotations.openapi3.json
@@ -2856,7 +2856,8 @@
                             {
                                 "$ref": "#/components/schemas/Supported.Annotations.TwoPartKey"
                             }
-                        ]
+                        ],
+                        "x-sap-odm-oid-reference-entity-name": "odmTwo"
                     },
                     "AllMany": {
                         "type": "array",

diff --git a/tools/tests/annotations.swagger.json b/tools/tests/annotations.swagger.json
@@ -2544,7 +2544,8 @@
                     ]
                 },
                 "AllOne": {
-                    "$ref": "#/definitions/Supported.Annotations.TwoPartKey"
+                    "$ref": "#/definitions/Supported.Annotations.TwoPartKey",
+                    "x-sap-odm-oid-reference-entity-name": "odmTwo"
                 },
                 "AllMany": {
                     "type": "array",

diff --git a/tools/tests/annotations.xml b/tools/tests/annotations.xml
@@ -633,6 +633,14 @@
         <Annotation Term="ODM.oid" PropertyPath="Computed" />
       </Annotations>
 
+      <Annotations Target="self.SinglePartKey/AllOne">
+        <Annotation Term="ODM.oidReference">
+          <Record Type="ODM.oidReferenceType">
+            <PropertyValue Property="entityName" String="odmTwo" />
+          </Record>
+        </Annotation>
+      </Annotations>
+
       <Annotations Target="self.TwoPartKey/One">
         <Annotation Term="Common.SAPObjectNodeTypeReference" String="SontOne" />
       </Annotations>