Skip to content

Commit 6fbe5a2

Browse files
committed
Strip namespace prefix independently of aliasing
1 parent c5c2545 commit 6fbe5a2

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/Microsoft.OpenApi.OData.Reader/Common/EdmModelHelper.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,9 @@ internal static string StripOrAliasNamespacePrefix(IEdmSchemaElement element, Op
378378
// Alias operation segment name
379379
segmentName = namespaceAlias.TrimEnd('.') + "." + element.Name;
380380
}
381-
else if (element.Namespace.Equals(settings.NamespacePrefixToStripForInMethodPaths, StringComparison.OrdinalIgnoreCase))
381+
382+
if (settings.NamespacePrefixToStripForInMethodPaths != null &&
383+
element.Namespace.Equals(settings.NamespacePrefixToStripForInMethodPaths, StringComparison.OrdinalIgnoreCase))
382384
{
383385
// Strip specified namespace from operation segment name
384386
segmentName = element.Name;

test/Microsoft.OpenAPI.OData.Reader.Tests/Edm/ODataOperationSegmentTests.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,9 @@ public void GetPathItemNameReturnsCorrectFunctionLiteral(bool unqualifiedCall, b
102102
[InlineData("NS.XY.MyFunction(param={param},param2=@param2)", "NS", "NS.XY", false)]
103103
[InlineData("MyFunction(param={param},param2=@param2)", "NS.XY", "NS.XY", false)]
104104
[InlineData("N.MyFunction(param={param},param2=@param2)", "NS", "NS.XY", true)]
105-
[InlineData("N.MyFunction(param={param},param2=@param2)", "NS.XY", "NS.XY", true)]
106-
public void GetPathItemNameReturnsCorrectFunctionLiteralWhenSegmentAliasedOrNamespacePrefixStripped(string expected, string namespacePrefixToStrip, string namespaceName, bool enableAlias)
105+
[InlineData("MyFunction(param={param},param2=@param2)", "NS.XY", "NS.XY", true)]
106+
public void GetPathItemNameReturnsCorrectFunctionLiteralWhenSegmentAliasedOrNamespacePrefixStripped(
107+
string expected, string namespacePrefixToStrip, string namespaceName, bool enableAlias)
107108
{
108109
// Arrange & Act
109110
IEdmEntityTypeReference entityTypeReference = new EdmEntityTypeReference(new EdmEntityType(namespaceName, "Entity"), false);

0 commit comments

Comments
 (0)