fix/static factories

src/Microsoft.OpenApi.Hidi/OpenApiService.cs

@@ -40,12 +40,6 @@ namespace Microsoft.OpenApi.Hidi
 {
     internal static class OpenApiService
     {
-        static OpenApiService()
-        {
-            OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
-            OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yml, new OpenApiYamlReader());
-        }
-
         /// <summary>
         /// Implementation of the transform command
         /// </summary>
@@ -394,6 +388,7 @@ private static async Task<ReadResult> ParseOpenApiAsync(string openApiFile, bool
                         new(openApiFile) :
                         new Uri("file://" + new FileInfo(openApiFile).DirectoryName + Path.DirectorySeparatorChar)
                 };
+                settings.AddYamlReader();
 
                 result = await OpenApiDocument.LoadAsync(stream, settings: settings, cancellationToken: cancellationToken).ConfigureAwait(false);
 

src/Microsoft.OpenApi.Readers/OpenApiReaderSettingsExtensions.cs

@@ -0,0 +1,33 @@
+using Microsoft.OpenApi.Interfaces;
+using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi.Readers;
+
+namespace Microsoft.OpenApi.Reader;
+
+/// <summary>
+/// Extensions for <see cref="OpenApiReaderSettings"/>
+/// </summary>
+public static class OpenApiReaderSettingsExtensions
+{
+    /// <summary>
+    /// Adds a reader for the specified format
+    /// </summary>
+    /// <param name="settings">The settings to add the reader to.</param>
+    public static void AddYamlReader(this OpenApiReaderSettings settings)
+    {
+        var yamlReader = new OpenApiYamlReader();
+        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.Workbench/MainModel.cs

@@ -211,9 +211,6 @@ protected void OnPropertyChanged(string propertyName)
         /// </summary>
         internal async Task ParseDocumentAsync()
         {
-            OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
-            OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yml, new OpenApiYamlReader());
-
             Stream stream = null;
             try
             {
@@ -238,6 +235,7 @@ internal async Task ParseDocumentAsync()
                 {
                     RuleSet = ValidationRuleSet.GetDefaultRuleSet()
                 };
+                settings.AddYamlReader();
                 if (ResolveExternal && !string.IsNullOrWhiteSpace(_inputFile))
                 {
                     settings.BaseUrl = _inputFile.StartsWith("http", StringComparison.OrdinalIgnoreCase) ? new(_inputFile) 

src/Microsoft.OpenApi/Models/OpenApiDocument.cs

@@ -222,7 +222,7 @@
         /// <summary>
         /// Serialize <see cref="OpenApiDocument"/> to OpenAPI object V2.0.
         /// </summary>
         public void SerializeAsV2(IOpenApiWriter writer)
         {
             Utils.CheckArgumentNull(writer);
 
@@ -516,7 +516,7 @@
             }
             else
             {
                 string relativePath = OpenApiConstants.ComponentsSegment + reference.Type.GetDisplayName() + "/" + reference.Id;
 
                 uriLocation = useExternal
                     ? Workspace?.GetDocumentId(reference.ExternalResource)?.OriginalString + relativePath
@@ -545,10 +545,11 @@
         /// </summary>
         /// <param name="url"> The path to the OpenAPI file.</param>
         /// <param name="settings">The OpenApi reader settings.</param>
+        /// <param name="token">The cancellation token</param>
         /// <returns></returns>
-        public static async Task<ReadResult> LoadAsync(string url, OpenApiReaderSettings? settings = null)
+        public static async Task<ReadResult> LoadAsync(string url, OpenApiReaderSettings? settings = null, CancellationToken token = default)
         {
-            return await OpenApiModelFactory.LoadAsync(url, settings);
+            return await OpenApiModelFactory.LoadAsync(url, settings, token).ConfigureAwait(false);
         }
 
         /// <summary>

src/Microsoft.OpenApi/Reader/OpenApiModelFactory.cs

@@ -23,11 +23,6 @@
     {
         private static readonly HttpClient _httpClient = new();
 
-        static OpenApiModelFactory()
-        {
-            OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Json, new OpenApiJsonReader());
-        }
-
         /// <summary>
         /// Loads the input stream and parses it into an Open API document.
         /// </summary>
@@ -73,15 +68,15 @@
         public static T Load<T>(MemoryStream input, OpenApiSpecVersion version, string format, OpenApiDocument openApiDocument, out OpenApiDiagnostic diagnostic, OpenApiReaderSettings settings = null) where T : IOpenApiElement
         {
             format ??= InspectStreamFormat(input);
-            return OpenApiReaderRegistry.GetReader(format).ReadFragment<T>(input, version, openApiDocument, out diagnostic, settings);
+            return settings.Readers[format].ReadFragment<T>(input, version, openApiDocument, out diagnostic, settings);
         }
 
         /// <summary>
         /// Loads the input URL and parses it into an Open API document.
         /// </summary>
         /// <param name="url">The path to the OpenAPI file</param>
         /// <param name="settings"> The OpenApi reader settings.</param>
-        /// <param name="token"></param>
+        /// <param name="token">The cancellation token</param>
         /// <returns></returns>
         public static async Task<ReadResult> LoadAsync(string url, OpenApiReaderSettings settings = null, CancellationToken token = default)
         {
@@ -243,10 +238,10 @@
 
         private static async Task<ReadResult> InternalLoadAsync(Stream input, string format, OpenApiReaderSettings settings, CancellationToken cancellationToken = default)
         {
-            var reader = OpenApiReaderRegistry.GetReader(format);
+            var reader = settings.Readers[format];
             var readResult = await reader.ReadAsync(input, settings, cancellationToken).ConfigureAwait(false);
 
             if (settings?.LoadExternalRefs ?? DefaultReaderSettings.LoadExternalRefs)
             {
                 var diagnosticExternalRefs = await LoadExternalRefsAsync(readResult.Document, settings, format, cancellationToken).ConfigureAwait(false);
                 // Merge diagnostics of external reference
@@ -283,7 +278,7 @@
                 throw new ArgumentException($"Cannot parse the stream: {nameof(input)} is empty or contains no elements.");
             }
 
-            var reader = OpenApiReaderRegistry.GetReader(format);
+            var reader = settings.Readers[format];
             var readResult = reader.Read(input, settings);
             return readResult;
         }
@@ -301,7 +296,7 @@
                     var response = await _httpClient.GetAsync(url, token).ConfigureAwait(false);
                     var mediaType = response.Content.Headers.ContentType.MediaType;
                     var contentType = mediaType.Split(";".ToCharArray(), StringSplitOptions.RemoveEmptyEntries)[0];
                     format = contentType.Split('/').Last().Split('+').Last().Split('-').Last();
                     // for non-standard MIME types e.g. text/x-yaml used in older libs or apps
 #if NETSTANDARD2_0
                     stream = await response.Content.ReadAsStreamAsync();

src/Microsoft.OpenApi/Reader/OpenApiReaderSettings.cs

@@ -7,6 +7,7 @@
 using System.Text.Json.Nodes;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.MicrosoftExtensions;
+using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Validations;
 
 namespace Microsoft.OpenApi.Reader
@@ -16,6 +17,27 @@ namespace Microsoft.OpenApi.Reader
     /// </summary>
     public class OpenApiReaderSettings
     {
+        /// <summary>
+        /// Adds a reader for the specified format
+        /// </summary>
+        public void AddJsonReader()
+        {
+#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)
+        {
+            { OpenApiConstants.Json, new OpenApiJsonReader() }
+        };
         /// <summary>
         /// When external references are found, load them into a shared workspace
         /// </summary>

test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiFilterServiceTests.cs

@@ -5,6 +5,7 @@
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.Interfaces;
 using Microsoft.OpenApi.Models.References;
+using Microsoft.OpenApi.Reader;
 using Microsoft.OpenApi.Services;
 using Microsoft.OpenApi.Tests.UtilityFiles;
 using Moq;
@@ -232,7 +233,9 @@ public async Task CopiesOverAllReferencedComponentsToTheSubsetDocumentCorrectly(
 
             // Act
             using var stream = File.OpenRead(filePath);
-            var doc = (await OpenApiDocument.LoadAsync(stream, "yaml")).Document;            
+            var settings = new OpenApiReaderSettings();
+            settings.AddYamlReader();
+            var doc = (await OpenApiDocument.LoadAsync(stream, "yaml", settings)).Document;            
             var predicate = OpenApiFilterService.CreatePredicate(operationIds: operationIds);
             var subsetOpenApiDocument = OpenApiFilterService.CreateFilteredDocument(doc, predicate);
 

test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiServiceTests.cs

@@ -26,8 +26,6 @@ public sealed class OpenApiServiceTests : IDisposable
         public OpenApiServiceTests()
         {
             _logger = new Logger<OpenApiServiceTests>(_loggerFactory);
-            OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yml, new OpenApiYamlReader());
-            OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
         }
 
         [Fact]

test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/OpenApiDiagnosticTests.cs

@@ -15,15 +15,10 @@ namespace Microsoft.OpenApi.Readers.Tests.OpenApiReaderTests
     [Collection("DefaultSettings")]
     public class OpenApiDiagnosticTests
     {
-        public OpenApiDiagnosticTests()
-        {
-            OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
-        }
-
         [Fact]
         public async Task DetectedSpecificationVersionShouldBeV2_0()
         {
-            var actual = await OpenApiDocument.LoadAsync("V2Tests/Samples/basic.v2.yaml");
+            var actual = await OpenApiDocument.LoadAsync("V2Tests/Samples/basic.v2.yaml", SettingsFixture.ReaderSettings);
 
             Assert.NotNull(actual.Diagnostic);
             Assert.Equal(OpenApiSpecVersion.OpenApi2_0, actual.Diagnostic.SpecificationVersion);
@@ -32,7 +27,7 @@ public async Task DetectedSpecificationVersionShouldBeV2_0()
         [Fact]
         public async Task DetectedSpecificationVersionShouldBeV3_0()
         {
-            var actual = await OpenApiDocument.LoadAsync("V3Tests/Samples/OpenApiDocument/minimalDocument.yaml");
+            var actual = await OpenApiDocument.LoadAsync("V3Tests/Samples/OpenApiDocument/minimalDocument.yaml", SettingsFixture.ReaderSettings);
 
             Assert.NotNull(actual.Diagnostic);
             Assert.Equal(OpenApiSpecVersion.OpenApi3_0, actual.Diagnostic.SpecificationVersion);
@@ -48,6 +43,7 @@ public async Task DiagnosticReportMergedForExternalReferenceAsync()
                 CustomExternalLoader = new ResourceLoader(),
                 BaseUrl = new("fie://c:\\")
             };
+            settings.AddYamlReader();
 
             ReadResult result;
             result = await OpenApiDocument.LoadAsync("OpenApiReaderTests/Samples/OpenApiDiagnosticReportMerged/TodoMain.yaml", settings);

test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/OpenApiStreamReaderTests.cs

@@ -15,16 +15,12 @@ public class OpenApiStreamReaderTests
     {
         private const string SampleFolderPath = "V3Tests/Samples/OpenApiDocument/";
 
-        public OpenApiStreamReaderTests()
-        {
-            OpenApiReaderRegistry.RegisterReader("yaml", new OpenApiYamlReader());
-        }
-
         [Fact]
         public async Task StreamShouldCloseIfLeaveStreamOpenSettingEqualsFalse()
         {
             using var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "petStore.yaml"));
             var settings = new OpenApiReaderSettings { LeaveStreamOpen = false };
+            settings.AddYamlReader();
             _ = await OpenApiDocument.LoadAsync(stream, settings: settings);
             Assert.False(stream.CanRead);
         }
@@ -34,6 +30,7 @@ public async Task StreamShouldNotCloseIfLeaveStreamOpenSettingEqualsTrue()
         {
             using var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "petStore.yaml"));
             var settings = new OpenApiReaderSettings { LeaveStreamOpen = true };
+            settings.AddYamlReader();
             _ = await OpenApiDocument.LoadAsync(stream, settings: settings);
             Assert.True(stream.CanRead);
         }
@@ -48,7 +45,9 @@ public async Task StreamShouldNotBeDisposedIfLeaveStreamOpenSettingIsTrueAsync()
             memoryStream.Position = 0;
             var stream = memoryStream;
 
-            _ = await OpenApiDocument.LoadAsync(stream, settings: new OpenApiReaderSettings { LeaveStreamOpen = true });
+            var settings = new OpenApiReaderSettings { LeaveStreamOpen = true };
+            settings.AddYamlReader();
+            _ = await OpenApiDocument.LoadAsync(stream, settings: settings);
             stream.Seek(0, SeekOrigin.Begin); // does not throw an object disposed exception
             Assert.True(stream.CanRead);
         }
@@ -64,7 +63,9 @@ public async Task StreamShouldReadWhenInitializedAsync()
             var stream = await httpClient.GetStreamAsync("20fe7a7b720a0e48e5842d002ac418b12a8201df/tests/v3.0/pass/petstore.yaml");
 
             // Read V3 as YAML
-            var result = await OpenApiDocument.LoadAsync(stream);
+            var settings = new OpenApiReaderSettings();
+            settings.AddYamlReader();
+            var result = await OpenApiDocument.LoadAsync(stream, settings: settings);
             Assert.NotNull(result.Document);
         }
     }

test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/UnsupportedSpecVersionTests.cs

@@ -16,7 +16,7 @@ public async Task ThrowOpenApiUnsupportedSpecVersionException()
         {
             try
             {
-                _ = await OpenApiDocument.LoadAsync("OpenApiReaderTests/Samples/unsupported.v1.yaml");
+                _ = await OpenApiDocument.LoadAsync("OpenApiReaderTests/Samples/unsupported.v1.yaml", SettingsFixture.ReaderSettings);
             }
             catch (OpenApiUnsupportedSpecVersionException exception)
             {

test/Microsoft.OpenApi.Readers.Tests/OpenApiWorkspaceTests/OpenApiWorkspaceStreamTests.cs

@@ -11,13 +11,6 @@ namespace Microsoft.OpenApi.Readers.Tests.OpenApiWorkspaceTests
 {
     public class OpenApiWorkspaceStreamTests
     {
-        private const string SampleFolderPath = "V3Tests/Samples/OpenApiWorkspace/";
-
-        public OpenApiWorkspaceStreamTests()
-        {
-            OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
-        }
-
         // Use OpenApiWorkspace to load a document and a referenced document
 
         [Fact]
@@ -30,6 +23,7 @@ public async Task LoadingDocumentWithResolveAllReferencesShouldLoadDocumentIntoW
                 CustomExternalLoader = new MockLoader(),
                 BaseUrl = new("file://c:\\")
             };
+            settings.AddYamlReader();
 
             var stream = new MemoryStream();
             var doc = """
@@ -59,6 +53,7 @@ public async Task LoadDocumentWithExternalReferenceShouldLoadBothDocumentsIntoWo
                 CustomExternalLoader = new ResourceLoader(),
                 BaseUrl = new("file://c:\\"),
             };
+            settings.AddYamlReader();
 
             ReadResult result;
             result = await OpenApiDocument.LoadAsync("V3Tests/Samples/OpenApiWorkspace/TodoMain.yaml", settings);

test/Microsoft.OpenApi.Readers.Tests/ParseNodeTests.cs

@@ -12,11 +12,6 @@ namespace Microsoft.OpenApi.Tests
 {
     public class ParseNodeTests
     {
-        public ParseNodeTests()
-        {
-            OpenApiReaderRegistry.RegisterReader("yaml", new OpenApiYamlReader());
-        }
-
         [Fact]
         public void BrokenSimpleList()
         {
@@ -30,7 +25,7 @@ public void BrokenSimpleList()
                 paths: { }
                 """;
 
-            var result = OpenApiDocument.Parse(input, "yaml");
+            var result = OpenApiDocument.Parse(input, "yaml", SettingsFixture.ReaderSettings);
 
             Assert.Equivalent(new List<OpenApiError>() {
                 new OpenApiError(new OpenApiReaderException("Expected a value."))
@@ -56,7 +51,7 @@ public void BadSchema()
                                       schema: asdasd
                         """;
 
-            var res= OpenApiDocument.Parse(input, "yaml");
+            var res= OpenApiDocument.Parse(input, "yaml", SettingsFixture.ReaderSettings);
 
             Assert.Equivalent(new List<OpenApiError>
             {