move stuff to Models (#945)

* move stuff to Models * fix build errors * fix build error * Resolve datalake build issue * fix build errors * fix build errors * reformat Co-authored-by: Tank Tang <kat@microsoft.com>
Azure · Nov 12, 2020 · 9462201 · 9462201
1 parent 1df5cfa
commit 9462201
Show file tree

Hide file tree

Showing 31 changed files with 1,191 additions and 1,215 deletions.
diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/append_blob_client.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/append_blob_client.hpp
@@ -114,7 +114,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * parameters to execute this function.
      * @return A CreateAppendBlobResult describing the newly created append blob.
      */
-    Azure::Core::Response<CreateAppendBlobResult> Create(
+    Azure::Core::Response<Models::CreateAppendBlobResult> Create(
         const CreateAppendBlobOptions& options = CreateAppendBlobOptions()) const;
 
     /**
@@ -127,7 +127,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * function.
      * @return A AppendBlockResult describing the state of the updated append blob.
      */
-    Azure::Core::Response<AppendBlockResult> AppendBlock(
+    Azure::Core::Response<Models::AppendBlockResult> AppendBlock(
         Azure::Core::Http::BodyStream* content,
         const AppendBlockOptions& options = AppendBlockOptions()) const;
 
@@ -143,7 +143,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * Optional parameters to execute this function.
      * @return A AppendBlockFromUriResult describing the state of the updated append blob.
      */
-    Azure::Core::Response<AppendBlockFromUriResult> AppendBlockFromUri(
+    Azure::Core::Response<Models::AppendBlockFromUriResult> AppendBlockFromUri(
         const std::string& sourceUri,
         const AppendBlockFromUriOptions& options = AppendBlockFromUriOptions()) const;
 
@@ -153,7 +153,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * @param options Optional parameters to execute this function.
      * @return A SealAppendBlobResult describing the state of the sealed append blob.
      */
-    Azure::Core::Response<SealAppendBlobResult> Seal(
+    Azure::Core::Response<Models::SealAppendBlobResult> Seal(
         const SealAppendBlobOptions& options = SealAppendBlobOptions()) const;
 
   private:

diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_batch_client.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_batch_client.hpp
@@ -48,7 +48,7 @@ namespace Azure { namespace Storage { namespace Blobs {
     int32_t SetBlobAccessTier(
         const std::string& containerName,
         const std::string& blobName,
-        AccessTier Tier,
+        Models::AccessTier Tier,
         const SetBlobAccessTierOptions& options = SetBlobAccessTierOptions());
 
   private:
@@ -65,7 +65,7 @@ namespace Azure { namespace Storage { namespace Blobs {
     {
       std::string ContainerName;
       std::string BlobName;
-      AccessTier Tier = AccessTier::Unknown;
+      Models::AccessTier Tier = Models::AccessTier::Unknown;
       SetBlobAccessTierOptions Options;
     };
 
@@ -75,8 +75,8 @@ namespace Azure { namespace Storage { namespace Blobs {
 
   struct SubmitBlobBatchResult
   {
-    std::vector<Azure::Core::Response<DeleteBlobResult>> DeleteBlobResults;
-    std::vector<Azure::Core::Response<SetBlobAccessTierResult>> SetBlobAccessTierResults;
+    std::vector<Azure::Core::Response<Models::DeleteBlobResult>> DeleteBlobResults;
+    std::vector<Azure::Core::Response<Models::SetBlobAccessTierResult>> SetBlobAccessTierResults;
   };
 
   /**

diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_client.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_client.hpp
@@ -146,7 +146,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * @param options Optional parameters to execute this function.
      * @return A GetBlobPropertiesResult describing the blob's properties.
      */
-    Azure::Core::Response<GetBlobPropertiesResult> GetProperties(
+    Azure::Core::Response<Models::GetBlobPropertiesResult> GetProperties(
         const GetBlobPropertiesOptions& options = GetBlobPropertiesOptions()) const;
 
     /**
@@ -156,8 +156,8 @@ namespace Azure { namespace Storage { namespace Blobs {
      * @param options Optional parameters to execute this function.
      * @return A SetBlobHttpHeadersResult describing the updated blob.
      */
-    Azure::Core::Response<SetBlobHttpHeadersResult> SetHttpHeaders(
-        BlobHttpHeaders httpHeaders,
+    Azure::Core::Response<Models::SetBlobHttpHeadersResult> SetHttpHeaders(
+        Models::BlobHttpHeaders httpHeaders,
         const SetBlobHttpHeadersOptions& options = SetBlobHttpHeadersOptions()) const;
 
     /**
@@ -169,7 +169,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * options Optional parameters to execute this function.
      * @return A SetBlobMetadataResult describing the updated blob.
      */
-    Azure::Core::Response<SetBlobMetadataResult> SetMetadata(
+    Azure::Core::Response<Models::SetBlobMetadataResult> SetMetadata(
         std::map<std::string, std::string> metadata,
         const SetBlobMetadataOptions& options = SetBlobMetadataOptions()) const;
 
@@ -182,8 +182,8 @@ namespace Azure { namespace Storage { namespace Blobs {
      * parameters to execute this function.
      * @return A SetBlobAccessTierResult on successfully setting the tier.
      */
-    Azure::Core::Response<SetBlobAccessTierResult> SetAccessTier(
-        AccessTier Tier,
+    Azure::Core::Response<Models::SetBlobAccessTierResult> SetAccessTier(
+        Models::AccessTier Tier,
         const SetBlobAccessTierOptions& options = SetBlobAccessTierOptions()) const;
 
     /**
@@ -198,7 +198,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * @param options Optional parameters to execute this function.
      * @return A StartCopyBlobFromUriResult describing the state of the copy operation.
      */
-    Azure::Core::Response<StartCopyBlobFromUriResult> StartCopyFromUri(
+    Azure::Core::Response<Models::StartCopyBlobFromUriResult> StartCopyFromUri(
         const std::string& sourceUri,
         const StartCopyBlobFromUriOptions& options = StartCopyBlobFromUriOptions()) const;
 
@@ -210,7 +210,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * @param options Optional parameters to execute this function.
      * @return A AbortCopyBlobFromUriResult on successfully aborting.
      */
-    Azure::Core::Response<AbortCopyBlobFromUriResult> AbortCopyFromUri(
+    Azure::Core::Response<Models::AbortCopyBlobFromUriResult> AbortCopyFromUri(
         const std::string& copyId,
         const AbortCopyBlobFromUriOptions& options = AbortCopyBlobFromUriOptions()) const;
 
@@ -222,7 +222,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * @return A DownloadBlobResult describing the downloaded blob.
      * BlobDownloadResponse.BodyStream contains the blob's data.
      */
-    Azure::Core::Response<DownloadBlobResult> Download(
+    Azure::Core::Response<Models::DownloadBlobResult> Download(
         const DownloadBlobOptions& options = DownloadBlobOptions()) const;
 
     /**
@@ -235,7 +235,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * @param options Optional parameters to execute this function.
      * @return A DownloadBlobToResult describing the downloaded blob.
      */
-    Azure::Core::Response<DownloadBlobToResult> DownloadTo(
+    Azure::Core::Response<Models::DownloadBlobToResult> DownloadTo(
         uint8_t* buffer,
         std::size_t bufferSize,
         const DownloadBlobToOptions& options = DownloadBlobToOptions()) const;
@@ -248,7 +248,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * @param options Optional parameters to execute this function.
      * @return A DownloadBlobToResult describing the downloaded blob.
      */
-    Azure::Core::Response<DownloadBlobToResult> DownloadTo(
+    Azure::Core::Response<Models::DownloadBlobToResult> DownloadTo(
         const std::string& fileName,
         const DownloadBlobToOptions& options = DownloadBlobToOptions()) const;
 
@@ -258,7 +258,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * @param options Optional parameters to execute this function.
      * @return A CreateBlobSnapshotResult describing the new blob snapshot.
      */
-    Azure::Core::Response<CreateBlobSnapshotResult> CreateSnapshot(
+    Azure::Core::Response<Models::CreateBlobSnapshotResult> CreateSnapshot(
         const CreateBlobSnapshotOptions& options = CreateBlobSnapshotOptions()) const;
 
     /**
@@ -269,7 +269,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * @param options Optional parameters to execute this function.
      * @return A DeleteBlobResult on successfully deleting.
      */
-    Azure::Core::Response<DeleteBlobResult> Delete(
+    Azure::Core::Response<Models::DeleteBlobResult> Delete(
         const DeleteBlobOptions& options = DeleteBlobOptions()) const;
 
     /**
@@ -279,7 +279,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * @param options Optional parameters to execute this function.
      * @return A UndeleteBlobResult on successfully deleting.
      */
-    Azure::Core::Response<UndeleteBlobResult> Undelete(
+    Azure::Core::Response<Models::UndeleteBlobResult> Undelete(
         const UndeleteBlobOptions& options = UndeleteBlobOptions()) const;
 
     /**
@@ -293,7 +293,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * @param options Optional parameters to execute this function.
      * @return A AcquireBlobLeaseResult describing the lease.
      */
-    Azure::Core::Response<AcquireBlobLeaseResult> AcquireLease(
+    Azure::Core::Response<Models::AcquireBlobLeaseResult> AcquireLease(
         const std::string& proposedLeaseId,
         int32_t duration,
         const AcquireBlobLeaseOptions& options = AcquireBlobLeaseOptions()) const;
@@ -305,7 +305,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * @param options Optional parameters to execute this function.
      * @return A RenewBlobLeaseResult describing the lease.
      */
-    Azure::Core::Response<RenewBlobLeaseResult> RenewLease(
+    Azure::Core::Response<Models::RenewBlobLeaseResult> RenewLease(
         const std::string& leaseId,
         const RenewBlobLeaseOptions& options = RenewBlobLeaseOptions()) const;
 
@@ -316,7 +316,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * @param options Optional parameters to execute this function.
      * @return A ReleaseBlobLeaseResult describing the updated container.
      */
-    Azure::Core::Response<ReleaseBlobLeaseResult> ReleaseLease(
+    Azure::Core::Response<Models::ReleaseBlobLeaseResult> ReleaseLease(
         const std::string& leaseId,
         const ReleaseBlobLeaseOptions& options = ReleaseBlobLeaseOptions()) const;
 
@@ -329,7 +329,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * @param options Optional parameters to execute this function.
      * @return A ChangeBlobLeaseResult describing the lease.
      */
-    Azure::Core::Response<ChangeBlobLeaseResult> ChangeLease(
+    Azure::Core::Response<Models::ChangeBlobLeaseResult> ChangeLease(
         const std::string& leaseId,
         const std::string& proposedLeaseId,
         const ChangeBlobLeaseOptions& options = ChangeBlobLeaseOptions()) const;
@@ -340,7 +340,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * @param options Optional parameters to execute this function.
      * @return A BreakBlobLeaseResult describing the broken lease.
      */
-    Azure::Core::Response<BreakBlobLeaseResult> BreakLease(
+    Azure::Core::Response<Models::BreakBlobLeaseResult> BreakLease(
         const BreakBlobLeaseOptions& options = BreakBlobLeaseOptions()) const;
 
     /**
@@ -350,7 +350,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * @param options Optional parameters to execute this function.
      * @return A SetBlobTagsInfo on successfully setting tags.
      */
-    Azure::Core::Response<SetBlobTagsResult> SetTags(
+    Azure::Core::Response<Models::SetBlobTagsResult> SetTags(
         std::map<std::string, std::string> tags,
         const SetBlobTagsOptions& options = SetBlobTagsOptions()) const;
 
@@ -360,7 +360,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * @param options Optional parameters to execute this function.
      * @return Tags on successfully getting tags.
      */
-    Azure::Core::Response<GetBlobTagsResult> GetTags(
+    Azure::Core::Response<Models::GetBlobTagsResult> GetTags(
         const GetBlobTagsOptions& options = GetBlobTagsOptions()) const;
 
   protected:

diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_container_client.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_container_client.hpp
@@ -133,7 +133,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * parameters to execute this function.
      * @return A CreateContainerResult describing the newly created blob container.
      */
-    Azure::Core::Response<CreateContainerResult> Create(
+    Azure::Core::Response<Models::CreateContainerResult> Create(
         const CreateContainerOptions& options = CreateContainerOptions()) const;
 
     /**
@@ -144,7 +144,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * options Optional parameters to execute this function.
      * @return A DeleteContainerResult if successful.
      */
-    Azure::Core::Response<DeleteContainerResult> Delete(
+    Azure::Core::Response<Models::DeleteContainerResult> Delete(
         const DeleteContainerOptions& options = DeleteContainerOptions()) const;
 
     /**
@@ -156,7 +156,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * @param options Optional parameters to execute this function.
      * @return An UndeleteContainerResult if successful.
      */
-    Azure::Core::Response<UndeleteContainerResult> Undelete(
+    Azure::Core::Response<Models::UndeleteContainerResult> Undelete(
         const std::string& deletedContainerName,
         const std::string& deletedContainerVersion,
         const UndeleteContainerOptions& options = UndeleteContainerOptions()) const;
@@ -168,7 +168,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * @param options Optional parameters to execute this function.
      * @return A GetContainerPropertiesResult describing the container and its properties.
      */
-    Azure::Core::Response<GetContainerPropertiesResult> GetProperties(
+    Azure::Core::Response<Models::GetContainerPropertiesResult> GetProperties(
         const GetContainerPropertiesOptions& options = GetContainerPropertiesOptions()) const;
 
     /**
@@ -179,7 +179,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * Optional parameters to execute this function.
      * @return A SetContainerMetadataResult if successful.
      */
-    Azure::Core::Response<SetContainerMetadataResult> SetMetadata(
+    Azure::Core::Response<Models::SetContainerMetadataResult> SetMetadata(
         std::map<std::string, std::string> metadata,
         SetContainerMetadataOptions options = SetContainerMetadataOptions()) const;
 
@@ -192,7 +192,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * @param options Optional parameters to execute this function.
      * @return A ListBlobsFlatSegmentResult describing a segment of the blobs in the container.
      */
-    Azure::Core::Response<ListBlobsFlatSegmentResult> ListBlobsFlatSegment(
+    Azure::Core::Response<Models::ListBlobsFlatSegmentResult> ListBlobsFlatSegment(
         const ListBlobsSegmentOptions& options = ListBlobsSegmentOptions()) const;
 
     /**
@@ -209,7 +209,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * @return A ListBlobsByHierarchySegmentResult describing a segment of the blobs in the
      * container.
      */
-    Azure::Core::Response<ListBlobsByHierarchySegmentResult> ListBlobsByHierarchySegment(
+    Azure::Core::Response<Models::ListBlobsByHierarchySegmentResult> ListBlobsByHierarchySegment(
         const std::string& delimiter,
         const ListBlobsSegmentOptions& options = ListBlobsSegmentOptions()) const;
 
@@ -221,7 +221,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * execute this function.
      * @return A GetContainerAccessPolicyResult describing the container's access policy.
      */
-    Azure::Core::Response<GetContainerAccessPolicyResult> GetAccessPolicy(
+    Azure::Core::Response<Models::GetContainerAccessPolicyResult> GetAccessPolicy(
         const GetContainerAccessPolicyOptions& options = GetContainerAccessPolicyOptions()) const;
 
     /**
@@ -232,7 +232,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * parameters to execute this function.
      * @return A SetContainerAccessPolicyResult describing the updated container.
      */
-    Azure::Core::Response<SetContainerAccessPolicyResult> SetAccessPolicy(
+    Azure::Core::Response<Models::SetContainerAccessPolicyResult> SetAccessPolicy(
         const SetContainerAccessPolicyOptions& options = SetContainerAccessPolicyOptions()) const;
 
     /**
@@ -248,7 +248,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * function.
      * @return A AcquireContainerLeaseResult describing the lease.
      */
-    Azure::Core::Response<AcquireContainerLeaseResult> AcquireLease(
+    Azure::Core::Response<Models::AcquireContainerLeaseResult> AcquireLease(
         const std::string& proposedLeaseId,
         int32_t duration,
         const AcquireContainerLeaseOptions& options = AcquireContainerLeaseOptions()) const;
@@ -262,7 +262,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * execute this function.
      * @return A RenewContainerLeaseResult describing the lease.
      */
-    Azure::Core::Response<RenewContainerLeaseResult> RenewLease(
+    Azure::Core::Response<Models::RenewContainerLeaseResult> RenewLease(
         const std::string& leaseId,
         const RenewContainerLeaseOptions& options = RenewContainerLeaseOptions()) const;
 
@@ -275,7 +275,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * execute this function.
      * @return A ReleaseContainerLeaseResult describing the updated container.
      */
-    Azure::Core::Response<ReleaseContainerLeaseResult> ReleaseLease(
+    Azure::Core::Response<Models::ReleaseContainerLeaseResult> ReleaseLease(
         const std::string& leaseId,
         const ReleaseContainerLeaseOptions& options = ReleaseContainerLeaseOptions()) const;
 
@@ -289,7 +289,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * @param options Optional parameters to execute this function.
      * @return A ChangeContainerLeaseResult describing the lease.
      */
-    Azure::Core::Response<ChangeContainerLeaseResult> ChangeLease(
+    Azure::Core::Response<Models::ChangeContainerLeaseResult> ChangeLease(
         const std::string& leaseId,
         const std::string& proposedLeaseId,
         const ChangeContainerLeaseOptions& options = ChangeContainerLeaseOptions()) const;
@@ -301,7 +301,7 @@ namespace Azure { namespace Storage { namespace Blobs {
      * parameters to execute this function.
      * @return A BreakContainerLeaseResult describing the broken lease.
      */
-    Azure::Core::Response<BreakContainerLeaseResult> BreakLease(
+    Azure::Core::Response<Models::BreakContainerLeaseResult> BreakLease(
         const BreakContainerLeaseOptions& options = BreakContainerLeaseOptions()) const;
 
   protected: