Skip to content

Adjusted cancellationToken to work for all NSwag supported frameworks #5190

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
lahma merged 2 commits into from
Jun 16, 2025
Merged

Adjusted cancellationToken to work for all NSwag supported frameworks #5190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
252d290
Added preprocessor directive that ensures cancellationToken is only a…
Jun 11, 2025
3199f4e
tweaks
lahma Jun 15, 2025
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
2 changes: 1 addition & 1 deletion src/NSwag.CodeGeneration.CSharp.Tests/FileDownloadTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public async Task When_response_is_file_and_stream_is_not_used_then_byte_array_i

// Assert
Assert.Contains("System.Threading.Tasks.Task<FileResponse> DownloadFileAsync();", code);
Assert.Contains("ReadAsStreamAsync(cancellationToken)", code);
Assert.Contains("ReadAsStreamAsync(", code);
}

[Fact]
Expand Down
24 changes: 22 additions & 2 deletions ...apshots/ArrayParameterTests.When_CollectionFormat_is_csv_then_do_not_explode.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,26 @@ namespace MyNamespace
public string Text { get; }
}

[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
private static System.Threading.Tasks.Task<string> ReadAsStringAsync(System.Net.Http.HttpContent content, System.Threading.CancellationToken cancellationToken)
{
#if NET5_0_OR_GREATER
return content.ReadAsStringAsync(cancellationToken);
#else
return content.ReadAsStringAsync();
#endif
}

[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
private static System.Threading.Tasks.Task<System.IO.Stream> ReadAsStreamAsync(System.Net.Http.HttpContent content, System.Threading.CancellationToken cancellationToken)
{
#if NET5_0_OR_GREATER
return content.ReadAsStreamAsync(cancellationToken);
#else
return content.ReadAsStreamAsync();
#endif
}

public bool ReadResponseAsString { get; set; }

protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> ReadObjectResponseAsync<T>(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, System.Threading.CancellationToken cancellationToken)
Expand All @@ -149,7 +169,7 @@ namespace MyNamespace

if (ReadResponseAsString)
{
var responseText = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
var responseText = await ReadAsStringAsync(response.Content, cancellationToken).ConfigureAwait(false);
try
{
var typedBody = Newtonsoft.Json.JsonConvert.DeserializeObject<T>(responseText, JsonSerializerSettings);
Expand All @@ -165,7 +185,7 @@ namespace MyNamespace
{
try
{
using (var responseStream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false))
using (var responseStream = await ReadAsStreamAsync(response.Content, cancellationToken).ConfigureAwait(false))
using (var streamReader = new System.IO.StreamReader(responseStream))
using (var jsonTextReader = new Newtonsoft.Json.JsonTextReader(streamReader))
{
Expand Down
24 changes: 22 additions & 2 deletions ...ts/Snapshots/ArrayParameterTests.When_CollectionFormat_is_multi_then_explode.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,26 @@ namespace MyNamespace
public string Text { get; }
}

[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
private static System.Threading.Tasks.Task<string> ReadAsStringAsync(System.Net.Http.HttpContent content, System.Threading.CancellationToken cancellationToken)
{
#if NET5_0_OR_GREATER
return content.ReadAsStringAsync(cancellationToken);
#else
return content.ReadAsStringAsync();
#endif
}

[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
private static System.Threading.Tasks.Task<System.IO.Stream> ReadAsStreamAsync(System.Net.Http.HttpContent content, System.Threading.CancellationToken cancellationToken)
{
#if NET5_0_OR_GREATER
return content.ReadAsStreamAsync(cancellationToken);
#else
return content.ReadAsStreamAsync();
#endif
}

public bool ReadResponseAsString { get; set; }

protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> ReadObjectResponseAsync<T>(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, System.Threading.CancellationToken cancellationToken)
Expand All @@ -143,7 +163,7 @@ namespace MyNamespace

if (ReadResponseAsString)
{
var responseText = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
var responseText = await ReadAsStringAsync(response.Content, cancellationToken).ConfigureAwait(false);
try
{
var typedBody = Newtonsoft.Json.JsonConvert.DeserializeObject<T>(responseText, JsonSerializerSettings);
Expand All @@ -159,7 +179,7 @@ namespace MyNamespace
{
try
{
using (var responseStream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false))
using (var responseStream = await ReadAsStreamAsync(response.Content, cancellationToken).ConfigureAwait(false))
using (var streamReader = new System.IO.StreamReader(responseStream))
using (var jsonTextReader = new Newtonsoft.Json.JsonTextReader(streamReader))
{
Expand Down
Loading
Loading