From f9e267630744bb1c35388a99d123d0c3adda05b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Heiko=20Thei=C3=9Fen?= <heiko.theissen@sap.com>
Date: Fri, 4 Sep 2026 09:13:25 +0200
Subject: [PATCH 1/8] Deduplicate entity type label based tags

---
 tools/V4-CSDL-to-OpenAPI.xsl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/V4-CSDL-to-OpenAPI.xsl b/tools/V4-CSDL-to-OpenAPI.xsl
index 206851cf..ee9e26b8 100644
--- a/tools/V4-CSDL-to-OpenAPI.xsl
+++ b/tools/V4-CSDL-to-OpenAPI.xsl
@@ -2807,6 +2807,9 @@
         <xsl:choose>
           <xsl:when test="$label!=''">
             <xsl:value-of select="$label" />
+            <xsl:text> (</xsl:text>
+            <xsl:value-of select="$set/@Name" />
+            <xsl:text>)</xsl:text>
           </xsl:when>
           <xsl:otherwise>
             <xsl:value-of select="$set/@Name" />

From 4ffdf2e539cdf56317d04cfcad267c8aca48ee47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Heiko=20Thei=C3=9Fen?= <heiko.theissen@sap.com>
Date: Fri, 4 Sep 2026 09:24:37 +0200
Subject: [PATCH 2/8] Disambiguate only where necessary

---
 tools/V4-CSDL-to-OpenAPI.xsl | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tools/V4-CSDL-to-OpenAPI.xsl b/tools/V4-CSDL-to-OpenAPI.xsl
index ee9e26b8..b19dbab3 100644
--- a/tools/V4-CSDL-to-OpenAPI.xsl
+++ b/tools/V4-CSDL-to-OpenAPI.xsl
@@ -2807,9 +2807,13 @@
         <xsl:choose>
           <xsl:when test="$label!=''">
             <xsl:value-of select="$label" />
-            <xsl:text> (</xsl:text>
-            <xsl:value-of select="$set/@Name" />
-            <xsl:text>)</xsl:text>
+            <!-- Add entity name for disambiguation if the label occurs more than once. -->
+            <xsl:if test="count(//edm:Annotation[(@Term=$commonLabel or @Term=$commonLabelAliased) and
+              (@String=$label or edm:String=$label)]) > 1">
+              <xsl:text> (</xsl:text>
+              <xsl:value-of select="$set/@Name" />
+              <xsl:text>)</xsl:text>
+            </xsl:if>
           </xsl:when>
           <xsl:otherwise>
             <xsl:value-of select="$set/@Name" />

From 83798d3ab6c768286fb6deebbc979464a8fed21f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Heiko=20Thei=C3=9Fen?= <heiko.theissen@sap.com>
Date: Fri, 4 Sep 2026 09:43:09 +0200
Subject: [PATCH 3/8] Speed up using xsl:key

---
 tools/V4-CSDL-to-OpenAPI.xsl | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/tools/V4-CSDL-to-OpenAPI.xsl b/tools/V4-CSDL-to-OpenAPI.xsl
index b19dbab3..deb97883 100644
--- a/tools/V4-CSDL-to-OpenAPI.xsl
+++ b/tools/V4-CSDL-to-OpenAPI.xsl
@@ -235,6 +235,8 @@
   <xsl:key name="namespaceQualifiedType" match="/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType|/edmx:Edmx/edmx:DataServices/edm:Schema/edm:ComplexType" use="concat(../@Namespace,'.',@Name)" />
   <xsl:key name="aliasQualifiedType" match="/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType|/edmx:Edmx/edmx:DataServices/edm:Schema/edm:ComplexType" use="concat(../@Alias,'.',@Name)" />
 
+  <xsl:key name="label" match="//edm:Annotation[(@Term=$commonLabel or @Term=$commonLabelAliased)]" use="@String | edm:String" />
+
   <!-- TODO: collect all annotations for target once in caller and pass them here -->
   <xsl:template name="capability">
     <xsl:param name="term" />
@@ -2808,11 +2810,14 @@
           <xsl:when test="$label!=''">
             <xsl:value-of select="$label" />
             <!-- Add entity name for disambiguation if the label occurs more than once. -->
-            <xsl:if test="count(//edm:Annotation[(@Term=$commonLabel or @Term=$commonLabelAliased) and
-              (@String=$label or edm:String=$label)]) > 1">
-              <xsl:text> (</xsl:text>
-              <xsl:value-of select="$set/@Name" />
-              <xsl:text>)</xsl:text>
+            <xsl:variable name="labelTarget" select="key('label',$label)/../@Target" />
+            <xsl:if test="$labelTarget!=$typename">
+              <xsl:variable name="labelEntityType" select="key('namespaceQualifiedType',$labelTarget)|key('aliasQualifiedType',$labelTarget)" />
+              <xsl:if test="generate-id($labelEntityType) != generate-id($entityType)">
+                <xsl:text> (</xsl:text>
+                <xsl:value-of select="$set/@Name" />
+                <xsl:text>)</xsl:text>
+              </xsl:if>
             </xsl:if>
           </xsl:when>
           <xsl:otherwise>

