code cleanup

Author: MaggieKimani1

src/Microsoft.OpenApi.Readers/OpenApiYamlReader.cs

@@ -65,6 +65,12 @@ public ReadResult Read(MemoryStream input,
             return Read(jsonNode, settings);
         }
 
+        /// <inheritdoc/>
+        public ReadResult Read(JsonNode jsonNode, OpenApiReaderSettings settings, string format = null)
+        {
+            return OpenApiReaderRegistry.DefaultReader.Read(jsonNode, settings, OpenApiConstants.Yaml);
+        }
+
         /// <inheritdoc/>
         public T ReadFragment<T>(MemoryStream input,
                                  OpenApiSpecVersion version,
@@ -89,6 +95,12 @@ public T ReadFragment<T>(MemoryStream input,
             return ReadFragment<T>(jsonNode, version, out diagnostic);
         }
 
+        /// <inheritdoc/>
+        public T ReadFragment<T>(JsonNode input, OpenApiSpecVersion version, out OpenApiDiagnostic diagnostic, OpenApiReaderSettings settings = null) where T : IOpenApiElement
+        {
+            return OpenApiReaderRegistry.DefaultReader.ReadFragment<T>(input, version, out diagnostic);
+        }
+
         /// <summary>
         /// Helper method to turn streams into a sequence of JsonNodes
         /// </summary>
@@ -98,20 +110,8 @@ static JsonNode LoadJsonNodesFromYamlDocument(TextReader input)
         {
             var yamlStream = new YamlStream();
             yamlStream.Load(input);
-            var yamlDocument = yamlStream.Documents.First();
+            var yamlDocument = yamlStream.Documents[0];
             return yamlDocument.ToJsonNode();
         }
-
-        /// <inheritdoc/>
-        public ReadResult Read(JsonNode jsonNode, OpenApiReaderSettings settings, string format = null)
-        {
-            return OpenApiReaderRegistry.DefaultReader.Read(jsonNode, settings, OpenApiConstants.Yaml);
-        }
-
-        /// <inheritdoc/>
-        public T ReadFragment<T>(JsonNode input, OpenApiSpecVersion version, out OpenApiDiagnostic diagnostic, OpenApiReaderSettings settings = null) where T : IOpenApiElement
-        {
-            return OpenApiReaderRegistry.DefaultReader.ReadFragment<T>(input, version, out diagnostic);
-        }
     }
 }

src/Microsoft.OpenApi/Reader/OpenApiJsonReader.cs

@@ -27,7 +27,7 @@ public class OpenApiJsonReader : IOpenApiReader
         /// <param name="settings">The Reader settings to be used during parsing.</param>
         /// <returns></returns>
         public ReadResult Read(MemoryStream input,
-                                OpenApiReaderSettings settings = null)
+                               OpenApiReaderSettings settings)
         {
             JsonNode jsonNode;
             var diagnostic = new OpenApiDiagnostic();
@@ -51,40 +51,6 @@ public ReadResult Read(MemoryStream input,
             return Read(jsonNode, settings);
         }
 
-
-        /// <summary>
-        /// Reads the stream input asynchronously and parses it into an Open API document.
-        /// </summary>
-        /// <param name="input">TextReader containing OpenAPI description to parse.</param>
-        /// <param name="settings">The Reader settings to be used during parsing.</param>
-        /// <param name="cancellationToken">Propagates notifications that operations should be cancelled.</param>
-        /// <returns></returns>
-        public async Task<ReadResult> ReadAsync(Stream input,
-                                                OpenApiReaderSettings settings,
-                                                CancellationToken cancellationToken = default)
-        {
-            JsonNode jsonNode;
-            var diagnostic = new OpenApiDiagnostic();
-            settings ??= new OpenApiReaderSettings();
-
-            // Parse the JSON text in the TextReader into JsonNodes
-            try
-            {
-                jsonNode = await JsonNode.ParseAsync(input);
-            }
-            catch (JsonException ex)
-            {
-                diagnostic.Errors.Add(new OpenApiError($"#line={ex.LineNumber}", $"Please provide the correct format, {ex.Message}"));
-                return new ReadResult
-                {
-                    OpenApiDocument = null,
-                    OpenApiDiagnostic = diagnostic
-                };
-            }
-
-            return Read(jsonNode, settings);
-        }
-
         /// <summary>
         /// Parses the JsonNode input into an Open API document.
         /// </summary>
@@ -137,6 +103,39 @@ public ReadResult Read(JsonNode jsonNode,
             };
         }
 
+        /// <summary>
+        /// Reads the stream input asynchronously and parses it into an Open API document.
+        /// </summary>
+        /// <param name="input">TextReader containing OpenAPI description to parse.</param>
+        /// <param name="settings">The Reader settings to be used during parsing.</param>
+        /// <param name="cancellationToken">Propagates notifications that operations should be cancelled.</param>
+        /// <returns></returns>
+        public async Task<ReadResult> ReadAsync(Stream input,
+                                                OpenApiReaderSettings settings,
+                                                CancellationToken cancellationToken = default)
+        {
+            JsonNode jsonNode;
+            var diagnostic = new OpenApiDiagnostic();
+            settings ??= new OpenApiReaderSettings();
+
+            // Parse the JSON text in the TextReader into JsonNodes
+            try
+            {
+                jsonNode = await JsonNode.ParseAsync(input);
+            }
+            catch (JsonException ex)
+            {
+                diagnostic.Errors.Add(new OpenApiError($"#line={ex.LineNumber}", $"Please provide the correct format, {ex.Message}"));
+                return new ReadResult
+                {
+                    OpenApiDocument = null,
+                    OpenApiDiagnostic = diagnostic
+                };
+            }
+
+            return Read(jsonNode, settings);
+        }
+
         /// <inheritdoc/>
         public T ReadFragment<T>(MemoryStream input,
                                  OpenApiSpecVersion version,