diff --git a/sdk/storage/azure_storage_blob/src/clients/blob_client.rs b/sdk/storage/azure_storage_blob/src/clients/blob_client.rs index bbe1a20542..070d7839f6 100644 --- a/sdk/storage/azure_storage_blob/src/clients/blob_client.rs +++ b/sdk/storage/azure_storage_blob/src/clients/blob_client.rs @@ -2,7 +2,7 @@ // Licensed under the MIT License. use crate::{ - clients::GeneratedBlobClient, + generated::clients::BlobClient as GeneratedBlobClient, models::{ BlobBlobClientDownloadOptions, BlobBlobClientGetPropertiesOptions, BlobBlockBlobClientCommitBlockListOptions, BlobBlockBlobClientStageBlockOptions, diff --git a/sdk/storage/azure_storage_blob/src/clients/blob_container_client.rs b/sdk/storage/azure_storage_blob/src/clients/blob_container_client.rs index aa8a011146..0f53bf2ce1 100644 --- a/sdk/storage/azure_storage_blob/src/clients/blob_container_client.rs +++ b/sdk/storage/azure_storage_blob/src/clients/blob_container_client.rs @@ -2,7 +2,7 @@ // Licensed under the MIT License. use crate::{ - clients::GeneratedBlobClient, + generated::clients::BlobClient as GeneratedBlobClient, models::{ BlobContainerClientCreateOptions, BlobContainerClientDeleteOptions, BlobContainerClientGetPropertiesOptions, ContainerProperties, diff --git a/sdk/storage/azure_storage_blob/src/clients/blob_service_client.rs b/sdk/storage/azure_storage_blob/src/clients/blob_service_client.rs index a89c0f8e42..18235b7c6e 100644 --- a/sdk/storage/azure_storage_blob/src/clients/blob_service_client.rs +++ b/sdk/storage/azure_storage_blob/src/clients/blob_service_client.rs @@ -2,7 +2,7 @@ // Licensed under the MIT License. use crate::{ - clients::GeneratedBlobClient, + generated::clients::BlobClient as GeneratedBlobClient, models::{BlobServiceClientGetPropertiesOptions, StorageServiceProperties}, pipeline::StorageHeadersPolicy, BlobClientOptions, diff --git a/sdk/storage/azure_storage_blob/src/generated/clients/blob_append_blob_client.rs b/sdk/storage/azure_storage_blob/src/generated/clients/blob_append_blob_client.rs index 75737d4605..07d230266e 100644 --- a/sdk/storage/azure_storage_blob/src/generated/clients/blob_append_blob_client.rs +++ b/sdk/storage/azure_storage_blob/src/generated/clients/blob_append_blob_client.rs @@ -3,8 +3,8 @@ // Licensed under the MIT License. See License.txt in the project root for license information. // Code generated by Microsoft (R) Rust Code Generator. DO NOT EDIT. -use crate::generated::clients::method_options::*; -use crate::models::BlobType; +use super::super::models::BlobType; +use super::method_options::*; use azure_core::{ base64, date, Bytes, Context, Method, Pipeline, Request, RequestContent, Response, Result, Url, }; diff --git a/sdk/storage/azure_storage_blob/src/generated/clients/blob_blob_client.rs b/sdk/storage/azure_storage_blob/src/generated/clients/blob_blob_client.rs index fe8f949d27..82f66839ba 100644 --- a/sdk/storage/azure_storage_blob/src/generated/clients/blob_blob_client.rs +++ b/sdk/storage/azure_storage_blob/src/generated/clients/blob_blob_client.rs @@ -3,8 +3,8 @@ // Licensed under the MIT License. See License.txt in the project root for license information. // Code generated by Microsoft (R) Rust Code Generator. DO NOT EDIT. -use crate::generated::clients::method_options::*; -use crate::models::{AccessTier, BlobExpiryOptions, BlobTags, QueryRequest}; +use super::super::models::{AccessTier, BlobExpiryOptions, BlobTags, QueryRequest}; +use super::method_options::*; use azure_core::{ base64, date, Context, Method, Pipeline, Request, RequestContent, Response, Result, Url, }; diff --git a/sdk/storage/azure_storage_blob/src/generated/clients/blob_block_blob_client.rs b/sdk/storage/azure_storage_blob/src/generated/clients/blob_block_blob_client.rs index 3a08f10cf6..d1f667986a 100644 --- a/sdk/storage/azure_storage_blob/src/generated/clients/blob_block_blob_client.rs +++ b/sdk/storage/azure_storage_blob/src/generated/clients/blob_block_blob_client.rs @@ -3,8 +3,8 @@ // Licensed under the MIT License. See License.txt in the project root for license information. // Code generated by Microsoft (R) Rust Code Generator. DO NOT EDIT. -use crate::generated::clients::method_options::*; -use crate::models::{BlobType, BlockListType, BlockLookupList}; +use super::super::models::{BlobType, BlockListType, BlockLookupList}; +use super::method_options::*; use azure_core::{ base64, date, Bytes, Context, Method, Pipeline, Request, RequestContent, Response, Result, Url, }; diff --git a/sdk/storage/azure_storage_blob/src/generated/clients/blob_client.rs b/sdk/storage/azure_storage_blob/src/generated/clients/blob_client.rs index 3e319238ba..b798a2ef4c 100644 --- a/sdk/storage/azure_storage_blob/src/generated/clients/blob_client.rs +++ b/sdk/storage/azure_storage_blob/src/generated/clients/blob_client.rs @@ -3,12 +3,12 @@ // Licensed under the MIT License. See License.txt in the project root for license information. // Code generated by Microsoft (R) Rust Code Generator. DO NOT EDIT. -use crate::generated::clients::blob_append_blob_client::BlobAppendBlobClient; -use crate::generated::clients::blob_blob_client::BlobBlobClient; -use crate::generated::clients::blob_block_blob_client::BlobBlockBlobClient; -use crate::generated::clients::blob_container_client::BlobContainerClient; -use crate::generated::clients::blob_page_blob_client::BlobPageBlobClient; -use crate::generated::clients::blob_service_client::BlobServiceClient; +use super::blob_append_blob_client::BlobAppendBlobClient; +use super::blob_blob_client::BlobBlobClient; +use super::blob_block_blob_client::BlobBlockBlobClient; +use super::blob_container_client::BlobContainerClient; +use super::blob_page_blob_client::BlobPageBlobClient; +use super::blob_service_client::BlobServiceClient; use azure_core::credentials::TokenCredential; use azure_core::{BearerTokenCredentialPolicy, ClientOptions, Pipeline, Policy, Result, Url}; use std::sync::Arc; diff --git a/sdk/storage/azure_storage_blob/src/generated/clients/blob_container_client.rs b/sdk/storage/azure_storage_blob/src/generated/clients/blob_container_client.rs index 3bc36fff42..2b9ed859a8 100644 --- a/sdk/storage/azure_storage_blob/src/generated/clients/blob_container_client.rs +++ b/sdk/storage/azure_storage_blob/src/generated/clients/blob_container_client.rs @@ -3,8 +3,8 @@ // Licensed under the MIT License. See License.txt in the project root for license information. // Code generated by Microsoft (R) Rust Code Generator. DO NOT EDIT. -use crate::generated::clients::method_options::*; -use crate::models::{FilterBlobSegment, SignedIdentifier}; +use super::super::models::{FilterBlobSegment, SignedIdentifier}; +use super::method_options::*; use azure_core::{ Bytes, Context, Method, Pipeline, Request, RequestContent, Response, Result, Url, }; diff --git a/sdk/storage/azure_storage_blob/src/generated/clients/blob_page_blob_client.rs b/sdk/storage/azure_storage_blob/src/generated/clients/blob_page_blob_client.rs index a6904126d3..7c090baa83 100644 --- a/sdk/storage/azure_storage_blob/src/generated/clients/blob_page_blob_client.rs +++ b/sdk/storage/azure_storage_blob/src/generated/clients/blob_page_blob_client.rs @@ -3,8 +3,8 @@ // Licensed under the MIT License. See License.txt in the project root for license information. // Code generated by Microsoft (R) Rust Code Generator. DO NOT EDIT. -use crate::generated::clients::method_options::*; -use crate::models::{BlobType, SequenceNumberActionType}; +use super::super::models::{BlobType, SequenceNumberActionType}; +use super::method_options::*; use azure_core::{ base64, date, Bytes, Context, Method, Pipeline, Request, RequestContent, Response, Result, Url, }; diff --git a/sdk/storage/azure_storage_blob/src/generated/clients/blob_service_client.rs b/sdk/storage/azure_storage_blob/src/generated/clients/blob_service_client.rs index d9ed90f16c..e226f58bb2 100644 --- a/sdk/storage/azure_storage_blob/src/generated/clients/blob_service_client.rs +++ b/sdk/storage/azure_storage_blob/src/generated/clients/blob_service_client.rs @@ -3,11 +3,11 @@ // Licensed under the MIT License. See License.txt in the project root for license information. // Code generated by Microsoft (R) Rust Code Generator. DO NOT EDIT. -use super::internal_models::{GetUserDelegationKeyRequest, SetPropertiesRequest}; -use crate::generated::clients::method_options::*; -use crate::models::{ +use super::super::models::{ FilterBlobSegment, StorageServiceProperties, StorageServiceStats, UserDelegationKey, }; +use super::internal_models::{GetUserDelegationKeyRequest, SetPropertiesRequest}; +use super::method_options::*; use azure_core::{ Bytes, Context, Method, Pipeline, Request, RequestContent, Response, Result, Url, }; diff --git a/sdk/storage/azure_storage_blob/src/generated/clients/internal_models.rs b/sdk/storage/azure_storage_blob/src/generated/clients/internal_models.rs index 670df9b70b..a1e41a30e9 100644 --- a/sdk/storage/azure_storage_blob/src/generated/clients/internal_models.rs +++ b/sdk/storage/azure_storage_blob/src/generated/clients/internal_models.rs @@ -3,8 +3,8 @@ // Licensed under the MIT License. See License.txt in the project root for license information. // Code generated by Microsoft (R) Rust Code Generator. DO NOT EDIT. -use crate::generated::xml_helpers::CorsCorsRule; -use crate::models::{CorsRule, Logging, Metrics, RetentionPolicy, StaticWebsite}; +use super::super::models::{CorsRule, Logging, Metrics, RetentionPolicy, StaticWebsite}; +use super::super::xml_helpers::CorsCorsRule; use azure_core::{RequestContent, Result}; use serde::{Deserialize, Serialize}; use typespec_client_core::fmt::SafeDebug; diff --git a/sdk/storage/azure_storage_blob/src/generated/clients/method_options.rs b/sdk/storage/azure_storage_blob/src/generated/clients/method_options.rs index bbe36dc4d9..39db13a424 100644 --- a/sdk/storage/azure_storage_blob/src/generated/clients/method_options.rs +++ b/sdk/storage/azure_storage_blob/src/generated/clients/method_options.rs @@ -3,7 +3,7 @@ // Licensed under the MIT License. See License.txt in the project root for license information. // Code generated by Microsoft (R) Rust Code Generator. DO NOT EDIT. -use crate::models::{ +use super::super::models::{ AccessTier, BlobDeleteType, BlobImmutabilityPolicyMode, CorsRule, DeleteSnapshotsOptionType, EncryptionAlgorithmType, FilterBlobsIncludeItem, Logging, Metrics, PremiumPageBlobAccessTier, PublicAccessType, RehydratePriority, RetentionPolicy, StaticWebsite, diff --git a/sdk/storage/azure_storage_blob/src/generated/clients/mod.rs b/sdk/storage/azure_storage_blob/src/generated/clients/mod.rs index b7023b9641..dfcbf19f8e 100644 --- a/sdk/storage/azure_storage_blob/src/generated/clients/mod.rs +++ b/sdk/storage/azure_storage_blob/src/generated/clients/mod.rs @@ -12,6 +12,7 @@ mod blob_page_blob_client; mod blob_service_client; mod internal_models; pub(crate) mod method_options; + pub use blob_append_blob_client::*; pub use blob_blob_client::*; pub use blob_block_blob_client::*; diff --git a/sdk/storage/azure_storage_blob/src/generated/mod.rs b/sdk/storage/azure_storage_blob/src/generated/mod.rs index 7661c41829..ccee1b796d 100644 --- a/sdk/storage/azure_storage_blob/src/generated/mod.rs +++ b/sdk/storage/azure_storage_blob/src/generated/mod.rs @@ -3,8 +3,10 @@ // Licensed under the MIT License. See License.txt in the project root for license information. // Code generated by Microsoft (R) Rust Code Generator. DO NOT EDIT. -pub(crate) mod clients; -pub(crate) mod enums; -pub(crate) mod models; -pub(crate) mod models_serde; +#![allow(unused_imports)] + +pub mod clients; +pub mod models; mod xml_helpers; + +pub use clients::{BlobClient, BlobClientOptions}; diff --git a/sdk/storage/azure_storage_blob/src/generated/enums.rs b/sdk/storage/azure_storage_blob/src/generated/models/enums.rs similarity index 100% rename from sdk/storage/azure_storage_blob/src/generated/enums.rs rename to sdk/storage/azure_storage_blob/src/generated/models/enums.rs diff --git a/sdk/storage/azure_storage_blob/src/generated/models.rs b/sdk/storage/azure_storage_blob/src/generated/models/mod.rs similarity index 98% rename from sdk/storage/azure_storage_blob/src/generated/models.rs rename to sdk/storage/azure_storage_blob/src/generated/models/mod.rs index 15964cdc4a..9e70b957f2 100644 --- a/sdk/storage/azure_storage_blob/src/generated/models.rs +++ b/sdk/storage/azure_storage_blob/src/generated/models/mod.rs @@ -3,11 +3,16 @@ // Licensed under the MIT License. See License.txt in the project root for license information. // Code generated by Microsoft (R) Rust Code Generator. DO NOT EDIT. -use crate::models::{GeoReplicationStatusType, QueryRequestType, QueryType}; -use crate::{ - generated::xml_helpers::Blob_tag_setBlobTag, generated::xml_helpers::BlobsFilterBlobItem, - generated::xml_helpers::CorsCorsRule, generated::xml_helpers::SchemaArrowField, +mod enums; +mod models_serde; + +pub use super::clients::method_options::*; +use super::xml_helpers::{ + Blob_tag_setBlobTag, BlobsFilterBlobItem, CorsCorsRule, SchemaArrowField, }; + +pub use enums::*; +pub use models_serde::*; use serde::{Deserialize, Serialize}; use time::OffsetDateTime; use typespec_client_core::fmt::SafeDebug; diff --git a/sdk/storage/azure_storage_blob/src/generated/models_serde.rs b/sdk/storage/azure_storage_blob/src/generated/models/models_serde.rs similarity index 93% rename from sdk/storage/azure_storage_blob/src/generated/models_serde.rs rename to sdk/storage/azure_storage_blob/src/generated/models/models_serde.rs index 84684366ec..901c66e137 100644 --- a/sdk/storage/azure_storage_blob/src/generated/models_serde.rs +++ b/sdk/storage/azure_storage_blob/src/generated/models/models_serde.rs @@ -3,7 +3,7 @@ // Licensed under the MIT License. See License.txt in the project root for license information. // Code generated by Microsoft (R) Rust Code Generator. DO NOT EDIT. -use crate::models::{BlobTags, BlockLookupList, QueryRequest}; +use super::{BlobTags, BlockLookupList, QueryRequest}; use azure_core::{RequestContent, Result}; use typespec_client_core::xml::to_xml; diff --git a/sdk/storage/azure_storage_blob/src/generated/xml_helpers.rs b/sdk/storage/azure_storage_blob/src/generated/xml_helpers.rs index 53de379545..ac80bc2524 100644 --- a/sdk/storage/azure_storage_blob/src/generated/xml_helpers.rs +++ b/sdk/storage/azure_storage_blob/src/generated/xml_helpers.rs @@ -6,7 +6,7 @@ #![allow(non_camel_case_types)] #![allow(non_snake_case)] -use crate::models::{ArrowField, BlobTag, CorsRule, FilterBlobItem}; +use super::models::{ArrowField, BlobTag, CorsRule, FilterBlobItem}; use serde::{Deserialize, Deserializer, Serialize, Serializer}; #[derive(Deserialize, Serialize)] diff --git a/sdk/storage/azure_storage_blob/src/lib.rs b/sdk/storage/azure_storage_blob/src/lib.rs index 051d11eaaa..979cf5825b 100644 --- a/sdk/storage/azure_storage_blob/src/lib.rs +++ b/sdk/storage/azure_storage_blob/src/lib.rs @@ -3,8 +3,8 @@ // Licensed under the MIT License. See License.txt in the project root for license information. // Code generated by Microsoft (R) Rust Code Generator. DO NOT EDIT. -// BEGIN GENERATED CODE -- do not edit from here till END mod generated; +mod pipeline; pub mod clients { mod blob_client; @@ -14,60 +14,15 @@ pub mod clients { pub use blob_client::BlobClient; pub use blob_container_client::BlobContainerClient as ContainerClient; pub use blob_service_client::BlobServiceClient as ServiceClient; - - pub use crate::generated::clients::{ - BlobAppendBlobClient, BlobBlobClient, BlobBlockBlobClient, - BlobClient as GeneratedBlobClient, BlobClientOptions, BlobContainerClient, - BlobPageBlobClient, BlobServiceClient, - }; } pub mod models { - pub use crate::generated::clients::method_options::{ - BlobAppendBlobClientAppendBlockFromUrlOptions, BlobAppendBlobClientAppendBlockOptions, - BlobAppendBlobClientCreateOptions, BlobAppendBlobClientSealOptions, - BlobBlobClientAbortCopyFromUrlOptions, BlobBlobClientAcquireLeaseOptions, - BlobBlobClientBreakLeaseOptions, BlobBlobClientChangeLeaseOptions, - BlobBlobClientCopyFromUrlOptions, BlobBlobClientCreateSnapshotOptions, - BlobBlobClientDeleteImmutabilityPolicyOptions, BlobBlobClientDeleteOptions, - BlobBlobClientDownloadOptions, BlobBlobClientGetAccountInfoOptions, - BlobBlobClientGetPropertiesOptions, BlobBlobClientGetTagsOptions, - BlobBlobClientQueryOptions, BlobBlobClientReleaseLeaseOptions, - BlobBlobClientRenewLeaseOptions, BlobBlobClientSetExpiryOptions, - BlobBlobClientSetHttpHeadersOptions, BlobBlobClientSetImmutabilityPolicyOptions, - BlobBlobClientSetLegalHoldOptions, BlobBlobClientSetMetadataOptions, - BlobBlobClientSetTagsOptions, BlobBlobClientSetTierOptions, - BlobBlobClientStartCopyFromUrlOptions, BlobBlobClientUndeleteOptions, - BlobBlockBlobClientCommitBlockListOptions, BlobBlockBlobClientGetBlockListOptions, - BlobBlockBlobClientPutBlobFromUrlOptions, BlobBlockBlobClientStageBlockFromUrlOptions, - BlobBlockBlobClientStageBlockOptions, BlobBlockBlobClientUploadOptions, - BlobContainerClientAcquireLeaseOptions, BlobContainerClientBreakLeaseOptions, - BlobContainerClientChangeLeaseOptions, BlobContainerClientCreateOptions, - BlobContainerClientDeleteOptions, BlobContainerClientFilterBlobsOptions, - BlobContainerClientGetAccessPolicyOptions, BlobContainerClientGetAccountInfoOptions, - BlobContainerClientGetPropertiesOptions, BlobContainerClientReleaseLeaseOptions, - BlobContainerClientRenameOptions, BlobContainerClientRenewLeaseOptions, - BlobContainerClientRestoreOptions, BlobContainerClientSetAccessPolicyOptions, - BlobContainerClientSetMetadataOptions, BlobContainerClientSubmitBatchOptions, - BlobPageBlobClientClearPagesOptions, BlobPageBlobClientCopyIncrementalOptions, - BlobPageBlobClientCreateOptions, BlobPageBlobClientResizeOptions, - BlobPageBlobClientUpdateSequenceNumberOptions, BlobPageBlobClientUploadPagesFromUrlOptions, - BlobPageBlobClientUploadPagesOptions, BlobServiceClientFilterBlobsOptions, - BlobServiceClientGetAccountInfoOptions, BlobServiceClientGetPropertiesOptions, - BlobServiceClientGetStatisticsOptions, BlobServiceClientGetUserDelegationKeyOptions, - BlobServiceClientSetPropertiesOptions, BlobServiceClientSubmitBatchOptions, - }; - pub use crate::generated::enums::*; - pub use crate::generated::models::*; - mod blob_properties; - pub use blob_properties::BlobProperties; - mod container_properties; - pub use container_properties::ContainerProperties; -} -pub use crate::generated::clients::{BlobClient, BlobClientOptions}; -// END GENERATED CODE + pub use super::generated::models::*; + pub use blob_properties::*; + pub use container_properties::*; +} -pub(crate) mod pipeline; +pub use generated::clients::{BlobClient, BlobClientOptions}; diff --git a/sdk/storage/azure_storage_blob/src/models/blob_properties.rs b/sdk/storage/azure_storage_blob/src/models/blob_properties.rs index 9d6cac68fa..74310f3bea 100644 --- a/sdk/storage/azure_storage_blob/src/models/blob_properties.rs +++ b/sdk/storage/azure_storage_blob/src/models/blob_properties.rs @@ -3,20 +3,19 @@ use azure_core::{ headers::{ - FromHeaders, HeaderName, Headers, BLOB_ACCESS_TIER, BLOB_TYPE, CREATION_TIME, LEASE_STATE, - LEASE_STATUS, SERVER_ENCRYPTED, + FromHeaders, HeaderName, Headers, BLOB_ACCESS_TIER, BLOB_TYPE, CREATION_TIME, + LAST_MODIFIED, LEASE_STATE, LEASE_STATUS, SERVER_ENCRYPTED, }, Error, Etag, LeaseStatus, }; use typespec_client_core::fmt::SafeDebug; -use crate::models::{AccessTier, BlobType, LeaseState}; +use crate::generated::models::{AccessTier, BlobType, LeaseState}; pub const CONTENT_LENGTH: HeaderName = HeaderName::from_static("content-length"); pub const CONTENT_MD5: HeaderName = HeaderName::from_static("content-md5"); pub const CONTENT_TYPE: HeaderName = HeaderName::from_static("content-type"); pub const ETAG: HeaderName = HeaderName::from_static("etag"); -pub const LAST_MODIFIED: HeaderName = HeaderName::from_static("last-modified"); pub const BLOB_ACCESS_TIER_INFERRED: HeaderName = HeaderName::from_static("x-ms-access-tier-inferred"); diff --git a/sdk/storage/azure_storage_blob/src/models/container_properties.rs b/sdk/storage/azure_storage_blob/src/models/container_properties.rs index b55d81e6ca..7614e43cdb 100644 --- a/sdk/storage/azure_storage_blob/src/models/container_properties.rs +++ b/sdk/storage/azure_storage_blob/src/models/container_properties.rs @@ -10,7 +10,7 @@ use azure_core::{ }; use typespec_client_core::fmt::SafeDebug; -use crate::models::LeaseState; +use crate::generated::models::LeaseState; pub const LAST_MODIFIED: HeaderName = HeaderName::from_static("last-modified"); pub const IMMUTABLE_STORAGE_WITH_VERSIONING_ENABLED: HeaderName = diff --git a/sdk/storage/azure_storage_blob/src/models/mod.rs b/sdk/storage/azure_storage_blob/src/models/mod.rs deleted file mode 100644 index ef2b8da6ec..0000000000 --- a/sdk/storage/azure_storage_blob/src/models/mod.rs +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -mod blob_properties; - -pub use crate::generated::enums::*; -pub use crate::generated::models::*; - -pub use blob_properties::BlobProperties;