fix: removes static readers registry

baywet · baywet · commit fe7a2fd654e9 · 2025-02-24T13:56:00.000-05:00
Signed-off-by: Vincent Biret &lt;vibiret@microsoft.com&gt;
diff --git a/src/Microsoft.OpenApi.Hidi/OpenApiService.cs b/src/Microsoft.OpenApi.Hidi/OpenApiService.cs
@@ -388,9 +388,7 @@ private static async Task<ReadResult> ParseOpenApiAsync(string openApiFile, bool
                         new(openApiFile) :
                         new Uri("file://" + new FileInfo(openApiFile).DirectoryName + Path.DirectorySeparatorChar)
                 };
-                var yamlReader = new OpenApiYamlReader();
-                settings.Readers.Add(OpenApiConstants.Yaml, yamlReader);
-                settings.Readers.Add(OpenApiConstants.Yml, yamlReader);
+                settings.AddYamlReader();
 
                 result = await OpenApiDocument.LoadAsync(stream, settings: settings, cancellationToken: cancellationToken).ConfigureAwait(false);
 
diff --git a/src/Microsoft.OpenApi.Readers/OpenApiReaderSettingsExtensions.cs b/src/Microsoft.OpenApi.Readers/OpenApiReaderSettingsExtensions.cs
@@ -0,0 +1,21 @@
+using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi.Reader;
+
+namespace Microsoft.OpenApi.Readers;
+
+/// <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.Readers.Add(OpenApiConstants.Yaml, yamlReader);
+        settings.Readers.Add(OpenApiConstants.Yml, yamlReader);
+    }
+}
diff --git a/src/Microsoft.OpenApi.Workbench/MainModel.cs b/src/Microsoft.OpenApi.Workbench/MainModel.cs
@@ -235,9 +235,7 @@ internal async Task ParseDocumentAsync()
                 {
                     RuleSet = ValidationRuleSet.GetDefaultRuleSet()
                 };
