Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/Azure.Core/api/Azure.Core.net461.cs
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ public HttpMessage(Azure.Core.Request request, Azure.Core.ResponseClassifier res
public Azure.Core.MessageProcessingContext ProcessingContext { get { throw null; } }
public new Azure.Core.Request Request { get { throw null; } }
public new Azure.Response Response { get { throw null; } set { } }
public Azure.Core.ResponseClassifier ResponseClassifier { get { throw null; } set { } }
public new Azure.Core.ResponseClassifier ResponseClassifier { get { throw null; } set { } }
public System.IO.Stream? ExtractResponseContent() { throw null; }
public void SetProperty(string name, object value) { }
public bool TryGetProperty(string name, out object? value) { throw null; }
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/Azure.Core/api/Azure.Core.net472.cs
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ public HttpMessage(Azure.Core.Request request, Azure.Core.ResponseClassifier res
public Azure.Core.MessageProcessingContext ProcessingContext { get { throw null; } }
public new Azure.Core.Request Request { get { throw null; } }
public new Azure.Response Response { get { throw null; } set { } }
public Azure.Core.ResponseClassifier ResponseClassifier { get { throw null; } set { } }
public new Azure.Core.ResponseClassifier ResponseClassifier { get { throw null; } set { } }
public System.IO.Stream? ExtractResponseContent() { throw null; }
public void SetProperty(string name, object value) { }
public bool TryGetProperty(string name, out object? value) { throw null; }
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/Azure.Core/api/Azure.Core.net6.0.cs
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ public HttpMessage(Azure.Core.Request request, Azure.Core.ResponseClassifier res
public Azure.Core.MessageProcessingContext ProcessingContext { get { throw null; } }
public new Azure.Core.Request Request { get { throw null; } }
public new Azure.Response Response { get { throw null; } set { } }
public Azure.Core.ResponseClassifier ResponseClassifier { get { throw null; } set { } }
public new Azure.Core.ResponseClassifier ResponseClassifier { get { throw null; } set { } }
public System.IO.Stream? ExtractResponseContent() { throw null; }
public void SetProperty(string name, object value) { }
public bool TryGetProperty(string name, out object? value) { throw null; }
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/Azure.Core/api/Azure.Core.netstandard2.0.cs
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ public HttpMessage(Azure.Core.Request request, Azure.Core.ResponseClassifier res
public Azure.Core.MessageProcessingContext ProcessingContext { get { throw null; } }
public new Azure.Core.Request Request { get { throw null; } }
public new Azure.Response Response { get { throw null; } set { } }
public Azure.Core.ResponseClassifier ResponseClassifier { get { throw null; } set { } }
public new Azure.Core.ResponseClassifier ResponseClassifier { get { throw null; } set { } }
public System.IO.Stream? ExtractResponseContent() { throw null; }
public void SetProperty(string name, object value) { }
public bool TryGetProperty(string name, out object? value) { throw null; }
Expand Down
15 changes: 3 additions & 12 deletions sdk/core/Azure.Core/src/HttpMessage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -63,19 +63,10 @@ public HttpMessage(Request request, ResponseClassifier responseClassifier)
/// <summary>
/// The <see cref="ResponseClassifier"/> instance to use for response classification during pipeline invocation.
/// </summary>
public ResponseClassifier ResponseClassifier
public new ResponseClassifier ResponseClassifier
{
get
{
if (MessageClassifier is not ResponseClassifier classifier)
{
throw new InvalidOperationException($"Invalid ResponseClassifier set on message: '{base.MessageClassifier}'.");
}

return classifier;
}

set => MessageClassifier = value;
get => (ResponseClassifier)base.ResponseClassifier;
set => base.ResponseClassifier = value;
}

internal int RetryNumber { get; set; }
Expand Down
10 changes: 5 additions & 5 deletions sdk/core/Azure.Core/src/Pipeline/RetryPolicy.AzurePolicy.cs
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ protected override async ValueTask OnRequestSentAsync(PipelineMessage message)
_elapsedTime = (_afterProcess - _beforeProcess) / (double)Stopwatch.Frequency;
}

protected override bool ShouldRetryCore(PipelineMessage message, Exception? exception)
protected override bool ShouldRetry(PipelineMessage message, Exception? exception)
=> _pipelinePolicy.ShouldRetry(AssertHttpMessage(message), exception);

protected override async ValueTask<bool> ShouldRetryCoreAsync(PipelineMessage message, Exception? exception)
protected override async ValueTask<bool> ShouldRetryAsync(PipelineMessage message, Exception? exception)
=> await _pipelinePolicy.ShouldRetryAsync(AssertHttpMessage(message), exception).ConfigureAwait(false);

protected override void OnTryComplete(PipelineMessage message)
Expand All @@ -77,7 +77,7 @@ protected override void OnTryComplete(PipelineMessage message)
_elapsedTime = default;
}

protected override TimeSpan GetNextDelayCore(PipelineMessage message, int tryCount)
protected override TimeSpan GetNextDelay(PipelineMessage message, int tryCount)
{
HttpMessage httpMessage = AssertHttpMessage(message);

Expand All @@ -87,10 +87,10 @@ protected override TimeSpan GetNextDelayCore(PipelineMessage message, int tryCou
return _delayStrategy.GetNextDelay(response, tryCount + 1);
}

protected override async Task WaitCoreAsync(TimeSpan time, CancellationToken cancellationToken)
protected override async Task WaitAsync(TimeSpan time, CancellationToken cancellationToken)
=> await _pipelinePolicy.WaitAsync(time, cancellationToken).ConfigureAwait(false);

protected override void WaitCore(TimeSpan time, CancellationToken cancellationToken)
protected override void Wait(TimeSpan time, CancellationToken cancellationToken)
=> _pipelinePolicy.Wait(time, cancellationToken);

private static HttpMessage AssertHttpMessage(PipelineMessage message)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ private HttpMessage CreateGetLocationRequest(string ipAddress, RequestContext co
{
HttpMessage message = _pipeline.CreateMessage();
message.Apply(context);
message.MessageClassifier = PipelineMessageClassifier.Create(stackalloc ushort[] { 200 });
message.ResponseClassifier = new StatusCodeClassifier(stackalloc ushort[] { 200 });

Request request = message.Request;
request.Method = RequestMethod.Get;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public virtual ClientResult GetCountryCode(string ipAddress, RequestOptions opti
private PipelineMessage CreateGetLocationRequest(string ipAddress, RequestOptions options)
{
PipelineMessage message = _pipeline.CreateMessage();
message.MessageClassifier = PipelineMessageClassifier.Create(stackalloc ushort[] { 200 });
message.ResponseClassifier = PipelineMessageClassifier.Create(stackalloc ushort[] { 200 });

PipelineRequest request = message.Request;
request.Method = "GET";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public virtual ClientResult GetCompletions(string deploymentId, BinaryContent co
internal PipelineMessage CreateGetCompletionsRequest(string deploymentId, BinaryContent content, RequestOptions options)
{
PipelineMessage message = _pipeline.CreateMessage();
message.MessageClassifier = MessageClassifier200;
message.ResponseClassifier = MessageClassifier200;

PipelineRequest request = message.Request;
request.Method = "POST";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public virtual ClientResult GetCountryCode(string ipAddress, RequestOptions? opt
private PipelineMessage CreateGetLocationRequest(string ipAddress, RequestOptions options)
{
PipelineMessage message = _pipeline.CreateMessage();
message.MessageClassifier = PipelineMessageClassifier.Create(stackalloc ushort[] { 200 });
message.ResponseClassifier = PipelineMessageClassifier.Create(stackalloc ushort[] { 200 });

PipelineRequest request = message.Request;
request.Method = "GET";
Expand Down