Skip to content

Azure.Core 2.0: Update Response, Response<T>, and NullableResponse<T> #42255

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
annelo-msft merged 17 commits into from
Feb 28, 2024
Merged

Azure.Core 2.0: Update Response, Response<T>, and NullableResponse<T> #42255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
ef2eaa4
initial checkin
annelo-msft Feb 27, 2024
abd2672
WIP
annelo-msft Feb 27, 2024
0e4a202
Tables
annelo-msft Feb 27, 2024
a781cf0
updates
annelo-msft Feb 27, 2024
db9d9b7
Add tests
annelo-msft Feb 27, 2024
918a011
updates
annelo-msft Feb 27, 2024
f7f9abe
API updates
annelo-msft Feb 27, 2024
718a99a
Add ResponseHeadersAdapter
annelo-msft Feb 28, 2024
76055b3
rework buffering a bit
annelo-msft Feb 28, 2024
fa98e1e
revert
annelo-msft Feb 28, 2024
3474932
reshuffle
annelo-msft Feb 28, 2024
6dbac06
fix
annelo-msft Feb 28, 2024
bbde0a1
Merge remote-tracking branch 'upstream/feature/azure.core-2.0' into c…
annelo-msft Feb 28, 2024
4804347
add tests
annelo-msft Feb 28, 2024
d49ba41
nits
annelo-msft Feb 28, 2024
9bd51c7
nits
annelo-msft Feb 28, 2024
1c87cc2
update comment on NullableResponse<T>.DefaultResponse
annelo-msft Feb 28, 2024
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
27 changes: 14 additions & 13 deletions sdk/core/Azure.Core/api/Azure.Core.net461.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,17 @@ public MatchConditions() { }
public Azure.ETag? IfMatch { get { throw null; } set { } }
public Azure.ETag? IfNoneMatch { get { throw null; } set { } }
}
public abstract partial class NullableResponse<T>
public abstract partial class NullableResponse<T> : System.ClientModel.ClientResult<T?>
{
protected NullableResponse() { }
public abstract bool HasValue { get; }
public abstract T? Value { get; }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
protected NullableResponse() : base (default(T), default(System.ClientModel.Primitives.PipelineResponse)) { }
protected NullableResponse(T? value, Azure.Response response) : base (default(T), default(System.ClientModel.Primitives.PipelineResponse)) { }
public virtual bool HasValue { get { throw null; } }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public override bool Equals(object? obj) { throw null; }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public override int GetHashCode() { throw null; }
public abstract Azure.Response GetRawResponse();
public virtual new Azure.Response GetRawResponse() { throw null; }
public override string ToString() { throw null; }
}
public abstract partial class Operation
Expand Down Expand Up @@ -238,18 +239,16 @@ public RequestFailedException(string message, System.Exception? innerException)
public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { }
public Azure.Response? GetRawResponse() { throw null; }
}
public abstract partial class Response : System.IDisposable
public abstract partial class Response : System.ClientModel.Primitives.PipelineResponse
{
protected Response() { }
public abstract string ClientRequestId { get; set; }
public virtual System.BinaryData Content { get { throw null; } }
public abstract System.IO.Stream? ContentStream { get; set; }
public virtual Azure.Core.ResponseHeaders Headers { get { throw null; } }
public virtual bool IsError { get { throw null; } }
public abstract string ReasonPhrase { get; }
public abstract int Status { get; }
public override System.BinaryData Content { get { throw null; } }
public virtual new Azure.Core.ResponseHeaders Headers { get { throw null; } }
protected override System.ClientModel.Primitives.PipelineResponseHeaders HeadersCore { get { throw null; } }
public override System.BinaryData BufferContent(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
public override System.Threading.Tasks.ValueTask<System.BinaryData> BufferContentAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
protected internal abstract bool ContainsHeader(string name);
public abstract void Dispose();
protected internal abstract System.Collections.Generic.IEnumerable<Azure.Core.HttpHeader> EnumerateHeaders();
public static Azure.Response<T> FromValue<T>(T value, Azure.Response response) { throw null; }
public override string ToString() { throw null; }
Expand All @@ -265,7 +264,9 @@ public ResponseError(string? code, string? message) { }
}
public abstract partial class Response<T> : Azure.NullableResponse<T>
{
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
protected Response() { }
protected Response(T value, Azure.Response response) { }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public override bool HasValue { get { throw null; } }
public override T Value { get { throw null; } }
Expand Down
27 changes: 14 additions & 13 deletions sdk/core/Azure.Core/api/Azure.Core.net472.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,17 @@ public MatchConditions() { }
public Azure.ETag? IfMatch { get { throw null; } set { } }
public Azure.ETag? IfNoneMatch { get { throw null; } set { } }
}
public abstract partial class NullableResponse<T>
public abstract partial class NullableResponse<T> : System.ClientModel.ClientResult<T?>
{
protected NullableResponse() { }
public abstract bool HasValue { get; }
public abstract T? Value { get; }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
protected NullableResponse() : base (default(T), default(System.ClientModel.Primitives.PipelineResponse)) { }
protected NullableResponse(T? value, Azure.Response response) : base (default(T), default(System.ClientModel.Primitives.PipelineResponse)) { }
public virtual bool HasValue { get { throw null; } }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public override bool Equals(object? obj) { throw null; }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public override int GetHashCode() { throw null; }
public abstract Azure.Response GetRawResponse();
public virtual new Azure.Response GetRawResponse() { throw null; }
public override string ToString() { throw null; }
}
public abstract partial class Operation
Expand Down Expand Up @@ -238,18 +239,16 @@ public RequestFailedException(string message, System.Exception? innerException)
public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { }
public Azure.Response? GetRawResponse() { throw null; }
}
public abstract partial class Response : System.IDisposable
public abstract partial class Response : System.ClientModel.Primitives.PipelineResponse
{
protected Response() { }
public abstract string ClientRequestId { get; set; }
public virtual System.BinaryData Content { get { throw null; } }
public abstract System.IO.Stream? ContentStream { get; set; }
public virtual Azure.Core.ResponseHeaders Headers { get { throw null; } }
public virtual bool IsError { get { throw null; } }
public abstract string ReasonPhrase { get; }
public abstract int Status { get; }
public override System.BinaryData Content { get { throw null; } }
public virtual new Azure.Core.ResponseHeaders Headers { get { throw null; } }
protected override System.ClientModel.Primitives.PipelineResponseHeaders HeadersCore { get { throw null; } }
public override System.BinaryData BufferContent(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
public override System.Threading.Tasks.ValueTask<System.BinaryData> BufferContentAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
protected internal abstract bool ContainsHeader(string name);
public abstract void Dispose();
protected internal abstract System.Collections.Generic.IEnumerable<Azure.Core.HttpHeader> EnumerateHeaders();
public static Azure.Response<T> FromValue<T>(T value, Azure.Response response) { throw null; }
public override string ToString() { throw null; }
Expand All @@ -265,7 +264,9 @@ public ResponseError(string? code, string? message) { }
}
public abstract partial class Response<T> : Azure.NullableResponse<T>
{
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
protected Response() { }
protected Response(T value, Azure.Response response) { }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public override bool HasValue { get { throw null; } }
public override T Value { get { throw null; } }
Expand Down
27 changes: 14 additions & 13 deletions sdk/core/Azure.Core/api/Azure.Core.net6.0.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,17 @@ public MatchConditions() { }
public Azure.ETag? IfMatch { get { throw null; } set { } }
public Azure.ETag? IfNoneMatch { get { throw null; } set { } }
}
public abstract partial class NullableResponse<T>
public abstract partial class NullableResponse<T> : System.ClientModel.ClientResult<T?>
{
protected NullableResponse() { }
public abstract bool HasValue { get; }
public abstract T? Value { get; }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
protected NullableResponse() : base (default(T), default(System.ClientModel.Primitives.PipelineResponse)) { }
protected NullableResponse(T? value, Azure.Response response) : base (default(T), default(System.ClientModel.Primitives.PipelineResponse)) { }
public virtual bool HasValue { get { throw null; } }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public override bool Equals(object? obj) { throw null; }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public override int GetHashCode() { throw null; }
public abstract Azure.Response GetRawResponse();
public virtual new Azure.Response GetRawResponse() { throw null; }
public override string ToString() { throw null; }
}
public abstract partial class Operation
Expand Down Expand Up @@ -238,18 +239,16 @@ public RequestFailedException(string message, System.Exception? innerException)
public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { }
public Azure.Response? GetRawResponse() { throw null; }
}
public abstract partial class Response : System.IDisposable
public abstract partial class Response : System.ClientModel.Primitives.PipelineResponse
{
protected Response() { }
public abstract string ClientRequestId { get; set; }
public virtual System.BinaryData Content { get { throw null; } }
public abstract System.IO.Stream? ContentStream { get; set; }
public virtual Azure.Core.ResponseHeaders Headers { get { throw null; } }
public virtual bool IsError { get { throw null; } }
public abstract string ReasonPhrase { get; }
public abstract int Status { get; }
public override System.BinaryData Content { get { throw null; } }
public virtual new Azure.Core.ResponseHeaders Headers { get { throw null; } }
protected override System.ClientModel.Primitives.PipelineResponseHeaders HeadersCore { get { throw null; } }
public override System.BinaryData BufferContent(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
public override System.Threading.Tasks.ValueTask<System.BinaryData> BufferContentAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
protected internal abstract bool ContainsHeader(string name);
public abstract void Dispose();
protected internal abstract System.Collections.Generic.IEnumerable<Azure.Core.HttpHeader> EnumerateHeaders();
public static Azure.Response<T> FromValue<T>(T value, Azure.Response response) { throw null; }
public override string ToString() { throw null; }
Expand All @@ -265,7 +264,9 @@ public ResponseError(string? code, string? message) { }
}
public abstract partial class Response<T> : Azure.NullableResponse<T>
{
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
protected Response() { }
protected Response(T value, Azure.Response response) { }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public override bool HasValue { get { throw null; } }
public override T Value { get { throw null; } }
Expand Down
27 changes: 14 additions & 13 deletions sdk/core/Azure.Core/api/Azure.Core.netstandard2.0.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,17 @@ public MatchConditions() { }
public Azure.ETag? IfMatch { get { throw null; } set { } }
public Azure.ETag? IfNoneMatch { get { throw null; } set { } }
}
public abstract partial class NullableResponse<T>
public abstract partial class NullableResponse<T> : System.ClientModel.ClientResult<T?>
{
protected NullableResponse() { }
public abstract bool HasValue { get; }
public abstract T? Value { get; }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
protected NullableResponse() : base (default(T), default(System.ClientModel.Primitives.PipelineResponse)) { }
protected NullableResponse(T? value, Azure.Response response) : base (default(T), default(System.ClientModel.Primitives.PipelineResponse)) { }
public virtual bool HasValue { get { throw null; } }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public override bool Equals(object? obj) { throw null; }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public override int GetHashCode() { throw null; }
public abstract Azure.Response GetRawResponse();
public virtual new Azure.Response GetRawResponse() { throw null; }
public override string ToString() { throw null; }
}
public abstract partial class Operation
Expand Down Expand Up @@ -238,18 +239,16 @@ public RequestFailedException(string message, System.Exception? innerException)
public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { }
public Azure.Response? GetRawResponse() { throw null; }
}
public abstract partial class Response : System.IDisposable
public abstract partial class Response : System.ClientModel.Primitives.PipelineResponse
{
protected Response() { }
public abstract string ClientRequestId { get; set; }
public virtual System.BinaryData Content { get { throw null; } }
public abstract System.IO.Stream? ContentStream { get; set; }
public virtual Azure.Core.ResponseHeaders Headers { get { throw null; } }
public virtual bool IsError { get { throw null; } }
public abstract string ReasonPhrase { get; }
public abstract int Status { get; }
public override System.BinaryData Content { get { throw null; } }
public virtual new Azure.Core.ResponseHeaders Headers { get { throw null; } }
protected override System.ClientModel.Primitives.PipelineResponseHeaders HeadersCore { get { throw null; } }
public override System.BinaryData BufferContent(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
public override System.Threading.Tasks.ValueTask<System.BinaryData> BufferContentAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
protected internal abstract bool ContainsHeader(string name);
public abstract void Dispose();
protected internal abstract System.Collections.Generic.IEnumerable<Azure.Core.HttpHeader> EnumerateHeaders();
public static Azure.Response<T> FromValue<T>(T value, Azure.Response response) { throw null; }
public override string ToString() { throw null; }
Expand All @@ -265,7 +264,9 @@ public ResponseError(string? code, string? message) { }
}
public abstract partial class Response<T> : Azure.NullableResponse<T>
{
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
protected Response() { }
protected Response(T value, Azure.Response response) { }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public override bool HasValue { get { throw null; } }
public override T Value { get { throw null; } }
Expand Down
3 changes: 2 additions & 1 deletion sdk/core/Azure.Core/src/HttpMessage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Licensed under the MIT License.

using System;
using System.ClientModel.Primitives;
Comment thread
annelo-msft marked this conversation as resolved.
using System.Collections.Generic;
using System.IO;
using System.Threading;
Expand Down Expand Up @@ -177,7 +178,7 @@ public void SetProperty(Type type, object value) =>
_propertyBag.Set((ulong)type.TypeHandle.Value, value);

/// <summary>
/// Returns the response content stream and releases it ownership to the caller. After calling this methods using <see cref="Azure.Response.ContentStream"/> or <see cref="Azure.Response.Content"/> would result in exception.
/// Returns the response content stream and releases it ownership to the caller. After calling this methods using <see cref="PipelineResponse.ContentStream"/> or <see cref="Azure.Response.Content"/> would result in exception.
/// </summary>
/// <returns>The content stream or null if response didn't have any.</returns>
public Stream? ExtractResponseContent()
Expand Down
20 changes: 0 additions & 20 deletions sdk/core/Azure.Core/src/Internal/ValueResponse.cs
View file
Open in desktop

This file was deleted.

Loading