From c17e1a756292c996e3cc8133cccf66c2ce0e48b6 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 3 Oct 2019 16:17:39 -0700 Subject: [PATCH] Reorder Response.FromValue parameters --- .../samples/Sample8_MockClient.cs | 2 +- .../src/ConfigurationClient.cs | 4 +- .../src/ConfigurationClient_private.cs | 4 +- sdk/core/Azure.Core/src/Operation{T}.cs | 2 +- sdk/core/Azure.Core/src/Response.cs | 2 +- sdk/core/Azure.Core/tests/ResponseTests.cs | 4 +- .../Azure.Identity/src/AadIdentityClient.cs | 4 +- .../src/CertificateClient.cs | 16 +-- .../src/Cryptography/KeyResolver.cs | 2 +- .../src/KeyClient.cs | 4 +- .../src/SecretClient.cs | 4 +- .../KeyVaultPipeline.cs | 2 +- .../Azure.Storage.Blobs/src/BlobBaseClient.cs | 26 ++-- .../src/BlobContainerClient.cs | 31 ++--- .../src/BlobServiceClient.cs | 4 +- .../src/Generated/BlobRestClient.cs | 112 +++++++++--------- .../Azure.Storage.Blobs/src/LeaseClient.cs | 4 +- .../src/Models/BlockList.cs | 2 +- .../Azure.Storage.Blobs/src/Models/Lease.cs | 13 +- .../src/StorageCollectionEnumerator.cs | 2 +- .../swagger/Generator/src/generator.ts | 2 +- .../src/DirectoryClient.cs | 16 +-- .../Azure.Storage.Files/src/FileClient.cs | 25 ++-- .../src/FileServiceClient.cs | 4 +- .../src/Generated/FileRestClient.cs | 62 +++++----- .../Azure.Storage.Files/src/ShareClient.cs | 6 +- .../src/Generated/QueueRestClient.cs | 18 +-- .../Azure.Storage.Queues/src/QueueClient.cs | 6 +- .../src/QueueServiceClient.cs | 4 +- 29 files changed, 196 insertions(+), 191 deletions(-) diff --git a/sdk/appconfiguration/Azure.Data.AppConfiguration/samples/Sample8_MockClient.cs b/sdk/appconfiguration/Azure.Data.AppConfiguration/samples/Sample8_MockClient.cs index 4a567d78a712a..27f47be80d450 100644 --- a/sdk/appconfiguration/Azure.Data.AppConfiguration/samples/Sample8_MockClient.cs +++ b/sdk/appconfiguration/Azure.Data.AppConfiguration/samples/Sample8_MockClient.cs @@ -22,7 +22,7 @@ public void MockClient() // Setup client method mock.Setup(c => c.Get("Key", It.IsAny(), It.IsAny())) - .Returns(Response.FromValue(mockResponse.Object, ConfigurationModelFactory.ConfigurationSetting("Key", "Value"))); + .Returns(Response.FromValue(ConfigurationModelFactory.ConfigurationSetting("Key", "Value"), mockResponse.Object)); // Use the client mock ConfigurationClient client = mock.Object; diff --git a/sdk/appconfiguration/Azure.Data.AppConfiguration/src/ConfigurationClient.cs b/sdk/appconfiguration/Azure.Data.AppConfiguration/src/ConfigurationClient.cs index dea556eda456c..d4e0b2fef8ba5 100644 --- a/sdk/appconfiguration/Azure.Data.AppConfiguration/src/ConfigurationClient.cs +++ b/sdk/appconfiguration/Azure.Data.AppConfiguration/src/ConfigurationClient.cs @@ -877,7 +877,7 @@ public virtual async Task> HasChangedAsync(ConfigurationSetting s etag = etag.Trim('\"'); } - return Response.FromValue(response, setting.ETag != new ETag(etag)); + return Response.FromValue(setting.ETag != new ETag(etag), response); default: throw await response.CreateRequestFailedExceptionAsync().ConfigureAwait(false); @@ -917,7 +917,7 @@ public virtual Response HasChanged(ConfigurationSetting setting, Cancellat etag = etag.Trim('\"'); } - return Response.FromValue(response, setting.ETag != new ETag(etag)); + return Response.FromValue(setting.ETag != new ETag(etag), response); default: throw response.CreateRequestFailedException(); diff --git a/sdk/appconfiguration/Azure.Data.AppConfiguration/src/ConfigurationClient_private.cs b/sdk/appconfiguration/Azure.Data.AppConfiguration/src/ConfigurationClient_private.cs index 97f2c49f7302a..8b6491cded665 100644 --- a/sdk/appconfiguration/Azure.Data.AppConfiguration/src/ConfigurationClient_private.cs +++ b/sdk/appconfiguration/Azure.Data.AppConfiguration/src/ConfigurationClient_private.cs @@ -35,12 +35,12 @@ public partial class ConfigurationClient private static async Task> CreateResponseAsync(Response response, CancellationToken cancellation) { ConfigurationSetting result = await ConfigurationServiceSerializer.DeserializeSettingAsync(response.ContentStream, cancellation).ConfigureAwait(false); - return Response.FromValue(response, result); + return Response.FromValue(result, response); } private static Response CreateResponse(Response response) { - return Response.FromValue(response, ConfigurationServiceSerializer.DeserializeSetting(response.ContentStream)); + return Response.FromValue(ConfigurationServiceSerializer.DeserializeSetting(response.ContentStream), response); } private static Response CreateResourceModifiedResponse(Response response) diff --git a/sdk/core/Azure.Core/src/Operation{T}.cs b/sdk/core/Azure.Core/src/Operation{T}.cs index 632123c00f35e..8a9d783d07aa3 100644 --- a/sdk/core/Azure.Core/src/Operation{T}.cs +++ b/sdk/core/Azure.Core/src/Operation{T}.cs @@ -102,7 +102,7 @@ public virtual async ValueTask> WaitCompletionAsync(CancellationToke await UpdateStatusAsync(cancellationToken).ConfigureAwait(false); if (HasCompleted) { - return Response.FromValue(_response, Value); + return Response.FromValue(Value, _response); } await Task.Delay(PollingInterval, cancellationToken).ConfigureAwait(false); } diff --git a/sdk/core/Azure.Core/src/Response.cs b/sdk/core/Azure.Core/src/Response.cs index 3d88823c4cc6d..76acd86798a44 100644 --- a/sdk/core/Azure.Core/src/Response.cs +++ b/sdk/core/Azure.Core/src/Response.cs @@ -31,7 +31,7 @@ public abstract class Response : IDisposable protected internal abstract IEnumerable EnumerateHeaders(); - public static Response FromValue(Response response, T value) + public static Response FromValue(T value, Response response) { return new ValueResponse(response, value); } diff --git a/sdk/core/Azure.Core/tests/ResponseTests.cs b/sdk/core/Azure.Core/tests/ResponseTests.cs index 03c3bef577cc0..610fc0bbab36b 100644 --- a/sdk/core/Azure.Core/tests/ResponseTests.cs +++ b/sdk/core/Azure.Core/tests/ResponseTests.cs @@ -11,7 +11,7 @@ public class ResponseTests [Test] public void ValueIsAccessible() { - var response = Response.FromValue(response: null, new TestPayload("test_name")); + var response = Response.FromValue(new TestPayload("test_name"), response: null); TestPayload value = response.Value; Assert.IsNotNull(value); @@ -21,7 +21,7 @@ public void ValueIsAccessible() [Test] public void ValueObtainedFromCast() { - var response = Response.FromValue(response: null, new TestPayload("test_name")); + var response = Response.FromValue(new TestPayload("test_name"), response: null); TestPayload value = response; Assert.IsNotNull(value); diff --git a/sdk/identity/Azure.Identity/src/AadIdentityClient.cs b/sdk/identity/Azure.Identity/src/AadIdentityClient.cs index 9e3e3a30a46c5..c9fb02a0911d9 100644 --- a/sdk/identity/Azure.Identity/src/AadIdentityClient.cs +++ b/sdk/identity/Azure.Identity/src/AadIdentityClient.cs @@ -148,7 +148,7 @@ private async Task SendAuthRequestAsync(Request request, Cancellati { AccessToken result = await DeserializeAsync(response.ContentStream, cancellationToken).ConfigureAwait(false); - return Response.FromValue(response, result); + return Response.FromValue(result, response); } throw await response.CreateRequestFailedExceptionAsync().ConfigureAwait(false); @@ -162,7 +162,7 @@ private AccessToken SendAuthRequest(Request request, CancellationToken cancellat { AccessToken result = Deserialize(response.ContentStream); - return Response.FromValue(response, result); + return Response.FromValue(result, response); } throw response.CreateRequestFailedException(); diff --git a/sdk/keyvault/Azure.Security.KeyVault.Certificates/src/CertificateClient.cs b/sdk/keyvault/Azure.Security.KeyVault.Certificates/src/CertificateClient.cs index 02dd9bbde6877..5e57eb85c9d3d 100644 --- a/sdk/keyvault/Azure.Security.KeyVault.Certificates/src/CertificateClient.cs +++ b/sdk/keyvault/Azure.Security.KeyVault.Certificates/src/CertificateClient.cs @@ -551,7 +551,7 @@ public virtual Response BackupCertificate(string name, CancellationToken { Response backup = _pipeline.SendRequest(RequestMethod.Post, () => new CertificateBackup(), cancellationToken, CertificatesPath, name, "/backup"); - return Response.FromValue(backup.GetRawResponse(), backup.Value.Value); + return Response.FromValue(backup.Value.Value, backup.GetRawResponse()); } catch (Exception e) { @@ -579,7 +579,7 @@ public virtual async Task> BackupCertificateAsync(string name, { Response backup = await _pipeline.SendRequestAsync(RequestMethod.Post, () => new CertificateBackup(), cancellationToken, CertificatesPath, name, "/backup").ConfigureAwait(false); - return Response.FromValue(backup.GetRawResponse(), backup.Value.Value); + return Response.FromValue(backup.Value.Value, backup.GetRawResponse()); } catch (Exception e) { @@ -1303,7 +1303,7 @@ public virtual Response> SetContacts(IEnumerable contact { Response contactList = _pipeline.SendRequest(RequestMethod.Put, new ContactList(contacts), () => new ContactList(), cancellationToken, ContactsPath); - return Response.FromValue(contactList.GetRawResponse(), contactList.Value.ToList()); + return Response.FromValue(contactList.Value.ToList(), contactList.GetRawResponse()); } catch (Exception e) { @@ -1329,7 +1329,7 @@ public virtual async Task>> SetContactsAsync(IEnumerable { Response contactList = await _pipeline.SendRequestAsync(RequestMethod.Put, new ContactList(contacts), () => new ContactList(), cancellationToken, ContactsPath).ConfigureAwait(false); - return Response.FromValue(contactList.GetRawResponse(), contactList.Value.ToList()); + return Response.FromValue(contactList.Value.ToList(), contactList.GetRawResponse()); } catch (Exception e) { @@ -1352,7 +1352,7 @@ public virtual Response> GetContacts(CancellationToken cancellati { Response contactList = _pipeline.SendRequest(RequestMethod.Get, () => new ContactList(), cancellationToken, ContactsPath); - return Response.FromValue(contactList.GetRawResponse(), contactList.Value.ToList()); + return Response.FromValue(contactList.Value.ToList(), contactList.GetRawResponse()); } catch (Exception e) { @@ -1375,7 +1375,7 @@ public virtual async Task>> GetContactsAsync(Cancellatio { Response contactList = await _pipeline.SendRequestAsync(RequestMethod.Get, () => new ContactList(), cancellationToken, ContactsPath).ConfigureAwait(false); - return Response.FromValue(contactList.GetRawResponse(), contactList.Value.ToList()); + return Response.FromValue(contactList.Value.ToList(), contactList.GetRawResponse()); } catch (Exception e) { @@ -1398,7 +1398,7 @@ public virtual Response> DeleteContacts(CancellationToken cancell { Response contactList = _pipeline.SendRequest(RequestMethod.Delete, () => new ContactList(), cancellationToken, ContactsPath); - return Response.FromValue(contactList.GetRawResponse(), contactList.Value.ToList()); + return Response.FromValue(contactList.Value.ToList(), contactList.GetRawResponse()); } catch (Exception e) { @@ -1421,7 +1421,7 @@ public virtual async Task>> DeleteContactsAsync(Cancella { Response contactList = await _pipeline.SendRequestAsync(RequestMethod.Delete, () => new ContactList(), cancellationToken, ContactsPath).ConfigureAwait(false); - return Response.FromValue(contactList.GetRawResponse(), contactList.Value.ToList()); + return Response.FromValue(contactList.Value.ToList(), contactList.GetRawResponse()); } catch (Exception e) { diff --git a/sdk/keyvault/Azure.Security.KeyVault.Keys/src/Cryptography/KeyResolver.cs b/sdk/keyvault/Azure.Security.KeyVault.Keys/src/Cryptography/KeyResolver.cs index 3d4b9eb97f846..3629d15175824 100644 --- a/sdk/keyvault/Azure.Security.KeyVault.Keys/src/Cryptography/KeyResolver.cs +++ b/sdk/keyvault/Azure.Security.KeyVault.Keys/src/Cryptography/KeyResolver.cs @@ -159,7 +159,7 @@ private Response ParseResponse(Response response, T result) case 202: case 204: result.Deserialize(response.ContentStream); - return Response.FromValue(response, result); + return Response.FromValue(result, response); default: throw response.CreateRequestFailedException(); } diff --git a/sdk/keyvault/Azure.Security.KeyVault.Keys/src/KeyClient.cs b/sdk/keyvault/Azure.Security.KeyVault.Keys/src/KeyClient.cs index e6df4c49d688b..2f7b976a09a50 100644 --- a/sdk/keyvault/Azure.Security.KeyVault.Keys/src/KeyClient.cs +++ b/sdk/keyvault/Azure.Security.KeyVault.Keys/src/KeyClient.cs @@ -826,7 +826,7 @@ public virtual Response BackupKey(string name, CancellationToken cancell { Response backup = _pipeline.SendRequest(RequestMethod.Post, () => new KeyBackup(), cancellationToken, KeysPath, name, "/backup"); - return Response.FromValue(backup.GetRawResponse(), backup.Value.Value); + return Response.FromValue(backup.Value.Value, backup.GetRawResponse()); } catch (Exception e) { @@ -870,7 +870,7 @@ public virtual async Task> BackupKeyAsync(string name, Cancella { Response backup = await _pipeline.SendRequestAsync(RequestMethod.Post, () => new KeyBackup(), cancellationToken, KeysPath, name, "/backup").ConfigureAwait(false); - return Response.FromValue(backup.GetRawResponse(), backup.Value.Value); + return Response.FromValue(backup.Value.Value, backup.GetRawResponse()); } catch (Exception e) { diff --git a/sdk/keyvault/Azure.Security.KeyVault.Secrets/src/SecretClient.cs b/sdk/keyvault/Azure.Security.KeyVault.Secrets/src/SecretClient.cs index 188a320667bb7..3791b9aefbb76 100644 --- a/sdk/keyvault/Azure.Security.KeyVault.Secrets/src/SecretClient.cs +++ b/sdk/keyvault/Azure.Security.KeyVault.Secrets/src/SecretClient.cs @@ -632,7 +632,7 @@ public virtual async Task> BackupSecretAsync(string name, Cance { Response backup = await _pipeline.SendRequestAsync(RequestMethod.Post, () => new VaultBackup(), cancellationToken, SecretsPath, name, "/backup").ConfigureAwait(false); - return Response.FromValue(backup.GetRawResponse(), backup.Value.Value); + return Response.FromValue(backup.Value.Value, backup.GetRawResponse()); } catch (Exception e) { @@ -663,7 +663,7 @@ public virtual Response BackupSecret(string name, CancellationToken canc { Response backup = _pipeline.SendRequest(RequestMethod.Post, () => new VaultBackup(), cancellationToken, SecretsPath, name, "/backup"); - return Response.FromValue(backup.GetRawResponse(), backup.Value.Value); + return Response.FromValue(backup.Value.Value, backup.GetRawResponse()); } catch (Exception e) { diff --git a/sdk/keyvault/Azure.Security.KeyVault.Shared/KeyVaultPipeline.cs b/sdk/keyvault/Azure.Security.KeyVault.Shared/KeyVaultPipeline.cs index 00133e68241e2..798dac80c0d6c 100644 --- a/sdk/keyvault/Azure.Security.KeyVault.Shared/KeyVaultPipeline.cs +++ b/sdk/keyvault/Azure.Security.KeyVault.Shared/KeyVaultPipeline.cs @@ -87,7 +87,7 @@ public Response CreateResponse(Response response, T result) where T : IJsonDeserializable { result.Deserialize(response.ContentStream); - return Response.FromValue(response, result); + return Response.FromValue(result, response); } public DiagnosticScope CreateScope(string name) diff --git a/sdk/storage/Azure.Storage.Blobs/src/BlobBaseClient.cs b/sdk/storage/Azure.Storage.Blobs/src/BlobBaseClient.cs index 342843497abc3..8c7b4ee7ca86e 100644 --- a/sdk/storage/Azure.Storage.Blobs/src/BlobBaseClient.cs +++ b/sdk/storage/Azure.Storage.Blobs/src/BlobBaseClient.cs @@ -662,7 +662,7 @@ private async Task> DownloadInternal( // Wrap the FlattenedDownloadProperties into a BlobDownloadOperation // to make the Content easier to find - return Response.FromValue(response.GetRawResponse(), new BlobDownloadInfo(response.Value)); + return Response.FromValue(new BlobDownloadInfo(response.Value), response.GetRawResponse()); } catch (Exception ex) { @@ -2348,12 +2348,13 @@ await BlobRestClient.Blob.SetHttpHeadersAsync( operationName: "Azure.Storage.Blobs.Specialized.BlobBaseClient.SetHttpHeaders", cancellationToken: cancellationToken) .ConfigureAwait(false); - return Response.FromValue(response.GetRawResponse(), new BlobInfo - { - LastModified = response.Value.LastModified, - ETag = response.Value.ETag, - BlobSequenceNumber = response.Value.BlobSequenceNumber - }); + return Response.FromValue( + new BlobInfo + { + LastModified = response.Value.LastModified, + ETag = response.Value.ETag, + BlobSequenceNumber = response.Value.BlobSequenceNumber + }, response.GetRawResponse()); } catch (Exception ex) { @@ -2503,11 +2504,12 @@ await BlobRestClient.Blob.SetMetadataAsync( operationName: "Azure.Storage.Blobs.Specialized.BlobBaseClient.SetMetadata", cancellationToken: cancellationToken) .ConfigureAwait(false); - return Response.FromValue(response.GetRawResponse(), new BlobInfo - { - LastModified = response.Value.LastModified, - ETag = response.Value.ETag - }); + return Response.FromValue( + new BlobInfo + { + LastModified = response.Value.LastModified, + ETag = response.Value.ETag + }, response.GetRawResponse()); } catch (Exception ex) { diff --git a/sdk/storage/Azure.Storage.Blobs/src/BlobContainerClient.cs b/sdk/storage/Azure.Storage.Blobs/src/BlobContainerClient.cs index e05eb15cb4462..c162b6f44bd50 100644 --- a/sdk/storage/Azure.Storage.Blobs/src/BlobContainerClient.cs +++ b/sdk/storage/Azure.Storage.Blobs/src/BlobContainerClient.cs @@ -692,22 +692,23 @@ await BlobRestClient.Container.GetPropertiesAsync( // Turn the flattened properties into a BlobContainerItem var uri = new BlobUriBuilder(Uri); - return Response.FromValue(response.GetRawResponse(), new BlobContainerItem(false) - { - Name = uri.BlobContainerName, - Metadata = response.Value.Metadata, - Properties = new BlobContainerProperties() + return Response.FromValue( + new BlobContainerItem(false) { - LastModified = response.Value.LastModified, - ETag = response.Value.ETag, - LeaseStatus = response.Value.LeaseStatus, - LeaseState = response.Value.LeaseState, - LeaseDuration = response.Value.LeaseDuration, - PublicAccess = response.Value.BlobPublicAccess, - HasImmutabilityPolicy = response.Value.HasImmutabilityPolicy, - HasLegalHold = response.Value.HasLegalHold - } - }); + Name = uri.BlobContainerName, + Metadata = response.Value.Metadata, + Properties = new BlobContainerProperties() + { + LastModified = response.Value.LastModified, + ETag = response.Value.ETag, + LeaseStatus = response.Value.LeaseStatus, + LeaseState = response.Value.LeaseState, + LeaseDuration = response.Value.LeaseDuration, + PublicAccess = response.Value.BlobPublicAccess, + HasImmutabilityPolicy = response.Value.HasImmutabilityPolicy, + HasLegalHold = response.Value.HasLegalHold + } + }, response.GetRawResponse()); } catch (Exception ex) { diff --git a/sdk/storage/Azure.Storage.Blobs/src/BlobServiceClient.cs b/sdk/storage/Azure.Storage.Blobs/src/BlobServiceClient.cs index 7d4bd3348e954..58052ea9522f0 100644 --- a/sdk/storage/Azure.Storage.Blobs/src/BlobServiceClient.cs +++ b/sdk/storage/Azure.Storage.Blobs/src/BlobServiceClient.cs @@ -1002,7 +1002,7 @@ public virtual Response CreateBlobContainer( { BlobContainerClient container = GetBlobContainerClient(blobContainerName); Response response = container.Create(publicAccessType, metadata, cancellationToken); - return Response.FromValue(response.GetRawResponse(), container); + return Response.FromValue(container, response.GetRawResponse()); } /// @@ -1052,7 +1052,7 @@ public virtual async Task> CreateBlobContainerAsyn { BlobContainerClient container = GetBlobContainerClient(blobContainerName); Response response = await container.CreateAsync(publicAccessType, metadata, cancellationToken).ConfigureAwait(false); - return Response.FromValue(response.GetRawResponse(), container); + return Response.FromValue(container, response.GetRawResponse()); } #endregion CreateBlobContainer diff --git a/sdk/storage/Azure.Storage.Blobs/src/Generated/BlobRestClient.cs b/sdk/storage/Azure.Storage.Blobs/src/Generated/BlobRestClient.cs index 5d5f5b226eb60..80d48ff3996d4 100644 --- a/sdk/storage/Azure.Storage.Blobs/src/Generated/BlobRestClient.cs +++ b/sdk/storage/Azure.Storage.Blobs/src/Generated/BlobRestClient.cs @@ -277,7 +277,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage GetPropertiesAsync_Creat Azure.Storage.Blobs.Models.BlobServiceProperties _value = Azure.Storage.Blobs.Models.BlobServiceProperties.FromXml(_xml.Root); // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -406,7 +406,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage GetStatisticsAsync_Creat Azure.Storage.Blobs.Models.BlobServiceStatistics _value = Azure.Storage.Blobs.Models.BlobServiceStatistics.FromXml(_xml.Root); // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -558,7 +558,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage ListBlobContainersSegmen Azure.Storage.Blobs.Models.BlobContainersSegment _value = Azure.Storage.Blobs.Models.BlobContainersSegment.FromXml(_xml.Root); // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -703,7 +703,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage GetUserDelegationKeyAsyn Azure.Storage.Blobs.Models.UserDelegationKey _value = Azure.Storage.Blobs.Models.UserDelegationKey.FromXml(_xml.Root); // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -832,7 +832,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage GetAccountInfoAsync_Crea Azure.Storage.Blobs.Models.AccountInfo _value = new Azure.Storage.Blobs.Models.AccountInfo(skuName, accountKind); // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -995,7 +995,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage SubmitBatchAsync_CreateM } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -1158,7 +1158,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage CreateAsync_CreateMessag } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -1334,7 +1334,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage GetPropertiesAsync_Creat } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -1637,7 +1637,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage SetMetadataAsync_CreateM } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -1792,7 +1792,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage GetAccessPolicyAsync_Cre } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -1974,7 +1974,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage SetAccessPolicyAsync_Cre } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -2142,7 +2142,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage AcquireLeaseAsync_Create } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -2304,7 +2304,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage ReleaseLeaseAsync_Create } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -2470,7 +2470,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage RenewLeaseAsync_CreateMe } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -2632,7 +2632,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage BreakLeaseAsync_CreateMe } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -2808,7 +2808,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage ChangeLeaseAsync_CreateM } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -2961,7 +2961,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage ListBlobsFlatSegmentAsyn Azure.Storage.Blobs.Models.BlobsFlatSegment _value = Azure.Storage.Blobs.Models.BlobsFlatSegment.FromXml(_xml.Root); // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -3120,7 +3120,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage ListBlobsHierarchySegmen Azure.Storage.Blobs.Models.BlobsHierarchySegment _value = Azure.Storage.Blobs.Models.BlobsHierarchySegment.FromXml(_xml.Root); // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -3452,7 +3452,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage DownloadAsync_CreateMess } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } case 206: { @@ -3580,7 +3580,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage DownloadAsync_CreateMess } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } case 304: { @@ -3909,7 +3909,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage GetPropertiesAsync_Creat } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } case 304: { @@ -4285,7 +4285,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage SetAccessControlAsync_Cr } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -4479,7 +4479,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage GetAccessControlAsync_Cr } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -4744,7 +4744,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage RenameAsync_CreateMessag } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -5085,7 +5085,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage SetHttpHeadersAsync_Crea } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -5290,7 +5290,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage SetMetadataAsync_CreateM } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -5469,7 +5469,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage AcquireLeaseAsync_Create } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -5642,7 +5642,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage ReleaseLeaseAsync_Create } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -5819,7 +5819,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage RenewLeaseAsync_CreateMe } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -6006,7 +6006,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage ChangeLeaseAsync_CreateM } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -6179,7 +6179,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage BreakLeaseAsync_CreateMe } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -6384,7 +6384,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage CreateSnapshotAsync_Crea } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -6616,7 +6616,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage StartCopyFromUriAsync_Cr } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -6843,7 +6843,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage CopyFromUriAsync_CreateM } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -7415,7 +7415,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage CreateAsync_CreateMessag } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -7678,7 +7678,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage UploadPagesAsync_CreateM Azure.Storage.Blobs.Models.PageInfo _value = new Azure.Storage.Blobs.Models.PageInfo(eTag, lastModified, contentHash, contentCrc64, blobSequenceNumber, encryptionKeySha256); // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -7917,7 +7917,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage ClearPagesAsync_CreateMe Azure.Storage.Blobs.Models.PageInfo _value = new Azure.Storage.Blobs.Models.PageInfo(eTag, lastModified, contentHash, contentCrc64, blobSequenceNumber, encryptionKeySha256); // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -8216,7 +8216,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage UploadPagesFromUriAsync_ Azure.Storage.Blobs.Models.PageInfo _value = new Azure.Storage.Blobs.Models.PageInfo(eTag, lastModified, contentHash, contentCrc64, blobSequenceNumber, encryptionKeySha256); // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } case 304: { @@ -8416,7 +8416,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage GetPageRangesAsync_Creat } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } case 304: { @@ -8622,7 +8622,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage GetPageRangesDiffAsync_C } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } case 304: { @@ -8832,7 +8832,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage ResizeAsync_CreateMessag } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -9016,7 +9016,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage UpdateSequenceNumberAsyn } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -9196,7 +9196,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage CopyIncrementalAsync_Cre } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -9465,7 +9465,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage CreateAsync_CreateMessag } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -9717,7 +9717,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage AppendBlockAsync_CreateM } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -10003,7 +10003,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage AppendBlockFromUriAsync_ } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } case 304: { @@ -10304,7 +10304,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage UploadAsync_CreateMessag } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -10510,7 +10510,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage StageBlockAsync_CreateMe } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -10744,7 +10744,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage StageBlockFromUriAsync_C } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } case 304: { @@ -11047,7 +11047,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage CommitBlockListAsync_Cre } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -11213,7 +11213,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage GetBlockListAsync_Create } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -11441,7 +11441,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage CreateAsync_CreateMessag } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -11716,7 +11716,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage RenameAsync_CreateMessag } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -11895,7 +11895,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage DeleteAsync_CreateMessag } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -12087,7 +12087,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage SetAccessControlAsync_Cr } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -12281,7 +12281,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage GetAccessControlAsync_Cr } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { diff --git a/sdk/storage/Azure.Storage.Blobs/src/LeaseClient.cs b/sdk/storage/Azure.Storage.Blobs/src/LeaseClient.cs index 657a69e3a0629..bcb8cf152c6d0 100644 --- a/sdk/storage/Azure.Storage.Blobs/src/LeaseClient.cs +++ b/sdk/storage/Azure.Storage.Blobs/src/LeaseClient.cs @@ -619,7 +619,7 @@ await BlobRestClient.Blob.ReleaseLeaseAsync( operationName: Constants.Blob.Lease.ReleaseOperationName, cancellationToken: cancellationToken) .ConfigureAwait(false); - return Response.FromValue(response.GetRawResponse(), new ReleasedObjectInfo(response.Value)); + return Response.FromValue(new ReleasedObjectInfo(response.Value), response.GetRawResponse()); } else { @@ -640,7 +640,7 @@ await BlobRestClient.Container.ReleaseLeaseAsync( operationName: Constants.Blob.Lease.ReleaseOperationName, cancellationToken: cancellationToken) .ConfigureAwait(false); - return Response.FromValue(response.GetRawResponse(), new ReleasedObjectInfo(response.Value)); + return Response.FromValue(new ReleasedObjectInfo(response.Value), response.GetRawResponse()); } } catch (Exception ex) diff --git a/sdk/storage/Azure.Storage.Blobs/src/Models/BlockList.cs b/sdk/storage/Azure.Storage.Blobs/src/Models/BlockList.cs index 5cfedac9e4003..b32a4d6484f77 100644 --- a/sdk/storage/Azure.Storage.Blobs/src/Models/BlockList.cs +++ b/sdk/storage/Azure.Storage.Blobs/src/Models/BlockList.cs @@ -63,7 +63,7 @@ internal static Response ToBlockList(this ResponseThe original response. /// The Lease response. internal static Response ToLease(this Response response) - => Response.FromValue(response.GetRawResponse(), new Lease - { - ETag = response.Value.ETag, - LastModified = response.Value.LastModified, - LeaseTime = response.Value.LeaseTime - }); + => Response.FromValue( + new Lease + { + ETag = response.Value.ETag, + LastModified = response.Value.LastModified, + LeaseTime = response.Value.LeaseTime + }, response.GetRawResponse()); } } diff --git a/sdk/storage/Azure.Storage.Common/src/StorageCollectionEnumerator.cs b/sdk/storage/Azure.Storage.Common/src/StorageCollectionEnumerator.cs index f152600aada0c..373441f26365a 100644 --- a/sdk/storage/Azure.Storage.Common/src/StorageCollectionEnumerator.cs +++ b/sdk/storage/Azure.Storage.Common/src/StorageCollectionEnumerator.cs @@ -232,7 +232,7 @@ protected IEnumerator> GetEnumerator() continuationToken = page.ContinuationToken; foreach (T item in page.Values) { - yield return Response.FromValue(page.GetRawResponse(), item); + yield return Response.FromValue(item, page.GetRawResponse()); } } while (CanContinue(continuationToken)); } diff --git a/sdk/storage/Azure.Storage.Common/swagger/Generator/src/generator.ts b/sdk/storage/Azure.Storage.Common/swagger/Generator/src/generator.ts index 8f5edc845782f..d3a586b4b4c4b 100644 --- a/sdk/storage/Azure.Storage.Common/swagger/Generator/src/generator.ts +++ b/sdk/storage/Azure.Storage.Common/swagger/Generator/src/generator.ts @@ -467,7 +467,7 @@ function generateOperation(w: IndentWriter, serviceModel: IServiceModel, group: processResponse(response); w.line(`// Create the response`); - w.line(`return Response.FromValue(${responseName}, ${valueName});`); + w.line(`return Response.FromValue(${valueName}, ${responseName});`); } }); } diff --git a/sdk/storage/Azure.Storage.Files/src/DirectoryClient.cs b/sdk/storage/Azure.Storage.Files/src/DirectoryClient.cs index 2781866b9b8a9..5744ae64b0d79 100644 --- a/sdk/storage/Azure.Storage.Files/src/DirectoryClient.cs +++ b/sdk/storage/Azure.Storage.Files/src/DirectoryClient.cs @@ -421,7 +421,7 @@ private async Task> CreateInternal( cancellationToken: cancellationToken) .ConfigureAwait(false); - return Response.FromValue(response.GetRawResponse(), new StorageDirectoryInfo(response.Value)); + return Response.FromValue(new StorageDirectoryInfo(response.Value), response.GetRawResponse()); } catch (Exception ex) { @@ -652,7 +652,7 @@ private async Task> GetPropertiesInternal( cancellationToken: cancellationToken) .ConfigureAwait(false); - return Response.FromValue(response.GetRawResponse(), new StorageDirectoryProperties(response.Value)); + return Response.FromValue(new StorageDirectoryProperties(response.Value), response.GetRawResponse()); } catch (Exception ex) { @@ -800,7 +800,7 @@ private async Task> SetHttpHeadersInternal( cancellationToken: cancellationToken) .ConfigureAwait(false); - return Response.FromValue(response.GetRawResponse(), new StorageDirectoryInfo(response.Value)); + return Response.FromValue(new StorageDirectoryInfo(response.Value), response.GetRawResponse()); } catch (Exception ex) { @@ -919,7 +919,7 @@ private async Task> SetMetadataInternal( cancellationToken: cancellationToken) .ConfigureAwait(false); - return Response.FromValue(response.GetRawResponse(), new StorageDirectoryInfo(response.Value)); + return Response.FromValue(new StorageDirectoryInfo(response.Value), response.GetRawResponse()); } catch (Exception ex) { @@ -1448,7 +1448,7 @@ public virtual Response CreateSubdirectory( smbProperties, filePermission, cancellationToken); - return Response.FromValue(response.GetRawResponse(), subdir); + return Response.FromValue(subdir, response.GetRawResponse()); } /// @@ -1494,7 +1494,7 @@ public virtual async Task> CreateSubdirectoryAsync( filePermission, cancellationToken) .ConfigureAwait(false); - return Response.FromValue(response.GetRawResponse(), subdir); + return Response.FromValue(subdir, response.GetRawResponse()); } #endregion CreateSubdirectory @@ -1603,7 +1603,7 @@ public virtual Response CreateFile( smbProperties, filePermission, cancellationToken); - return Response.FromValue(response.GetRawResponse(), file); + return Response.FromValue(file, response.GetRawResponse()); } /// @@ -1660,7 +1660,7 @@ public virtual async Task> CreateFileAsync( smbProperties, filePermission, cancellationToken).ConfigureAwait(false); - return Response.FromValue(response.GetRawResponse(), file); + return Response.FromValue(file, response.GetRawResponse()); } #endregion CreateFile diff --git a/sdk/storage/Azure.Storage.Files/src/FileClient.cs b/sdk/storage/Azure.Storage.Files/src/FileClient.cs index c11336db47dcc..99f03c83d3b7e 100644 --- a/sdk/storage/Azure.Storage.Files/src/FileClient.cs +++ b/sdk/storage/Azure.Storage.Files/src/FileClient.cs @@ -478,7 +478,7 @@ private async Task> CreateInternal( cancellationToken: cancellationToken) .ConfigureAwait(false); - return Response.FromValue(response.GetRawResponse(), new StorageFileInfo(response.Value)); + return Response.FromValue(new StorageFileInfo(response.Value), response.GetRawResponse()); } catch (Exception ex) { @@ -908,7 +908,7 @@ private async Task> DownloadInternal( // Wrap the FlattenedStorageFileProperties into a StorageFileDownloadInfo // to make the Content easier to find - return Response.FromValue(response.GetRawResponse(), new StorageFileDownloadInfo(response.Value)); + return Response.FromValue(new StorageFileDownloadInfo(response.Value), response.GetRawResponse()); } catch (Exception ex) { @@ -1191,7 +1191,7 @@ private async Task> GetPropertiesInternal( cancellationToken: cancellationToken) .ConfigureAwait(false); - return Response.FromValue(response.GetRawResponse(), new StorageFileProperties(response.Value)); + return Response.FromValue(new StorageFileProperties(response.Value), response.GetRawResponse()); } catch (Exception ex) { @@ -1385,7 +1385,7 @@ private async Task> SetHttpHeadersInternal( cancellationToken: cancellationToken) .ConfigureAwait(false); - return Response.FromValue(response.GetRawResponse(), new StorageFileInfo(response.Value)); + return Response.FromValue(new StorageFileInfo(response.Value), response.GetRawResponse()); } catch (Exception ex) { @@ -1505,7 +1505,7 @@ private async Task> SetMetadataInternal( cancellationToken: cancellationToken) .ConfigureAwait(false); - return Response.FromValue(response.GetRawResponse(), new StorageFileInfo(response.Value)); + return Response.FromValue(new StorageFileInfo(response.Value), response.GetRawResponse()); } catch (Exception ex) { @@ -1871,13 +1871,14 @@ private async Task> UploadRangeFromUriInternal( cancellationToken: cancellationToken) .ConfigureAwait(false); - return Response.FromValue(response.GetRawResponse(), new StorageFileUploadInfo - { - ETag = response.Value.ETag, - LastModified = response.Value.LastModified, - ContentHash = response.Value.XMSContentCrc64, - IsServerEncrypted = response.Value.IsServerEncrypted - }); + return Response.FromValue( + new StorageFileUploadInfo + { + ETag = response.Value.ETag, + LastModified = response.Value.LastModified, + ContentHash = response.Value.XMSContentCrc64, + IsServerEncrypted = response.Value.IsServerEncrypted + }, response.GetRawResponse()); } catch (Exception ex) { diff --git a/sdk/storage/Azure.Storage.Files/src/FileServiceClient.cs b/sdk/storage/Azure.Storage.Files/src/FileServiceClient.cs index 2883899c9b8cc..be50cdc3045eb 100644 --- a/sdk/storage/Azure.Storage.Files/src/FileServiceClient.cs +++ b/sdk/storage/Azure.Storage.Files/src/FileServiceClient.cs @@ -609,7 +609,7 @@ public virtual Response CreateShare( { ShareClient share = GetShareClient(shareName); Response response = share.Create(metadata, quotaInBytes, cancellationToken); - return Response.FromValue(response.GetRawResponse(), share); + return Response.FromValue(share, response.GetRawResponse()); } /// @@ -649,7 +649,7 @@ public virtual async Task> CreateShareAsync( { ShareClient share = GetShareClient(shareName); Response response = await share.CreateAsync(metadata, quotaInBytes, cancellationToken).ConfigureAwait(false); - return Response.FromValue(response.GetRawResponse(), share); + return Response.FromValue(share, response.GetRawResponse()); } #endregion CreateShare diff --git a/sdk/storage/Azure.Storage.Files/src/Generated/FileRestClient.cs b/sdk/storage/Azure.Storage.Files/src/Generated/FileRestClient.cs index d20dfc95524da..185a6ce7cc5f0 100644 --- a/sdk/storage/Azure.Storage.Files/src/Generated/FileRestClient.cs +++ b/sdk/storage/Azure.Storage.Files/src/Generated/FileRestClient.cs @@ -265,7 +265,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage GetPropertiesAsync_Creat Azure.Storage.Files.Models.FileServiceProperties _value = Azure.Storage.Files.Models.FileServiceProperties.FromXml(_xml.Root); // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -411,7 +411,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage ListSharesSegmentAsync_C Azure.Storage.Files.Models.SharesSegment _value = Azure.Storage.Files.Models.SharesSegment.FromXml(_xml.Root); // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -568,7 +568,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage CreateAsync_CreateMessag } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -718,7 +718,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage GetPropertiesAsync_Creat } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -995,7 +995,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage CreateSnapshotAsync_Crea } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -1139,7 +1139,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage CreatePermissionAsync_Cr } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -1275,7 +1275,7 @@ internal static Azure.Response GetPermissionAsync_CreateResponse( } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -1414,7 +1414,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage SetQuotaAsync_CreateMess } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -1558,7 +1558,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage SetMetadataAsync_CreateM } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -1685,7 +1685,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage GetAccessPolicyAsync_Cre Azure.Storage.Files.Models.SignedIdentifier.FromXml)); // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -1837,7 +1837,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage SetAccessPolicyAsync_Cre } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -1960,7 +1960,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage GetStatisticsAsync_Creat Azure.Storage.Files.Models.ShareStatistics _value = Azure.Storage.Files.Models.ShareStatistics.FromXml(_xml.Root); // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -2181,7 +2181,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage CreateAsync_CreateMessag } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -2359,7 +2359,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage GetPropertiesAsync_Creat } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -2679,7 +2679,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage SetPropertiesAsync_Creat } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -2823,7 +2823,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage SetMetadataAsync_CreateM } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -2970,7 +2970,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage ListFilesAndDirectoriesS Azure.Storage.Files.Models.FilesAndDirectoriesSegment _value = Azure.Storage.Files.Models.FilesAndDirectoriesSegment.FromXml(_xml.Root); // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -3120,7 +3120,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage ListHandlesAsync_CreateM Azure.Storage.Files.Models.StorageHandlesSegment _value = Azure.Storage.Files.Models.StorageHandlesSegment.FromXml(_xml.Root); // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -3284,7 +3284,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage ForceCloseHandlesAsync_C } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -3561,7 +3561,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage CreateAsync_CreateMessag } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -3815,7 +3815,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage DownloadAsync_CreateMess } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } case 206: { @@ -3939,7 +3939,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage DownloadAsync_CreateMess } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -4172,7 +4172,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage GetPropertiesAsync_Creat } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -4552,7 +4552,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage SetPropertiesAsync_Creat } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -4699,7 +4699,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage SetMetadataAsync_CreateM } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -4875,7 +4875,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage UploadRangeAsync_CreateM } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -5066,7 +5066,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage UploadRangeFromURLAsync_ } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -5220,7 +5220,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage GetRangeListAsync_Create } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -5380,7 +5380,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage StartCopyAsync_CreateMes } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -5648,7 +5648,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage ListHandlesAsync_CreateM Azure.Storage.Files.Models.StorageHandlesSegment _value = Azure.Storage.Files.Models.StorageHandlesSegment.FromXml(_xml.Root); // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -5802,7 +5802,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage ForceCloseHandlesAsync_C } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { diff --git a/sdk/storage/Azure.Storage.Files/src/ShareClient.cs b/sdk/storage/Azure.Storage.Files/src/ShareClient.cs index 3ed5c7fefe6a5..1013916734b76 100644 --- a/sdk/storage/Azure.Storage.Files/src/ShareClient.cs +++ b/sdk/storage/Azure.Storage.Files/src/ShareClient.cs @@ -1413,7 +1413,7 @@ await FileRestClient.Share.GetPermissionAsync( var permission = permissionProperty.GetString(); // Return the Permission string - return Response.FromValue(jsonResponse.GetRawResponse(), permission); + return Response.FromValue(permission, jsonResponse.GetRawResponse()); } catch (Exception ex) { @@ -1574,7 +1574,7 @@ public virtual Response CreateDirectory( smbProperties, filePermission, cancellationToken); - return Response.FromValue(response.GetRawResponse(), directory); + return Response.FromValue(directory, response.GetRawResponse()); } /// @@ -1621,7 +1621,7 @@ public virtual async Task> CreateDirectoryAsync( smbProperties, filePermission, cancellationToken).ConfigureAwait(false); - return Response.FromValue(response.GetRawResponse(), directory); + return Response.FromValue(directory, response.GetRawResponse()); } #endregion CreateDirectory diff --git a/sdk/storage/Azure.Storage.Queues/src/Generated/QueueRestClient.cs b/sdk/storage/Azure.Storage.Queues/src/Generated/QueueRestClient.cs index 278bdc861e5dd..03686c92e0b44 100644 --- a/sdk/storage/Azure.Storage.Queues/src/Generated/QueueRestClient.cs +++ b/sdk/storage/Azure.Storage.Queues/src/Generated/QueueRestClient.cs @@ -277,7 +277,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage GetPropertiesAsync_Creat Azure.Storage.Queues.Models.QueueServiceProperties _value = Azure.Storage.Queues.Models.QueueServiceProperties.FromXml(_xml.Root); // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -406,7 +406,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage GetStatisticsAsync_Creat Azure.Storage.Queues.Models.QueueServiceStatistics _value = Azure.Storage.Queues.Models.QueueServiceStatistics.FromXml(_xml.Root); // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -558,7 +558,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage ListQueuesSegmentAsync_C Azure.Storage.Queues.Models.QueuesSegment _value = Azure.Storage.Queues.Models.QueuesSegment.FromXml(_xml.Root); // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -967,7 +967,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage GetPropertiesAsync_Creat } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -1233,7 +1233,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage GetAccessPolicyAsync_Cre Azure.Storage.Queues.Models.SignedIdentifier.FromXml)); // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -1526,7 +1526,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage DequeueAsync_CreateMessa Azure.Storage.Queues.Models.DequeuedMessage.FromXml)); // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -1807,7 +1807,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage EnqueueAsync_CreateMessa Azure.Storage.Queues.Models.EnqueuedMessage.FromXml)); // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -1945,7 +1945,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage PeekAsync_CreateMessage( Azure.Storage.Queues.Models.PeekedMessage.FromXml)); // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { @@ -2122,7 +2122,7 @@ internal static Azure.Core.Pipeline.HttpPipelineMessage UpdateAsync_CreateMessag } // Create the response - return Response.FromValue(response, _value); + return Response.FromValue(_value, response); } default: { diff --git a/sdk/storage/Azure.Storage.Queues/src/QueueClient.cs b/sdk/storage/Azure.Storage.Queues/src/QueueClient.cs index 502e10f8269d6..1c1cdac708f19 100644 --- a/sdk/storage/Azure.Storage.Queues/src/QueueClient.cs +++ b/sdk/storage/Azure.Storage.Queues/src/QueueClient.cs @@ -1000,7 +1000,7 @@ await QueueRestClient.Messages.EnqueueAsync( .ConfigureAwait(false); // The service returns a sequence of messages, but the // sequence only ever has one value so we'll unwrap it - return Response.FromValue(messages.GetRawResponse(), messages.Value.FirstOrDefault()); + return Response.FromValue(messages.Value.FirstOrDefault(), messages.GetRawResponse()); } catch (Exception ex) { @@ -1117,7 +1117,7 @@ private async Task> DequeueMessagesInternal( operationName: Constants.Queue.DequeueMessageOperationName, cancellationToken: cancellationToken) .ConfigureAwait(false); - return Response.FromValue(dequeuedMessage.GetRawResponse(), dequeuedMessage.Value.ToArray()); + return Response.FromValue(dequeuedMessage.Value.ToArray(), dequeuedMessage.GetRawResponse()); } catch (Exception ex) { @@ -1218,7 +1218,7 @@ private async Task> PeekMessagesInternal( operationName: Constants.Queue.PeekMessagesOperationName, cancellationToken: cancellationToken) .ConfigureAwait(false); - return Response.FromValue(peekedMessages.GetRawResponse(), peekedMessages.Value.ToArray()); + return Response.FromValue(peekedMessages.Value.ToArray(), peekedMessages.GetRawResponse()); } catch (Exception ex) { diff --git a/sdk/storage/Azure.Storage.Queues/src/QueueServiceClient.cs b/sdk/storage/Azure.Storage.Queues/src/QueueServiceClient.cs index 52da7e703e28d..f7d8a97cafb31 100644 --- a/sdk/storage/Azure.Storage.Queues/src/QueueServiceClient.cs +++ b/sdk/storage/Azure.Storage.Queues/src/QueueServiceClient.cs @@ -619,7 +619,7 @@ public virtual Response CreateQueue( { QueueClient queue = GetQueueClient(queueName); Response response = queue.Create(metadata, cancellationToken); - return Response.FromValue(response, queue); + return Response.FromValue(queue, response); } /// @@ -647,7 +647,7 @@ public virtual async Task> CreateQueueAsync( { QueueClient queue = GetQueueClient(queueName); Response response = await queue.CreateAsync(metadata, cancellationToken).ConfigureAwait(false); - return Response.FromValue(response, queue); + return Response.FromValue(queue, response); } #endregion CreateQueue