Skip to content

ClientModel: Fix build break caused by merge conflict #42046

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
Feb 16, 2024
Merged

ClientModel: Fix build break caused by merge conflict #42046

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion sdk/core/System.ClientModel/src/Pipeline/HttpClientPipelineTransport.Response.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public override Stream? ContentStream
return _contentStream;
}

return ReadContent().ToStream();
return BufferContent().ToStream();
}
set
{
Expand Down
8 changes: 4 additions & 4 deletions sdk/core/System.ClientModel/tests/Pipeline/HttpClientPipelineTransportTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ public async Task ResponseReadContentReturnsContentIfBuffered()

await transport.ProcessSyncOrAsync(message, IsAsync);

BinaryData content = await message.Response!.ReadContentSyncOrAsync(default, IsAsync);
BinaryData content = await message.Response!.BufferContentSyncOrAsync(default, IsAsync);

Assert.AreEqual(message.Response!.Content, content);
}
Expand All @@ -416,7 +416,7 @@ public async Task ResponseReadContentReturnsEmptyWhenNoResponseContent()

await transport.ProcessSyncOrAsync(message, IsAsync);

BinaryData content = await message.Response!.ReadContentSyncOrAsync(default, IsAsync);
BinaryData content = await message.Response!.BufferContentSyncOrAsync(default, IsAsync);

Assert.AreEqual(0, content.ToMemory().Length);
}
Expand All @@ -439,7 +439,7 @@ public async Task ResponseReadContentReturnsEmptyWhenContentStreamNull()
// Explicitly assign ContentStream via property setter
message.Response!.ContentStream = null;

BinaryData content = await message.Response!.ReadContentSyncOrAsync(default, IsAsync);
BinaryData content = await message.Response!.BufferContentSyncOrAsync(default, IsAsync);

Assert.AreEqual(0, content.ToMemory().Length);
}
Expand Down Expand Up @@ -467,7 +467,7 @@ public async Task ResponseReadContentThrowsWhenPositionNonZero()

message.Response!.ContentStream!.ReadByte();

Assert.ThrowsAsync<InvalidOperationException>(async() => { await message.Response!.ReadContentSyncOrAsync(default, IsAsync); });
Assert.ThrowsAsync<InvalidOperationException>(async() => { await message.Response!.BufferContentSyncOrAsync(default, IsAsync); });
}

[Test]
Expand Down
6 changes: 3 additions & 3 deletions sdk/core/System.ClientModel/tests/TestFramework/Mocks/MockSyncAsyncExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,15 @@ public static async Task WaitSyncOrAsync(this MockRetryPolicy policy, TimeSpan d
}
}

public static async Task<BinaryData> ReadContentSyncOrAsync(this PipelineResponse response, CancellationToken cancellationToken, bool isAsync)
public static async Task<BinaryData> BufferContentSyncOrAsync(this PipelineResponse response, CancellationToken cancellationToken, bool isAsync)
{
if (isAsync)
{
return await response.ReadContentAsync(cancellationToken).ConfigureAwait(false);
return await response.BufferContentAsync(cancellationToken).ConfigureAwait(false);
}
else
{
return response.ReadContent(cancellationToken);
return response.BufferContent(cancellationToken);
}
}
}