-                var yamlReader = new OpenApiYamlReader();
-                settings.Readers.Add(OpenApiConstants.Yaml, yamlReader);
-                settings.Readers.Add(OpenApiConstants.Yml, yamlReader);
+                settings.AddYamlReader();
                 if (ResolveExternal && !string.IsNullOrWhiteSpace(_inputFile))
                 {
                     settings.BaseUrl = _inputFile.StartsWith("http", StringComparison.OrdinalIgnoreCase) ? new(_inputFile) 
diff --git a/src/Microsoft.OpenApi/Reader/OpenApiModelFactory.cs b/src/Microsoft.OpenApi/Reader/OpenApiModelFactory.cs
@@ -40,7 +40,7 @@ public static ReadResult Load(MemoryStream stream,
             if (stream is null) throw new ArgumentNullException(nameof(stream));
 #endif
             settings ??= new OpenApiReaderSettings();
-            settings.Readers.TryAdd(OpenApiConstants.Json, new OpenApiJsonReader());
+            settings.AddJsonReader();
 
             // Get the format of the stream if not provided
             format ??= InspectStreamFormat(stream);
@@ -118,7 +118,7 @@ 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.Readers.TryAdd(OpenApiConstants.Json, new OpenApiJsonReader());
+            settings.AddJsonReader();
 
             Stream preparedStream;
             if (format is null)
@@ -201,7 +201,7 @@ public static ReadResult Parse(string input,
 #endif
             format ??= InspectInputFormat(input);
             settings ??= new OpenApiReaderSettings();
-            settings.Readers.TryAdd(OpenApiConstants.Json, new OpenApiJsonReader());
+            settings.AddJsonReader();
 
             // Copy string into MemoryStream
             using var stream = new MemoryStream(Encoding.UTF8.GetBytes(input));
@@ -233,7 +233,7 @@ public static T Parse<T>(string input,
 #endif
             format ??= InspectInputFormat(input);
             settings ??= new OpenApiReaderSettings();
-            settings.Readers.TryAdd(OpenApiConstants.Json, new OpenApiJsonReader());
+            settings.AddJsonReader();
             using var stream = new MemoryStream(Encoding.UTF8.GetBytes(input));
             return Load<T>(stream, version, format, openApiDocument, out diagnostic, settings);
         }
diff --git a/src/Microsoft.OpenApi/Reader/OpenApiReaderRegistry.cs b/src/Microsoft.OpenApi/Reader/OpenApiReaderRegistry.cs
diff --git a/src/Microsoft.OpenApi/Reader/OpenApiReaderSettings.cs b/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,13 @@ namespace Microsoft.OpenApi.Reader
     /// </summary>
     public class OpenApiReaderSettings
     {
+        /// <summary>
+        /// Adds a reader for the specified format
+        /// </summary>
+        public void AddJsonReader()
+        {
+            Readers.Add(OpenApiConstants.Json, new OpenApiJsonReader());
+        }
         /// <summary>
         /// Readers to use to parse the OpenAPI document
         /// </summary>
diff --git a/test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiServiceTests.cs b/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]
diff --git a/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/OpenApiDiagnosticTests.cs b/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/OpenApiDiagnosticTests.cs
@@ -15,11 +15,6 @@ 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()
         {
diff --git a/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/OpenApiStreamReaderTests.cs b/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/OpenApiStreamReaderTests.cs
@@ -15,11 +15,6 @@ public class OpenApiStreamReaderTests
     {
         private const string SampleFolderPath = "V3Tests/Samples/OpenApiDocument/";
 
-        public OpenApiStreamReaderTests()
-        {
-            OpenApiReaderRegistry.RegisterReader("yaml", new OpenApiYamlReader());
-        }
-
         [Fact]
         public async Task StreamShouldCloseIfLeaveStreamOpenSettingEqualsFalse()
         {
diff --git a/test/Microsoft.OpenApi.Readers.Tests/OpenApiWorkspaceTests/OpenApiWorkspaceStreamTests.cs b/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]
diff --git a/test/Microsoft.OpenApi.Readers.Tests/ParseNodeTests.cs b/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()
         {
diff --git a/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/TryLoadReferenceV2Tests.cs b/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/TryLoadReferenceV2Tests.cs
@@ -16,12 +16,6 @@ namespace Microsoft.OpenApi.Readers.Tests.ReferenceService
     public class TryLoadReferenceV2Tests
     {
         private const string SampleFolderPath = "ReferenceService/Samples/";
-
-        public TryLoadReferenceV2Tests()
-        {
-            OpenApiReaderRegistry.RegisterReader("yaml", new OpenApiYamlReader());
-        }
-
         [Fact]
         public async Task LoadParameterReference()
         {
diff --git a/test/Microsoft.OpenApi.Readers.Tests/TestCustomExtension.cs b/test/Microsoft.OpenApi.Readers.Tests/TestCustomExtension.cs
@@ -36,8 +36,8 @@ public void ParseCustomExtension()
                         };
                 } } }
             };
+            settings.AddYamlReader();
 
-            OpenApiReaderRegistry.RegisterReader("yaml", new OpenApiYamlReader());
             var diag = new OpenApiDiagnostic();
             var actual = OpenApiDocument.Parse(description, "yaml", settings: settings);
 
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/ComparisonTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/ComparisonTests.cs
@@ -21,7 +21,8 @@ public class ComparisonTests
         //[InlineData("definitions")]  //Currently broken due to V3 references not behaving the same as V2
         public async Task EquivalentV2AndV3DocumentsShouldProduceEquivalentObjects(string fileName)
         {
-            OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
+            var settings = new OpenApiReaderSettings();
+            settings.AddYamlReader();
             using var streamV2 = Resources.GetStream(Path.Combine(SampleFolderPath, $"{fileName}.v2.yaml"));
             using var streamV3 = Resources.GetStream(Path.Combine(SampleFolderPath, $"{fileName}.v3.yaml"));
             var result1 = await OpenApiDocument.LoadAsync(Path.Combine(SampleFolderPath, $"{fileName}.v2.yaml"));
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs
@@ -21,11 +21,6 @@ public class OpenApiDocumentTests
     {
         private const string SampleFolderPath = "V2Tests/Samples/";
 
-        public OpenApiDocumentTests()
-        {
-            OpenApiReaderRegistry.RegisterReader("yaml", new OpenApiYamlReader());
-        }
-
         [Theory]
         [InlineData("en-US")]
         [InlineData("hi-IN")]
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiServerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiServerTests.cs
@@ -7,11 +7,6 @@ namespace Microsoft.OpenApi.Readers.Tests.V2Tests
 {
     public class OpenApiServerTests
     {
-        public OpenApiServerTests()
-        {
-            OpenApiReaderRegistry.RegisterReader("yaml", new OpenApiYamlReader());
-        }
-
         [Fact]
         public void NoServer()
         {
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDocumentTests.cs
@@ -20,11 +20,6 @@ public class OpenApiDocumentTests
     {
         private const string SampleFolderPath = "V31Tests/Samples/OpenApiDocument/";
 
-        public OpenApiDocumentTests()
-        {
-            OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
-        }
-
         [Fact]
         public async Task ParseDocumentWithWebhooksShouldSucceed()
         {
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiSchemaTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiSchemaTests.cs
@@ -32,11 +32,6 @@ public static MemoryStream GetMemoryStream(string fileName)
             return new MemoryStream(fileBytes);
         }
 
-        public OpenApiSchemaTests()
-        {
-            OpenApiReaderRegistry.RegisterReader("yaml", new OpenApiYamlReader());
-        }
-
         [Fact]
         public async Task ParseBasicV31SchemaShouldSucceed()
         {
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiCallbackTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiCallbackTests.cs
@@ -16,11 +16,6 @@ namespace Microsoft.OpenApi.Readers.Tests.V3Tests
     public class OpenApiCallbackTests
     {
         private const string SampleFolderPath = "V3Tests/Samples/OpenApiCallback/";
-        public OpenApiCallbackTests()
-        {
-            OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
-        }
-
         [Fact]
         public async Task ParseBasicCallbackShouldSucceed()
         {
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDiscriminatorTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDiscriminatorTests.cs
@@ -14,11 +14,6 @@ public class OpenApiDiscriminatorTests
     {
         private const string SampleFolderPath = "V3Tests/Samples/OpenApiDiscriminator/";
 
-        public OpenApiDiscriminatorTests()
-        {
-            OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
-        }
-
         [Fact]
         public async Task ParseBasicDiscriminatorShouldSucceed()
         {
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs
@@ -28,11 +28,6 @@ public class OpenApiDocumentTests
         private const string SampleFolderPath = "V3Tests/Samples/OpenApiDocument/";
         private const string codacyApi = "https://api.codacy.com/api/api-docs/swagger.yaml";
 
-        public OpenApiDocumentTests()
-        {
-            OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
-        }
-
         private static async Task<T> CloneAsync<T>(T element) where T : class, IOpenApiSerializable
         {
             using var stream = new MemoryStream();
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiEncodingTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiEncodingTests.cs
@@ -14,11 +14,6 @@ public class OpenApiEncodingTests
     {
         private const string SampleFolderPath = "V3Tests/Samples/OpenApiEncoding/";
 
-        public OpenApiEncodingTests()
-        {
-            OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
-        }
-
         [Fact]
         public async Task ParseBasicEncodingShouldSucceed()
         {
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiExampleTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiExampleTests.cs
@@ -16,11 +16,6 @@ public class OpenApiExampleTests
     {
         private const string SampleFolderPath = "V3Tests/Samples/OpenApiExample/";
 
-        public OpenApiExampleTests() 
-        {     
-            OpenApiReaderRegistry.RegisterReader("yaml", new OpenApiYamlReader());
-        }
-
         [Fact]
         public async Task ParseAdvancedExampleShouldSucceed()
         {
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiInfoTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiInfoTests.cs
@@ -18,11 +18,6 @@ public class OpenApiInfoTests
     {
         private const string SampleFolderPath = "V3Tests/Samples/OpenApiInfo/";
 
-        public OpenApiInfoTests()
-        {
-            OpenApiReaderRegistry.RegisterReader("yaml", new OpenApiYamlReader());
-        }
-
         [Fact]
         public async Task ParseAdvancedInfoShouldSucceed()
         {
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiMediaTypeTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiMediaTypeTests.cs
@@ -19,11 +19,6 @@ public class OpenApiMediaTypeTests
     {
         private const string SampleFolderPath = "V3Tests/Samples/OpenApiMediaType/";
 
-        public OpenApiMediaTypeTests()
-        {
-            OpenApiReaderRegistry.RegisterReader("yaml", new OpenApiYamlReader());
-        }
-
         [Fact]
         public async Task ParseMediaTypeWithExampleShouldSucceed()
         {
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiOperationTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiOperationTests.cs
@@ -16,11 +16,6 @@ public class OpenApiOperationTests
     {
         private const string SampleFolderPath = "V3Tests/Samples/OpenApiOperation/";
 
-        public OpenApiOperationTests()
-        {
-            OpenApiReaderRegistry.RegisterReader("yaml", new OpenApiYamlReader());
-        }
-
         [Fact]
         public async Task OperationWithSecurityRequirementShouldReferenceSecurityScheme()
         {
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiParameterTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiParameterTests.cs
@@ -19,11 +19,6 @@ public class OpenApiParameterTests
     {
         private const string SampleFolderPath = "V3Tests/Samples/OpenApiParameter/";
 
-        public OpenApiParameterTests() 
-        {
-            OpenApiReaderRegistry.RegisterReader("yaml", new OpenApiYamlReader());
-        }
-
         [Fact]
         public async Task ParsePathParameterShouldSucceed()
         {
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiResponseTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiResponseTests.cs
@@ -16,11 +16,6 @@ public class OpenApiResponseTests
     {
         private const string SampleFolderPath = "V3Tests/Samples/OpenApiResponse/";
 
-        public OpenApiResponseTests()
-        {
-            OpenApiReaderRegistry.RegisterReader("yaml", new OpenApiYamlReader());
-        }
-
         [Fact]
         public async Task ResponseWithReferencedHeaderShouldReferenceComponent()
         {
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSchemaTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSchemaTests.cs
@@ -24,11 +24,6 @@ public class OpenApiSchemaTests
     {
         private const string SampleFolderPath = "V3Tests/Samples/OpenApiSchema/";
 
-        public OpenApiSchemaTests()
-        {
-            OpenApiReaderRegistry.RegisterReader("yaml", new OpenApiYamlReader());
-        }
-
         [Fact]
         public void ParsePrimitiveSchemaShouldSucceed()
         {
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSecuritySchemeTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSecuritySchemeTests.cs
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiXmlTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiXmlTests.cs
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.cs
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.cs
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.cs
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.cs
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.cs
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiPathItemReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiPathItemReferenceTests.cs
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.cs
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.cs
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.cs
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.cs

Original file line number	Diff line number	Diff line change
`@@ -235,9 +235,7 @@ internal async Task ParseDocumentAsync()`
`235`	`235`	`{`
`236`	`236`	`RuleSet = ValidationRuleSet.GetDefaultRuleSet()`
`237`	`237`	`};`
`238`		`- var yamlReader = new OpenApiYamlReader();`
`239`		`- settings.Readers.Add(OpenApiConstants.Yaml, yamlReader);`
`240`		`- settings.Readers.Add(OpenApiConstants.Yml, yamlReader);`
	`238`	`+ settings.AddYamlReader();`
`241`	`239`	`if (ResolveExternal && !string.IsNullOrWhiteSpace(_inputFile))`
`242`	`240`	`{`
`243`	`241`	`settings.BaseUrl = _inputFile.StartsWith("http", StringComparison.OrdinalIgnoreCase) ? new(_inputFile)`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,6 @@ public sealed class OpenApiServiceTests : IDisposable`
`26`	`26`	`public OpenApiServiceTests()`
`27`	`27`	`{`
`28`	`28`	`_logger = new Logger<OpenApiServiceTests>(_loggerFactory);`
`29`		`- OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yml, new OpenApiYamlReader());`
`30`		`- OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());`
`31`	`29`	`}`
`32`	`30`
`33`	`31`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,6 @@ namespace Microsoft.OpenApi.Readers.Tests.OpenApiReaderTests`
`15`	`15`	`[Collection("DefaultSettings")]`
`16`	`16`	`public class OpenApiDiagnosticTests`
`17`	`17`	`{`
`18`		`- public OpenApiDiagnosticTests()`
`19`		`- {`
`20`		`- OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());`
`21`		`- }`
`22`		`-`
`23`	`18`	`[Fact]`
`24`	`19`	`public async Task DetectedSpecificationVersionShouldBeV2_0()`
`25`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,6 @@ public class OpenApiStreamReaderTests`
`15`	`15`	`{`
`16`	`16`	`private const string SampleFolderPath = "V3Tests/Samples/OpenApiDocument/";`
`17`	`17`
`18`		`- public OpenApiStreamReaderTests()`
`19`		`- {`
`20`		`- OpenApiReaderRegistry.RegisterReader("yaml", new OpenApiYamlReader());`
`21`		`- }`
`22`		`-`
`23`	`18`	`[Fact]`
`24`	`19`	`public async Task StreamShouldCloseIfLeaveStreamOpenSettingEqualsFalse()`
`25`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,6 @@ namespace Microsoft.OpenApi.Readers.Tests.OpenApiWorkspaceTests`
`11`	`11`	`{`
`12`	`12`	`public class OpenApiWorkspaceStreamTests`
`13`	`13`	`{`
`14`		`- private const string SampleFolderPath = "V3Tests/Samples/OpenApiWorkspace/";`
`15`		`-`
`16`		`- public OpenApiWorkspaceStreamTests()`
`17`		`- {`
`18`		`- OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());`
`19`		`- }`
`20`		`-`
`21`	`14`	`// Use OpenApiWorkspace to load a document and a referenced document`
`22`	`15`
`23`	`16`	`[Fact]`