From 83f8f25c957b2dd587c43a9395286c5b449dfd16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Heiko=20Thei=C3=9Fen?= <heiko.theissen@sap.com>
Date: Fri, 4 Sep 2026 14:14:52 +0200
Subject: [PATCH 4/8] Common.Label can also be embedded (OData V2)

---
 tools/V4-CSDL-to-OpenAPI.xsl | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/tools/V4-CSDL-to-OpenAPI.xsl b/tools/V4-CSDL-to-OpenAPI.xsl
index deb97883..dd074995 100644
--- a/tools/V4-CSDL-to-OpenAPI.xsl
+++ b/tools/V4-CSDL-to-OpenAPI.xsl
@@ -2810,14 +2810,21 @@
           <xsl:when test="$label!=''">
             <xsl:value-of select="$label" />
             <!-- Add entity name for disambiguation if the label occurs more than once. -->
-            <xsl:variable name="labelTarget" select="key('label',$label)/../@Target" />
-            <xsl:if test="$labelTarget!=$typename">
-              <xsl:variable name="labelEntityType" select="key('namespaceQualifiedType',$labelTarget)|key('aliasQualifiedType',$labelTarget)" />
-              <xsl:if test="generate-id($labelEntityType) != generate-id($entityType)">
-                <xsl:text> (</xsl:text>
-                <xsl:value-of select="$set/@Name" />
-                <xsl:text>)</xsl:text>
-              </xsl:if>
+            <xsl:variable name="labelTarget" select="key('label',$label)/.." />
+            <xsl:variable name="labelEntityType">
+              <xsl:choose>
+                <xsl:when test="$labelTarget/@Target">
+                  <xsl:value-of select="generate-id(key('namespaceQualifiedType',$labelTarget/@Target)|key('aliasQualifiedType',$labelTarget/@Target))" />
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:value-of select="generate-id($labelTarget)" />
+                </xsl:otherwise>
+              </xsl:choose>
+            </xsl:variable>
+              <xsl:if test="$labelEntityType != generate-id($entityType)">
+              <xsl:text> (</xsl:text>
+              <xsl:value-of select="$set/@Name" />
+              <xsl:text>)</xsl:text>
             </xsl:if>
           </xsl:when>
           <xsl:otherwise>

From c4cd97e241d453b44def2457a3dcc7e8114da70f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Heiko=20Thei=C3=9Fen?= <heiko.theissen@sap.com>
Date: Fri, 4 Sep 2026 14:25:56 +0200
Subject: [PATCH 5/8] Corrected indentation

---
 tools/V4-CSDL-to-OpenAPI.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/V4-CSDL-to-OpenAPI.xsl b/tools/V4-CSDL-to-OpenAPI.xsl
index dd074995..fe5d3799 100644
--- a/tools/V4-CSDL-to-OpenAPI.xsl
+++ b/tools/V4-CSDL-to-OpenAPI.xsl
@@ -2821,7 +2821,7 @@
                 </xsl:otherwise>
               </xsl:choose>
             </xsl:variable>
-              <xsl:if test="$labelEntityType != generate-id($entityType)">
+            <xsl:if test="$labelEntityType != generate-id($entityType)">
               <xsl:text> (</xsl:text>
               <xsl:value-of select="$set/@Name" />
               <xsl:text>)</xsl:text>

From 71c5be4076b44b19a3f5f6bda6cb6d0afc45e815 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Heiko=20Thei=C3=9Fen?= <heiko.theissen@sap.com>
Date: Mon, 7 Sep 2026 10:43:48 +0200
Subject: [PATCH 6/8] Proper Muenchian grouping

---
 tools/V4-CSDL-to-OpenAPI.xsl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/V4-CSDL-to-OpenAPI.xsl b/tools/V4-CSDL-to-OpenAPI.xsl
index fe5d3799..a8fdcca9 100644
--- a/tools/V4-CSDL-to-OpenAPI.xsl
+++ b/tools/V4-CSDL-to-OpenAPI.xsl
@@ -235,7 +235,7 @@
   <xsl:key name="namespaceQualifiedType" match="/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType|/edmx:Edmx/edmx:DataServices/edm:Schema/edm:ComplexType" use="concat(../@Namespace,'.',@Name)" />
   <xsl:key name="aliasQualifiedType" match="/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType|/edmx:Edmx/edmx:DataServices/edm:Schema/edm:ComplexType" use="concat(../@Alias,'.',@Name)" />
 
