Skip to content

[OpenApi] Fix thread static use and write directly to PipeWriter #61700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 28, 2025
Merged

[OpenApi] Fix thread static use and write directly to PipeWriter #61700

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 13 additions & 19 deletions src/OpenApi/src/Extensions/OpenApiEndpointRouteBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,29 +53,23 @@ public static IEndpointConventionBuilder MapOpenApi(this IEndpointRouteBuilder e
{
var document = await documentService.GetOpenApiDocumentAsync(context.RequestServices, context.Request, context.RequestAborted);
var documentOptions = options.Get(lowercasedDocumentName);
using var output = MemoryBufferWriter.Get();
using var writer = Utf8BufferTextWriter.Get(output);
try

using var writer = new Utf8BufferTextWriter();
writer.SetWriter(context.Response.BodyWriter);

if (UseYaml(pattern))
{
if (UseYaml(pattern))
{
await document.SerializeAsync(new OpenApiYamlWriter(writer), documentOptions.OpenApiVersion);
context.Response.ContentType = "text/plain+yaml;charset=utf-8";
}
else
{
await document.SerializeAsync(new OpenApiJsonWriter(writer), documentOptions.OpenApiVersion);
context.Response.ContentType = "application/json;charset=utf-8";
}
await context.Response.BodyWriter.WriteAsync(output.ToArray(), context.RequestAborted);
await context.Response.BodyWriter.FlushAsync(context.RequestAborted);
context.Response.ContentType = "text/plain+yaml;charset=utf-8";
await context.Response.StartAsync();
await document.SerializeAsync(new OpenApiYamlWriter(writer), documentOptions.OpenApiVersion, context.RequestAborted);
}
finally
else
{
MemoryBufferWriter.Return(output);
Utf8BufferTextWriter.Return(writer);
context.Response.ContentType = "application/json;charset=utf-8";
await context.Response.StartAsync();
await document.SerializeAsync(new OpenApiJsonWriter(writer), documentOptions.OpenApiVersion, context.RequestAborted);
}

await context.Response.BodyWriter.FlushAsync(context.RequestAborted);
}
}).ExcludeFromDescription();
}
Expand Down
Loading