From cd74c1f42d3762905778994b89d9d2ca400d9d97 Mon Sep 17 00:00:00 2001 From: rickle-msft Date: Tue, 7 Aug 2018 15:40:31 -0700 Subject: [PATCH] Generated with new autorest version to comply with new runtime --- .../azure/storage/GeneratedBlobs.java | 76 ++++++-- .../azure/storage/GeneratedContainers.java | 54 ++++++ .../azure/storage/GeneratedServices.java | 54 ++++++ .../microsoft/azure/storage/blob/BlobURL.java | 3 +- .../azure/storage/blob/DownloadResponse.java | 7 +- .../storage/blob/models/AccountKind.java | 66 +++++++ .../models/AppendBlobAppendBlockResponse.java | 6 +- .../blob/models/AppendBlobCreateResponse.java | 6 +- .../models/BlobAbortCopyFromURLResponse.java | 6 +- .../blob/models/BlobAcquireLeaseResponse.java | 6 +- .../blob/models/BlobBreakLeaseResponse.java | 6 +- .../blob/models/BlobChangeLeaseResponse.java | 6 +- .../models/BlobCreateSnapshotResponse.java | 6 +- .../blob/models/BlobDeleteResponse.java | 6 +- .../blob/models/BlobDownloadResponse.java | 6 +- .../models/BlobGetAccountInfoHeaders.java | 167 ++++++++++++++++++ .../models/BlobGetAccountInfoResponse.java | 41 +++++ .../blob/models/BlobGetPropertiesHeaders.java | 58 ++++-- .../models/BlobGetPropertiesResponse.java | 6 +- .../storage/blob/models/BlobProperties.java | 33 ++++ .../blob/models/BlobReleaseLeaseResponse.java | 6 +- .../blob/models/BlobRenewLeaseResponse.java | 6 +- .../models/BlobSetHTTPHeadersResponse.java | 6 +- .../blob/models/BlobSetMetadataResponse.java | 6 +- .../blob/models/BlobSetTierResponse.java | 6 +- .../models/BlobStartCopyFromURLResponse.java | 6 +- .../blob/models/BlobUndeleteResponse.java | 6 +- .../BlockBlobCommitBlockListResponse.java | 6 +- .../models/BlockBlobGetBlockListResponse.java | 6 +- .../BlockBlobStageBlockFromURLResponse.java | 6 +- .../models/BlockBlobStageBlockResponse.java | 6 +- .../blob/models/BlockBlobUploadResponse.java | 6 +- .../models/ContainerAcquireLeaseResponse.java | 6 +- .../models/ContainerBreakLeaseResponse.java | 6 +- .../models/ContainerChangeLeaseResponse.java | 6 +- .../blob/models/ContainerCreateResponse.java | 6 +- .../blob/models/ContainerDeleteResponse.java | 6 +- .../ContainerGetAccessPolicyResponse.java | 6 +- .../ContainerGetAccountInfoHeaders.java | 167 ++++++++++++++++++ .../ContainerGetAccountInfoResponse.java | 41 +++++ .../ContainerGetPropertiesResponse.java | 6 +- .../ContainerListBlobFlatSegmentResponse.java | 6 +- ...ainerListBlobHierarchySegmentResponse.java | 6 +- .../models/ContainerReleaseLeaseResponse.java | 6 +- .../models/ContainerRenewLeaseResponse.java | 6 +- .../ContainerSetAccessPolicyResponse.java | 6 +- .../models/ContainerSetMetadataResponse.java | 6 +- .../models/ListBlobsFlatSegmentResponse.java | 2 +- .../ListBlobsHierarchySegmentResponse.java | 2 +- .../models/PageBlobClearPagesResponse.java | 6 +- .../PageBlobCopyIncrementalResponse.java | 6 +- .../blob/models/PageBlobCreateResponse.java | 6 +- .../PageBlobGetPageRangesDiffResponse.java | 6 +- .../models/PageBlobGetPageRangesResponse.java | 6 +- .../blob/models/PageBlobResizeResponse.java | 6 +- .../PageBlobUpdateSequenceNumberResponse.java | 6 +- .../models/PageBlobUploadPagesResponse.java | 6 +- .../models/ServiceGetAccountInfoHeaders.java | 167 ++++++++++++++++++ .../models/ServiceGetAccountInfoResponse.java | 41 +++++ .../models/ServiceGetPropertiesResponse.java | 6 +- .../models/ServiceGetStatisticsResponse.java | 6 +- .../ServiceListContainersSegmentResponse.java | 6 +- .../models/ServiceSetPropertiesResponse.java | 6 +- .../azure/storage/blob/models/SkuName.java | 76 ++++++++ .../storage/blob/models/StaticWebsite.java | 99 +++++++++++ .../blob/models/StorageServiceProperties.java | 26 +++ .../microsoft/azure/storage/APISpec.groovy | 3 +- .../azure/storage/BlobStorageAPITests.java | 2 +- .../storage/RetryReaderMockFlowable.java | 2 +- .../com/microsoft/azure/storage/Samples.java | 6 +- swagger/generate.bat | 2 +- 71 files changed, 1345 insertions(+), 132 deletions(-) create mode 100644 src/main/java/com/microsoft/azure/storage/blob/models/AccountKind.java create mode 100644 src/main/java/com/microsoft/azure/storage/blob/models/BlobGetAccountInfoHeaders.java create mode 100644 src/main/java/com/microsoft/azure/storage/blob/models/BlobGetAccountInfoResponse.java create mode 100644 src/main/java/com/microsoft/azure/storage/blob/models/ContainerGetAccountInfoHeaders.java create mode 100644 src/main/java/com/microsoft/azure/storage/blob/models/ContainerGetAccountInfoResponse.java create mode 100644 src/main/java/com/microsoft/azure/storage/blob/models/ServiceGetAccountInfoHeaders.java create mode 100644 src/main/java/com/microsoft/azure/storage/blob/models/ServiceGetAccountInfoResponse.java create mode 100644 src/main/java/com/microsoft/azure/storage/blob/models/SkuName.java create mode 100644 src/main/java/com/microsoft/azure/storage/blob/models/StaticWebsite.java diff --git a/src/main/java/com/microsoft/azure/storage/GeneratedBlobs.java b/src/main/java/com/microsoft/azure/storage/GeneratedBlobs.java index 8c052b592c46..866595062591 100644 --- a/src/main/java/com/microsoft/azure/storage/GeneratedBlobs.java +++ b/src/main/java/com/microsoft/azure/storage/GeneratedBlobs.java @@ -18,6 +18,7 @@ import com.microsoft.azure.storage.blob.models.BlobCreateSnapshotResponse; import com.microsoft.azure.storage.blob.models.BlobDeleteResponse; import com.microsoft.azure.storage.blob.models.BlobDownloadResponse; +import com.microsoft.azure.storage.blob.models.BlobGetAccountInfoResponse; import com.microsoft.azure.storage.blob.models.BlobGetPropertiesResponse; import com.microsoft.azure.storage.blob.models.BlobReleaseLeaseResponse; import com.microsoft.azure.storage.blob.models.BlobRenewLeaseResponse; @@ -149,7 +150,7 @@ private interface BlobsService { @PUT("{containerName}/{blob}") @ExpectedResponses({202}) @UnexpectedResponseExceptionType(StorageErrorException.class) - Single startCopyFromURL(@HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-meta-") Map metadata, @HeaderParam("x-ms-source-if-modified-since") DateTimeRfc1123 sourceIfModifiedSince, @HeaderParam("x-ms-source-if-unmodified-since") DateTimeRfc1123 sourceIfUnmodifiedSince, @HeaderParam("x-ms-source-if-match") String sourceIfMatches, @HeaderParam("x-ms-source-if-none-match") String sourceIfNoneMatch, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatches, @HeaderParam("If-None-Match") String ifNoneMatch, @HeaderParam("x-ms-copy-source") URL copySource, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("x-ms-source-lease-id") String sourceLeaseId, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId); + Single startCopyFromURL(@HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-meta-") Map metadata, @HeaderParam("x-ms-source-if-modified-since") DateTimeRfc1123 sourceIfModifiedSince, @HeaderParam("x-ms-source-if-unmodified-since") DateTimeRfc1123 sourceIfUnmodifiedSince, @HeaderParam("x-ms-source-if-match") String sourceIfMatches, @HeaderParam("x-ms-source-if-none-match") String sourceIfNoneMatch, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatches, @HeaderParam("If-None-Match") String ifNoneMatch, @HeaderParam("x-ms-copy-source") URL copySource, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId); @PUT("{containerName}/{blob}") @ExpectedResponses({204}) @@ -160,6 +161,11 @@ private interface BlobsService { @ExpectedResponses({200, 202}) @UnexpectedResponseExceptionType(StorageErrorException.class) Single setTier(@HostParam("url") String url, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-access-tier") AccessTier tier, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp); + + @GET("{containerName}/{blobName}") + @ExpectedResponses({200}) + @UnexpectedResponseExceptionType(StorageErrorException.class) + Single getAccountInfo(@HostParam("url") String url, @HeaderParam("x-ms-version") String version, @QueryParam("restype") String restype, @QueryParam("comp") String comp); } /** @@ -1263,14 +1269,13 @@ public Completable createSnapshotAsync(Integer timeout, Map meta * @param ifMatches Specify an ETag value to operate only on blobs with a matching value. * @param ifNoneMatch Specify an ETag value to operate only on blobs without a matching value. * @param leaseId If specified, the operation only succeeds if the container's lease is active and matches this ID. - * @param sourceLeaseId Specify this header to perform the operation only if the lease ID given matches the active lease ID of the source blob. * @param requestId 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. * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws StorageErrorException thrown if the request is rejected by server. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. */ - public void startCopyFromURL(@NonNull URL copySource, Integer timeout, Map metadata, OffsetDateTime sourceIfModifiedSince, OffsetDateTime sourceIfUnmodifiedSince, String sourceIfMatches, String sourceIfNoneMatch, OffsetDateTime ifModifiedSince, OffsetDateTime ifUnmodifiedSince, String ifMatches, String ifNoneMatch, String leaseId, String sourceLeaseId, String requestId) { - startCopyFromURLAsync(copySource, timeout, metadata, sourceIfModifiedSince, sourceIfUnmodifiedSince, sourceIfMatches, sourceIfNoneMatch, ifModifiedSince, ifUnmodifiedSince, ifMatches, ifNoneMatch, leaseId, sourceLeaseId, requestId).blockingAwait(); + public void startCopyFromURL(@NonNull URL copySource, Integer timeout, Map metadata, OffsetDateTime sourceIfModifiedSince, OffsetDateTime sourceIfUnmodifiedSince, String sourceIfMatches, String sourceIfNoneMatch, OffsetDateTime ifModifiedSince, OffsetDateTime ifUnmodifiedSince, String ifMatches, String ifNoneMatch, String leaseId, String requestId) { + startCopyFromURLAsync(copySource, timeout, metadata, sourceIfModifiedSince, sourceIfUnmodifiedSince, sourceIfMatches, sourceIfNoneMatch, ifModifiedSince, ifUnmodifiedSince, ifMatches, ifNoneMatch, leaseId, requestId).blockingAwait(); } /** @@ -1288,14 +1293,13 @@ public void startCopyFromURL(@NonNull URL copySource, Integer timeout, Map startCopyFromURLAsync(@NonNull URL copySource, Integer timeout, Map metadata, OffsetDateTime sourceIfModifiedSince, OffsetDateTime sourceIfUnmodifiedSince, String sourceIfMatches, String sourceIfNoneMatch, OffsetDateTime ifModifiedSince, OffsetDateTime ifUnmodifiedSince, String ifMatches, String ifNoneMatch, String leaseId, String sourceLeaseId, String requestId, ServiceCallback serviceCallback) { - return ServiceFuture.fromBody(startCopyFromURLAsync(copySource, timeout, metadata, sourceIfModifiedSince, sourceIfUnmodifiedSince, sourceIfMatches, sourceIfNoneMatch, ifModifiedSince, ifUnmodifiedSince, ifMatches, ifNoneMatch, leaseId, sourceLeaseId, requestId), serviceCallback); + public ServiceFuture startCopyFromURLAsync(@NonNull URL copySource, Integer timeout, Map metadata, OffsetDateTime sourceIfModifiedSince, OffsetDateTime sourceIfUnmodifiedSince, String sourceIfMatches, String sourceIfNoneMatch, OffsetDateTime ifModifiedSince, OffsetDateTime ifUnmodifiedSince, String ifMatches, String ifNoneMatch, String leaseId, String requestId, ServiceCallback serviceCallback) { + return ServiceFuture.fromBody(startCopyFromURLAsync(copySource, timeout, metadata, sourceIfModifiedSince, sourceIfUnmodifiedSince, sourceIfMatches, sourceIfNoneMatch, ifModifiedSince, ifUnmodifiedSince, ifMatches, ifNoneMatch, leaseId, requestId), serviceCallback); } /** @@ -1313,12 +1317,11 @@ public ServiceFuture startCopyFromURLAsync(@NonNull URL copySource, Intege * @param ifMatches Specify an ETag value to operate only on blobs with a matching value. * @param ifNoneMatch Specify an ETag value to operate only on blobs without a matching value. * @param leaseId If specified, the operation only succeeds if the container's lease is active and matches this ID. - * @param sourceLeaseId Specify this header to perform the operation only if the lease ID given matches the active lease ID of the source blob. * @param requestId 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. * @throws IllegalArgumentException thrown if parameters fail the validation. * @return a Single which performs the network request upon subscription. */ - public Single startCopyFromURLWithRestResponseAsync(@NonNull URL copySource, Integer timeout, Map metadata, OffsetDateTime sourceIfModifiedSince, OffsetDateTime sourceIfUnmodifiedSince, String sourceIfMatches, String sourceIfNoneMatch, OffsetDateTime ifModifiedSince, OffsetDateTime ifUnmodifiedSince, String ifMatches, String ifNoneMatch, String leaseId, String sourceLeaseId, String requestId) { + public Single startCopyFromURLWithRestResponseAsync(@NonNull URL copySource, Integer timeout, Map metadata, OffsetDateTime sourceIfModifiedSince, OffsetDateTime sourceIfUnmodifiedSince, String sourceIfMatches, String sourceIfNoneMatch, OffsetDateTime ifModifiedSince, OffsetDateTime ifUnmodifiedSince, String ifMatches, String ifNoneMatch, String leaseId, String requestId) { if (this.client.url() == null) { throw new IllegalArgumentException("Parameter this.client.url() is required and cannot be null."); } @@ -1346,7 +1349,7 @@ public Single startCopyFromURLWithRestResponseAsyn if (ifUnmodifiedSince != null) { ifUnmodifiedSinceConverted = new DateTimeRfc1123(ifUnmodifiedSince); } - return service.startCopyFromURL(this.client.url(), timeout, metadata, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatches, sourceIfNoneMatch, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatches, ifNoneMatch, copySource, leaseId, sourceLeaseId, this.client.version(), requestId); + return service.startCopyFromURL(this.client.url(), timeout, metadata, sourceIfModifiedSinceConverted, sourceIfUnmodifiedSinceConverted, sourceIfMatches, sourceIfNoneMatch, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatches, ifNoneMatch, copySource, leaseId, this.client.version(), requestId); } /** @@ -1364,13 +1367,12 @@ public Single startCopyFromURLWithRestResponseAsyn * @param ifMatches Specify an ETag value to operate only on blobs with a matching value. * @param ifNoneMatch Specify an ETag value to operate only on blobs without a matching value. * @param leaseId If specified, the operation only succeeds if the container's lease is active and matches this ID. - * @param sourceLeaseId Specify this header to perform the operation only if the lease ID given matches the active lease ID of the source blob. * @param requestId 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. * @throws IllegalArgumentException thrown if parameters fail the validation. * @return a Single which performs the network request upon subscription. */ - public Completable startCopyFromURLAsync(@NonNull URL copySource, Integer timeout, Map metadata, OffsetDateTime sourceIfModifiedSince, OffsetDateTime sourceIfUnmodifiedSince, String sourceIfMatches, String sourceIfNoneMatch, OffsetDateTime ifModifiedSince, OffsetDateTime ifUnmodifiedSince, String ifMatches, String ifNoneMatch, String leaseId, String sourceLeaseId, String requestId) { - return startCopyFromURLWithRestResponseAsync(copySource, timeout, metadata, sourceIfModifiedSince, sourceIfUnmodifiedSince, sourceIfMatches, sourceIfNoneMatch, ifModifiedSince, ifUnmodifiedSince, ifMatches, ifNoneMatch, leaseId, sourceLeaseId, requestId) + public Completable startCopyFromURLAsync(@NonNull URL copySource, Integer timeout, Map metadata, OffsetDateTime sourceIfModifiedSince, OffsetDateTime sourceIfUnmodifiedSince, String sourceIfMatches, String sourceIfNoneMatch, OffsetDateTime ifModifiedSince, OffsetDateTime ifUnmodifiedSince, String ifMatches, String ifNoneMatch, String leaseId, String requestId) { + return startCopyFromURLWithRestResponseAsync(copySource, timeout, metadata, sourceIfModifiedSince, sourceIfUnmodifiedSince, sourceIfMatches, sourceIfNoneMatch, ifModifiedSince, ifUnmodifiedSince, ifMatches, ifNoneMatch, leaseId, requestId) .toCompletable(); } @@ -1508,4 +1510,52 @@ public Completable setTierAsync(@NonNull AccessTier tier, Integer timeout, Strin return setTierWithRestResponseAsync(tier, timeout, requestId) .toCompletable(); } + + /** + * Returns the sku name and account kind. + * + * @throws StorageErrorException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + public void getAccountInfo() { + getAccountInfoAsync().blockingAwait(); + } + + /** + * Returns the sku name and account kind. + * + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @return a ServiceFuture which will be completed with the result of the network request. + */ + public ServiceFuture getAccountInfoAsync(ServiceCallback serviceCallback) { + return ServiceFuture.fromBody(getAccountInfoAsync(), serviceCallback); + } + + /** + * Returns the sku name and account kind. + * + * @return a Single which performs the network request upon subscription. + */ + public Single getAccountInfoWithRestResponseAsync() { + if (this.client.url() == null) { + throw new IllegalArgumentException("Parameter this.client.url() is required and cannot be null."); + } + if (this.client.version() == null) { + throw new IllegalArgumentException("Parameter this.client.version() is required and cannot be null."); + } + final String restype = "account"; + final String comp = "properties"; + return service.getAccountInfo(this.client.url(), this.client.version(), restype, comp); + } + + /** + * Returns the sku name and account kind. + * + * @return a Single which performs the network request upon subscription. + */ + public Completable getAccountInfoAsync() { + return getAccountInfoWithRestResponseAsync() + .toCompletable(); + } } diff --git a/src/main/java/com/microsoft/azure/storage/GeneratedContainers.java b/src/main/java/com/microsoft/azure/storage/GeneratedContainers.java index 89f684820e04..e996745c7f80 100644 --- a/src/main/java/com/microsoft/azure/storage/GeneratedContainers.java +++ b/src/main/java/com/microsoft/azure/storage/GeneratedContainers.java @@ -17,6 +17,7 @@ import com.microsoft.azure.storage.blob.models.ContainerCreateResponse; import com.microsoft.azure.storage.blob.models.ContainerDeleteResponse; import com.microsoft.azure.storage.blob.models.ContainerGetAccessPolicyResponse; +import com.microsoft.azure.storage.blob.models.ContainerGetAccountInfoResponse; import com.microsoft.azure.storage.blob.models.ContainerGetPropertiesResponse; import com.microsoft.azure.storage.blob.models.ContainerListBlobFlatSegmentResponse; import com.microsoft.azure.storage.blob.models.ContainerListBlobHierarchySegmentResponse; @@ -151,6 +152,11 @@ private interface ContainersService { @ExpectedResponses({200}) @UnexpectedResponseExceptionType(StorageErrorException.class) Single listBlobHierarchySegment(@HostParam("url") String url, @QueryParam("prefix") String prefix, @QueryParam("delimiter") String delimiter, @QueryParam("marker") String marker, @QueryParam("maxresults") Integer maxresults, @QueryParam("include") String include, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("restype") String restype, @QueryParam("comp") String comp); + + @GET("{containerName}") + @ExpectedResponses({200}) + @UnexpectedResponseExceptionType(StorageErrorException.class) + Single getAccountInfo(@HostParam("url") String url, @HeaderParam("x-ms-version") String version, @QueryParam("restype") String restype, @QueryParam("comp") String comp); } /** @@ -1170,4 +1176,52 @@ public Maybe listBlobHierarchySegmentAsync(@N return listBlobHierarchySegmentWithRestResponseAsync(delimiter, prefix, marker, maxresults, include, timeout, requestId) .flatMapMaybe((ContainerListBlobHierarchySegmentResponse res) -> res.body() == null ? Maybe.empty() : Maybe.just(res.body())); } + + /** + * Returns the sku name and account kind. + * + * @throws StorageErrorException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + public void getAccountInfo() { + getAccountInfoAsync().blockingAwait(); + } + + /** + * Returns the sku name and account kind. + * + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @return a ServiceFuture which will be completed with the result of the network request. + */ + public ServiceFuture getAccountInfoAsync(ServiceCallback serviceCallback) { + return ServiceFuture.fromBody(getAccountInfoAsync(), serviceCallback); + } + + /** + * Returns the sku name and account kind. + * + * @return a Single which performs the network request upon subscription. + */ + public Single getAccountInfoWithRestResponseAsync() { + if (this.client.url() == null) { + throw new IllegalArgumentException("Parameter this.client.url() is required and cannot be null."); + } + if (this.client.version() == null) { + throw new IllegalArgumentException("Parameter this.client.version() is required and cannot be null."); + } + final String restype = "account"; + final String comp = "properties"; + return service.getAccountInfo(this.client.url(), this.client.version(), restype, comp); + } + + /** + * Returns the sku name and account kind. + * + * @return a Single which performs the network request upon subscription. + */ + public Completable getAccountInfoAsync() { + return getAccountInfoWithRestResponseAsync() + .toCompletable(); + } } diff --git a/src/main/java/com/microsoft/azure/storage/GeneratedServices.java b/src/main/java/com/microsoft/azure/storage/GeneratedServices.java index 0628ef01fc3c..4f56d62672c2 100644 --- a/src/main/java/com/microsoft/azure/storage/GeneratedServices.java +++ b/src/main/java/com/microsoft/azure/storage/GeneratedServices.java @@ -12,6 +12,7 @@ import com.microsoft.azure.storage.blob.models.ListContainersIncludeType; import com.microsoft.azure.storage.blob.models.ListContainersSegmentResponse; +import com.microsoft.azure.storage.blob.models.ServiceGetAccountInfoResponse; import com.microsoft.azure.storage.blob.models.ServiceGetPropertiesResponse; import com.microsoft.azure.storage.blob.models.ServiceGetStatisticsResponse; import com.microsoft.azure.storage.blob.models.ServiceListContainersSegmentResponse; @@ -87,6 +88,11 @@ private interface ServicesService { @ExpectedResponses({200}) @UnexpectedResponseExceptionType(StorageErrorException.class) Single listContainersSegment(@HostParam("url") String url, @QueryParam("prefix") String prefix, @QueryParam("marker") String marker, @QueryParam("maxresults") Integer maxresults, @QueryParam("include") ListContainersIncludeType include, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("comp") String comp); + + @GET("") + @ExpectedResponses({200}) + @UnexpectedResponseExceptionType(StorageErrorException.class) + Single getAccountInfo(@HostParam("url") String url, @HeaderParam("x-ms-version") String version, @QueryParam("restype") String restype, @QueryParam("comp") String comp); } /** @@ -350,4 +356,52 @@ public Maybe listContainersSegmentAsync(String pr return listContainersSegmentWithRestResponseAsync(prefix, marker, maxresults, include, timeout, requestId) .flatMapMaybe((ServiceListContainersSegmentResponse res) -> res.body() == null ? Maybe.empty() : Maybe.just(res.body())); } + + /** + * Returns the sku name and account kind. + * + * @throws StorageErrorException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + public void getAccountInfo() { + getAccountInfoAsync().blockingAwait(); + } + + /** + * Returns the sku name and account kind. + * + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @return a ServiceFuture which will be completed with the result of the network request. + */ + public ServiceFuture getAccountInfoAsync(ServiceCallback serviceCallback) { + return ServiceFuture.fromBody(getAccountInfoAsync(), serviceCallback); + } + + /** + * Returns the sku name and account kind. + * + * @return a Single which performs the network request upon subscription. + */ + public Single getAccountInfoWithRestResponseAsync() { + if (this.client.url() == null) { + throw new IllegalArgumentException("Parameter this.client.url() is required and cannot be null."); + } + if (this.client.version() == null) { + throw new IllegalArgumentException("Parameter this.client.version() is required and cannot be null."); + } + final String restype = "account"; + final String comp = "properties"; + return service.getAccountInfo(this.client.url(), this.client.version(), restype, comp); + } + + /** + * Returns the sku name and account kind. + * + * @return a Single which performs the network request upon subscription. + */ + public Completable getAccountInfoAsync() { + return getAccountInfoWithRestResponseAsync() + .toCompletable(); + } } diff --git a/src/main/java/com/microsoft/azure/storage/blob/BlobURL.java b/src/main/java/com/microsoft/azure/storage/blob/BlobURL.java index fb02fb10acad..6ea6ace57a9d 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/BlobURL.java +++ b/src/main/java/com/microsoft/azure/storage/blob/BlobURL.java @@ -169,7 +169,6 @@ public Single startCopyFromURL( destAccessConditions.getHttpAccessConditions().getIfMatch().toString(), destAccessConditions.getHttpAccessConditions().getIfNoneMatch().toString(), destAccessConditions.getLeaseAccessConditions().getLeaseId(), - sourceAccessConditions.getLeaseAccessConditions().getLeaseId(), null)); } @@ -240,7 +239,7 @@ public Single download( accessConditions.getHttpAccessConditions().getIfNoneMatch().toString(), null)) .map(response -> - new DownloadResponse(response.statusCode(), response.headers(), + new DownloadResponse(response.request(), response.statusCode(), response.headers(), response.rawHeaders(), response.body())); } diff --git a/src/main/java/com/microsoft/azure/storage/blob/DownloadResponse.java b/src/main/java/com/microsoft/azure/storage/blob/DownloadResponse.java index 317c3bd89078..2be06fc7638b 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/DownloadResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/DownloadResponse.java @@ -17,6 +17,7 @@ import com.microsoft.azure.storage.blob.models.BlobDownloadHeaders; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import io.reactivex.Flowable; import io.reactivex.Single; import io.reactivex.internal.functions.Functions; @@ -34,9 +35,9 @@ public class DownloadResponse extends RestResponse rawHeaders, - Flowable byteBufferFlowable) { - super(statusCode, blobsDownloadHeaders, rawHeaders, byteBufferFlowable); + DownloadResponse(HttpRequest request, int statusCode, BlobDownloadHeaders blobsDownloadHeaders, + Map rawHeaders, Flowable byteBufferFlowable) { + super(request, statusCode, blobsDownloadHeaders, rawHeaders, byteBufferFlowable); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/AccountKind.java b/src/main/java/com/microsoft/azure/storage/blob/models/AccountKind.java new file mode 100644 index 000000000000..c6bdc109cace --- /dev/null +++ b/src/main/java/com/microsoft/azure/storage/blob/models/AccountKind.java @@ -0,0 +1,66 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + * Changes may cause incorrect behavior and will be lost if the code is + * regenerated. + */ + +package com.microsoft.azure.storage.blob.models; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + +/** + * Defines values for AccountKind. + */ +public enum AccountKind { + /** + * Enum value Storage. + */ + STORAGE("Storage"), + + /** + * Enum value BlobStorage. + */ + BLOB_STORAGE("BlobStorage"), + + /** + * Enum value StorageV2. + */ + STORAGE_V2("StorageV2"); + + /** + * The actual serialized value for a AccountKind instance. + */ + private final String value; + + private AccountKind(String value) { + this.value = value; + } + + /** + * Parses a serialized value to a AccountKind instance. + * + * @param value the serialized value to parse. + * @return the parsed AccountKind object, or null if unable to parse. + */ + @JsonCreator + public static AccountKind fromString(String value) { + AccountKind[] items = AccountKind.values(); + for (AccountKind item : items) { + if (item.toString().equalsIgnoreCase(value)) { + return item; + } + } + return null; + } + + @JsonValue + @Override + public String toString() { + return this.value; + } +} diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/AppendBlobAppendBlockResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/AppendBlobAppendBlockResponse.java index 237bc92ce11d..f612a47ecaa5 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/AppendBlobAppendBlockResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/AppendBlobAppendBlockResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class AppendBlobAppendBlockResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public AppendBlobAppendBlockResponse(HttpRequest request, int statusCode, AppendBlobAppendBlockHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/AppendBlobCreateResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/AppendBlobCreateResponse.java index 307f16592000..41b2b3b6df99 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/AppendBlobCreateResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/AppendBlobCreateResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class AppendBlobCreateResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public AppendBlobCreateResponse(HttpRequest request, int statusCode, AppendBlobCreateHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/BlobAbortCopyFromURLResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/BlobAbortCopyFromURLResponse.java index a46f750b6eb3..09f57267623a 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/BlobAbortCopyFromURLResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/BlobAbortCopyFromURLResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class BlobAbortCopyFromURLResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public BlobAbortCopyFromURLResponse(HttpRequest request, int statusCode, BlobAbortCopyFromURLHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/BlobAcquireLeaseResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/BlobAcquireLeaseResponse.java index 497dc71e7891..aa08a418244d 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/BlobAcquireLeaseResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/BlobAcquireLeaseResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class BlobAcquireLeaseResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public BlobAcquireLeaseResponse(HttpRequest request, int statusCode, BlobAcquireLeaseHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/BlobBreakLeaseResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/BlobBreakLeaseResponse.java index b0eec4668b17..53c9e84960ed 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/BlobBreakLeaseResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/BlobBreakLeaseResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class BlobBreakLeaseResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public BlobBreakLeaseResponse(HttpRequest request, int statusCode, BlobBreakLeaseHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/BlobChangeLeaseResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/BlobChangeLeaseResponse.java index 5b8059e410f3..91ce29d40c36 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/BlobChangeLeaseResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/BlobChangeLeaseResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class BlobChangeLeaseResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public BlobChangeLeaseResponse(HttpRequest request, int statusCode, BlobChangeLeaseHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/BlobCreateSnapshotResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/BlobCreateSnapshotResponse.java index 7d777bca4144..d4e3ece3cc7d 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/BlobCreateSnapshotResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/BlobCreateSnapshotResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class BlobCreateSnapshotResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public BlobCreateSnapshotResponse(HttpRequest request, int statusCode, BlobCreateSnapshotHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/BlobDeleteResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/BlobDeleteResponse.java index c19e5cd36a5a..dd452f42b26d 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/BlobDeleteResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/BlobDeleteResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class BlobDeleteResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public BlobDeleteResponse(HttpRequest request, int statusCode, BlobDeleteHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/BlobDownloadResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/BlobDownloadResponse.java index 252de31b1cc6..227b178df420 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/BlobDownloadResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/BlobDownloadResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import io.reactivex.Flowable; import io.reactivex.internal.functions.Functions; import java.io.Closeable; @@ -24,13 +25,14 @@ public final class BlobDownloadResponse extends RestResponse rawHeaders, Flowable body) { - super(statusCode, headers, rawHeaders, body); + public BlobDownloadResponse(HttpRequest request, int statusCode, BlobDownloadHeaders headers, Map rawHeaders, Flowable body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/BlobGetAccountInfoHeaders.java b/src/main/java/com/microsoft/azure/storage/blob/models/BlobGetAccountInfoHeaders.java new file mode 100644 index 000000000000..87da30dcb6dd --- /dev/null +++ b/src/main/java/com/microsoft/azure/storage/blob/models/BlobGetAccountInfoHeaders.java @@ -0,0 +1,167 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + * Changes may cause incorrect behavior and will be lost if the code is + * regenerated. + */ + +package com.microsoft.azure.storage.blob.models; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import com.microsoft.rest.v2.DateTimeRfc1123; +import java.time.OffsetDateTime; + +/** + * Defines headers for GetAccountInfo operation. + */ +@JacksonXmlRootElement(localName = "Blob-GetAccountInfo-Headers") +public final class BlobGetAccountInfoHeaders { + /** + * This header uniquely identifies the request that was made and can be + * used for troubleshooting the request. + */ + @JsonProperty(value = "x-ms-request-id") + private String requestId; + + /** + * Indicates the version of the Blob service used to execute the request. + * This header is returned for requests made against version 2009-09-19 and + * above. + */ + @JsonProperty(value = "x-ms-version") + private String version; + + /** + * UTC date/time value generated by the service that indicates the time at + * which the response was initiated. + */ + @JsonProperty(value = "Date") + private DateTimeRfc1123 date; + + /** + * Identifies the sku name of the account. Possible values include: + * 'Standard_LRS', 'Standard_GRS', 'Standard_RAGRS', 'Standard_ZRS', + * 'Premium_LRS'. + */ + @JsonProperty(value = "x-ms-sku-name") + private SkuName skuName; + + /** + * Identifies the account kind. Possible values include: 'Storage', + * 'BlobStorage', 'StorageV2'. + */ + @JsonProperty(value = "x-ms-account-kind") + private AccountKind accountKind; + + /** + * Get the requestId value. + * + * @return the requestId value. + */ + public String requestId() { + return this.requestId; + } + + /** + * Set the requestId value. + * + * @param requestId the requestId value to set. + * @return the BlobGetAccountInfoHeaders object itself. + */ + public BlobGetAccountInfoHeaders withRequestId(String requestId) { + this.requestId = requestId; + return this; + } + + /** + * Get the version value. + * + * @return the version value. + */ + public String version() { + return this.version; + } + + /** + * Set the version value. + * + * @param version the version value to set. + * @return the BlobGetAccountInfoHeaders object itself. + */ + public BlobGetAccountInfoHeaders withVersion(String version) { + this.version = version; + return this; + } + + /** + * Get the date value. + * + * @return the date value. + */ + public OffsetDateTime date() { + if (this.date == null) { + return null; + } + return this.date.dateTime(); + } + + /** + * Set the date value. + * + * @param date the date value to set. + * @return the BlobGetAccountInfoHeaders object itself. + */ + public BlobGetAccountInfoHeaders withDate(OffsetDateTime date) { + if (date == null) { + this.date = null; + } else { + this.date = new DateTimeRfc1123(date); + } + return this; + } + + /** + * Get the skuName value. + * + * @return the skuName value. + */ + public SkuName skuName() { + return this.skuName; + } + + /** + * Set the skuName value. + * + * @param skuName the skuName value to set. + * @return the BlobGetAccountInfoHeaders object itself. + */ + public BlobGetAccountInfoHeaders withSkuName(SkuName skuName) { + this.skuName = skuName; + return this; + } + + /** + * Get the accountKind value. + * + * @return the accountKind value. + */ + public AccountKind accountKind() { + return this.accountKind; + } + + /** + * Set the accountKind value. + * + * @param accountKind the accountKind value to set. + * @return the BlobGetAccountInfoHeaders object itself. + */ + public BlobGetAccountInfoHeaders withAccountKind(AccountKind accountKind) { + this.accountKind = accountKind; + return this; + } +} diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/BlobGetAccountInfoResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/BlobGetAccountInfoResponse.java new file mode 100644 index 000000000000..d774469ca054 --- /dev/null +++ b/src/main/java/com/microsoft/azure/storage/blob/models/BlobGetAccountInfoResponse.java @@ -0,0 +1,41 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + * Changes may cause incorrect behavior and will be lost if the code is + * regenerated. + */ + +package com.microsoft.azure.storage.blob.models; + +import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; +import java.util.Map; + +/** + * Contains all response data for the getAccountInfo operation. + */ +public final class BlobGetAccountInfoResponse extends RestResponse { + /** + * Creates an instance of BlobGetAccountInfoResponse. + * + * @param request the request which resulted in this {response.Name}. + * @param statusCode the status code of the HTTP response. + * @param headers the deserialized headers of the HTTP response. + * @param rawHeaders the raw headers of the HTTP response. + * @param body the deserialized body of the HTTP response. + */ + public BlobGetAccountInfoResponse(HttpRequest request, int statusCode, BlobGetAccountInfoHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); + } + + /** + * @return the deserialized response headers. + */ + @Override + public BlobGetAccountInfoHeaders headers() { + return super.headers(); + } +} diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/BlobGetPropertiesHeaders.java b/src/main/java/com/microsoft/azure/storage/blob/models/BlobGetPropertiesHeaders.java index 4add09a17f81..7510195de4b0 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/BlobGetPropertiesHeaders.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/BlobGetPropertiesHeaders.java @@ -35,7 +35,7 @@ public final class BlobGetPropertiesHeaders { * Returns the date and time the blob was created. */ @JsonProperty(value = "x-ms-creation-time") - private DateTimeRfc1123 xMsCreationTime; + private DateTimeRfc1123 creationTime; /** * The metadata property. @@ -284,6 +284,13 @@ public final class BlobGetPropertiesHeaders { @JsonProperty(value = "x-ms-archive-status") private String archiveStatus; + /** + * The time the tier was changed on the object. This is only returned if + * the tier on the block blob was ever set. + */ + @JsonProperty(value = "x-ms-access-tier-change-time") + private DateTimeRfc1123 accessTierChangeTime; + /** * Get the lastModified value. * @@ -312,28 +319,28 @@ public BlobGetPropertiesHeaders withLastModified(OffsetDateTime lastModified) { } /** - * Get the xMsCreationTime value. + * Get the creationTime value. * - * @return the xMsCreationTime value. + * @return the creationTime value. */ - public OffsetDateTime xMsCreationTime() { - if (this.xMsCreationTime == null) { + public OffsetDateTime creationTime() { + if (this.creationTime == null) { return null; } - return this.xMsCreationTime.dateTime(); + return this.creationTime.dateTime(); } /** - * Set the xMsCreationTime value. + * Set the creationTime value. * - * @param xMsCreationTime the xMsCreationTime value to set. + * @param creationTime the creationTime value to set. * @return the BlobGetPropertiesHeaders object itself. */ - public BlobGetPropertiesHeaders withXMsCreationTime(OffsetDateTime xMsCreationTime) { - if (xMsCreationTime == null) { - this.xMsCreationTime = null; + public BlobGetPropertiesHeaders withCreationTime(OffsetDateTime creationTime) { + if (creationTime == null) { + this.creationTime = null; } else { - this.xMsCreationTime = new DateTimeRfc1123(xMsCreationTime); + this.creationTime = new DateTimeRfc1123(creationTime); } return this; } @@ -971,4 +978,31 @@ public BlobGetPropertiesHeaders withArchiveStatus(String archiveStatus) { this.archiveStatus = archiveStatus; return this; } + + /** + * Get the accessTierChangeTime value. + * + * @return the accessTierChangeTime value. + */ + public OffsetDateTime accessTierChangeTime() { + if (this.accessTierChangeTime == null) { + return null; + } + return this.accessTierChangeTime.dateTime(); + } + + /** + * Set the accessTierChangeTime value. + * + * @param accessTierChangeTime the accessTierChangeTime value to set. + * @return the BlobGetPropertiesHeaders object itself. + */ + public BlobGetPropertiesHeaders withAccessTierChangeTime(OffsetDateTime accessTierChangeTime) { + if (accessTierChangeTime == null) { + this.accessTierChangeTime = null; + } else { + this.accessTierChangeTime = new DateTimeRfc1123(accessTierChangeTime); + } + return this; + } } diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/BlobGetPropertiesResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/BlobGetPropertiesResponse.java index 6e7aba8b403f..49a7631cd7c9 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/BlobGetPropertiesResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/BlobGetPropertiesResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class BlobGetPropertiesResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public BlobGetPropertiesResponse(HttpRequest request, int statusCode, BlobGetPropertiesHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/BlobProperties.java b/src/main/java/com/microsoft/azure/storage/blob/models/BlobProperties.java index 403dba27cb0f..46d179a4411d 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/BlobProperties.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/BlobProperties.java @@ -198,6 +198,12 @@ public final class BlobProperties { @JsonProperty(value = "ArchiveStatus") private ArchiveStatus archiveStatus; + /** + * The accessTierChangeTime property. + */ + @JsonProperty(value = "AccessTierChangeTime") + private DateTimeRfc1123 accessTierChangeTime; + /** * Get the creationTime value. * @@ -805,4 +811,31 @@ public BlobProperties withArchiveStatus(ArchiveStatus archiveStatus) { this.archiveStatus = archiveStatus; return this; } + + /** + * Get the accessTierChangeTime value. + * + * @return the accessTierChangeTime value. + */ + public OffsetDateTime accessTierChangeTime() { + if (this.accessTierChangeTime == null) { + return null; + } + return this.accessTierChangeTime.dateTime(); + } + + /** + * Set the accessTierChangeTime value. + * + * @param accessTierChangeTime the accessTierChangeTime value to set. + * @return the BlobProperties object itself. + */ + public BlobProperties withAccessTierChangeTime(OffsetDateTime accessTierChangeTime) { + if (accessTierChangeTime == null) { + this.accessTierChangeTime = null; + } else { + this.accessTierChangeTime = new DateTimeRfc1123(accessTierChangeTime); + } + return this; + } } diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/BlobReleaseLeaseResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/BlobReleaseLeaseResponse.java index 8908898a4d3f..aeae2c5e6d52 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/BlobReleaseLeaseResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/BlobReleaseLeaseResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class BlobReleaseLeaseResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public BlobReleaseLeaseResponse(HttpRequest request, int statusCode, BlobReleaseLeaseHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/BlobRenewLeaseResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/BlobRenewLeaseResponse.java index f09d736800a3..2bd6354d6ef2 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/BlobRenewLeaseResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/BlobRenewLeaseResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class BlobRenewLeaseResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public BlobRenewLeaseResponse(HttpRequest request, int statusCode, BlobRenewLeaseHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/BlobSetHTTPHeadersResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/BlobSetHTTPHeadersResponse.java index 177fc1e6e2bc..8c92290fd425 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/BlobSetHTTPHeadersResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/BlobSetHTTPHeadersResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class BlobSetHTTPHeadersResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public BlobSetHTTPHeadersResponse(HttpRequest request, int statusCode, BlobSetHTTPHeadersHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/BlobSetMetadataResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/BlobSetMetadataResponse.java index 80df14317b35..c9a9a392c516 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/BlobSetMetadataResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/BlobSetMetadataResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class BlobSetMetadataResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public BlobSetMetadataResponse(HttpRequest request, int statusCode, BlobSetMetadataHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/BlobSetTierResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/BlobSetTierResponse.java index 87a5158a423a..12e85f0eac9b 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/BlobSetTierResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/BlobSetTierResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class BlobSetTierResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public BlobSetTierResponse(HttpRequest request, int statusCode, BlobSetTierHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/BlobStartCopyFromURLResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/BlobStartCopyFromURLResponse.java index a79403e78cb0..20b30fcd4dfa 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/BlobStartCopyFromURLResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/BlobStartCopyFromURLResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class BlobStartCopyFromURLResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public BlobStartCopyFromURLResponse(HttpRequest request, int statusCode, BlobStartCopyFromURLHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/BlobUndeleteResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/BlobUndeleteResponse.java index d3929d519a81..7222085caab0 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/BlobUndeleteResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/BlobUndeleteResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class BlobUndeleteResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public BlobUndeleteResponse(HttpRequest request, int statusCode, BlobUndeleteHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/BlockBlobCommitBlockListResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/BlockBlobCommitBlockListResponse.java index 05a0e5ae8f33..3901f36b9b0f 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/BlockBlobCommitBlockListResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/BlockBlobCommitBlockListResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class BlockBlobCommitBlockListResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public BlockBlobCommitBlockListResponse(HttpRequest request, int statusCode, BlockBlobCommitBlockListHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/BlockBlobGetBlockListResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/BlockBlobGetBlockListResponse.java index 9673f938fdf0..d8a0d26b329b 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/BlockBlobGetBlockListResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/BlockBlobGetBlockListResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class BlockBlobGetBlockListResponse extends RestResponse rawHeaders, BlockList body) { - super(statusCode, headers, rawHeaders, body); + public BlockBlobGetBlockListResponse(HttpRequest request, int statusCode, BlockBlobGetBlockListHeaders headers, Map rawHeaders, BlockList body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/BlockBlobStageBlockFromURLResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/BlockBlobStageBlockFromURLResponse.java index 6b55d32f80a5..eec168743b1e 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/BlockBlobStageBlockFromURLResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/BlockBlobStageBlockFromURLResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class BlockBlobStageBlockFromURLResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public BlockBlobStageBlockFromURLResponse(HttpRequest request, int statusCode, BlockBlobStageBlockFromURLHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/BlockBlobStageBlockResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/BlockBlobStageBlockResponse.java index 13d8a42551e8..64ffddbc024b 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/BlockBlobStageBlockResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/BlockBlobStageBlockResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class BlockBlobStageBlockResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public BlockBlobStageBlockResponse(HttpRequest request, int statusCode, BlockBlobStageBlockHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/BlockBlobUploadResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/BlockBlobUploadResponse.java index 2616fa3f55d1..43461d15a608 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/BlockBlobUploadResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/BlockBlobUploadResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class BlockBlobUploadResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public BlockBlobUploadResponse(HttpRequest request, int statusCode, BlockBlobUploadHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/ContainerAcquireLeaseResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/ContainerAcquireLeaseResponse.java index b67d9a5460a9..8379f72229c2 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/ContainerAcquireLeaseResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/ContainerAcquireLeaseResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class ContainerAcquireLeaseResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public ContainerAcquireLeaseResponse(HttpRequest request, int statusCode, ContainerAcquireLeaseHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/ContainerBreakLeaseResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/ContainerBreakLeaseResponse.java index badc95d8bf17..fa8567cde39e 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/ContainerBreakLeaseResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/ContainerBreakLeaseResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class ContainerBreakLeaseResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public ContainerBreakLeaseResponse(HttpRequest request, int statusCode, ContainerBreakLeaseHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/ContainerChangeLeaseResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/ContainerChangeLeaseResponse.java index aa040e7dc3db..d8d0d390d773 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/ContainerChangeLeaseResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/ContainerChangeLeaseResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class ContainerChangeLeaseResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public ContainerChangeLeaseResponse(HttpRequest request, int statusCode, ContainerChangeLeaseHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/ContainerCreateResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/ContainerCreateResponse.java index 25020277626e..a34625f5e825 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/ContainerCreateResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/ContainerCreateResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class ContainerCreateResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public ContainerCreateResponse(HttpRequest request, int statusCode, ContainerCreateHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/ContainerDeleteResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/ContainerDeleteResponse.java index 396e09d40925..ddc8e824ce11 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/ContainerDeleteResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/ContainerDeleteResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class ContainerDeleteResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public ContainerDeleteResponse(HttpRequest request, int statusCode, ContainerDeleteHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/ContainerGetAccessPolicyResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/ContainerGetAccessPolicyResponse.java index 1597ac11b865..b30c99d08fa8 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/ContainerGetAccessPolicyResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/ContainerGetAccessPolicyResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -22,13 +23,14 @@ public final class ContainerGetAccessPolicyResponse extends RestResponse rawHeaders, List body) { - super(statusCode, headers, rawHeaders, body); + public ContainerGetAccessPolicyResponse(HttpRequest request, int statusCode, ContainerGetAccessPolicyHeaders headers, Map rawHeaders, List body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/ContainerGetAccountInfoHeaders.java b/src/main/java/com/microsoft/azure/storage/blob/models/ContainerGetAccountInfoHeaders.java new file mode 100644 index 000000000000..baab0c1a676a --- /dev/null +++ b/src/main/java/com/microsoft/azure/storage/blob/models/ContainerGetAccountInfoHeaders.java @@ -0,0 +1,167 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + * Changes may cause incorrect behavior and will be lost if the code is + * regenerated. + */ + +package com.microsoft.azure.storage.blob.models; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import com.microsoft.rest.v2.DateTimeRfc1123; +import java.time.OffsetDateTime; + +/** + * Defines headers for GetAccountInfo operation. + */ +@JacksonXmlRootElement(localName = "Container-GetAccountInfo-Headers") +public final class ContainerGetAccountInfoHeaders { + /** + * This header uniquely identifies the request that was made and can be + * used for troubleshooting the request. + */ + @JsonProperty(value = "x-ms-request-id") + private String requestId; + + /** + * Indicates the version of the Blob service used to execute the request. + * This header is returned for requests made against version 2009-09-19 and + * above. + */ + @JsonProperty(value = "x-ms-version") + private String version; + + /** + * UTC date/time value generated by the service that indicates the time at + * which the response was initiated. + */ + @JsonProperty(value = "Date") + private DateTimeRfc1123 date; + + /** + * Identifies the sku name of the account. Possible values include: + * 'Standard_LRS', 'Standard_GRS', 'Standard_RAGRS', 'Standard_ZRS', + * 'Premium_LRS'. + */ + @JsonProperty(value = "x-ms-sku-name") + private SkuName skuName; + + /** + * Identifies the account kind. Possible values include: 'Storage', + * 'BlobStorage', 'StorageV2'. + */ + @JsonProperty(value = "x-ms-account-kind") + private AccountKind accountKind; + + /** + * Get the requestId value. + * + * @return the requestId value. + */ + public String requestId() { + return this.requestId; + } + + /** + * Set the requestId value. + * + * @param requestId the requestId value to set. + * @return the ContainerGetAccountInfoHeaders object itself. + */ + public ContainerGetAccountInfoHeaders withRequestId(String requestId) { + this.requestId = requestId; + return this; + } + + /** + * Get the version value. + * + * @return the version value. + */ + public String version() { + return this.version; + } + + /** + * Set the version value. + * + * @param version the version value to set. + * @return the ContainerGetAccountInfoHeaders object itself. + */ + public ContainerGetAccountInfoHeaders withVersion(String version) { + this.version = version; + return this; + } + + /** + * Get the date value. + * + * @return the date value. + */ + public OffsetDateTime date() { + if (this.date == null) { + return null; + } + return this.date.dateTime(); + } + + /** + * Set the date value. + * + * @param date the date value to set. + * @return the ContainerGetAccountInfoHeaders object itself. + */ + public ContainerGetAccountInfoHeaders withDate(OffsetDateTime date) { + if (date == null) { + this.date = null; + } else { + this.date = new DateTimeRfc1123(date); + } + return this; + } + + /** + * Get the skuName value. + * + * @return the skuName value. + */ + public SkuName skuName() { + return this.skuName; + } + + /** + * Set the skuName value. + * + * @param skuName the skuName value to set. + * @return the ContainerGetAccountInfoHeaders object itself. + */ + public ContainerGetAccountInfoHeaders withSkuName(SkuName skuName) { + this.skuName = skuName; + return this; + } + + /** + * Get the accountKind value. + * + * @return the accountKind value. + */ + public AccountKind accountKind() { + return this.accountKind; + } + + /** + * Set the accountKind value. + * + * @param accountKind the accountKind value to set. + * @return the ContainerGetAccountInfoHeaders object itself. + */ + public ContainerGetAccountInfoHeaders withAccountKind(AccountKind accountKind) { + this.accountKind = accountKind; + return this; + } +} diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/ContainerGetAccountInfoResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/ContainerGetAccountInfoResponse.java new file mode 100644 index 000000000000..2348d16b4c0f --- /dev/null +++ b/src/main/java/com/microsoft/azure/storage/blob/models/ContainerGetAccountInfoResponse.java @@ -0,0 +1,41 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + * Changes may cause incorrect behavior and will be lost if the code is + * regenerated. + */ + +package com.microsoft.azure.storage.blob.models; + +import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; +import java.util.Map; + +/** + * Contains all response data for the getAccountInfo operation. + */ +public final class ContainerGetAccountInfoResponse extends RestResponse { + /** + * Creates an instance of ContainerGetAccountInfoResponse. + * + * @param request the request which resulted in this {response.Name}. + * @param statusCode the status code of the HTTP response. + * @param headers the deserialized headers of the HTTP response. + * @param rawHeaders the raw headers of the HTTP response. + * @param body the deserialized body of the HTTP response. + */ + public ContainerGetAccountInfoResponse(HttpRequest request, int statusCode, ContainerGetAccountInfoHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); + } + + /** + * @return the deserialized response headers. + */ + @Override + public ContainerGetAccountInfoHeaders headers() { + return super.headers(); + } +} diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/ContainerGetPropertiesResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/ContainerGetPropertiesResponse.java index 69124cf21932..037e7949bb73 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/ContainerGetPropertiesResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/ContainerGetPropertiesResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class ContainerGetPropertiesResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public ContainerGetPropertiesResponse(HttpRequest request, int statusCode, ContainerGetPropertiesHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/ContainerListBlobFlatSegmentResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/ContainerListBlobFlatSegmentResponse.java index d813f3d2e97b..6d751f0b2fd9 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/ContainerListBlobFlatSegmentResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/ContainerListBlobFlatSegmentResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class ContainerListBlobFlatSegmentResponse extends RestResponse rawHeaders, ListBlobsFlatSegmentResponse body) { - super(statusCode, headers, rawHeaders, body); + public ContainerListBlobFlatSegmentResponse(HttpRequest request, int statusCode, ContainerListBlobFlatSegmentHeaders headers, Map rawHeaders, ListBlobsFlatSegmentResponse body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/ContainerListBlobHierarchySegmentResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/ContainerListBlobHierarchySegmentResponse.java index af3918a6d363..958af21272e3 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/ContainerListBlobHierarchySegmentResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/ContainerListBlobHierarchySegmentResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class ContainerListBlobHierarchySegmentResponse extends RestRespons /** * Creates an instance of ContainerListBlobHierarchySegmentResponse. * + * @param request the request which resulted in this {response.Name}. * @param statusCode the status code of the HTTP response. * @param headers the deserialized headers of the HTTP response. * @param rawHeaders the raw headers of the HTTP response. * @param body the deserialized body of the HTTP response. */ - public ContainerListBlobHierarchySegmentResponse(int statusCode, ContainerListBlobHierarchySegmentHeaders headers, Map rawHeaders, ListBlobsHierarchySegmentResponse body) { - super(statusCode, headers, rawHeaders, body); + public ContainerListBlobHierarchySegmentResponse(HttpRequest request, int statusCode, ContainerListBlobHierarchySegmentHeaders headers, Map rawHeaders, ListBlobsHierarchySegmentResponse body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/ContainerReleaseLeaseResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/ContainerReleaseLeaseResponse.java index 81a4afef936f..21a2aefcaf35 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/ContainerReleaseLeaseResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/ContainerReleaseLeaseResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class ContainerReleaseLeaseResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public ContainerReleaseLeaseResponse(HttpRequest request, int statusCode, ContainerReleaseLeaseHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/ContainerRenewLeaseResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/ContainerRenewLeaseResponse.java index a8b815fe7d33..9c50a7148697 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/ContainerRenewLeaseResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/ContainerRenewLeaseResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class ContainerRenewLeaseResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public ContainerRenewLeaseResponse(HttpRequest request, int statusCode, ContainerRenewLeaseHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/ContainerSetAccessPolicyResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/ContainerSetAccessPolicyResponse.java index 53481bae39f0..08faa8cb06ff 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/ContainerSetAccessPolicyResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/ContainerSetAccessPolicyResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class ContainerSetAccessPolicyResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public ContainerSetAccessPolicyResponse(HttpRequest request, int statusCode, ContainerSetAccessPolicyHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/ContainerSetMetadataResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/ContainerSetMetadataResponse.java index f420b6ff80d5..07688f18c3bb 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/ContainerSetMetadataResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/ContainerSetMetadataResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class ContainerSetMetadataResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public ContainerSetMetadataResponse(HttpRequest request, int statusCode, ContainerSetMetadataHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/ListBlobsFlatSegmentResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/ListBlobsFlatSegmentResponse.java index d7c7f6bcb8a2..629a79f53f47 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/ListBlobsFlatSegmentResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/ListBlobsFlatSegmentResponse.java @@ -58,7 +58,7 @@ public final class ListBlobsFlatSegmentResponse { /** * The segment property. */ - @JsonProperty(value = "Blobs") + @JsonProperty(value = "Blobs", required = true) private BlobFlatListSegment segment; /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/ListBlobsHierarchySegmentResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/ListBlobsHierarchySegmentResponse.java index 69893a4e57c2..12ba3f950c78 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/ListBlobsHierarchySegmentResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/ListBlobsHierarchySegmentResponse.java @@ -58,7 +58,7 @@ public final class ListBlobsHierarchySegmentResponse { /** * The segment property. */ - @JsonProperty(value = "Blobs") + @JsonProperty(value = "Blobs", required = true) private BlobHierarchyListSegment segment; /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobClearPagesResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobClearPagesResponse.java index a44811396e9f..99f7fe8bd49c 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobClearPagesResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobClearPagesResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class PageBlobClearPagesResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public PageBlobClearPagesResponse(HttpRequest request, int statusCode, PageBlobClearPagesHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobCopyIncrementalResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobCopyIncrementalResponse.java index d7c5a19f76ec..077a466656c5 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobCopyIncrementalResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobCopyIncrementalResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class PageBlobCopyIncrementalResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public PageBlobCopyIncrementalResponse(HttpRequest request, int statusCode, PageBlobCopyIncrementalHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobCreateResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobCreateResponse.java index b85664c65613..b18a74841b95 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobCreateResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobCreateResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class PageBlobCreateResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public PageBlobCreateResponse(HttpRequest request, int statusCode, PageBlobCreateHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobGetPageRangesDiffResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobGetPageRangesDiffResponse.java index 33806a73cce3..28d4ed76ac45 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobGetPageRangesDiffResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobGetPageRangesDiffResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class PageBlobGetPageRangesDiffResponse extends RestResponse rawHeaders, PageList body) { - super(statusCode, headers, rawHeaders, body); + public PageBlobGetPageRangesDiffResponse(HttpRequest request, int statusCode, PageBlobGetPageRangesDiffHeaders headers, Map rawHeaders, PageList body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobGetPageRangesResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobGetPageRangesResponse.java index 7cdc15c17b64..4ca391ed0715 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobGetPageRangesResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobGetPageRangesResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class PageBlobGetPageRangesResponse extends RestResponse rawHeaders, PageList body) { - super(statusCode, headers, rawHeaders, body); + public PageBlobGetPageRangesResponse(HttpRequest request, int statusCode, PageBlobGetPageRangesHeaders headers, Map rawHeaders, PageList body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobResizeResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobResizeResponse.java index 481e186b37ca..3de49146bb9a 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobResizeResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobResizeResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class PageBlobResizeResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public PageBlobResizeResponse(HttpRequest request, int statusCode, PageBlobResizeHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobUpdateSequenceNumberResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobUpdateSequenceNumberResponse.java index 02de1a7add44..637404963e48 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobUpdateSequenceNumberResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobUpdateSequenceNumberResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class PageBlobUpdateSequenceNumberResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public PageBlobUpdateSequenceNumberResponse(HttpRequest request, int statusCode, PageBlobUpdateSequenceNumberHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobUploadPagesResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobUploadPagesResponse.java index fd1a0b0a029c..d9184fc61d2c 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobUploadPagesResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/PageBlobUploadPagesResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class PageBlobUploadPagesResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public PageBlobUploadPagesResponse(HttpRequest request, int statusCode, PageBlobUploadPagesHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/ServiceGetAccountInfoHeaders.java b/src/main/java/com/microsoft/azure/storage/blob/models/ServiceGetAccountInfoHeaders.java new file mode 100644 index 000000000000..f552cf625449 --- /dev/null +++ b/src/main/java/com/microsoft/azure/storage/blob/models/ServiceGetAccountInfoHeaders.java @@ -0,0 +1,167 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + * Changes may cause incorrect behavior and will be lost if the code is + * regenerated. + */ + +package com.microsoft.azure.storage.blob.models; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import com.microsoft.rest.v2.DateTimeRfc1123; +import java.time.OffsetDateTime; + +/** + * Defines headers for GetAccountInfo operation. + */ +@JacksonXmlRootElement(localName = "Service-GetAccountInfo-Headers") +public final class ServiceGetAccountInfoHeaders { + /** + * This header uniquely identifies the request that was made and can be + * used for troubleshooting the request. + */ + @JsonProperty(value = "x-ms-request-id") + private String requestId; + + /** + * Indicates the version of the Blob service used to execute the request. + * This header is returned for requests made against version 2009-09-19 and + * above. + */ + @JsonProperty(value = "x-ms-version") + private String version; + + /** + * UTC date/time value generated by the service that indicates the time at + * which the response was initiated. + */ + @JsonProperty(value = "Date") + private DateTimeRfc1123 date; + + /** + * Identifies the sku name of the account. Possible values include: + * 'Standard_LRS', 'Standard_GRS', 'Standard_RAGRS', 'Standard_ZRS', + * 'Premium_LRS'. + */ + @JsonProperty(value = "x-ms-sku-name") + private SkuName skuName; + + /** + * Identifies the account kind. Possible values include: 'Storage', + * 'BlobStorage', 'StorageV2'. + */ + @JsonProperty(value = "x-ms-account-kind") + private AccountKind accountKind; + + /** + * Get the requestId value. + * + * @return the requestId value. + */ + public String requestId() { + return this.requestId; + } + + /** + * Set the requestId value. + * + * @param requestId the requestId value to set. + * @return the ServiceGetAccountInfoHeaders object itself. + */ + public ServiceGetAccountInfoHeaders withRequestId(String requestId) { + this.requestId = requestId; + return this; + } + + /** + * Get the version value. + * + * @return the version value. + */ + public String version() { + return this.version; + } + + /** + * Set the version value. + * + * @param version the version value to set. + * @return the ServiceGetAccountInfoHeaders object itself. + */ + public ServiceGetAccountInfoHeaders withVersion(String version) { + this.version = version; + return this; + } + + /** + * Get the date value. + * + * @return the date value. + */ + public OffsetDateTime date() { + if (this.date == null) { + return null; + } + return this.date.dateTime(); + } + + /** + * Set the date value. + * + * @param date the date value to set. + * @return the ServiceGetAccountInfoHeaders object itself. + */ + public ServiceGetAccountInfoHeaders withDate(OffsetDateTime date) { + if (date == null) { + this.date = null; + } else { + this.date = new DateTimeRfc1123(date); + } + return this; + } + + /** + * Get the skuName value. + * + * @return the skuName value. + */ + public SkuName skuName() { + return this.skuName; + } + + /** + * Set the skuName value. + * + * @param skuName the skuName value to set. + * @return the ServiceGetAccountInfoHeaders object itself. + */ + public ServiceGetAccountInfoHeaders withSkuName(SkuName skuName) { + this.skuName = skuName; + return this; + } + + /** + * Get the accountKind value. + * + * @return the accountKind value. + */ + public AccountKind accountKind() { + return this.accountKind; + } + + /** + * Set the accountKind value. + * + * @param accountKind the accountKind value to set. + * @return the ServiceGetAccountInfoHeaders object itself. + */ + public ServiceGetAccountInfoHeaders withAccountKind(AccountKind accountKind) { + this.accountKind = accountKind; + return this; + } +} diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/ServiceGetAccountInfoResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/ServiceGetAccountInfoResponse.java new file mode 100644 index 000000000000..eb1ac1e60498 --- /dev/null +++ b/src/main/java/com/microsoft/azure/storage/blob/models/ServiceGetAccountInfoResponse.java @@ -0,0 +1,41 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + * Changes may cause incorrect behavior and will be lost if the code is + * regenerated. + */ + +package com.microsoft.azure.storage.blob.models; + +import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; +import java.util.Map; + +/** + * Contains all response data for the getAccountInfo operation. + */ +public final class ServiceGetAccountInfoResponse extends RestResponse { + /** + * Creates an instance of ServiceGetAccountInfoResponse. + * + * @param request the request which resulted in this {response.Name}. + * @param statusCode the status code of the HTTP response. + * @param headers the deserialized headers of the HTTP response. + * @param rawHeaders the raw headers of the HTTP response. + * @param body the deserialized body of the HTTP response. + */ + public ServiceGetAccountInfoResponse(HttpRequest request, int statusCode, ServiceGetAccountInfoHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); + } + + /** + * @return the deserialized response headers. + */ + @Override + public ServiceGetAccountInfoHeaders headers() { + return super.headers(); + } +} diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/ServiceGetPropertiesResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/ServiceGetPropertiesResponse.java index bbabf6237dae..cabb5217fe1d 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/ServiceGetPropertiesResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/ServiceGetPropertiesResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class ServiceGetPropertiesResponse extends RestResponse rawHeaders, StorageServiceProperties body) { - super(statusCode, headers, rawHeaders, body); + public ServiceGetPropertiesResponse(HttpRequest request, int statusCode, ServiceGetPropertiesHeaders headers, Map rawHeaders, StorageServiceProperties body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/ServiceGetStatisticsResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/ServiceGetStatisticsResponse.java index ccfbd4d5c51c..34c3d7675303 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/ServiceGetStatisticsResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/ServiceGetStatisticsResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class ServiceGetStatisticsResponse extends RestResponse rawHeaders, StorageServiceStats body) { - super(statusCode, headers, rawHeaders, body); + public ServiceGetStatisticsResponse(HttpRequest request, int statusCode, ServiceGetStatisticsHeaders headers, Map rawHeaders, StorageServiceStats body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/ServiceListContainersSegmentResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/ServiceListContainersSegmentResponse.java index 272eb8127ef7..0ead4cebd4e2 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/ServiceListContainersSegmentResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/ServiceListContainersSegmentResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class ServiceListContainersSegmentResponse extends RestResponse rawHeaders, ListContainersSegmentResponse body) { - super(statusCode, headers, rawHeaders, body); + public ServiceListContainersSegmentResponse(HttpRequest request, int statusCode, ServiceListContainersSegmentHeaders headers, Map rawHeaders, ListContainersSegmentResponse body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/ServiceSetPropertiesResponse.java b/src/main/java/com/microsoft/azure/storage/blob/models/ServiceSetPropertiesResponse.java index 0d49de16e9e7..52fb3b2a30c9 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/ServiceSetPropertiesResponse.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/ServiceSetPropertiesResponse.java @@ -11,6 +11,7 @@ package com.microsoft.azure.storage.blob.models; import com.microsoft.rest.v2.RestResponse; +import com.microsoft.rest.v2.http.HttpRequest; import java.util.Map; /** @@ -20,13 +21,14 @@ public final class ServiceSetPropertiesResponse extends RestResponse rawHeaders, Void body) { - super(statusCode, headers, rawHeaders, body); + public ServiceSetPropertiesResponse(HttpRequest request, int statusCode, ServiceSetPropertiesHeaders headers, Map rawHeaders, Void body) { + super(request, statusCode, headers, rawHeaders, body); } /** diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/SkuName.java b/src/main/java/com/microsoft/azure/storage/blob/models/SkuName.java new file mode 100644 index 000000000000..468e579a685f --- /dev/null +++ b/src/main/java/com/microsoft/azure/storage/blob/models/SkuName.java @@ -0,0 +1,76 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + * Changes may cause incorrect behavior and will be lost if the code is + * regenerated. + */ + +package com.microsoft.azure.storage.blob.models; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + +/** + * Defines values for SkuName. + */ +public enum SkuName { + /** + * Enum value Standard_LRS. + */ + STANDARD_LRS("Standard_LRS"), + + /** + * Enum value Standard_GRS. + */ + STANDARD_GRS("Standard_GRS"), + + /** + * Enum value Standard_RAGRS. + */ + STANDARD_RAGRS("Standard_RAGRS"), + + /** + * Enum value Standard_ZRS. + */ + STANDARD_ZRS("Standard_ZRS"), + + /** + * Enum value Premium_LRS. + */ + PREMIUM_LRS("Premium_LRS"); + + /** + * The actual serialized value for a SkuName instance. + */ + private final String value; + + private SkuName(String value) { + this.value = value; + } + + /** + * Parses a serialized value to a SkuName instance. + * + * @param value the serialized value to parse. + * @return the parsed SkuName object, or null if unable to parse. + */ + @JsonCreator + public static SkuName fromString(String value) { + SkuName[] items = SkuName.values(); + for (SkuName item : items) { + if (item.toString().equalsIgnoreCase(value)) { + return item; + } + } + return null; + } + + @JsonValue + @Override + public String toString() { + return this.value; + } +} diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/StaticWebsite.java b/src/main/java/com/microsoft/azure/storage/blob/models/StaticWebsite.java new file mode 100644 index 000000000000..dbda8afe34ec --- /dev/null +++ b/src/main/java/com/microsoft/azure/storage/blob/models/StaticWebsite.java @@ -0,0 +1,99 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + * Changes may cause incorrect behavior and will be lost if the code is + * regenerated. + */ + +package com.microsoft.azure.storage.blob.models; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; + +/** + * The properties that enable an account to host a static website. + */ +@JacksonXmlRootElement(localName = "StaticWebsite") +public final class StaticWebsite { + /** + * Indicates whether this account is hosting a static website. + */ + @JsonProperty(value = "Enabled", required = true) + private boolean enabled; + + /** + * The default name of the index page under each directory. + */ + @JsonProperty(value = "IndexDocument") + private String indexDocument; + + /** + * The absolute path of the custom 404 page. + */ + @JsonProperty(value = "ErrorDocument404Path") + private String errorDocument404Path; + + /** + * Get the enabled value. + * + * @return the enabled value. + */ + public boolean enabled() { + return this.enabled; + } + + /** + * Set the enabled value. + * + * @param enabled the enabled value to set. + * @return the StaticWebsite object itself. + */ + public StaticWebsite withEnabled(boolean enabled) { + this.enabled = enabled; + return this; + } + + /** + * Get the indexDocument value. + * + * @return the indexDocument value. + */ + public String indexDocument() { + return this.indexDocument; + } + + /** + * Set the indexDocument value. + * + * @param indexDocument the indexDocument value to set. + * @return the StaticWebsite object itself. + */ + public StaticWebsite withIndexDocument(String indexDocument) { + this.indexDocument = indexDocument; + return this; + } + + /** + * Get the errorDocument404Path value. + * + * @return the errorDocument404Path value. + */ + public String errorDocument404Path() { + return this.errorDocument404Path; + } + + /** + * Set the errorDocument404Path value. + * + * @param errorDocument404Path the errorDocument404Path value to set. + * @return the StaticWebsite object itself. + */ + public StaticWebsite withErrorDocument404Path(String errorDocument404Path) { + this.errorDocument404Path = errorDocument404Path; + return this; + } +} diff --git a/src/main/java/com/microsoft/azure/storage/blob/models/StorageServiceProperties.java b/src/main/java/com/microsoft/azure/storage/blob/models/StorageServiceProperties.java index 3ead123fbe83..5b3467c7e4a1 100644 --- a/src/main/java/com/microsoft/azure/storage/blob/models/StorageServiceProperties.java +++ b/src/main/java/com/microsoft/azure/storage/blob/models/StorageServiceProperties.java @@ -70,6 +70,12 @@ private CorsWrapper(@JacksonXmlProperty(localName = "CorsRule") List i @JsonProperty(value = "DeleteRetentionPolicy") private RetentionPolicy deleteRetentionPolicy; + /** + * The staticWebsite property. + */ + @JsonProperty(value = "StaticWebsite") + private StaticWebsite staticWebsite; + /** * Get the logging value. * @@ -192,4 +198,24 @@ public StorageServiceProperties withDeleteRetentionPolicy(RetentionPolicy delete this.deleteRetentionPolicy = deleteRetentionPolicy; return this; } + + /** + * Get the staticWebsite value. + * + * @return the staticWebsite value. + */ + public StaticWebsite staticWebsite() { + return this.staticWebsite; + } + + /** + * Set the staticWebsite value. + * + * @param staticWebsite the staticWebsite value to set. + * @return the StorageServiceProperties object itself. + */ + public StorageServiceProperties withStaticWebsite(StaticWebsite staticWebsite) { + this.staticWebsite = staticWebsite; + return this; + } } diff --git a/src/test/java/com/microsoft/azure/storage/APISpec.groovy b/src/test/java/com/microsoft/azure/storage/APISpec.groovy index 6c2ce4e2121b..20df29932ac1 100644 --- a/src/test/java/com/microsoft/azure/storage/APISpec.groovy +++ b/src/test/java/com/microsoft/azure/storage/APISpec.groovy @@ -180,7 +180,8 @@ class APISpec extends Specification { static HttpClient getHttpClient() { if (enableDebugging) { HttpClientConfiguration configuration = new HttpClientConfiguration( - new Proxy(Proxy.Type.HTTP, new InetSocketAddress("localhost", 8888))) + new Proxy(Proxy.Type.HTTP, new InetSocketAddress("localhost", 8888)), + false) return HttpClient.createDefault(configuration) } else return HttpClient.createDefault() diff --git a/src/test/java/com/microsoft/azure/storage/BlobStorageAPITests.java b/src/test/java/com/microsoft/azure/storage/BlobStorageAPITests.java index 024a2e24957c..f28a8b880ad0 100644 --- a/src/test/java/com/microsoft/azure/storage/BlobStorageAPITests.java +++ b/src/test/java/com/microsoft/azure/storage/BlobStorageAPITests.java @@ -73,7 +73,7 @@ public void TestPutBlobBasic() throws IOException, InvalidKeyException, Interrup // Currently only the default PipelineOptions are supported. PipelineOptions po = new PipelineOptions(); HttpClientConfiguration configuration = new HttpClientConfiguration( - new Proxy(Proxy.Type.HTTP, new InetSocketAddress("localhost", 8888))); + new Proxy(Proxy.Type.HTTP, new InetSocketAddress("localhost", 8888)), false); po.client = HttpClient.createDefault();//configuration); HttpPipeline pipeline = StorageURL.createPipeline(creds, po); diff --git a/src/test/java/com/microsoft/azure/storage/RetryReaderMockFlowable.java b/src/test/java/com/microsoft/azure/storage/RetryReaderMockFlowable.java index e6ac2c807146..6d41fa1a1437 100644 --- a/src/test/java/com/microsoft/azure/storage/RetryReaderMockFlowable.java +++ b/src/test/java/com/microsoft/azure/storage/RetryReaderMockFlowable.java @@ -169,7 +169,7 @@ public Single>> getter(RetryReade this.tryNumber++; this.info = info; RestResponse> response = - new RestResponse<>(200, new BlobDownloadHeaders(), new HashMap<>(), this); + new RestResponse<>(null,200, new BlobDownloadHeaders(), new HashMap<>(), this); switch(this.scenario) { case RR_TEST_SCENARIO_ERROR_GETTER_INITIAL: diff --git a/src/test/java/com/microsoft/azure/storage/Samples.java b/src/test/java/com/microsoft/azure/storage/Samples.java index c8e1141a7bfb..7c0ec54005be 100644 --- a/src/test/java/com/microsoft/azure/storage/Samples.java +++ b/src/test/java/com/microsoft/azure/storage/Samples.java @@ -400,7 +400,8 @@ else if (exception.errorCode() } // We just fake a successful response to prevent the example from crashing. return Single.just( - new ContainerCreateResponse(200, null, null, null)); + new ContainerCreateResponse(null,200, null, null, + null)); }) /* This will synchronize all the above operations. This is strongly discouraged for use in production as @@ -1648,7 +1649,8 @@ else if (exception.errorCode() } // We just fake a successful response to prevent the example from crashing. return Single.just( - new ContainerCreateResponse(200, null, null, null)); + new ContainerCreateResponse(null,200, null, null, + null)); }).subscribe(); // diff --git a/swagger/generate.bat b/swagger/generate.bat index d4b8a58ab322..a4fd197ac712 100644 --- a/swagger/generate.bat +++ b/swagger/generate.bat @@ -1,3 +1,3 @@ -set version=2.0.22 +set version=2.0.23 set url=https://github.com/Azure/autorest.java/releases/download/v%version%/microsoft.azure-autorest.java-%version%.tgz autorest %~dp0README.md --use=%url% --reset --preview --implementation-subpackage=blob.implementation --models-subpackage=blob.models --generate-client-interfaces=false --required-parameter-client-methods=false --client-type-prefix=Generated \ No newline at end of file