Regenerated blob based off 04-08 swagger (Azure#18477)

Author: gapra-msft

sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/BlobsImpl.java

@@ -25,6 +25,7 @@
 import com.azure.core.util.Base64Util;
 import com.azure.core.util.Context;
 import com.azure.core.util.DateTimeRfc1123;
+import com.azure.storage.blob.implementation.models.BlobDeleteType;
 import com.azure.storage.blob.implementation.models.BlobExpiryOptions;
 import com.azure.storage.blob.implementation.models.BlobsAbortCopyFromURLResponse;
 import com.azure.storage.blob.implementation.models.BlobsAcquireLeaseResponse;
@@ -113,7 +114,7 @@ private interface BlobsService {
         @Delete("{containerName}/{blob}")
         @ExpectedResponses({202})
         @UnexpectedResponseExceptionType(BlobStorageException.class)
-        Mono<BlobsDeleteResponse> delete(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("snapshot") String snapshot, @QueryParam("versionid") String versionId, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("x-ms-delete-snapshots") DeleteSnapshotsOptionType deleteSnapshots, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, @HeaderParam("x-ms-if-tags") String ifTags, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, Context context);
+        Mono<BlobsDeleteResponse> delete(@PathParam("containerName") String containerName, @PathParam("blob") String blob, @HostParam("url") String url, @QueryParam("snapshot") String snapshot, @QueryParam("versionid") String versionId, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("x-ms-delete-snapshots") DeleteSnapshotsOptionType deleteSnapshots, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch, @HeaderParam("x-ms-if-tags") String ifTags, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("deletetype") BlobDeleteType blobDeleteType, Context context);
 
         @Patch("{filesystem}/{path}")
         @ExpectedResponses({200})
@@ -379,9 +380,10 @@ public Mono<BlobsDeleteResponse> deleteWithRestResponseAsync(String containerNam
         final String ifNoneMatch = null;
         final String ifTags = null;
         final String requestId = null;
+        final BlobDeleteType blobDeleteType = null;
         DateTimeRfc1123 ifModifiedSinceConverted = null;
         DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
-        return service.delete(containerName, blob, this.client.getUrl(), snapshot, versionId, timeout, leaseId, deleteSnapshots, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, ifTags, this.client.getVersion(), requestId, context);
+        return service.delete(containerName, blob, this.client.getUrl(), snapshot, versionId, timeout, leaseId, deleteSnapshots, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, ifTags, this.client.getVersion(), requestId, blobDeleteType, context);
     }
 
     /**
@@ -400,15 +402,16 @@ public Mono<BlobsDeleteResponse> deleteWithRestResponseAsync(String containerNam
      * @param ifNoneMatch Specify an ETag value to operate only on blobs without a matching value.
      * @param ifTags Specify a SQL where clause on blob tags to operate only on blobs with a matching value.
      * @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.
+     * @param blobDeleteType Optional.  Only possible value is 'permanent', which specifies to permanently delete a blob if blob soft delete is enabled. Possible values include: 'Permanent'.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @return a Mono which performs the network request upon subscription.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<BlobsDeleteResponse> deleteWithRestResponseAsync(String containerName, String blob, String snapshot, String versionId, Integer timeout, String leaseId, DeleteSnapshotsOptionType deleteSnapshots, OffsetDateTime ifModifiedSince, OffsetDateTime ifUnmodifiedSince, String ifMatch, String ifNoneMatch, String ifTags, String requestId, Context context) {
+    public Mono<BlobsDeleteResponse> deleteWithRestResponseAsync(String containerName, String blob, String snapshot, String versionId, Integer timeout, String leaseId, DeleteSnapshotsOptionType deleteSnapshots, OffsetDateTime ifModifiedSince, OffsetDateTime ifUnmodifiedSince, String ifMatch, String ifNoneMatch, String ifTags, String requestId, BlobDeleteType blobDeleteType, Context context) {
         DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
         DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
-        return service.delete(containerName, blob, this.client.getUrl(), snapshot, versionId, timeout, leaseId, deleteSnapshots, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, ifTags, this.client.getVersion(), requestId, context);
+        return service.delete(containerName, blob, this.client.getUrl(), snapshot, versionId, timeout, leaseId, deleteSnapshots, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, ifMatch, ifNoneMatch, ifTags, this.client.getVersion(), requestId, blobDeleteType, context);
     }
 
     /**

sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobDeleteType.java

@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.storage.blob.implementation.models;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for BlobDeleteType.
+ */
+public enum BlobDeleteType {
+    /**
+     * Enum value Permanent.
+     */
+    PERMANENT("Permanent");
+
+    /**
+     * The actual serialized value for a BlobDeleteType instance.
+     */
+    private final String value;
+
+    BlobDeleteType(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a BlobDeleteType instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed BlobDeleteType object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static BlobDeleteType fromString(String value) {
+        BlobDeleteType[] items = BlobDeleteType.values();
+        for (BlobDeleteType item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}

sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/BlobDownloadHeaders.java

@@ -244,6 +244,13 @@ public final class BlobDownloadHeaders {
     @JsonProperty(value = "x-ms-version-id")
     private String versionId;
 
+    /*
+     * The value of this header indicates whether version of this blob is a
+     * current version, see also x-ms-version-id header.
+     */
+    @JsonProperty(value = "x-ms-is-current-version")
+    private Boolean isCurrentVersion;
+
     /*
      * Indicates that the service supports requests for partial blob content.
      */
@@ -1037,6 +1044,30 @@ public BlobDownloadHeaders setVersionId(String versionId) {
         return this;
     }
 
+    /**
+     * Get the isCurrentVersion property: The value of this header indicates
+     * whether version of this blob is a current version, see also
+     * x-ms-version-id header.
+     *
+     * @return the isCurrentVersion value.
+     */
+    public Boolean isCurrentVersion() {
+        return this.isCurrentVersion;
+    }
+
+    /**
+     * Set the isCurrentVersion property: The value of this header indicates
+     * whether version of this blob is a current version, see also
+     * x-ms-version-id header.
+     *
+     * @param isCurrentVersion the isCurrentVersion value to set.
+     * @return the BlobDownloadHeaders object itself.
+     */
+    public BlobDownloadHeaders setIsCurrentVersion(Boolean isCurrentVersion) {
+        this.isCurrentVersion = isCurrentVersion;
+        return this;
+    }
+
     /**
      * Get the acceptRanges property: Indicates that the service supports
      * requests for partial blob content.

sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/implementation/models/ServiceGetAccountInfoHeaders.java

@@ -62,6 +62,13 @@ public final class ServiceGetAccountInfoHeaders {
     @JsonProperty(value = "x-ms-account-kind")
     private AccountKind accountKind;
 
+    /*
+     * Version 2019-07-07 and newer. Indicates if the account has a
+     * hierarchical namespace enabled.
+     */
+    @JsonProperty(value = "x-ms-is-hns-enabled")
+    private Boolean isHierarchicalNamespaceEnabled;
+
     /*
      * The errorCode property.
      */
@@ -215,6 +222,29 @@ public ServiceGetAccountInfoHeaders setAccountKind(AccountKind accountKind) {
         return this;
     }
 
+    /**
+     * Get the isHierarchicalNamespaceEnabled property: Version 2019-07-07 and
+     * newer. Indicates if the account has a hierarchical namespace enabled.
+     *
+     * @return the isHierarchicalNamespaceEnabled value.
+     */
+    public Boolean isHierarchicalNamespaceEnabled() {
+        return this.isHierarchicalNamespaceEnabled;
+    }
+
+    /**
+     * Set the isHierarchicalNamespaceEnabled property: Version 2019-07-07 and
+     * newer. Indicates if the account has a hierarchical namespace enabled.
+     *
+     * @param isHierarchicalNamespaceEnabled the isHierarchicalNamespaceEnabled
+     * value to set.
+     * @return the ServiceGetAccountInfoHeaders object itself.
+     */
+    public ServiceGetAccountInfoHeaders setIsHierarchicalNamespaceEnabled(Boolean isHierarchicalNamespaceEnabled) {
+        this.isHierarchicalNamespaceEnabled = isHierarchicalNamespaceEnabled;
+        return this;
+    }
+
     /**
      * Get the errorCode property: The errorCode property.
      *

sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobAsyncClientBase.java

@@ -1221,7 +1221,7 @@ Mono<Response<Void>> deleteWithResponse(DeleteSnapshotsOptionType deleteBlobSnap
         return this.azureBlobStorage.blobs().deleteWithRestResponseAsync(null, null, snapshot, versionId,
             null, requestConditions.getLeaseId(), deleteBlobSnapshotOptions, requestConditions.getIfModifiedSince(),
             requestConditions.getIfUnmodifiedSince(), requestConditions.getIfMatch(),
-            requestConditions.getIfNoneMatch(), requestConditions.getTagsConditions(), null, context)
+            requestConditions.getIfNoneMatch(), requestConditions.getTagsConditions(), null, null, context)
             .map(response -> new SimpleResponse<>(response, null));
     }
 

sdk/storage/azure-storage-blob/swagger/README.md

@@ -1425,4 +1425,13 @@ directive:
     delete $.FilterBlobItem.properties.TagValue;
 ```
 
+### Hide AllowPermanentDelete in RetentionPolicy
+``` yaml
+directive:
+- from: swagger-document
+  where: $.definitions.BlobRetentionPolicy
+  transform: >
+    delete $.properties.AllowPermanentDelete;
+```
+
 ![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-java%2Fsdk%2Fstorage%2Fazure-storage-blob%2Fswagger%2FREADME.png)