chore: default registration of json reader

chore: default namespace for yaml reader registration

Signed-off-by: Vincent Biret <[email protected]>

Author: baywet

src/Microsoft.OpenApi.Readers/OpenApiReaderSettingsExtensions.cs

@@ -1,7 +1,8 @@
+using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Readers;
 
-namespace Microsoft.OpenApi.Readers;
+namespace Microsoft.OpenApi.Reader;
 
 /// <summary>
 /// Extensions for <see cref="OpenApiReaderSettings"/>
@@ -15,7 +16,18 @@ public static class OpenApiReaderSettingsExtensions
     public static void AddYamlReader(this OpenApiReaderSettings settings)
     {
         var yamlReader = new OpenApiYamlReader();
-        settings.Readers.Add(OpenApiConstants.Yaml, yamlReader);
-        settings.Readers.Add(OpenApiConstants.Yml, yamlReader);
+        settings.AddReaderToSettings(OpenApiConstants.Yaml, yamlReader);
+        settings.AddReaderToSettings(OpenApiConstants.Yml, yamlReader);
+    }
+    private static void AddReaderToSettings(this OpenApiReaderSettings settings, string format, IOpenApiReader reader)
+    {
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP || NET5_0_OR_GREATER
+        settings.Readers.Add(format, reader);
+#else
+        if (!settings.Readers.ContainsKey(format))
+        {
+            settings.Readers.Add(format, reader);
+        }
+#endif
     }
 }

src/Microsoft.OpenApi/Reader/OpenApiModelFactory.cs

@@ -40,7 +40,6 @@ public static ReadResult Load(MemoryStream stream,
             if (stream is null) throw new ArgumentNullException(nameof(stream));
 #endif
             settings ??= new OpenApiReaderSettings();
-            settings.AddJsonReader();
 
             // Get the format of the stream if not provided
             format ??= InspectStreamFormat(stream);
@@ -118,7 +117,6 @@ public static async Task<ReadResult> LoadAsync(Stream input, string format = nul
             if (input is null) throw new ArgumentNullException(nameof(input));
 #endif
             settings ??= new OpenApiReaderSettings();
-            settings.AddJsonReader();
 
             Stream preparedStream;
             if (format is null)
@@ -201,7 +199,6 @@ public static ReadResult Parse(string input,
 #endif
             format ??= InspectInputFormat(input);
             settings ??= new OpenApiReaderSettings();
-            settings.AddJsonReader();
 
             // Copy string into MemoryStream
             using var stream = new MemoryStream(Encoding.UTF8.GetBytes(input));
@@ -233,7 +230,6 @@ public static T Parse<T>(string input,
 #endif
             format ??= InspectInputFormat(input);
             settings ??= new OpenApiReaderSettings();
-            settings.AddJsonReader();
             using var stream = new MemoryStream(Encoding.UTF8.GetBytes(input));
             return Load<T>(stream, version, format, openApiDocument, out diagnostic, settings);
         }

src/Microsoft.OpenApi/Reader/OpenApiReaderSettings.cs

@@ -22,12 +22,22 @@ public class OpenApiReaderSettings
         /// </summary>
         public void AddJsonReader()
         {
-            Readers.Add(OpenApiConstants.Json, new OpenApiJsonReader());
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP || NET5_0_OR_GREATER
+            Readers.TryAdd(OpenApiConstants.Json, new OpenApiJsonReader());
+#else
+            if (!Readers.ContainsKey(OpenApiConstants.Json))
+            {
+                Readers.Add(OpenApiConstants.Json, new OpenApiJsonReader());
+            }
+#endif
         }
         /// <summary>
         /// Readers to use to parse the OpenAPI document
         /// </summary>
-        public Dictionary<string, IOpenApiReader> Readers { get; init; } = new Dictionary<string, IOpenApiReader>(StringComparer.OrdinalIgnoreCase);
+        public Dictionary<string, IOpenApiReader> Readers { get; init; } = new Dictionary<string, IOpenApiReader>(StringComparer.OrdinalIgnoreCase)
+        {
+            { OpenApiConstants.Json, new OpenApiJsonReader() }
+        };
         /// <summary>
         /// When external references are found, load them into a shared workspace
         /// </summary>