-  <xsl:key name="label" match="//edm:Annotation[(@Term=$commonLabel or @Term=$commonLabelAliased)]" use="@String | edm:String" />
+  <xsl:key name="label" match="//edm:Annotation[@Term=$commonLabel or @Term=$commonLabelAliased]" use="@String | edm:String" />
 
   <!-- TODO: collect all annotations for target once in caller and pass them here -->
   <xsl:template name="capability">
@@ -2810,7 +2810,7 @@
           <xsl:when test="$label!=''">
             <xsl:value-of select="$label" />
             <!-- Add entity name for disambiguation if the label occurs more than once. -->
-            <xsl:variable name="labelTarget" select="key('label',$label)/.." />
+            <xsl:variable name="labelTarget" select="key('label',$label)[1]/.." />
             <xsl:variable name="labelEntityType">
               <xsl:choose>
                 <xsl:when test="$labelTarget/@Target">

From 8af3a13d5e778d5f241cb6e089839fda44a50dc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Heiko=20Thei=C3=9Fen?= <heiko.theissen@sap.com>
Date: Mon, 7 Sep 2026 11:14:22 +0200
Subject: [PATCH 7/8] Avoid global variables in xsl:key

---
 tools/V4-CSDL-to-OpenAPI.xsl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/V4-CSDL-to-OpenAPI.xsl b/tools/V4-CSDL-to-OpenAPI.xsl
index a8fdcca9..7976c52d 100644
--- a/tools/V4-CSDL-to-OpenAPI.xsl
+++ b/tools/V4-CSDL-to-OpenAPI.xsl
@@ -235,7 +235,9 @@
   <xsl:key name="namespaceQualifiedType" match="/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType|/edmx:Edmx/edmx:DataServices/edm:Schema/edm:ComplexType" use="concat(../@Namespace,'.',@Name)" />
   <xsl:key name="aliasQualifiedType" match="/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType|/edmx:Edmx/edmx:DataServices/edm:Schema/edm:ComplexType" use="concat(../@Alias,'.',@Name)" />
 
-  <xsl:key name="label" match="//edm:Annotation[@Term=$commonLabel or @Term=$commonLabelAliased]" use="@String | edm:String" />
+  <xsl:key name="label" match="//edm:Annotation[@Term='com.sap.vocabularies.Common.v1.Label' or
+    @Term=concat(/edmx:Edmx/edmx:Reference/edmx:Include[@Namespace='com.sap.vocabularies.Common.v1']/@Alias,'.Label')]"
+    use="@String | edm:String" />
 
   <!-- TODO: collect all annotations for target once in caller and pass them here -->
   <xsl:template name="capability">

From 54515711fc55553665a8ccfa6165461d0227f8d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Heiko=20Thei=C3=9Fen?= <heiko.theissen@sap.com>
Date: Mon, 7 Sep 2026 14:08:07 +0200
Subject: [PATCH 8/8] Ignore labels for properties

---
 tools/V4-CSDL-to-OpenAPI.xsl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/V4-CSDL-to-OpenAPI.xsl b/tools/V4-CSDL-to-OpenAPI.xsl
index 7976c52d..2afab121 100644
--- a/tools/V4-CSDL-to-OpenAPI.xsl
+++ b/tools/V4-CSDL-to-OpenAPI.xsl
@@ -235,8 +235,10 @@
   <xsl:key name="namespaceQualifiedType" match="/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType|/edmx:Edmx/edmx:DataServices/edm:Schema/edm:ComplexType" use="concat(../@Namespace,'.',@Name)" />
   <xsl:key name="aliasQualifiedType" match="/edmx:Edmx/edmx:DataServices/edm:Schema/edm:EntityType|/edmx:Edmx/edmx:DataServices/edm:Schema/edm:ComplexType" use="concat(../@Alias,'.',@Name)" />
 
-  <xsl:key name="label" match="//edm:Annotation[@Term='com.sap.vocabularies.Common.v1.Label' or
-    @Term=concat(/edmx:Edmx/edmx:Reference/edmx:Include[@Namespace='com.sap.vocabularies.Common.v1']/@Alias,'.Label')]"
+  <xsl:key name="label" match="//edm:Annotation[
+    (parent::edm:EntityType or parent::edm:Annotations[not(contains(@Target,'/'))]) and
+    (@Term='com.sap.vocabularies.Common.v1.Label' or
+    @Term=concat(/edmx:Edmx/edmx:Reference/edmx:Include[@Namespace='com.sap.vocabularies.Common.v1']/@Alias,'.Label'))]"
     use="@String | edm:String" />
 
   <!-- TODO: collect all annotations for target once in caller and pass them here -->