From 4c19a6f5108a1e721db30be47e0f355b185b53fa Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 24 Nov 2020 12:24:30 -0800 Subject: [PATCH 1/2] Update storage generator to suppress issues --- .../src/Generated/BlobRestClient.cs | 234 +++++++++--------- .../swagger/Generator/src/generator.ts | 10 +- .../src/Generated/FileRestClient.cs | 92 +++---- .../src/Generated/QueueRestClient.cs | 36 +-- 4 files changed, 190 insertions(+), 182 deletions(-) diff --git a/sdk/storage/Azure.Storage.Blobs/src/Generated/BlobRestClient.cs b/sdk/storage/Azure.Storage.Blobs/src/Generated/BlobRestClient.cs index 40c0a6926f52..a472012ef45c 100644 --- a/sdk/storage/Azure.Storage.Blobs/src/Generated/BlobRestClient.cs +++ b/sdk/storage/Azure.Storage.Blobs/src/Generated/BlobRestClient.cs @@ -15260,13 +15260,13 @@ public static partial class BlobsModelFactory /// Creates a new AccountInfo instance for mocking. /// public static AccountInfo AccountInfo( - Azure.Storage.Blobs.Models.SkuName skuName, - Azure.Storage.Blobs.Models.AccountKind accountKind) + Azure.Storage.Blobs.Models.AccountKind accountKind, + Azure.Storage.Blobs.Models.SkuName skuName) { return new AccountInfo() { - SkuName = skuName, AccountKind = accountKind, + SkuName = skuName, }; } } @@ -16085,27 +16085,27 @@ public static partial class BlobsModelFactory /// Creates a new BlobAppendInfo instance for mocking. /// public static BlobAppendInfo BlobAppendInfo( - Azure.ETag eTag, - System.DateTimeOffset lastModified, - byte[] contentHash, - byte[] contentCrc64, - string blobAppendOffset, - int blobCommittedBlockCount, - bool isServerEncrypted, + string encryptionScope, string encryptionKeySha256, - string encryptionScope) + bool isServerEncrypted, + int blobCommittedBlockCount, + string blobAppendOffset, + byte[] contentCrc64, + byte[] contentHash, + System.DateTimeOffset lastModified, + Azure.ETag eTag) { return new BlobAppendInfo() { - ETag = eTag, - LastModified = lastModified, - ContentHash = contentHash, - ContentCrc64 = contentCrc64, - BlobAppendOffset = blobAppendOffset, - BlobCommittedBlockCount = blobCommittedBlockCount, - IsServerEncrypted = isServerEncrypted, - EncryptionKeySha256 = encryptionKeySha256, EncryptionScope = encryptionScope, + EncryptionKeySha256 = encryptionKeySha256, + IsServerEncrypted = isServerEncrypted, + BlobCommittedBlockCount = blobCommittedBlockCount, + BlobAppendOffset = blobAppendOffset, + ContentCrc64 = contentCrc64, + ContentHash = contentHash, + LastModified = lastModified, + ETag = eTag, }; } } @@ -16251,10 +16251,10 @@ public static partial class BlobsModelFactory /// Creates a new BlobBlock instance for mocking. /// public static BlobBlock BlobBlock( - string name, - int size) + int size, + string name) { - return new BlobBlock(name, size); + return new BlobBlock(size, name); } } } @@ -16306,17 +16306,17 @@ public static partial class BlobsModelFactory /// Creates a new BlobContainerAccessPolicy instance for mocking. /// public static BlobContainerAccessPolicy BlobContainerAccessPolicy( - Azure.Storage.Blobs.Models.PublicAccessType blobPublicAccess, - Azure.ETag eTag, + System.Collections.Generic.IEnumerable signedIdentifiers, System.DateTimeOffset lastModified, - System.Collections.Generic.IEnumerable signedIdentifiers) + Azure.ETag eTag, + Azure.Storage.Blobs.Models.PublicAccessType blobPublicAccess) { return new BlobContainerAccessPolicy() { - BlobPublicAccess = blobPublicAccess, - ETag = eTag, - LastModified = lastModified, SignedIdentifiers = signedIdentifiers, + LastModified = lastModified, + ETag = eTag, + BlobPublicAccess = blobPublicAccess, }; } } @@ -16357,13 +16357,13 @@ public static partial class BlobsModelFactory /// Creates a new BlobContainerInfo instance for mocking. /// public static BlobContainerInfo BlobContainerInfo( - Azure.ETag eTag, - System.DateTimeOffset lastModified) + System.DateTimeOffset lastModified, + Azure.ETag eTag) { return new BlobContainerInfo() { - ETag = eTag, LastModified = lastModified, + ETag = eTag, }; } } @@ -16464,15 +16464,15 @@ public static partial class BlobsModelFactory /// Creates a new BlobContainerItem instance for mocking. /// public static BlobContainerItem BlobContainerItem( - string name, Azure.Storage.Blobs.Models.BlobContainerProperties properties, + string name, bool? isDeleted = default, string versionId = default) { return new BlobContainerItem() { - Name = name, Properties = properties, + Name = name, IsDeleted = isDeleted, VersionId = versionId, }; @@ -16669,35 +16669,35 @@ public static partial class BlobsModelFactory /// Creates a new BlobContainerProperties instance for mocking. /// public static BlobContainerProperties BlobContainerProperties( - System.DateTimeOffset lastModified, Azure.ETag eTag, + System.DateTimeOffset lastModified, + Azure.Storage.Blobs.Models.LeaseStatus? leaseStatus = default, Azure.Storage.Blobs.Models.LeaseState? leaseState = default, Azure.Storage.Blobs.Models.LeaseDurationType? leaseDuration = default, Azure.Storage.Blobs.Models.PublicAccessType? publicAccess = default, bool? hasImmutabilityPolicy = default, - Azure.Storage.Blobs.Models.LeaseStatus? leaseStatus = default, + bool? hasLegalHold = default, string defaultEncryptionScope = default, bool? preventEncryptionScopeOverride = default, System.DateTimeOffset? deletedOn = default, int? remainingRetentionDays = default, - System.Collections.Generic.IDictionary metadata = default, - bool? hasLegalHold = default) + System.Collections.Generic.IDictionary metadata = default) { return new BlobContainerProperties() { - LastModified = lastModified, ETag = eTag, + LastModified = lastModified, + LeaseStatus = leaseStatus, LeaseState = leaseState, LeaseDuration = leaseDuration, PublicAccess = publicAccess, HasImmutabilityPolicy = hasImmutabilityPolicy, - LeaseStatus = leaseStatus, + HasLegalHold = hasLegalHold, DefaultEncryptionScope = defaultEncryptionScope, PreventEncryptionScopeOverride = preventEncryptionScopeOverride, DeletedOn = deletedOn, RemainingRetentionDays = remainingRetentionDays, Metadata = metadata, - HasLegalHold = hasLegalHold, }; } } @@ -16880,23 +16880,23 @@ public static partial class BlobsModelFactory /// Creates a new BlobContentInfo instance for mocking. /// public static BlobContentInfo BlobContentInfo( - Azure.ETag eTag, - System.DateTimeOffset lastModified, - byte[] contentHash, - string versionId, - string encryptionKeySha256, + long blobSequenceNumber, string encryptionScope, - long blobSequenceNumber) + string encryptionKeySha256, + string versionId, + byte[] contentHash, + System.DateTimeOffset lastModified, + Azure.ETag eTag) { return new BlobContentInfo() { - ETag = eTag, - LastModified = lastModified, - ContentHash = contentHash, - VersionId = versionId, - EncryptionKeySha256 = encryptionKeySha256, - EncryptionScope = encryptionScope, BlobSequenceNumber = blobSequenceNumber, + EncryptionScope = encryptionScope, + EncryptionKeySha256 = encryptionKeySha256, + VersionId = versionId, + ContentHash = contentHash, + LastModified = lastModified, + ETag = eTag, }; } } @@ -16952,19 +16952,19 @@ public static partial class BlobsModelFactory /// Creates a new BlobCopyInfo instance for mocking. /// public static BlobCopyInfo BlobCopyInfo( - Azure.ETag eTag, - System.DateTimeOffset lastModified, - string versionId, + Azure.Storage.Blobs.Models.CopyStatus copyStatus, string copyId, - Azure.Storage.Blobs.Models.CopyStatus copyStatus) + string versionId, + System.DateTimeOffset lastModified, + Azure.ETag eTag) { return new BlobCopyInfo() { - ETag = eTag, - LastModified = lastModified, - VersionId = versionId, - CopyId = copyId, CopyStatus = copyStatus, + CopyId = copyId, + VersionId = versionId, + LastModified = lastModified, + ETag = eTag, }; } } @@ -17974,13 +17974,13 @@ public static partial class BlobsModelFactory /// Creates a new BlobInfo instance for mocking. /// public static BlobInfo BlobInfo( - Azure.ETag eTag, - System.DateTimeOffset lastModified) + System.DateTimeOffset lastModified, + Azure.ETag eTag) { return new BlobInfo() { - ETag = eTag, LastModified = lastModified, + ETag = eTag, }; } } @@ -18548,7 +18548,8 @@ public static partial class BlobsModelFactory /// public static BlobItemProperties BlobItemProperties( bool accessTierInferred, - bool? serverEncrypted = default, + System.DateTimeOffset? lastModified = default, + long? contentLength = default, string contentType = default, string contentEncoding = default, string contentLanguage = default, @@ -18565,12 +18566,11 @@ public static BlobItemProperties BlobItemProperties( System.Uri copySource = default, string copyProgress = default, string copyStatusDescription = default, - long? contentLength = default, + bool? serverEncrypted = default, bool? incrementalCopy = default, string destinationSnapshot = default, int? remainingRetentionDays = default, Azure.Storage.Blobs.Models.AccessTier? accessTier = default, - System.DateTimeOffset? lastModified = default, Azure.Storage.Blobs.Models.ArchiveStatus? archiveStatus = default, string customerProvidedKeySha256 = default, string encryptionScope = default, @@ -18588,7 +18588,8 @@ public static BlobItemProperties BlobItemProperties( return new BlobItemProperties() { AccessTierInferred = accessTierInferred, - ServerEncrypted = serverEncrypted, + LastModified = lastModified, + ContentLength = contentLength, ContentType = contentType, ContentEncoding = contentEncoding, ContentLanguage = contentLanguage, @@ -18605,12 +18606,11 @@ public static BlobItemProperties BlobItemProperties( CopySource = copySource, CopyProgress = copyProgress, CopyStatusDescription = copyStatusDescription, - ContentLength = contentLength, + ServerEncrypted = serverEncrypted, IncrementalCopy = incrementalCopy, DestinationSnapshot = destinationSnapshot, RemainingRetentionDays = remainingRetentionDays, AccessTier = accessTier, - LastModified = lastModified, ArchiveStatus = archiveStatus, CustomerProvidedKeySha256 = customerProvidedKeySha256, EncryptionScope = encryptionScope, @@ -18669,15 +18669,15 @@ public static partial class BlobsModelFactory /// Creates a new BlobLease instance for mocking. /// public static BlobLease BlobLease( - Azure.ETag eTag, + string leaseId, System.DateTimeOffset lastModified, - string leaseId) + Azure.ETag eTag) { return new BlobLease() { - ETag = eTag, - LastModified = lastModified, LeaseId = leaseId, + LastModified = lastModified, + ETag = eTag, }; } } @@ -19186,9 +19186,9 @@ public partial class BlobServiceProperties /// /// The set of CORS rules. /// -#pragma warning disable CA2227 // Collection properties should be readonly + #pragma warning disable CA2227 // Collection properties should be readonly public System.Collections.Generic.IList Cors { get; set; } -#pragma warning restore CA2227 // Collection properties should be readonly + #pragma warning restore CA2227 // Collection properties should be readonly /// /// The default version to use for requests to the Blob service if an incoming request's version is not specified. Possible values include version 2008-10-27 and all more recent versions @@ -19575,19 +19575,19 @@ public static partial class BlobsModelFactory /// Creates a new BlobSnapshotInfo instance for mocking. /// public static BlobSnapshotInfo BlobSnapshotInfo( - string snapshot, - Azure.ETag eTag, - System.DateTimeOffset lastModified, + bool isServerEncrypted, string versionId, - bool isServerEncrypted) + System.DateTimeOffset lastModified, + Azure.ETag eTag, + string snapshot) { return new BlobSnapshotInfo() { - Snapshot = snapshot, - ETag = eTag, - LastModified = lastModified, - VersionId = versionId, IsServerEncrypted = isServerEncrypted, + VersionId = versionId, + LastModified = lastModified, + ETag = eTag, + Snapshot = snapshot, }; } } @@ -20241,17 +20241,17 @@ public static partial class BlobsModelFactory /// Creates a new BlockInfo instance for mocking. /// public static BlockInfo BlockInfo( - byte[] contentHash, - byte[] contentCrc64, + string encryptionScope, string encryptionKeySha256, - string encryptionScope) + byte[] contentCrc64, + byte[] contentHash) { return new BlockInfo() { - ContentHash = contentHash, - ContentCrc64 = contentCrc64, - EncryptionKeySha256 = encryptionKeySha256, EncryptionScope = encryptionScope, + EncryptionKeySha256 = encryptionKeySha256, + ContentCrc64 = contentCrc64, + ContentHash = contentHash, }; } } @@ -22036,15 +22036,15 @@ public static partial class BlobsModelFactory /// Creates a new PageBlobInfo instance for mocking. /// public static PageBlobInfo PageBlobInfo( - Azure.ETag eTag, + long blobSequenceNumber, System.DateTimeOffset lastModified, - long blobSequenceNumber) + Azure.ETag eTag) { return new PageBlobInfo() { - ETag = eTag, - LastModified = lastModified, BlobSequenceNumber = blobSequenceNumber, + LastModified = lastModified, + ETag = eTag, }; } } @@ -22114,23 +22114,23 @@ public static partial class BlobsModelFactory /// Creates a new PageInfo instance for mocking. /// public static PageInfo PageInfo( - Azure.ETag eTag, - System.DateTimeOffset lastModified, - byte[] contentHash, - byte[] contentCrc64, - long blobSequenceNumber, + string encryptionScope, string encryptionKeySha256, - string encryptionScope) + long blobSequenceNumber, + byte[] contentCrc64, + byte[] contentHash, + System.DateTimeOffset lastModified, + Azure.ETag eTag) { return new PageInfo() { - ETag = eTag, - LastModified = lastModified, - ContentHash = contentHash, - ContentCrc64 = contentCrc64, - BlobSequenceNumber = blobSequenceNumber, - EncryptionKeySha256 = encryptionKeySha256, EncryptionScope = encryptionScope, + EncryptionKeySha256 = encryptionKeySha256, + BlobSequenceNumber = blobSequenceNumber, + ContentCrc64 = contentCrc64, + ContentHash = contentHash, + LastModified = lastModified, + ETag = eTag, }; } } @@ -23078,23 +23078,23 @@ public static partial class BlobsModelFactory /// Creates a new UserDelegationKey instance for mocking. /// public static UserDelegationKey UserDelegationKey( - string signedObjectId, - string signedTenantId, - string signedService, - string signedVersion, - string value, + System.DateTimeOffset signedStartsOn, System.DateTimeOffset signedExpiresOn, - System.DateTimeOffset signedStartsOn) + string value, + string signedVersion, + string signedService, + string signedTenantId, + string signedObjectId) { return new UserDelegationKey() { - SignedObjectId = signedObjectId, - SignedTenantId = signedTenantId, - SignedService = signedService, - SignedVersion = signedVersion, - Value = value, - SignedExpiresOn = signedExpiresOn, SignedStartsOn = signedStartsOn, + SignedExpiresOn = signedExpiresOn, + Value = value, + SignedVersion = signedVersion, + SignedService = signedService, + SignedTenantId = signedTenantId, + SignedObjectId = signedObjectId, }; } } 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 fd3dae289306..257bcf1de026 100644 --- a/sdk/storage/Azure.Storage.Common/swagger/Generator/src/generator.ts +++ b/sdk/storage/Azure.Storage.Common/swagger/Generator/src/generator.ts @@ -902,12 +902,17 @@ function generateObject(w: IndentWriter, model: IServiceModel, type: IObjectType w.line(`/// `); w.line(`/// ${property.description || property.model.description || property.name}`); w.line(`/// `); + let internalSetter = !property.isNullable && (property.readonly || property.model.type === `array`); + let isCollection = isPrimitiveType(property.model) && property.model.itemType && !type.struct; if (property.model.type === `byte`) { w.line(`#pragma warning disable CA1819 // Properties should not return arrays`); } + if (isCollection && !internalSetter) { + w.line(`#pragma warning disable CA2227 // Collection properties should be readonly`); + } w.write(`public ${types.getDeclarationType(property.model, property.required, property.readonly)} ${naming.property(property.clientName)} { get; `); if (!type.struct) { - if (!property.isNullable && (property.readonly || property.model.type === `array`)) { + if (internalSetter) { w.write(`internal `); } w.write(`set; `); @@ -917,6 +922,9 @@ function generateObject(w: IndentWriter, model: IServiceModel, type: IObjectType if (property.model.type === `byte`) { w.line(`#pragma warning restore CA1819 // Properties should not return arrays`); } + if (isCollection && !internalSetter) { + w.line(`#pragma warning restore CA2227 // Collection properties should be readonly`); + } } // Instantiate nested models if necessary diff --git a/sdk/storage/Azure.Storage.Files.Shares/src/Generated/FileRestClient.cs b/sdk/storage/Azure.Storage.Files.Shares/src/Generated/FileRestClient.cs index e78386c9e109..c5a93085661d 100644 --- a/sdk/storage/Azure.Storage.Files.Shares/src/Generated/FileRestClient.cs +++ b/sdk/storage/Azure.Storage.Files.Shares/src/Generated/FileRestClient.cs @@ -8654,13 +8654,13 @@ public static partial class ShareModelFactory /// Creates a new FileLeaseReleaseInfo instance for mocking. /// public static FileLeaseReleaseInfo FileLeaseReleaseInfo( - Azure.ETag eTag, - System.DateTimeOffset lastModified) + System.DateTimeOffset lastModified, + Azure.ETag eTag) { return new FileLeaseReleaseInfo() { - ETag = eTag, LastModified = lastModified, + ETag = eTag, }; } } @@ -10354,17 +10354,17 @@ public static partial class ShareModelFactory /// Creates a new ShareFileCopyInfo instance for mocking. /// public static ShareFileCopyInfo ShareFileCopyInfo( - Azure.ETag eTag, - System.DateTimeOffset lastModified, + Azure.Storage.Files.Shares.Models.CopyStatus copyStatus, string copyId, - Azure.Storage.Files.Shares.Models.CopyStatus copyStatus) + System.DateTimeOffset lastModified, + Azure.ETag eTag) { return new ShareFileCopyInfo() { - ETag = eTag, - LastModified = lastModified, - CopyId = copyId, CopyStatus = copyStatus, + CopyId = copyId, + LastModified = lastModified, + ETag = eTag, }; } } @@ -10491,22 +10491,22 @@ public static partial class ShareModelFactory /// Creates a new ShareFileHandle instance for mocking. /// public static ShareFileHandle ShareFileHandle( - string handleId, - string path, - string fileId, - string sessionId, string clientIp, + string sessionId, + string fileId, + string path, + string handleId, string parentId = default, System.DateTimeOffset? openedOn = default, System.DateTimeOffset? lastReconnectedOn = default) { return new ShareFileHandle() { - HandleId = handleId, - Path = path, - FileId = fileId, - SessionId = sessionId, ClientIp = clientIp, + SessionId = sessionId, + FileId = fileId, + Path = path, + HandleId = handleId, ParentId = parentId, OpenedOn = openedOn, LastReconnectedOn = lastReconnectedOn, @@ -10555,15 +10555,15 @@ public static partial class ShareModelFactory /// Creates a new ShareFileLease instance for mocking. /// public static ShareFileLease ShareFileLease( - Azure.ETag eTag, + string leaseId, System.DateTimeOffset lastModified, - string leaseId) + Azure.ETag eTag) { return new ShareFileLease() { - ETag = eTag, - LastModified = lastModified, LeaseId = leaseId, + LastModified = lastModified, + ETag = eTag, }; } } @@ -10770,17 +10770,17 @@ public static partial class ShareModelFactory /// Creates a new ShareFileUploadInfo instance for mocking. /// public static ShareFileUploadInfo ShareFileUploadInfo( - Azure.ETag eTag, - System.DateTimeOffset lastModified, + bool isServerEncrypted, byte[] contentHash, - bool isServerEncrypted) + System.DateTimeOffset lastModified, + Azure.ETag eTag) { return new ShareFileUploadInfo() { - ETag = eTag, - LastModified = lastModified, - ContentHash = contentHash, IsServerEncrypted = isServerEncrypted, + ContentHash = contentHash, + LastModified = lastModified, + ETag = eTag, }; } } @@ -10821,13 +10821,13 @@ public static partial class ShareModelFactory /// Creates a new ShareInfo instance for mocking. /// public static ShareInfo ShareInfo( - Azure.ETag eTag, - System.DateTimeOffset lastModified) + System.DateTimeOffset lastModified, + Azure.ETag eTag) { return new ShareInfo() { - ETag = eTag, LastModified = lastModified, + ETag = eTag, }; } } @@ -10938,16 +10938,16 @@ public static partial class ShareModelFactory /// Creates a new ShareItem instance for mocking. /// public static ShareItem ShareItem( - string name, Azure.Storage.Files.Shares.Models.ShareProperties properties, + string name, string snapshot = default, bool? isDeleted = default, string versionId = default) { return new ShareItem() { - Name = name, Properties = properties, + Name = name, Snapshot = snapshot, IsDeleted = isDeleted, VersionId = versionId, @@ -11469,15 +11469,15 @@ public static partial class ShareModelFactory /// Creates a new ShareProperties instance for mocking. /// public static ShareProperties ShareProperties( - string accessTier = default, System.DateTimeOffset? lastModified = default, + Azure.ETag? eTag = default, int? provisionedIops = default, int? provisionedIngressMBps = default, int? provisionedEgressMBps = default, System.DateTimeOffset? nextAllowedQuotaDowngradeTime = default, System.DateTimeOffset? deletedOn = default, int? remainingRetentionDays = default, - Azure.ETag? eTag = default, + string accessTier = default, System.DateTimeOffset? accessTierChangeTime = default, string accessTierTransitionState = default, Azure.Storage.Files.Shares.Models.ShareLeaseStatus? leaseStatus = default, @@ -11488,15 +11488,15 @@ public static ShareProperties ShareProperties( { return new ShareProperties() { - AccessTier = accessTier, LastModified = lastModified, + ETag = eTag, ProvisionedIops = provisionedIops, ProvisionedIngressMBps = provisionedIngressMBps, ProvisionedEgressMBps = provisionedEgressMBps, NextAllowedQuotaDowngradeTime = nextAllowedQuotaDowngradeTime, DeletedOn = deletedOn, RemainingRetentionDays = remainingRetentionDays, - ETag = eTag, + AccessTier = accessTier, AccessTierChangeTime = accessTierChangeTime, AccessTierTransitionState = accessTierTransitionState, LeaseStatus = leaseStatus, @@ -11683,9 +11683,9 @@ public partial class ShareServiceProperties /// /// The set of CORS rules. /// -#pragma warning disable CA2227 // Collection properties should be readonly + #pragma warning disable CA2227 // Collection properties should be readonly public System.Collections.Generic.IList Cors { get; set; } -#pragma warning restore CA2227 // Collection properties should be readonly + #pragma warning restore CA2227 // Collection properties should be readonly /// /// Protocol settings @@ -11997,15 +11997,15 @@ public static partial class ShareModelFactory /// Creates a new ShareSnapshotInfo instance for mocking. /// public static ShareSnapshotInfo ShareSnapshotInfo( - string snapshot, + System.DateTimeOffset lastModified, Azure.ETag eTag, - System.DateTimeOffset lastModified) + string snapshot) { return new ShareSnapshotInfo() { - Snapshot = snapshot, - ETag = eTag, LastModified = lastModified, + ETag = eTag, + Snapshot = snapshot, }; } } @@ -12341,15 +12341,15 @@ public static partial class ShareModelFactory /// Creates a new StorageClosedHandlesSegment instance for mocking. /// public static StorageClosedHandlesSegment StorageClosedHandlesSegment( - string marker, + int numberOfHandlesFailedToClose, int numberOfHandlesClosed, - int numberOfHandlesFailedToClose) + string marker) { return new StorageClosedHandlesSegment() { - Marker = marker, - NumberOfHandlesClosed = numberOfHandlesClosed, NumberOfHandlesFailedToClose = numberOfHandlesFailedToClose, + NumberOfHandlesClosed = numberOfHandlesClosed, + Marker = marker, }; } } diff --git a/sdk/storage/Azure.Storage.Queues/src/Generated/QueueRestClient.cs b/sdk/storage/Azure.Storage.Queues/src/Generated/QueueRestClient.cs index a5fec105ca74..bfec9cb20383 100644 --- a/sdk/storage/Azure.Storage.Queues/src/Generated/QueueRestClient.cs +++ b/sdk/storage/Azure.Storage.Queues/src/Generated/QueueRestClient.cs @@ -1851,7 +1851,7 @@ internal static Azure.Response ClearAsync_CreateResponse( /// The URL of the service account, queue or message that is the targe of the desired operation. /// A Message object which can be stored in a Queue /// Specifies the version of the operation to use for this request. - /// Optional. Specifies the new visibility timeout value, in seconds, relative to server time. The default value is 30 seconds. A specified value must be larger than or equal to 1 second, and cannot be larger than 7 days, or larger than 2 hours on REST protocol versions prior to version 2011-08-18. The visibility timeout of a message can be set to a value later than the expiry time. + /// Optional. If specified, the request must be made using an x-ms-version of 2011-08-18 or later. If not specified, the default value is 0. Specifies the new visibility timeout value, in seconds, relative to server time. The new value must be larger than or equal to 0, and cannot be larger than 7 days. The visibility timeout of a message cannot be set to a value later than the expiry time. visibilitytimeout should be set to a value smaller than the time-to-live value. /// Optional. Specifies the time-to-live interval for the message, in seconds. Prior to version 2017-07-29, the maximum time-to-live allowed is 7 days. For version 2017-07-29 or later, the maximum time-to-live can be any positive number, as well as -1 indicating that the message does not expire. If this parameter is omitted, the default time-to-live is 7 days. /// The The timeout parameter is expressed in seconds. For more information, see Setting Timeouts for Queue Service Operations. /// Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled. @@ -1922,7 +1922,7 @@ internal static Azure.Response ClearAsync_CreateResponse( /// The URL of the service account, queue or message that is the targe of the desired operation. /// A Message object which can be stored in a Queue /// Specifies the version of the operation to use for this request. - /// Optional. Specifies the new visibility timeout value, in seconds, relative to server time. The default value is 30 seconds. A specified value must be larger than or equal to 1 second, and cannot be larger than 7 days, or larger than 2 hours on REST protocol versions prior to version 2011-08-18. The visibility timeout of a message can be set to a value later than the expiry time. + /// Optional. If specified, the request must be made using an x-ms-version of 2011-08-18 or later. If not specified, the default value is 0. Specifies the new visibility timeout value, in seconds, relative to server time. The new value must be larger than or equal to 0, and cannot be larger than 7 days. The visibility timeout of a message cannot be set to a value later than the expiry time. visibilitytimeout should be set to a value smaller than the time-to-live value. /// Optional. Specifies the time-to-live interval for the message, in seconds. Prior to version 2017-07-29, the maximum time-to-live allowed is 7 days. For version 2017-07-29 or later, the maximum time-to-live can be any positive number, as well as -1 indicating that the message does not expire. If this parameter is omitted, the default time-to-live is 7 days. /// The The timeout parameter is expressed in seconds. For more information, see Setting Timeouts for Queue Service Operations. /// Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled. @@ -3814,13 +3814,13 @@ public static partial class QueuesModelFactory /// Creates a new QueueProperties instance for mocking. /// public static QueueProperties QueueProperties( - System.Collections.Generic.IDictionary metadata, - int approximateMessagesCount) + int approximateMessagesCount, + System.Collections.Generic.IDictionary metadata) { return new QueueProperties() { - Metadata = metadata, ApproximateMessagesCount = approximateMessagesCount, + Metadata = metadata, }; } } @@ -3968,9 +3968,9 @@ public partial class QueueServiceProperties /// /// The set of CORS rules. /// -#pragma warning disable CA2227 // Collection properties should be readonly + #pragma warning disable CA2227 // Collection properties should be readonly public System.Collections.Generic.IList Cors { get; set; } -#pragma warning restore CA2227 // Collection properties should be readonly + #pragma warning restore CA2227 // Collection properties should be readonly /// /// Creates a new QueueServiceProperties instance @@ -4440,19 +4440,19 @@ public static partial class QueuesModelFactory /// Creates a new SendReceipt instance for mocking. /// public static SendReceipt SendReceipt( - string messageId, - System.DateTimeOffset insertionTime, - System.DateTimeOffset expirationTime, + System.DateTimeOffset timeNextVisible, string popReceipt, - System.DateTimeOffset timeNextVisible) + System.DateTimeOffset expirationTime, + System.DateTimeOffset insertionTime, + string messageId) { return new SendReceipt() { - MessageId = messageId, - InsertionTime = insertionTime, - ExpirationTime = expirationTime, - PopReceipt = popReceipt, TimeNextVisible = timeNextVisible, + PopReceipt = popReceipt, + ExpirationTime = expirationTime, + InsertionTime = insertionTime, + MessageId = messageId, }; } } @@ -4546,13 +4546,13 @@ public static partial class QueuesModelFactory /// Creates a new UpdateReceipt instance for mocking. /// public static UpdateReceipt UpdateReceipt( - string popReceipt, - System.DateTimeOffset nextVisibleOn) + System.DateTimeOffset nextVisibleOn, + string popReceipt) { return new UpdateReceipt() { - PopReceipt = popReceipt, NextVisibleOn = nextVisibleOn, + PopReceipt = popReceipt, }; } } From 45cd16d22181b667398e7327825b57a576ad1321 Mon Sep 17 00:00:00 2001 From: Sean McCullough Date: Tue, 24 Nov 2020 20:45:13 -0600 Subject: [PATCH 2/2] Generated with Node 10 --- .../src/Generated/BlobRestClient.cs | 230 +++++++++--------- .../src/Generated/FileRestClient.cs | 88 +++---- .../src/Generated/QueueRestClient.cs | 28 +-- 3 files changed, 173 insertions(+), 173 deletions(-) diff --git a/sdk/storage/Azure.Storage.Blobs/src/Generated/BlobRestClient.cs b/sdk/storage/Azure.Storage.Blobs/src/Generated/BlobRestClient.cs index a472012ef45c..5b1894c6b59e 100644 --- a/sdk/storage/Azure.Storage.Blobs/src/Generated/BlobRestClient.cs +++ b/sdk/storage/Azure.Storage.Blobs/src/Generated/BlobRestClient.cs @@ -15260,13 +15260,13 @@ public static partial class BlobsModelFactory /// Creates a new AccountInfo instance for mocking. /// public static AccountInfo AccountInfo( - Azure.Storage.Blobs.Models.AccountKind accountKind, - Azure.Storage.Blobs.Models.SkuName skuName) + Azure.Storage.Blobs.Models.SkuName skuName, + Azure.Storage.Blobs.Models.AccountKind accountKind) { return new AccountInfo() { - AccountKind = accountKind, SkuName = skuName, + AccountKind = accountKind, }; } } @@ -16085,27 +16085,27 @@ public static partial class BlobsModelFactory /// Creates a new BlobAppendInfo instance for mocking. /// public static BlobAppendInfo BlobAppendInfo( - string encryptionScope, - string encryptionKeySha256, - bool isServerEncrypted, - int blobCommittedBlockCount, - string blobAppendOffset, - byte[] contentCrc64, - byte[] contentHash, + Azure.ETag eTag, System.DateTimeOffset lastModified, - Azure.ETag eTag) + byte[] contentHash, + byte[] contentCrc64, + string blobAppendOffset, + int blobCommittedBlockCount, + bool isServerEncrypted, + string encryptionKeySha256, + string encryptionScope) { return new BlobAppendInfo() { - EncryptionScope = encryptionScope, - EncryptionKeySha256 = encryptionKeySha256, - IsServerEncrypted = isServerEncrypted, - BlobCommittedBlockCount = blobCommittedBlockCount, - BlobAppendOffset = blobAppendOffset, - ContentCrc64 = contentCrc64, - ContentHash = contentHash, - LastModified = lastModified, ETag = eTag, + LastModified = lastModified, + ContentHash = contentHash, + ContentCrc64 = contentCrc64, + BlobAppendOffset = blobAppendOffset, + BlobCommittedBlockCount = blobCommittedBlockCount, + IsServerEncrypted = isServerEncrypted, + EncryptionKeySha256 = encryptionKeySha256, + EncryptionScope = encryptionScope, }; } } @@ -16251,10 +16251,10 @@ public static partial class BlobsModelFactory /// Creates a new BlobBlock instance for mocking. /// public static BlobBlock BlobBlock( - int size, - string name) + string name, + int size) { - return new BlobBlock(size, name); + return new BlobBlock(name, size); } } } @@ -16306,17 +16306,17 @@ public static partial class BlobsModelFactory /// Creates a new BlobContainerAccessPolicy instance for mocking. /// public static BlobContainerAccessPolicy BlobContainerAccessPolicy( - System.Collections.Generic.IEnumerable signedIdentifiers, - System.DateTimeOffset lastModified, + Azure.Storage.Blobs.Models.PublicAccessType blobPublicAccess, Azure.ETag eTag, - Azure.Storage.Blobs.Models.PublicAccessType blobPublicAccess) + System.DateTimeOffset lastModified, + System.Collections.Generic.IEnumerable signedIdentifiers) { return new BlobContainerAccessPolicy() { - SignedIdentifiers = signedIdentifiers, - LastModified = lastModified, - ETag = eTag, BlobPublicAccess = blobPublicAccess, + ETag = eTag, + LastModified = lastModified, + SignedIdentifiers = signedIdentifiers, }; } } @@ -16357,13 +16357,13 @@ public static partial class BlobsModelFactory /// Creates a new BlobContainerInfo instance for mocking. /// public static BlobContainerInfo BlobContainerInfo( - System.DateTimeOffset lastModified, - Azure.ETag eTag) + Azure.ETag eTag, + System.DateTimeOffset lastModified) { return new BlobContainerInfo() { - LastModified = lastModified, ETag = eTag, + LastModified = lastModified, }; } } @@ -16464,15 +16464,15 @@ public static partial class BlobsModelFactory /// Creates a new BlobContainerItem instance for mocking. /// public static BlobContainerItem BlobContainerItem( - Azure.Storage.Blobs.Models.BlobContainerProperties properties, string name, + Azure.Storage.Blobs.Models.BlobContainerProperties properties, bool? isDeleted = default, string versionId = default) { return new BlobContainerItem() { - Properties = properties, Name = name, + Properties = properties, IsDeleted = isDeleted, VersionId = versionId, }; @@ -16669,35 +16669,35 @@ public static partial class BlobsModelFactory /// Creates a new BlobContainerProperties instance for mocking. /// public static BlobContainerProperties BlobContainerProperties( - Azure.ETag eTag, System.DateTimeOffset lastModified, - Azure.Storage.Blobs.Models.LeaseStatus? leaseStatus = default, + Azure.ETag eTag, Azure.Storage.Blobs.Models.LeaseState? leaseState = default, Azure.Storage.Blobs.Models.LeaseDurationType? leaseDuration = default, Azure.Storage.Blobs.Models.PublicAccessType? publicAccess = default, bool? hasImmutabilityPolicy = default, - bool? hasLegalHold = default, + Azure.Storage.Blobs.Models.LeaseStatus? leaseStatus = default, string defaultEncryptionScope = default, bool? preventEncryptionScopeOverride = default, System.DateTimeOffset? deletedOn = default, int? remainingRetentionDays = default, - System.Collections.Generic.IDictionary metadata = default) + System.Collections.Generic.IDictionary metadata = default, + bool? hasLegalHold = default) { return new BlobContainerProperties() { - ETag = eTag, LastModified = lastModified, - LeaseStatus = leaseStatus, + ETag = eTag, LeaseState = leaseState, LeaseDuration = leaseDuration, PublicAccess = publicAccess, HasImmutabilityPolicy = hasImmutabilityPolicy, - HasLegalHold = hasLegalHold, + LeaseStatus = leaseStatus, DefaultEncryptionScope = defaultEncryptionScope, PreventEncryptionScopeOverride = preventEncryptionScopeOverride, DeletedOn = deletedOn, RemainingRetentionDays = remainingRetentionDays, Metadata = metadata, + HasLegalHold = hasLegalHold, }; } } @@ -16880,23 +16880,23 @@ public static partial class BlobsModelFactory /// Creates a new BlobContentInfo instance for mocking. /// public static BlobContentInfo BlobContentInfo( - long blobSequenceNumber, - string encryptionScope, - string encryptionKeySha256, - string versionId, - byte[] contentHash, + Azure.ETag eTag, System.DateTimeOffset lastModified, - Azure.ETag eTag) + byte[] contentHash, + string versionId, + string encryptionKeySha256, + string encryptionScope, + long blobSequenceNumber) { return new BlobContentInfo() { - BlobSequenceNumber = blobSequenceNumber, - EncryptionScope = encryptionScope, - EncryptionKeySha256 = encryptionKeySha256, - VersionId = versionId, - ContentHash = contentHash, - LastModified = lastModified, ETag = eTag, + LastModified = lastModified, + ContentHash = contentHash, + VersionId = versionId, + EncryptionKeySha256 = encryptionKeySha256, + EncryptionScope = encryptionScope, + BlobSequenceNumber = blobSequenceNumber, }; } } @@ -16952,19 +16952,19 @@ public static partial class BlobsModelFactory /// Creates a new BlobCopyInfo instance for mocking. /// public static BlobCopyInfo BlobCopyInfo( - Azure.Storage.Blobs.Models.CopyStatus copyStatus, - string copyId, - string versionId, + Azure.ETag eTag, System.DateTimeOffset lastModified, - Azure.ETag eTag) + string versionId, + string copyId, + Azure.Storage.Blobs.Models.CopyStatus copyStatus) { return new BlobCopyInfo() { - CopyStatus = copyStatus, - CopyId = copyId, - VersionId = versionId, - LastModified = lastModified, ETag = eTag, + LastModified = lastModified, + VersionId = versionId, + CopyId = copyId, + CopyStatus = copyStatus, }; } } @@ -17974,13 +17974,13 @@ public static partial class BlobsModelFactory /// Creates a new BlobInfo instance for mocking. /// public static BlobInfo BlobInfo( - System.DateTimeOffset lastModified, - Azure.ETag eTag) + Azure.ETag eTag, + System.DateTimeOffset lastModified) { return new BlobInfo() { - LastModified = lastModified, ETag = eTag, + LastModified = lastModified, }; } } @@ -18548,8 +18548,7 @@ public static partial class BlobsModelFactory /// public static BlobItemProperties BlobItemProperties( bool accessTierInferred, - System.DateTimeOffset? lastModified = default, - long? contentLength = default, + bool? serverEncrypted = default, string contentType = default, string contentEncoding = default, string contentLanguage = default, @@ -18566,11 +18565,12 @@ public static BlobItemProperties BlobItemProperties( System.Uri copySource = default, string copyProgress = default, string copyStatusDescription = default, - bool? serverEncrypted = default, + long? contentLength = default, bool? incrementalCopy = default, string destinationSnapshot = default, int? remainingRetentionDays = default, Azure.Storage.Blobs.Models.AccessTier? accessTier = default, + System.DateTimeOffset? lastModified = default, Azure.Storage.Blobs.Models.ArchiveStatus? archiveStatus = default, string customerProvidedKeySha256 = default, string encryptionScope = default, @@ -18588,8 +18588,7 @@ public static BlobItemProperties BlobItemProperties( return new BlobItemProperties() { AccessTierInferred = accessTierInferred, - LastModified = lastModified, - ContentLength = contentLength, + ServerEncrypted = serverEncrypted, ContentType = contentType, ContentEncoding = contentEncoding, ContentLanguage = contentLanguage, @@ -18606,11 +18605,12 @@ public static BlobItemProperties BlobItemProperties( CopySource = copySource, CopyProgress = copyProgress, CopyStatusDescription = copyStatusDescription, - ServerEncrypted = serverEncrypted, + ContentLength = contentLength, IncrementalCopy = incrementalCopy, DestinationSnapshot = destinationSnapshot, RemainingRetentionDays = remainingRetentionDays, AccessTier = accessTier, + LastModified = lastModified, ArchiveStatus = archiveStatus, CustomerProvidedKeySha256 = customerProvidedKeySha256, EncryptionScope = encryptionScope, @@ -18669,15 +18669,15 @@ public static partial class BlobsModelFactory /// Creates a new BlobLease instance for mocking. /// public static BlobLease BlobLease( - string leaseId, + Azure.ETag eTag, System.DateTimeOffset lastModified, - Azure.ETag eTag) + string leaseId) { return new BlobLease() { - LeaseId = leaseId, - LastModified = lastModified, ETag = eTag, + LastModified = lastModified, + LeaseId = leaseId, }; } } @@ -19575,19 +19575,19 @@ public static partial class BlobsModelFactory /// Creates a new BlobSnapshotInfo instance for mocking. /// public static BlobSnapshotInfo BlobSnapshotInfo( - bool isServerEncrypted, - string versionId, - System.DateTimeOffset lastModified, + string snapshot, Azure.ETag eTag, - string snapshot) + System.DateTimeOffset lastModified, + string versionId, + bool isServerEncrypted) { return new BlobSnapshotInfo() { - IsServerEncrypted = isServerEncrypted, - VersionId = versionId, - LastModified = lastModified, - ETag = eTag, Snapshot = snapshot, + ETag = eTag, + LastModified = lastModified, + VersionId = versionId, + IsServerEncrypted = isServerEncrypted, }; } } @@ -20241,17 +20241,17 @@ public static partial class BlobsModelFactory /// Creates a new BlockInfo instance for mocking. /// public static BlockInfo BlockInfo( - string encryptionScope, - string encryptionKeySha256, + byte[] contentHash, byte[] contentCrc64, - byte[] contentHash) + string encryptionKeySha256, + string encryptionScope) { return new BlockInfo() { - EncryptionScope = encryptionScope, - EncryptionKeySha256 = encryptionKeySha256, - ContentCrc64 = contentCrc64, ContentHash = contentHash, + ContentCrc64 = contentCrc64, + EncryptionKeySha256 = encryptionKeySha256, + EncryptionScope = encryptionScope, }; } } @@ -22036,15 +22036,15 @@ public static partial class BlobsModelFactory /// Creates a new PageBlobInfo instance for mocking. /// public static PageBlobInfo PageBlobInfo( - long blobSequenceNumber, + Azure.ETag eTag, System.DateTimeOffset lastModified, - Azure.ETag eTag) + long blobSequenceNumber) { return new PageBlobInfo() { - BlobSequenceNumber = blobSequenceNumber, - LastModified = lastModified, ETag = eTag, + LastModified = lastModified, + BlobSequenceNumber = blobSequenceNumber, }; } } @@ -22114,23 +22114,23 @@ public static partial class BlobsModelFactory /// Creates a new PageInfo instance for mocking. /// public static PageInfo PageInfo( - string encryptionScope, - string encryptionKeySha256, - long blobSequenceNumber, - byte[] contentCrc64, - byte[] contentHash, + Azure.ETag eTag, System.DateTimeOffset lastModified, - Azure.ETag eTag) + byte[] contentHash, + byte[] contentCrc64, + long blobSequenceNumber, + string encryptionKeySha256, + string encryptionScope) { return new PageInfo() { - EncryptionScope = encryptionScope, - EncryptionKeySha256 = encryptionKeySha256, - BlobSequenceNumber = blobSequenceNumber, - ContentCrc64 = contentCrc64, - ContentHash = contentHash, - LastModified = lastModified, ETag = eTag, + LastModified = lastModified, + ContentHash = contentHash, + ContentCrc64 = contentCrc64, + BlobSequenceNumber = blobSequenceNumber, + EncryptionKeySha256 = encryptionKeySha256, + EncryptionScope = encryptionScope, }; } } @@ -23078,23 +23078,23 @@ public static partial class BlobsModelFactory /// Creates a new UserDelegationKey instance for mocking. /// public static UserDelegationKey UserDelegationKey( - System.DateTimeOffset signedStartsOn, - System.DateTimeOffset signedExpiresOn, - string value, - string signedVersion, - string signedService, + string signedObjectId, string signedTenantId, - string signedObjectId) + string signedService, + string signedVersion, + string value, + System.DateTimeOffset signedExpiresOn, + System.DateTimeOffset signedStartsOn) { return new UserDelegationKey() { - SignedStartsOn = signedStartsOn, - SignedExpiresOn = signedExpiresOn, - Value = value, - SignedVersion = signedVersion, - SignedService = signedService, - SignedTenantId = signedTenantId, SignedObjectId = signedObjectId, + SignedTenantId = signedTenantId, + SignedService = signedService, + SignedVersion = signedVersion, + Value = value, + SignedExpiresOn = signedExpiresOn, + SignedStartsOn = signedStartsOn, }; } } diff --git a/sdk/storage/Azure.Storage.Files.Shares/src/Generated/FileRestClient.cs b/sdk/storage/Azure.Storage.Files.Shares/src/Generated/FileRestClient.cs index c5a93085661d..6a433a843dad 100644 --- a/sdk/storage/Azure.Storage.Files.Shares/src/Generated/FileRestClient.cs +++ b/sdk/storage/Azure.Storage.Files.Shares/src/Generated/FileRestClient.cs @@ -8654,13 +8654,13 @@ public static partial class ShareModelFactory /// Creates a new FileLeaseReleaseInfo instance for mocking. /// public static FileLeaseReleaseInfo FileLeaseReleaseInfo( - System.DateTimeOffset lastModified, - Azure.ETag eTag) + Azure.ETag eTag, + System.DateTimeOffset lastModified) { return new FileLeaseReleaseInfo() { - LastModified = lastModified, ETag = eTag, + LastModified = lastModified, }; } } @@ -10354,17 +10354,17 @@ public static partial class ShareModelFactory /// Creates a new ShareFileCopyInfo instance for mocking. /// public static ShareFileCopyInfo ShareFileCopyInfo( - Azure.Storage.Files.Shares.Models.CopyStatus copyStatus, - string copyId, + Azure.ETag eTag, System.DateTimeOffset lastModified, - Azure.ETag eTag) + string copyId, + Azure.Storage.Files.Shares.Models.CopyStatus copyStatus) { return new ShareFileCopyInfo() { - CopyStatus = copyStatus, - CopyId = copyId, - LastModified = lastModified, ETag = eTag, + LastModified = lastModified, + CopyId = copyId, + CopyStatus = copyStatus, }; } } @@ -10491,22 +10491,22 @@ public static partial class ShareModelFactory /// Creates a new ShareFileHandle instance for mocking. /// public static ShareFileHandle ShareFileHandle( - string clientIp, - string sessionId, - string fileId, - string path, string handleId, + string path, + string fileId, + string sessionId, + string clientIp, string parentId = default, System.DateTimeOffset? openedOn = default, System.DateTimeOffset? lastReconnectedOn = default) { return new ShareFileHandle() { - ClientIp = clientIp, - SessionId = sessionId, - FileId = fileId, - Path = path, HandleId = handleId, + Path = path, + FileId = fileId, + SessionId = sessionId, + ClientIp = clientIp, ParentId = parentId, OpenedOn = openedOn, LastReconnectedOn = lastReconnectedOn, @@ -10555,15 +10555,15 @@ public static partial class ShareModelFactory /// Creates a new ShareFileLease instance for mocking. /// public static ShareFileLease ShareFileLease( - string leaseId, + Azure.ETag eTag, System.DateTimeOffset lastModified, - Azure.ETag eTag) + string leaseId) { return new ShareFileLease() { - LeaseId = leaseId, - LastModified = lastModified, ETag = eTag, + LastModified = lastModified, + LeaseId = leaseId, }; } } @@ -10770,17 +10770,17 @@ public static partial class ShareModelFactory /// Creates a new ShareFileUploadInfo instance for mocking. /// public static ShareFileUploadInfo ShareFileUploadInfo( - bool isServerEncrypted, - byte[] contentHash, + Azure.ETag eTag, System.DateTimeOffset lastModified, - Azure.ETag eTag) + byte[] contentHash, + bool isServerEncrypted) { return new ShareFileUploadInfo() { - IsServerEncrypted = isServerEncrypted, - ContentHash = contentHash, - LastModified = lastModified, ETag = eTag, + LastModified = lastModified, + ContentHash = contentHash, + IsServerEncrypted = isServerEncrypted, }; } } @@ -10821,13 +10821,13 @@ public static partial class ShareModelFactory /// Creates a new ShareInfo instance for mocking. /// public static ShareInfo ShareInfo( - System.DateTimeOffset lastModified, - Azure.ETag eTag) + Azure.ETag eTag, + System.DateTimeOffset lastModified) { return new ShareInfo() { - LastModified = lastModified, ETag = eTag, + LastModified = lastModified, }; } } @@ -10938,16 +10938,16 @@ public static partial class ShareModelFactory /// Creates a new ShareItem instance for mocking. /// public static ShareItem ShareItem( - Azure.Storage.Files.Shares.Models.ShareProperties properties, string name, + Azure.Storage.Files.Shares.Models.ShareProperties properties, string snapshot = default, bool? isDeleted = default, string versionId = default) { return new ShareItem() { - Properties = properties, Name = name, + Properties = properties, Snapshot = snapshot, IsDeleted = isDeleted, VersionId = versionId, @@ -11469,15 +11469,15 @@ public static partial class ShareModelFactory /// Creates a new ShareProperties instance for mocking. /// public static ShareProperties ShareProperties( + string accessTier = default, System.DateTimeOffset? lastModified = default, - Azure.ETag? eTag = default, int? provisionedIops = default, int? provisionedIngressMBps = default, int? provisionedEgressMBps = default, System.DateTimeOffset? nextAllowedQuotaDowngradeTime = default, System.DateTimeOffset? deletedOn = default, int? remainingRetentionDays = default, - string accessTier = default, + Azure.ETag? eTag = default, System.DateTimeOffset? accessTierChangeTime = default, string accessTierTransitionState = default, Azure.Storage.Files.Shares.Models.ShareLeaseStatus? leaseStatus = default, @@ -11488,15 +11488,15 @@ public static ShareProperties ShareProperties( { return new ShareProperties() { + AccessTier = accessTier, LastModified = lastModified, - ETag = eTag, ProvisionedIops = provisionedIops, ProvisionedIngressMBps = provisionedIngressMBps, ProvisionedEgressMBps = provisionedEgressMBps, NextAllowedQuotaDowngradeTime = nextAllowedQuotaDowngradeTime, DeletedOn = deletedOn, RemainingRetentionDays = remainingRetentionDays, - AccessTier = accessTier, + ETag = eTag, AccessTierChangeTime = accessTierChangeTime, AccessTierTransitionState = accessTierTransitionState, LeaseStatus = leaseStatus, @@ -11997,15 +11997,15 @@ public static partial class ShareModelFactory /// Creates a new ShareSnapshotInfo instance for mocking. /// public static ShareSnapshotInfo ShareSnapshotInfo( - System.DateTimeOffset lastModified, + string snapshot, Azure.ETag eTag, - string snapshot) + System.DateTimeOffset lastModified) { return new ShareSnapshotInfo() { - LastModified = lastModified, - ETag = eTag, Snapshot = snapshot, + ETag = eTag, + LastModified = lastModified, }; } } @@ -12341,15 +12341,15 @@ public static partial class ShareModelFactory /// Creates a new StorageClosedHandlesSegment instance for mocking. /// public static StorageClosedHandlesSegment StorageClosedHandlesSegment( - int numberOfHandlesFailedToClose, + string marker, int numberOfHandlesClosed, - string marker) + int numberOfHandlesFailedToClose) { return new StorageClosedHandlesSegment() { - NumberOfHandlesFailedToClose = numberOfHandlesFailedToClose, - NumberOfHandlesClosed = numberOfHandlesClosed, Marker = marker, + NumberOfHandlesClosed = numberOfHandlesClosed, + NumberOfHandlesFailedToClose = numberOfHandlesFailedToClose, }; } } diff --git a/sdk/storage/Azure.Storage.Queues/src/Generated/QueueRestClient.cs b/sdk/storage/Azure.Storage.Queues/src/Generated/QueueRestClient.cs index bfec9cb20383..338a8b3b88d8 100644 --- a/sdk/storage/Azure.Storage.Queues/src/Generated/QueueRestClient.cs +++ b/sdk/storage/Azure.Storage.Queues/src/Generated/QueueRestClient.cs @@ -3814,13 +3814,13 @@ public static partial class QueuesModelFactory /// Creates a new QueueProperties instance for mocking. /// public static QueueProperties QueueProperties( - int approximateMessagesCount, - System.Collections.Generic.IDictionary metadata) + System.Collections.Generic.IDictionary metadata, + int approximateMessagesCount) { return new QueueProperties() { - ApproximateMessagesCount = approximateMessagesCount, Metadata = metadata, + ApproximateMessagesCount = approximateMessagesCount, }; } } @@ -4440,19 +4440,19 @@ public static partial class QueuesModelFactory /// Creates a new SendReceipt instance for mocking. /// public static SendReceipt SendReceipt( - System.DateTimeOffset timeNextVisible, - string popReceipt, - System.DateTimeOffset expirationTime, + string messageId, System.DateTimeOffset insertionTime, - string messageId) + System.DateTimeOffset expirationTime, + string popReceipt, + System.DateTimeOffset timeNextVisible) { return new SendReceipt() { - TimeNextVisible = timeNextVisible, - PopReceipt = popReceipt, - ExpirationTime = expirationTime, - InsertionTime = insertionTime, MessageId = messageId, + InsertionTime = insertionTime, + ExpirationTime = expirationTime, + PopReceipt = popReceipt, + TimeNextVisible = timeNextVisible, }; } } @@ -4546,13 +4546,13 @@ public static partial class QueuesModelFactory /// Creates a new UpdateReceipt instance for mocking. /// public static UpdateReceipt UpdateReceipt( - System.DateTimeOffset nextVisibleOn, - string popReceipt) + string popReceipt, + System.DateTimeOffset nextVisibleOn) { return new UpdateReceipt() { - NextVisibleOn = nextVisibleOn, PopReceipt = popReceipt, + NextVisibleOn = nextVisibleOn, }; } }