Skip to content

Commit 9462201

Browse files
Jinming-Hukatmsft
andauthored
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>
1 parent 1df5cfa commit 9462201

31 files changed

+1191
-1215
lines changed

sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/append_blob_client.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ namespace Azure { namespace Storage { namespace Blobs {
114114
* parameters to execute this function.
115115
* @return A CreateAppendBlobResult describing the newly created append blob.
116116
*/
117-
Azure::Core::Response<CreateAppendBlobResult> Create(
117+
Azure::Core::Response<Models::CreateAppendBlobResult> Create(
118118
const CreateAppendBlobOptions& options = CreateAppendBlobOptions()) const;
119119

120120
/**
@@ -127,7 +127,7 @@ namespace Azure { namespace Storage { namespace Blobs {
127127
* function.
128128
* @return A AppendBlockResult describing the state of the updated append blob.
129129
*/
130-
Azure::Core::Response<AppendBlockResult> AppendBlock(
130+
Azure::Core::Response<Models::AppendBlockResult> AppendBlock(
131131
Azure::Core::Http::BodyStream* content,
132132
const AppendBlockOptions& options = AppendBlockOptions()) const;
133133

@@ -143,7 +143,7 @@ namespace Azure { namespace Storage { namespace Blobs {
143143
* Optional parameters to execute this function.
144144
* @return A AppendBlockFromUriResult describing the state of the updated append blob.
145145
*/
146-
Azure::Core::Response<AppendBlockFromUriResult> AppendBlockFromUri(
146+
Azure::Core::Response<Models::AppendBlockFromUriResult> AppendBlockFromUri(
147147
const std::string& sourceUri,
148148
const AppendBlockFromUriOptions& options = AppendBlockFromUriOptions()) const;
149149

@@ -153,7 +153,7 @@ namespace Azure { namespace Storage { namespace Blobs {
153153
* @param options Optional parameters to execute this function.
154154
* @return A SealAppendBlobResult describing the state of the sealed append blob.
155155
*/
156-
Azure::Core::Response<SealAppendBlobResult> Seal(
156+
Azure::Core::Response<Models::SealAppendBlobResult> Seal(
157157
const SealAppendBlobOptions& options = SealAppendBlobOptions()) const;
158158

159159
private:

sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_batch_client.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ namespace Azure { namespace Storage { namespace Blobs {
4848
int32_t SetBlobAccessTier(
4949
const std::string& containerName,
5050
const std::string& blobName,
51-
AccessTier Tier,
51+
Models::AccessTier Tier,
5252
const SetBlobAccessTierOptions& options = SetBlobAccessTierOptions());
5353

5454
private:
@@ -65,7 +65,7 @@ namespace Azure { namespace Storage { namespace Blobs {
6565
{
6666
std::string ContainerName;
6767
std::string BlobName;
68-
AccessTier Tier = AccessTier::Unknown;
68+
Models::AccessTier Tier = Models::AccessTier::Unknown;
6969
SetBlobAccessTierOptions Options;
7070
};
7171

@@ -75,8 +75,8 @@ namespace Azure { namespace Storage { namespace Blobs {
7575

7676
struct SubmitBlobBatchResult
7777
{
78-
std::vector<Azure::Core::Response<DeleteBlobResult>> DeleteBlobResults;
79-
std::vector<Azure::Core::Response<SetBlobAccessTierResult>> SetBlobAccessTierResults;
78+
std::vector<Azure::Core::Response<Models::DeleteBlobResult>> DeleteBlobResults;
79+
std::vector<Azure::Core::Response<Models::SetBlobAccessTierResult>> SetBlobAccessTierResults;
8080
};
8181

8282
/**

sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_client.hpp

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ namespace Azure { namespace Storage { namespace Blobs {
146146
* @param options Optional parameters to execute this function.
147147
* @return A GetBlobPropertiesResult describing the blob's properties.
148148
*/
149-
Azure::Core::Response<GetBlobPropertiesResult> GetProperties(
149+
Azure::Core::Response<Models::GetBlobPropertiesResult> GetProperties(
150150
const GetBlobPropertiesOptions& options = GetBlobPropertiesOptions()) const;
151151

152152
/**
@@ -156,8 +156,8 @@ namespace Azure { namespace Storage { namespace Blobs {
156156
* @param options Optional parameters to execute this function.
157157
* @return A SetBlobHttpHeadersResult describing the updated blob.
158158
*/
159-
Azure::Core::Response<SetBlobHttpHeadersResult> SetHttpHeaders(
160-
BlobHttpHeaders httpHeaders,
159+
Azure::Core::Response<Models::SetBlobHttpHeadersResult> SetHttpHeaders(
160+
Models::BlobHttpHeaders httpHeaders,
161161
const SetBlobHttpHeadersOptions& options = SetBlobHttpHeadersOptions()) const;
162162

163163
/**
@@ -169,7 +169,7 @@ namespace Azure { namespace Storage { namespace Blobs {
169169
* options Optional parameters to execute this function.
170170
* @return A SetBlobMetadataResult describing the updated blob.
171171
*/
172-
Azure::Core::Response<SetBlobMetadataResult> SetMetadata(
172+
Azure::Core::Response<Models::SetBlobMetadataResult> SetMetadata(
173173
std::map<std::string, std::string> metadata,
174174
const SetBlobMetadataOptions& options = SetBlobMetadataOptions()) const;
175175

@@ -182,8 +182,8 @@ namespace Azure { namespace Storage { namespace Blobs {
182182
* parameters to execute this function.
183183
* @return A SetBlobAccessTierResult on successfully setting the tier.
184184
*/
185-
Azure::Core::Response<SetBlobAccessTierResult> SetAccessTier(
186-
AccessTier Tier,
185+
Azure::Core::Response<Models::SetBlobAccessTierResult> SetAccessTier(
186+
Models::AccessTier Tier,
187187
const SetBlobAccessTierOptions& options = SetBlobAccessTierOptions()) const;
188188

189189
/**
@@ -198,7 +198,7 @@ namespace Azure { namespace Storage { namespace Blobs {
198198
* @param options Optional parameters to execute this function.
199199
* @return A StartCopyBlobFromUriResult describing the state of the copy operation.
200200
*/
201-
Azure::Core::Response<StartCopyBlobFromUriResult> StartCopyFromUri(
201+
Azure::Core::Response<Models::StartCopyBlobFromUriResult> StartCopyFromUri(
202202
const std::string& sourceUri,
203203
const StartCopyBlobFromUriOptions& options = StartCopyBlobFromUriOptions()) const;
204204

@@ -210,7 +210,7 @@ namespace Azure { namespace Storage { namespace Blobs {
210210
* @param options Optional parameters to execute this function.
211211
* @return A AbortCopyBlobFromUriResult on successfully aborting.
212212
*/
213-
Azure::Core::Response<AbortCopyBlobFromUriResult> AbortCopyFromUri(
213+
Azure::Core::Response<Models::AbortCopyBlobFromUriResult> AbortCopyFromUri(
214214
const std::string& copyId,
215215
const AbortCopyBlobFromUriOptions& options = AbortCopyBlobFromUriOptions()) const;
216216

@@ -222,7 +222,7 @@ namespace Azure { namespace Storage { namespace Blobs {
222222
* @return A DownloadBlobResult describing the downloaded blob.
223223
* BlobDownloadResponse.BodyStream contains the blob's data.
224224
*/
225-
Azure::Core::Response<DownloadBlobResult> Download(
225+
Azure::Core::Response<Models::DownloadBlobResult> Download(
226226
const DownloadBlobOptions& options = DownloadBlobOptions()) const;
227227

228228
/**
@@ -235,7 +235,7 @@ namespace Azure { namespace Storage { namespace Blobs {
235235
* @param options Optional parameters to execute this function.
236236
* @return A DownloadBlobToResult describing the downloaded blob.
237237
*/
238-
Azure::Core::Response<DownloadBlobToResult> DownloadTo(
238+
Azure::Core::Response<Models::DownloadBlobToResult> DownloadTo(
239239
uint8_t* buffer,
240240
std::size_t bufferSize,
241241
const DownloadBlobToOptions& options = DownloadBlobToOptions()) const;
@@ -248,7 +248,7 @@ namespace Azure { namespace Storage { namespace Blobs {
248248
* @param options Optional parameters to execute this function.
249249
* @return A DownloadBlobToResult describing the downloaded blob.
250250
*/
251-
Azure::Core::Response<DownloadBlobToResult> DownloadTo(
251+
Azure::Core::Response<Models::DownloadBlobToResult> DownloadTo(
252252
const std::string& fileName,
253253
const DownloadBlobToOptions& options = DownloadBlobToOptions()) const;
254254

@@ -258,7 +258,7 @@ namespace Azure { namespace Storage { namespace Blobs {
258258
* @param options Optional parameters to execute this function.
259259
* @return A CreateBlobSnapshotResult describing the new blob snapshot.
260260
*/
261-
Azure::Core::Response<CreateBlobSnapshotResult> CreateSnapshot(
261+
Azure::Core::Response<Models::CreateBlobSnapshotResult> CreateSnapshot(
262262
const CreateBlobSnapshotOptions& options = CreateBlobSnapshotOptions()) const;
263263

264264
/**
@@ -269,7 +269,7 @@ namespace Azure { namespace Storage { namespace Blobs {
269269
* @param options Optional parameters to execute this function.
270270
* @return A DeleteBlobResult on successfully deleting.
271271
*/
272-
Azure::Core::Response<DeleteBlobResult> Delete(
272+
Azure::Core::Response<Models::DeleteBlobResult> Delete(
273273
const DeleteBlobOptions& options = DeleteBlobOptions()) const;
274274

275275
/**
@@ -279,7 +279,7 @@ namespace Azure { namespace Storage { namespace Blobs {
279279
* @param options Optional parameters to execute this function.
280280
* @return A UndeleteBlobResult on successfully deleting.
281281
*/
282-
Azure::Core::Response<UndeleteBlobResult> Undelete(
282+
Azure::Core::Response<Models::UndeleteBlobResult> Undelete(
283283
const UndeleteBlobOptions& options = UndeleteBlobOptions()) const;
284284

285285
/**
@@ -293,7 +293,7 @@ namespace Azure { namespace Storage { namespace Blobs {
293293
* @param options Optional parameters to execute this function.
294294
* @return A AcquireBlobLeaseResult describing the lease.
295295
*/
296-
Azure::Core::Response<AcquireBlobLeaseResult> AcquireLease(
296+
Azure::Core::Response<Models::AcquireBlobLeaseResult> AcquireLease(
297297
const std::string& proposedLeaseId,
298298
int32_t duration,
299299
const AcquireBlobLeaseOptions& options = AcquireBlobLeaseOptions()) const;
@@ -305,7 +305,7 @@ namespace Azure { namespace Storage { namespace Blobs {
305305
* @param options Optional parameters to execute this function.
306306
* @return A RenewBlobLeaseResult describing the lease.
307307
*/
308-
Azure::Core::Response<RenewBlobLeaseResult> RenewLease(
308+
Azure::Core::Response<Models::RenewBlobLeaseResult> RenewLease(
309309
const std::string& leaseId,
310310
const RenewBlobLeaseOptions& options = RenewBlobLeaseOptions()) const;
311311

@@ -316,7 +316,7 @@ namespace Azure { namespace Storage { namespace Blobs {
316316
* @param options Optional parameters to execute this function.
317317
* @return A ReleaseBlobLeaseResult describing the updated container.
318318
*/
319-
Azure::Core::Response<ReleaseBlobLeaseResult> ReleaseLease(
319+
Azure::Core::Response<Models::ReleaseBlobLeaseResult> ReleaseLease(
320320
const std::string& leaseId,
321321
const ReleaseBlobLeaseOptions& options = ReleaseBlobLeaseOptions()) const;
322322

@@ -329,7 +329,7 @@ namespace Azure { namespace Storage { namespace Blobs {
329329
* @param options Optional parameters to execute this function.
330330
* @return A ChangeBlobLeaseResult describing the lease.
331331
*/
332-
Azure::Core::Response<ChangeBlobLeaseResult> ChangeLease(
332+
Azure::Core::Response<Models::ChangeBlobLeaseResult> ChangeLease(
333333
const std::string& leaseId,
334334
const std::string& proposedLeaseId,
335335
const ChangeBlobLeaseOptions& options = ChangeBlobLeaseOptions()) const;
@@ -340,7 +340,7 @@ namespace Azure { namespace Storage { namespace Blobs {
340340
* @param options Optional parameters to execute this function.
341341
* @return A BreakBlobLeaseResult describing the broken lease.
342342
*/
343-
Azure::Core::Response<BreakBlobLeaseResult> BreakLease(
343+
Azure::Core::Response<Models::BreakBlobLeaseResult> BreakLease(
344344
const BreakBlobLeaseOptions& options = BreakBlobLeaseOptions()) const;
345345

346346
/**
@@ -350,7 +350,7 @@ namespace Azure { namespace Storage { namespace Blobs {
350350
* @param options Optional parameters to execute this function.
351351
* @return A SetBlobTagsInfo on successfully setting tags.
352352
*/
353-
Azure::Core::Response<SetBlobTagsResult> SetTags(
353+
Azure::Core::Response<Models::SetBlobTagsResult> SetTags(
354354
std::map<std::string, std::string> tags,
355355
const SetBlobTagsOptions& options = SetBlobTagsOptions()) const;
356356

@@ -360,7 +360,7 @@ namespace Azure { namespace Storage { namespace Blobs {
360360
* @param options Optional parameters to execute this function.
361361
* @return Tags on successfully getting tags.
362362
*/
363-
Azure::Core::Response<GetBlobTagsResult> GetTags(
363+
Azure::Core::Response<Models::GetBlobTagsResult> GetTags(
364364
const GetBlobTagsOptions& options = GetBlobTagsOptions()) const;
365365

366366
protected:

sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_container_client.hpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ namespace Azure { namespace Storage { namespace Blobs {
133133
* parameters to execute this function.
134134
* @return A CreateContainerResult describing the newly created blob container.
135135
*/
136-
Azure::Core::Response<CreateContainerResult> Create(
136+
Azure::Core::Response<Models::CreateContainerResult> Create(
137137
const CreateContainerOptions& options = CreateContainerOptions()) const;
138138

139139
/**
@@ -144,7 +144,7 @@ namespace Azure { namespace Storage { namespace Blobs {
144144
* options Optional parameters to execute this function.
145145
* @return A DeleteContainerResult if successful.
146146
*/
147-
Azure::Core::Response<DeleteContainerResult> Delete(
147+
Azure::Core::Response<Models::DeleteContainerResult> Delete(
148148
const DeleteContainerOptions& options = DeleteContainerOptions()) const;
149149

150150
/**
@@ -156,7 +156,7 @@ namespace Azure { namespace Storage { namespace Blobs {
156156
* @param options Optional parameters to execute this function.
157157
* @return An UndeleteContainerResult if successful.
158158
*/
159-
Azure::Core::Response<UndeleteContainerResult> Undelete(
159+
Azure::Core::Response<Models::UndeleteContainerResult> Undelete(
160160
const std::string& deletedContainerName,
161161
const std::string& deletedContainerVersion,
162162
const UndeleteContainerOptions& options = UndeleteContainerOptions()) const;
@@ -168,7 +168,7 @@ namespace Azure { namespace Storage { namespace Blobs {
168168
* @param options Optional parameters to execute this function.
169169
* @return A GetContainerPropertiesResult describing the container and its properties.
170170
*/
171-
Azure::Core::Response<GetContainerPropertiesResult> GetProperties(
171+
Azure::Core::Response<Models::GetContainerPropertiesResult> GetProperties(
172172
const GetContainerPropertiesOptions& options = GetContainerPropertiesOptions()) const;
173173

174174
/**
@@ -179,7 +179,7 @@ namespace Azure { namespace Storage { namespace Blobs {
179179
* Optional parameters to execute this function.
180180
* @return A SetContainerMetadataResult if successful.
181181
*/
182-
Azure::Core::Response<SetContainerMetadataResult> SetMetadata(
182+
Azure::Core::Response<Models::SetContainerMetadataResult> SetMetadata(
183183
std::map<std::string, std::string> metadata,
184184
SetContainerMetadataOptions options = SetContainerMetadataOptions()) const;
185185

@@ -192,7 +192,7 @@ namespace Azure { namespace Storage { namespace Blobs {
192192
* @param options Optional parameters to execute this function.
193193
* @return A ListBlobsFlatSegmentResult describing a segment of the blobs in the container.
194194
*/
195-
Azure::Core::Response<ListBlobsFlatSegmentResult> ListBlobsFlatSegment(
195+
Azure::Core::Response<Models::ListBlobsFlatSegmentResult> ListBlobsFlatSegment(
196196
const ListBlobsSegmentOptions& options = ListBlobsSegmentOptions()) const;
197197

198198
/**
@@ -209,7 +209,7 @@ namespace Azure { namespace Storage { namespace Blobs {
209209
* @return A ListBlobsByHierarchySegmentResult describing a segment of the blobs in the
210210
* container.
211211
*/
212-
Azure::Core::Response<ListBlobsByHierarchySegmentResult> ListBlobsByHierarchySegment(
212+
Azure::Core::Response<Models::ListBlobsByHierarchySegmentResult> ListBlobsByHierarchySegment(
213213
const std::string& delimiter,
214214
const ListBlobsSegmentOptions& options = ListBlobsSegmentOptions()) const;
215215

@@ -221,7 +221,7 @@ namespace Azure { namespace Storage { namespace Blobs {
221221
* execute this function.
222222
* @return A GetContainerAccessPolicyResult describing the container's access policy.
223223
*/
224-
Azure::Core::Response<GetContainerAccessPolicyResult> GetAccessPolicy(
224+
Azure::Core::Response<Models::GetContainerAccessPolicyResult> GetAccessPolicy(
225225
const GetContainerAccessPolicyOptions& options = GetContainerAccessPolicyOptions()) const;
226226

227227
/**
@@ -232,7 +232,7 @@ namespace Azure { namespace Storage { namespace Blobs {
232232
* parameters to execute this function.
233233
* @return A SetContainerAccessPolicyResult describing the updated container.
234234
*/
235-
Azure::Core::Response<SetContainerAccessPolicyResult> SetAccessPolicy(
235+
Azure::Core::Response<Models::SetContainerAccessPolicyResult> SetAccessPolicy(
236236
const SetContainerAccessPolicyOptions& options = SetContainerAccessPolicyOptions()) const;
237237

238238
/**
@@ -248,7 +248,7 @@ namespace Azure { namespace Storage { namespace Blobs {
248248
* function.
249249
* @return A AcquireContainerLeaseResult describing the lease.
250250
*/
251-
Azure::Core::Response<AcquireContainerLeaseResult> AcquireLease(
251+
Azure::Core::Response<Models::AcquireContainerLeaseResult> AcquireLease(
252252
const std::string& proposedLeaseId,
253253
int32_t duration,
254254
const AcquireContainerLeaseOptions& options = AcquireContainerLeaseOptions()) const;
@@ -262,7 +262,7 @@ namespace Azure { namespace Storage { namespace Blobs {
262262
* execute this function.
263263
* @return A RenewContainerLeaseResult describing the lease.
264264
*/
265-
Azure::Core::Response<RenewContainerLeaseResult> RenewLease(
265+
Azure::Core::Response<Models::RenewContainerLeaseResult> RenewLease(
266266
const std::string& leaseId,
267267
const RenewContainerLeaseOptions& options = RenewContainerLeaseOptions()) const;
268268

@@ -275,7 +275,7 @@ namespace Azure { namespace Storage { namespace Blobs {
275275
* execute this function.
276276
* @return A ReleaseContainerLeaseResult describing the updated container.
277277
*/
278-
Azure::Core::Response<ReleaseContainerLeaseResult> ReleaseLease(
278+
Azure::Core::Response<Models::ReleaseContainerLeaseResult> ReleaseLease(
279279
const std::string& leaseId,
280280
const ReleaseContainerLeaseOptions& options = ReleaseContainerLeaseOptions()) const;
281281

@@ -289,7 +289,7 @@ namespace Azure { namespace Storage { namespace Blobs {
289289
* @param options Optional parameters to execute this function.
290290
* @return A ChangeContainerLeaseResult describing the lease.
291291
*/
292-
Azure::Core::Response<ChangeContainerLeaseResult> ChangeLease(
292+
Azure::Core::Response<Models::ChangeContainerLeaseResult> ChangeLease(
293293
const std::string& leaseId,
294294
const std::string& proposedLeaseId,
295295
const ChangeContainerLeaseOptions& options = ChangeContainerLeaseOptions()) const;
@@ -301,7 +301,7 @@ namespace Azure { namespace Storage { namespace Blobs {
301301
* parameters to execute this function.
302302
* @return A BreakContainerLeaseResult describing the broken lease.
303303
*/
304-
Azure::Core::Response<BreakContainerLeaseResult> BreakLease(
304+
Azure::Core::Response<Models::BreakContainerLeaseResult> BreakLease(
305305
const BreakContainerLeaseOptions& options = BreakContainerLeaseOptions()) const;
306306

307307
protected:

0 commit comments

Comments
 (0)