code cleanup

Author: MaggieKimani1

src/Microsoft.OpenApi.Readers/OpenApiYamlReader.cs

@@ -23,7 +23,7 @@ public class OpenApiYamlReader : IOpenApiReader
 
         /// <inheritdoc/>
         public async Task<ReadResult> ReadAsync(Stream input,
-                                                OpenApiReaderSettings settings = null,
+                                                OpenApiReaderSettings settings,
                                                 CancellationToken cancellationToken = default)
         {
             if (input is MemoryStream memoryStream)
@@ -41,14 +41,14 @@ public async Task<ReadResult> ReadAsync(Stream input,
 
         /// <inheritdoc/>
         public ReadResult Read(MemoryStream input,
-                               OpenApiReaderSettings settings = null)
+                               OpenApiReaderSettings settings)
         {
             JsonNode jsonNode;
 
             // Parse the YAML text in the TextReader into a sequence of JsonNodes
             try
             {
-                using var stream = new StreamReader(input, default, true, -1, settings?.LeaveStreamOpen);
+                using var stream = new StreamReader(input, default, true, -1, settings.LeaveStreamOpen);
                 jsonNode = LoadJsonNodesFromYamlDocument(stream);
             }
             catch (JsonException ex)

src/Microsoft.OpenApi/Interfaces/IOpenApiReader.cs

@@ -21,15 +21,15 @@ public interface IOpenApiReader
         /// <param name="settings"> The OpenApi reader settings.</param>
         /// <param name="cancellationToken">Propagates notification that an operation should be cancelled.</param>
         /// <returns></returns>
-        Task<ReadResult> ReadAsync(Stream input, OpenApiReaderSettings settings = null, CancellationToken cancellationToken = default);
+        Task<ReadResult> ReadAsync(Stream input, OpenApiReaderSettings settings, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Provides a synchronous method to read the input memory stream and parse it into an Open API document.
         /// </summary>
         /// <param name="input"></param>
         /// <param name="settings"></param>
         /// <returns></returns>
-        ReadResult Read(MemoryStream input, OpenApiReaderSettings settings = null);
+        ReadResult Read(MemoryStream input, OpenApiReaderSettings settings);
 
         /// <summary>
         /// Parses the JsonNode input into an Open API document.

src/Microsoft.OpenApi/Reader/OpenApiJsonReader.cs

@@ -61,7 +61,7 @@ public ReadResult Read(MemoryStream input,
         /// <param name="cancellationToken">Propagates notifications that operations should be cancelled.</param>
         /// <returns></returns>
         public async Task<ReadResult> ReadAsync(Stream input,
-                                                OpenApiReaderSettings settings = null,
+                                                OpenApiReaderSettings settings,
                                                 CancellationToken cancellationToken = default)
         {
             JsonNode jsonNode;
@@ -94,8 +94,8 @@ public async Task<ReadResult> ReadAsync(Stream input,
         /// <param name="format">The OpenAPI format.</param>
         /// <returns></returns>
         public ReadResult Read(JsonNode jsonNode,
-                                                OpenApiReaderSettings settings,
-                                                string format = null)
+                               OpenApiReaderSettings settings,
+                               string format = null)
         {
             var diagnostic = new OpenApiDiagnostic();
             var context = new ParsingContext(diagnostic)

src/Microsoft.OpenApi/Reader/OpenApiModelFactory.cs

@@ -149,18 +149,14 @@ public static async Task<ReadResult> LoadAsync(Stream input, string format = nul
                 preparedStream.Position = 0;
             }
 
-            try
+            // Use StreamReader to process the prepared stream (buffered for YAML, direct for JSON)
+            var result = await InternalLoadAsync(preparedStream, format, settings, cancellationToken);
+            if (!settings.LeaveStreamOpen)
             {
-                // Use StreamReader to process the prepared stream (buffered for YAML, direct for JSON)
-                return await InternalLoadAsync(preparedStream, format, settings, cancellationToken);
-            }
-            finally
-            {
-                if (!settings.LeaveStreamOpen)
-                {
-                    input.Dispose();
-                }
+                input.Dispose();
             }
+
+            return result;
         }
 
         /// <summary>
@@ -204,13 +200,13 @@ public static T Parse<T>(string input,
             return Load<T>(stream, version, format, out diagnostic, settings);
         }
 
-        private static async Task<ReadResult> InternalLoadAsync(Stream input, string format, OpenApiReaderSettings settings = null, CancellationToken cancellationToken = default)
+        private static async Task<ReadResult> InternalLoadAsync(Stream input, string format, OpenApiReaderSettings settings, CancellationToken cancellationToken = default)
         {
             Utils.CheckArgumentNull(format, nameof(format));
             var reader = OpenApiReaderRegistry.GetReader(format);
             var readResult = await reader.ReadAsync(input, settings, cancellationToken);
 
-            if (settings is not null && settings.LoadExternalRefs)
+            if (settings.LoadExternalRefs)
             {
                 var diagnosticExternalRefs = await LoadExternalRefsAsync(readResult.OpenApiDocument, cancellationToken, settings, format);
                 // Merge diagnostics of external reference
@@ -236,10 +232,10 @@ private static async Task<OpenApiDiagnostic> LoadExternalRefsAsync(OpenApiDocume
             return await workspaceLoader.LoadAsync(new OpenApiReference() { ExternalResource = "/" }, document, format ?? OpenApiConstants.Json, null, cancellationToken);
         }
 
-        private static ReadResult InternalLoad(MemoryStream input, string format, OpenApiReaderSettings settings = null)
+        private static ReadResult InternalLoad(MemoryStream input, string format, OpenApiReaderSettings settings)
         {
             Utils.CheckArgumentNull(format, nameof(format));
-            if (settings is not null && settings.LoadExternalRefs)
+            if (settings.LoadExternalRefs)
             {
                 throw new InvalidOperationException("Loading external references are not supported when using synchronous methods.");
             }