Address feedback

Author: captainsafia

src/OpenApi/src/Services/OpenApiDocumentService.cs

@@ -88,7 +88,7 @@ public async Task<OpenApiDocument> GetOpenApiDocumentAsync(IServiceProvider scop
         document.Workspace.RegisterComponents(document);
         if (document.Components?.Schemas is not null)
         {
-            document.Components.Schemas = document.Components.Schemas.OrderBy(schema => schema.Key).ToDictionary();
+            document.Components.Schemas = new SortedDictionary<string, OpenApiSchema>(document.Components.Schemas);
         }
         return document;
     }

src/OpenApi/src/Services/Schemas/OpenApiSchemaService.cs

@@ -196,7 +196,7 @@ internal static OpenApiSchema ResolveReferenceForSchema(OpenApiDocument document
             schema.Not = ResolveReferenceForSchema(document, schema.Not);
         }
 
-        // Handle schemas where the references have been inline by the JsonSchemaExporter. In this case,
+        // Handle schemas where the references have been inlined by the JsonSchemaExporter. In this case,
         // the `#` ID is generated by the exporter since it has no base document to baseline against. In this
         // case we we want to replace the reference ID with the schema ID that was generated by the
         // `CreateSchemaReferenceId` method in the OpenApiSchemaService.

src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Extensions/OpenApiEndpointRouteBuilderExtensionsTests.cs

@@ -12,6 +12,7 @@
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Readers;
 using System.Text;
+using Microsoft.OpenApi.Reader;
 
 public class OpenApiEndpointRouteBuilderExtensionsTests : OpenApiDocumentServiceTestBase
 {
@@ -67,7 +68,7 @@ public async Task MapOpenApi_ReturnsRenderedDocument()
 
         // Assert
         Assert.Equal(StatusCodes.Status200OK, context.Response.StatusCode);
-        ValidateOpenApiDocument(responseBodyStream, document =>
+        await ValidateOpenApiDocumentAsync(responseBodyStream, document =>
         {
             Assert.Equal("OpenApiEndpointRouteBuilderExtensionsTests | v1", document.Info.Title);
             Assert.Equal("1.0.0", document.Info.Version);
@@ -102,11 +103,11 @@ public async Task MapOpenApi_ReturnsDefaultDocumentIfNoNameProvided(string expec
         // String check to validate that generated document starts with YAML syntax
         Assert.Equal(isYaml, responseString.StartsWith("openapi: '3.1.1'", StringComparison.OrdinalIgnoreCase));
         responseBodyStream.Position = 0;
-        ValidateOpenApiDocument(responseBodyStream, document =>
+        await ValidateOpenApiDocumentAsync(responseBodyStream, document =>
         {
             Assert.Equal("OpenApiEndpointRouteBuilderExtensionsTests | v1", document.Info.Title);
             Assert.Equal("1.0.0", document.Info.Version);
-        });
+        }, isYaml ? "yaml" : "json");
     }
 
     [Fact]
@@ -163,16 +164,18 @@ public async Task MapOpenApi_ReturnsDocumentIfNameProvidedInQuery(string expecte
         // String check to validate that generated document starts with YAML syntax
         Assert.Equal(isYaml, responseString.StartsWith("openapi: '3.1.1'", StringComparison.OrdinalIgnoreCase));
         responseBodyStream.Position = 0;
-        ValidateOpenApiDocument(responseBodyStream, document =>
+        await ValidateOpenApiDocumentAsync(responseBodyStream, document =>
         {
             Assert.Equal($"OpenApiEndpointRouteBuilderExtensionsTests | {documentName}", document.Info.Title);
             Assert.Equal("1.0.0", document.Info.Version);
-        });
+        }, isYaml ? "yaml" : "json");
     }
 
-    private static async void ValidateOpenApiDocument(MemoryStream documentStream, Action<OpenApiDocument> action)
+    private static async Task ValidateOpenApiDocumentAsync(MemoryStream documentStream, Action<OpenApiDocument> action, string format = "json")
     {
-        var result = await OpenApiDocument.LoadAsync(documentStream, "json");
+        documentStream.Position = 0;
+        OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
+        var result = await OpenApiDocument.LoadAsync(documentStream, format);
         Assert.Empty(result.OpenApiDiagnostic.Errors);
         action(result.OpenApiDocument);
     }

src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiSchemaService/OpenApiSchemaService.ParameterSchemas.cs

@@ -70,7 +70,7 @@ await VerifyOpenApiDocument(builder, document =>
         {
             var operation = document.Paths["/api/{id}"].Operations[OperationType.Get];
             var parameter = Assert.Single(operation.Parameters);
-            Assert.Equal( schemaType, parameter.Schema.Type);
+            Assert.Equal(schemaType, parameter.Schema.Type);
             Assert.Equal(schemaFormat, parameter.Schema.Format);
             Assert.False(parameter.Schema.Nullable);
         });