fix: rename class; add logic for sorting IEnumerable collections

Author: MaggieKimani1

src/Microsoft.OpenApi/Extensions/DictionaryExtensions.cs renamed to src/Microsoft.OpenApi/Extensions/CollectionExtensions.cs

@@ -7,45 +7,44 @@ namespace Microsoft.OpenApi.Extensions
     /// <summary>
     /// Dictionary extension methods
     /// </summary>
-    public static class DictionaryExtensions
+    public static class CollectionExtensions
     {
         /// <summary>
-        /// Returns a new dictionary with entries sorted by key using the default comparer.
+        /// Returns a new dictionary with entries sorted by key using a custom comparer.
         /// </summary>
         public static IDictionary<TKey, TValue> Sort<TKey, TValue>(
-            this IDictionary<TKey, TValue> source)
+            this IDictionary<TKey, TValue> source,
+            IComparer<TKey> comparer)
             where TKey : notnull
         {
 #if NET7_0_OR_GREATER
             ArgumentNullException.ThrowIfNull(nameof(source));
+            ArgumentNullException.ThrowIfNull(nameof(comparer));
 #else
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
+            if (comparer == null)
+                throw new ArgumentNullException(nameof(comparer));
 #endif
-
-            return source.OrderBy(kvp => kvp.Key)
+            return source.OrderBy(kvp => kvp.Key, comparer)
                                .ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
         }
 
         /// <summary>
-        /// Returns a new dictionary with entries sorted by key using a custom comparer.
+        /// Sorts any IEnumerable<T> using the specified comparer and returns a List</T>.
         /// </summary>
-        public static IDictionary<TKey, TValue> Sort<TKey, TValue>(
-            this IDictionary<TKey, TValue> source,
-            IComparer<TKey> comparer)
-            where TKey : notnull
+        public static List<T> Sort<T>(this IEnumerable<T> source, IComparer<T> comparer)
         {
 #if NET7_0_OR_GREATER
-            ArgumentNullException.ThrowIfNull(nameof(source));
-            ArgumentNullException.ThrowIfNull(nameof(comparer));
+        ArgumentNullException.ThrowIfNull(source);
+        ArgumentNullException.ThrowIfNull(comparer);
 #else
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
             if (comparer == null)
                 throw new ArgumentNullException(nameof(comparer));
 #endif
-            return source.OrderBy(kvp => kvp.Key, comparer)
-                               .ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
+            return source.OrderBy(item => item, comparer).ToList();
         }
     }
 }

src/Microsoft.OpenApi/Writers/OpenApiWriterExtensions.cs

@@ -421,6 +421,13 @@ private static void WriteCollectionInternal<T>(
             writer.WriteStartArray();
             if (elements != null)
             {
+                var settings = writer.GetSettings();
+
+                if (settings?.Comparer is IComparer<T> typedComparer)
+                {
+                    elements = elements.Sort(typedComparer);
+                }
+
                 foreach (var item in elements)
                 {
                     if (item != null)
@@ -460,14 +467,9 @@ private static void WriteMapInternal<T>(
             if (elements != null)
             {
                 var settings = writer.GetSettings();
-
-                if (settings?.EnableSorting == true)
-                {
-                    elements = elements.Sort(); // sort with default comparer
-                }
-                else if (settings?.KeyComparer != null)
+                if (settings?.Comparer != null)
                 {
-                    elements = elements.Sort(settings.KeyComparer); // sort using custom comparer
+                    elements = elements.Sort(settings.Comparer); // sort using custom comparer
                 }
 
                 foreach (var item in elements)

src/Microsoft.OpenApi/Writers/OpenApiWriterSettings.cs

@@ -26,14 +26,9 @@ internal bool ShouldInlineReference(OpenApiReference reference)
                              || (reference.IsExternal && InlineExternalReferences);
         }
 
-        /// <summary>  
-        /// Enables sorting of collections using the default comparer  
-        /// </summary>  
-        public bool EnableSorting { get; set; }
-
         /// <summary>  
         /// Custom comparer for sorting collections.  
         /// </summary>  
-        public IComparer<string>? KeyComparer { get; set; }
+        public IComparer<string>? Comparer { get; set; }
     }
 }