Resolve conflicts when two csdl names have similar suffixes (#407)

* Select best match when multiple resources match target csdl * Fix tests * Update VB code generation * Make name conflict resolution more efficient
OData · Sep 10, 2024 · a58b8c2 · a58b8c2
1 parent 55a4768
commit a58b8c2
Show file tree

Hide file tree

Showing 13 changed files with 77 additions and 15 deletions.
diff --git a/src/Microsoft.OData.CodeGen/Templates/ODataT4CodeGenerator.cs b/src/Microsoft.OData.CodeGen/Templates/ODataT4CodeGenerator.cs
@@ -5121,7 +5121,11 @@ internal override void WriteGeneratedEdmModel(string escapedEdmxString)
                 try
                 {
                     var assembly = global::System.Reflection.Assembly.GetExecutingAssembly();
-                    var resourcePath = global::System.Linq.Enumerable.Single(assembly.GetManifestResourceNames(), str => str.EndsWith(filePath));
+                    // If multiple resource names end with the file name, select the shortest one.
+                    var resourcePath = global::System.Linq.Enumerable.First(
+                        global::System.Linq.Enumerable.OrderBy(
+                            global::System.Linq.Enumerable.Where(assembly.GetManifestResourceNames(), name => name.EndsWith(filePath)),
+                            filteredName => filteredName.Length));
                     global::System.IO.Stream stream = assembly.GetManifestResourceStream(resourcePath);
                     return global::System.Xml.XmlReader.Create(new global::System.IO.StreamReader(stream));
                 }
@@ -7297,7 +7301,12 @@ End Function
             Private Shared Function CreateXmlReader() As Global.System.Xml.XmlReader
                 Try
                     Dim assembly As Global.System.Reflection.Assembly = Global.System.Reflection.Assembly.GetExecutingAssembly()
-                    Dim resourcePath As Global.System.String = Global.System.Linq.Enumerable.Single(assembly.GetManifestResourceNames(), Function(str) str.EndsWith(filePath))
+                    ' If multiple resource names end with the file name, select the shortest one.
+                    Dim resourcePath As Global.System.String =
+                        Global.System.Linq.Enumerable.First(
+                            Global.System.Linq.Enumerable.OrderBy(
+                                Global.System.Linq.Enumerable.Where(assembly.GetManifestResourceNames(), Function(name) name.EndsWith(filePath)),
+                                Function(filteredName) filteredName.Length))
                     Dim stream As Global.System.IO.Stream = assembly.GetManifestResourceStream(resourcePath)
                     Return Global.System.Xml.XmlReader.Create(New Global.System.IO.StreamReader(stream))
                 Catch e As Global.System.Xml.XmlException

diff --git a/src/Microsoft.OData.CodeGen/Templates/ODataT4CodeGenerator.ttinclude b/src/Microsoft.OData.CodeGen/Templates/ODataT4CodeGenerator.ttinclude
@@ -4683,7 +4683,11 @@ namespace <#= fullNamespace #>
                 try
                 {
                     var assembly = global::System.Reflection.Assembly.GetExecutingAssembly();
-                    var resourcePath = global::System.Linq.Enumerable.Single(assembly.GetManifestResourceNames(), str => str.EndsWith(filePath));
+                    // If multiple resource names end with the file name, select the shortest one.
+                    var resourcePath = global::System.Linq.Enumerable.First(
+                        global::System.Linq.Enumerable.OrderBy(
+                            global::System.Linq.Enumerable.Where(assembly.GetManifestResourceNames(), name => name.EndsWith(filePath)),
+                            filteredName => filteredName.Length));
                     global::System.IO.Stream stream = assembly.GetManifestResourceStream(resourcePath);
                     return global::System.Xml.XmlReader.Create(new global::System.IO.StreamReader(stream));
                 }
@@ -5870,7 +5874,12 @@ Namespace <#= fullNamespace #>
             Private Shared Function CreateXmlReader() As Global.System.Xml.XmlReader
                 Try
                     Dim assembly As Global.System.Reflection.Assembly = Global.System.Reflection.Assembly.GetExecutingAssembly()
-                    Dim resourcePath As Global.System.String = Global.System.Linq.Enumerable.Single(assembly.GetManifestResourceNames(), Function(str) str.EndsWith(filePath))
+                    ' If multiple resource names end with the file name, select the shortest one.
+                    Dim resourcePath As Global.System.String =
+                        Global.System.Linq.Enumerable.First(
+                            Global.System.Linq.Enumerable.OrderBy(
+                                Global.System.Linq.Enumerable.Where(assembly.GetManifestResourceNames(), Function(name) name.EndsWith(filePath)),
+                                Function(filteredName) filteredName.Length))
                     Dim stream As Global.System.IO.Stream = assembly.GetManifestResourceStream(resourcePath)
                     Return Global.System.Xml.XmlReader.Create(New Global.System.IO.StreamReader(stream))
                 Catch e As Global.System.Xml.XmlException

diff --git a/.../Microsoft.OData.Cli.Tests/CodeGeneration/Artifacts/SampleServiceV4EnableInternalProxy.cs b/.../Microsoft.OData.Cli.Tests/CodeGeneration/Artifacts/SampleServiceV4EnableInternalProxy.cs
@@ -574,7 +574,11 @@ private abstract class GeneratedEdmModel
                 try
                 {
                     var assembly = global::System.Reflection.Assembly.GetExecutingAssembly();
-                    var resourcePath = global::System.Linq.Enumerable.Single(assembly.GetManifestResourceNames(), str => str.EndsWith(filePath));
+                    // If multiple resource names end with the file name, select the shortest one.
+                    var resourcePath = global::System.Linq.Enumerable.First(
+                        global::System.Linq.Enumerable.OrderBy(
+                            global::System.Linq.Enumerable.Where(assembly.GetManifestResourceNames(), name => name.EndsWith(filePath)),
+                            filteredName => filteredName.Length));
                     global::System.IO.Stream stream = assembly.GetManifestResourceStream(resourcePath);
                     return global::System.Xml.XmlReader.Create(new global::System.IO.StreamReader(stream));
                 }

diff --git a/.../Microsoft.OData.Cli.Tests/CodeGeneration/Artifacts/SampleServiceV4EnableTrackingProxy.cs b/.../Microsoft.OData.Cli.Tests/CodeGeneration/Artifacts/SampleServiceV4EnableTrackingProxy.cs
@@ -651,7 +651,11 @@ private abstract class GeneratedEdmModel
                 try
                 {
                     var assembly = global::System.Reflection.Assembly.GetExecutingAssembly();
-                    var resourcePath = global::System.Linq.Enumerable.Single(assembly.GetManifestResourceNames(), str => str.EndsWith(filePath));
+                    // If multiple resource names end with the file name, select the shortest one.
+                    var resourcePath = global::System.Linq.Enumerable.First(
+                        global::System.Linq.Enumerable.OrderBy(
+                            global::System.Linq.Enumerable.Where(assembly.GetManifestResourceNames(), name => name.EndsWith(filePath)),
+                            filteredName => filteredName.Length));
                     global::System.IO.Stream stream = assembly.GetManifestResourceStream(resourcePath);
                     return global::System.Xml.XmlReader.Create(new global::System.IO.StreamReader(stream));
                 }

diff --git a/...t.OData.Cli.Tests/CodeGeneration/Artifacts/SampleServiceV4ExcludedBoundOperationsProxy.cs b/...t.OData.Cli.Tests/CodeGeneration/Artifacts/SampleServiceV4ExcludedBoundOperationsProxy.cs
@@ -575,7 +575,11 @@ private abstract class GeneratedEdmModel
                 try
                 {
                     var assembly = global::System.Reflection.Assembly.GetExecutingAssembly();
-                    var resourcePath = global::System.Linq.Enumerable.Single(assembly.GetManifestResourceNames(), str => str.EndsWith(filePath));
+                    // If multiple resource names end with the file name, select the shortest one.
+                    var resourcePath = global::System.Linq.Enumerable.First(
+                        global::System.Linq.Enumerable.OrderBy(
+                            global::System.Linq.Enumerable.Where(assembly.GetManifestResourceNames(), name => name.EndsWith(filePath)),
+                            filteredName => filteredName.Length));
                     global::System.IO.Stream stream = assembly.GetManifestResourceStream(resourcePath);
                     return global::System.Xml.XmlReader.Create(new global::System.IO.StreamReader(stream));
                 }

diff --git a/....OData.Cli.Tests/CodeGeneration/Artifacts/SampleServiceV4ExcludedOperationImportsProxy.cs b/....OData.Cli.Tests/CodeGeneration/Artifacts/SampleServiceV4ExcludedOperationImportsProxy.cs
@@ -574,7 +574,11 @@ private abstract class GeneratedEdmModel
                 try
                 {
                     var assembly = global::System.Reflection.Assembly.GetExecutingAssembly();
-                    var resourcePath = global::System.Linq.Enumerable.Single(assembly.GetManifestResourceNames(), str => str.EndsWith(filePath));
+                    // If multiple resource names end with the file name, select the shortest one.
+                    var resourcePath = global::System.Linq.Enumerable.First(
+                        global::System.Linq.Enumerable.OrderBy(
+                            global::System.Linq.Enumerable.Where(assembly.GetManifestResourceNames(), name => name.EndsWith(filePath)),
+                            filteredName => filteredName.Length));
                     global::System.IO.Stream stream = assembly.GetManifestResourceStream(resourcePath);
                     return global::System.Xml.XmlReader.Create(new global::System.IO.StreamReader(stream));
                 }

diff --git a/...osoft.OData.Cli.Tests/CodeGeneration/Artifacts/SampleServiceV4ExcludedSchemaTypesProxy.cs b/...osoft.OData.Cli.Tests/CodeGeneration/Artifacts/SampleServiceV4ExcludedSchemaTypesProxy.cs
@@ -469,7 +469,11 @@ private abstract class GeneratedEdmModel
                 try
                 {
                     var assembly = global::System.Reflection.Assembly.GetExecutingAssembly();
-                    var resourcePath = global::System.Linq.Enumerable.Single(assembly.GetManifestResourceNames(), str => str.EndsWith(filePath));
+                    // If multiple resource names end with the file name, select the shortest one.
+                    var resourcePath = global::System.Linq.Enumerable.First(
+                        global::System.Linq.Enumerable.OrderBy(
+                            global::System.Linq.Enumerable.Where(assembly.GetManifestResourceNames(), name => name.EndsWith(filePath)),
+                            filteredName => filteredName.Length));
                     global::System.IO.Stream stream = assembly.GetManifestResourceStream(resourcePath);
                     return global::System.Xml.XmlReader.Create(new global::System.IO.StreamReader(stream));
                 }

diff --git a/test/Microsoft.OData.Cli.Tests/CodeGeneration/Artifacts/SampleServiceV4MultipleFilesProxy.cs b/test/Microsoft.OData.Cli.Tests/CodeGeneration/Artifacts/SampleServiceV4MultipleFilesProxy.cs
@@ -143,7 +143,11 @@ private abstract class GeneratedEdmModel
                 try
                 {
                     var assembly = global::System.Reflection.Assembly.GetExecutingAssembly();
-                    var resourcePath = global::System.Linq.Enumerable.Single(assembly.GetManifestResourceNames(), str => str.EndsWith(filePath));
+                    // If multiple resource names end with the file name, select the shortest one.
+                    var resourcePath = global::System.Linq.Enumerable.First(
+                        global::System.Linq.Enumerable.OrderBy(
+                            global::System.Linq.Enumerable.Where(assembly.GetManifestResourceNames(), name => name.EndsWith(filePath)),
+                            filteredName => filteredName.Length));
                     global::System.IO.Stream stream = assembly.GetManifestResourceStream(resourcePath);
                     return global::System.Xml.XmlReader.Create(new global::System.IO.StreamReader(stream));
                 }

diff --git a/...Microsoft.OData.Cli.Tests/CodeGeneration/Artifacts/SampleServiceV4MultipleOptionsProxy.cs b/...Microsoft.OData.Cli.Tests/CodeGeneration/Artifacts/SampleServiceV4MultipleOptionsProxy.cs
@@ -546,7 +546,11 @@ private abstract class GeneratedEdmModel
                 try
                 {
                     var assembly = global::System.Reflection.Assembly.GetExecutingAssembly();
-                    var resourcePath = global::System.Linq.Enumerable.Single(assembly.GetManifestResourceNames(), str => str.EndsWith(filePath));
+                    // If multiple resource names end with the file name, select the shortest one.
+                    var resourcePath = global::System.Linq.Enumerable.First(
+                        global::System.Linq.Enumerable.OrderBy(
+                            global::System.Linq.Enumerable.Where(assembly.GetManifestResourceNames(), name => name.EndsWith(filePath)),
+                            filteredName => filteredName.Length));
                     global::System.IO.Stream stream = assembly.GetManifestResourceStream(resourcePath);
                     return global::System.Xml.XmlReader.Create(new global::System.IO.StreamReader(stream));
                 }

diff --git a/...Microsoft.OData.Cli.Tests/CodeGeneration/Artifacts/SampleServiceV4NamespacePrefixProxy.cs b/...Microsoft.OData.Cli.Tests/CodeGeneration/Artifacts/SampleServiceV4NamespacePrefixProxy.cs
@@ -614,7 +614,11 @@ private abstract class GeneratedEdmModel
                 try
                 {
                     var assembly = global::System.Reflection.Assembly.GetExecutingAssembly();
-                    var resourcePath = global::System.Linq.Enumerable.Single(assembly.GetManifestResourceNames(), str => str.EndsWith(filePath));
+                    // If multiple resource names end with the file name, select the shortest one.
+                    var resourcePath = global::System.Linq.Enumerable.First(
+                        global::System.Linq.Enumerable.OrderBy(
+                            global::System.Linq.Enumerable.Where(assembly.GetManifestResourceNames(), name => name.EndsWith(filePath)),
+                            filteredName => filteredName.Length));
                     global::System.IO.Stream stream = assembly.GetManifestResourceStream(resourcePath);
                     return global::System.Xml.XmlReader.Create(new global::System.IO.StreamReader(stream));
                 }

diff --git a/test/Microsoft.OData.Cli.Tests/CodeGeneration/Artifacts/SampleServiceV4Proxy.cs b/test/Microsoft.OData.Cli.Tests/CodeGeneration/Artifacts/SampleServiceV4Proxy.cs
@@ -574,7 +574,11 @@ private abstract class GeneratedEdmModel
                 try
                 {
                     var assembly = global::System.Reflection.Assembly.GetExecutingAssembly();
-                    var resourcePath = global::System.Linq.Enumerable.Single(assembly.GetManifestResourceNames(), str => str.EndsWith(filePath));
+                    // If multiple resource names end with the file name, select the shortest one.
+                    var resourcePath = global::System.Linq.Enumerable.First(
+                        global::System.Linq.Enumerable.OrderBy(
+                            global::System.Linq.Enumerable.Where(assembly.GetManifestResourceNames(), name => name.EndsWith(filePath)),
+                            filteredName => filteredName.Length));
                     global::System.IO.Stream stream = assembly.GetManifestResourceStream(resourcePath);
                     return global::System.Xml.XmlReader.Create(new global::System.IO.StreamReader(stream));
                 }

diff --git a/test/Microsoft.OData.Cli.Tests/CodeGeneration/Artifacts/SampleServiceV4ServiceNameProxy.cs b/test/Microsoft.OData.Cli.Tests/CodeGeneration/Artifacts/SampleServiceV4ServiceNameProxy.cs
@@ -574,7 +574,11 @@ private abstract class GeneratedEdmModel
                 try
                 {
                     var assembly = global::System.Reflection.Assembly.GetExecutingAssembly();
-                    var resourcePath = global::System.Linq.Enumerable.Single(assembly.GetManifestResourceNames(), str => str.EndsWith(filePath));
+                    // If multiple resource names end with the file name, select the shortest one.
+                    var resourcePath = global::System.Linq.Enumerable.First(
+                        global::System.Linq.Enumerable.OrderBy(
+                            global::System.Linq.Enumerable.Where(assembly.GetManifestResourceNames(), name => name.EndsWith(filePath)),
+                            filteredName => filteredName.Length));
                     global::System.IO.Stream stream = assembly.GetManifestResourceStream(resourcePath);
                     return global::System.Xml.XmlReader.Create(new global::System.IO.StreamReader(stream));
                 }

diff --git a/.../Microsoft.OData.Cli.Tests/CodeGeneration/Artifacts/SampleServiceV4UpperCamelCaseProxy.cs b/.../Microsoft.OData.Cli.Tests/CodeGeneration/Artifacts/SampleServiceV4UpperCamelCaseProxy.cs
@@ -644,7 +644,11 @@ private abstract class GeneratedEdmModel
                 try
                 {
                     var assembly = global::System.Reflection.Assembly.GetExecutingAssembly();
-                    var resourcePath = global::System.Linq.Enumerable.Single(assembly.GetManifestResourceNames(), str => str.EndsWith(filePath));
+                    // If multiple resource names end with the file name, select the shortest one.
+                    var resourcePath = global::System.Linq.Enumerable.First(
+                        global::System.Linq.Enumerable.OrderBy(
+                            global::System.Linq.Enumerable.Where(assembly.GetManifestResourceNames(), name => name.EndsWith(filePath)),
+                            filteredName => filteredName.Length));
                     global::System.IO.Stream stream = assembly.GetManifestResourceStream(resourcePath);
                     return global::System.Xml.XmlReader.Create(new global::System.IO.StreamReader(stream));
                 }