Skip to content

Commit 7e6e7f3

Browse files
authored
Merge pull request #2375 from microsoft/copilot/fix-2374
Remove KeyComparer property from OpenApiWriterSettings
2 parents 07071ac + 73a8527 commit 7e6e7f3

12 files changed

+1
-655
lines changed

src/Microsoft.OpenApi/Extensions/CollectionExtensions.cs

Lines changed: 0 additions & 50 deletions
This file was deleted.

src/Microsoft.OpenApi/Writers/OpenApiWriterExtensions.cs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -419,13 +419,6 @@ private static void WriteCollectionInternal<T>(
419419
writer.WriteStartArray();
420420
if (elements != null)
421421
{
422-
var settings = writer.GetSettings();
423-
424-
if (settings?.KeyComparer is IComparer<T> typedComparer)
425-
{
426-
elements = elements.Sort(typedComparer);
427-
}
428-
429422
foreach (var item in elements)
430423
{
431424
if (item != null)
@@ -464,12 +457,6 @@ private static void WriteMapInternal<T>(
464457

465458
if (elements != null)
466459
{
467-
var settings = writer.GetSettings();
468-
if (settings?.KeyComparer != null)
469-
{
470-
elements = elements.Sort(settings.KeyComparer); // sort using custom comparer
471-
}
472-
473460
foreach (var item in elements)
474461
{
475462
writer.WritePropertyName(item.Key);

src/Microsoft.OpenApi/Writers/OpenApiWriterSettings.cs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using System.Collections.Generic;
2-
3-
namespace Microsoft.OpenApi
1+
namespace Microsoft.OpenApi
42
{
53
/// <summary>
64
/// Configuration settings to control how OpenAPI documents are written
@@ -23,10 +21,5 @@ internal bool ShouldInlineReference(OpenApiReference reference)
2321
return (reference.IsLocal && InlineLocalReferences)
2422
|| (reference.IsExternal && InlineExternalReferences);
2523
}
26-
27-
/// <summary>
28-
/// Specifies a comparer used to sort string-based collection keys, such as components or tags.
29-
/// </summary>
30-
public IComparer<string>? KeyComparer { get; set; }
3124
}
3225
}

test/Microsoft.OpenApi.Tests/Extensions/CollectionExtensionsTests.SortOpenApiDocumentSucceeds_version=OpenApi2_0.verified.txt

Lines changed: 0 additions & 57 deletions
This file was deleted.

test/Microsoft.OpenApi.Tests/Extensions/CollectionExtensionsTests.SortOpenApiDocumentSucceeds_version=OpenApi3_0.verified.txt

Lines changed: 0 additions & 56 deletions
This file was deleted.

test/Microsoft.OpenApi.Tests/Extensions/CollectionExtensionsTests.SortOpenApiDocumentSucceeds_version=OpenApi3_1.verified.txt

Lines changed: 0 additions & 56 deletions
This file was deleted.

test/Microsoft.OpenApi.Tests/Extensions/CollectionExtensionsTests.SortOpenApiDocumentUsingCustomComparerSucceeds_version=OpenApi2_0.verified.txt

Lines changed: 0 additions & 57 deletions
This file was deleted.

test/Microsoft.OpenApi.Tests/Extensions/CollectionExtensionsTests.SortOpenApiDocumentUsingCustomComparerSucceeds_version=OpenApi3_0.verified.txt

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)